Merge pull request #1152 from splitbrain/composer

Use composer to add 3rd party libs

inc/geshi/apt_sources.php → vendor/easybook/geshi/geshi/apt_sources.php

@@ -55,7 +55,7 @@ $language_data = array (
             'stable/updates',
             //Debian
             'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato', 'woody', 'sarge',
-            'etch', 'lenny', 'wheezy', 'sid',
+            'etch', 'lenny', 'wheezy', 'jessie', 'sid',
             //Ubuntu
             'warty', 'warty-updates', 'warty-security', 'warty-proposed', 'warty-backports',
             'hoary', 'hoary-updates', 'hoary-security', 'hoary-proposed', 'hoary-backports',
@@ -69,7 +69,14 @@ $language_data = array (
             'jaunty', 'jaunty-updates', 'jaunty-security', 'jaunty-proposed', 'jaunty-backports',
             'karmic', 'karmic-updates', 'karmic-security', 'karmic-proposed', 'karmic-backports',
             'lucid', 'lucid-updates', 'lucid-security', 'lucid-proposed', 'lucid-backports',
-            'maverick', 'maverick-updates', 'maverick-security', 'maverick-proposed', 'maverick-backports'
+            'maverick', 'maverick-updates', 'maverick-security', 'maverick-proposed', 'maverick-backports',
+            'natty', 'natty-updates', 'natty-security', 'natty-proposed', 'natty-backports',
+            'oneiric', 'oneiric-updates', 'oneiric-security', 'oneiric-proposed', 'oneiric-backports',
+            'precise', 'precise-updates', 'precise-security', 'precise-proposed', 'precise-backports',
+            'quantal', 'quantal-updates', 'quantal-security', 'quantal-proposed', 'quantal-backports',
+            'raring', 'raring-updates', 'raring-security', 'raring-proposed', 'raring-backports',
+            'saucy', 'saucy-updates', 'saucy-security', 'saucy-proposed', 'saucy-backports',
+            'trusty', 'trusty-updates', 'trusty-security', 'trusty-proposed', 'trusty-backports'
             ),
         3 => array(
             'main', 'restricted', 'preview', 'contrib', 'non-free',

inc/geshi/asymptote.php → vendor/easybook/geshi/geshi/asymptote.php

@@ -190,5 +190,3 @@ $language_data = array(
             )
         )
 );
-
-?>

inc/geshi/awk.php → vendor/easybook/geshi/geshi/awk.php

@@ -154,5 +154,3 @@ $language_data = array (
     'SCRIPT_DELIMITERS' => array (),
     'HIGHLIGHT_STRICT_BLOCK' => array()
 );
-
-?>

inc/geshi/bash.php → vendor/easybook/geshi/geshi/bash.php

@@ -132,7 +132,16 @@ $language_data = array (
             'apt-src remove', 'apt-src update', 'apt-src upgrade',
             'apt-src version',
 
-            'basename', 'bash', 'bc', 'bison', 'bunzip2', 'bzcat',
+            'aptitude autoclean', 'aptitude build-dep', 'aptitude changelog',
+            'aptitude clean', 'aptitude download', 'aptitude forbid-version',
+            'aptitude forget-new', 'aptitude full-upgrade', 'aptitude hold',
+            'aptitude install', 'aptitude markauto', 'aptitude purge',
+            'aptitude reinstall', 'aptitude remove', 'aptitude safe-upgrade',
+            'aptitude search', 'aptitude show', 'aptitude unhold',
+            'aptitude unmarkauto', 'aptitude update', 'aptitude versions',
+            'aptitude why', 'aptitude why-not',
+
+            'basename', 'bash', 'batctl', 'bc', 'bison', 'bunzip2', 'bzcat',
             'bzcmp', 'bzdiff', 'bzegrep', 'bzfgrep', 'bzgrep',
             'bzip2', 'bzip2recover', 'bzless', 'bzmore',
 
@@ -247,14 +256,14 @@ $language_data = array (
             'git-web--browse', 'git-whatchanged', 'gitwhich', 'gitwipe',
             'git-write-tree', 'gitxgrep',
 
-            'head', 'hexdump', 'hostname',
+            'head', 'hexdump', 'hostname', 'htop',
 
             'id', 'ifconfig', 'ifdown', 'ifup', 'igawk', 'install',
 
             'ip', 'ip addr', 'ip addrlabel', 'ip link', 'ip maddr', 'ip mroute',
             'ip neigh', 'ip route', 'ip rule', 'ip tunnel', 'ip xfrm',
 
-            'join',
+            'jar', 'java', 'javac', 'join',
 
             'kbd_mode','kbdrate', 'kdialog', 'kfile', 'kill', 'killall',
 
@@ -271,10 +280,11 @@ $language_data = array (
 
             'od', 'openvt',
 
-            'passwd', 'patch', 'pcregrep', 'pcretest', 'perl', 'perror',
-            'pgawk', 'pidof', 'ping', 'pr', 'procmail', 'prune', 'ps', 'pstree',
-            'ps2ascii', 'ps2epsi', 'ps2frag', 'ps2pdf', 'ps2ps', 'psbook',
-            'psmerge', 'psnup', 'psresize', 'psselect', 'pstops',
+            'passwd', 'patch', 'pbzip2', 'pcregrep', 'pcretest', 'perl',
+            'perror', 'pgawk', 'pidof', 'pigz', 'ping', 'pr', 'procmail',
+            'prune', 'ps', 'pstree', 'ps2ascii', 'ps2epsi', 'ps2frag',
+            'ps2pdf', 'ps2ps', 'psbook', 'psmerge', 'psnup', 'psresize',
+            'psselect', 'pstops',
 
             'rbash', 'rcs', 'rcs2log', 'read', 'readlink', 'red', 'resizecons',
             'rev', 'rm', 'rmdir', 'rsh', 'run-parts',
@@ -283,7 +293,7 @@ $language_data = array (
             'setkeycodes', 'setleds', 'setmetamode', 'setserial', 'setterm',
             'sh', 'showkey', 'shred', 'size', 'size86', 'skill', 'sleep',
             'slogin', 'snice', 'sort', 'sox', 'split', 'ssed', 'ssh', 'ssh-add',
-            'ssh-agent', 'ssh-keygen', 'ssh-keyscan', 'stat', 'strace',
+            'ssh-agent', 'ssh-keygen', 'ssh-keyscan', 'sshfs', 'stat', 'strace',
             'strings', 'strip', 'stty', 'su', 'sudo', 'suidperl', 'sum', 'svn',
             'svnadmin', 'svndumpfilter', 'svnlook', 'svnmerge', 'svnmucc',
             'svnserve', 'svnshell', 'svnsync', 'svnversion', 'svnwrap', 'sync',
@@ -291,16 +301,40 @@ $language_data = array (
             'svn add', 'svn ann', 'svn annotate', 'svn blame', 'svn cat',
             'svn changelist', 'svn checkout', 'svn ci', 'svn cl', 'svn cleanup',
             'svn co', 'svn commit', 'svn copy', 'svn cp', 'svn del',
-            'svn delete', 'svn di', 'svn diff', 'svn export', 'svn h',
-            'svn help', 'svn import', 'svn info', 'svn list', 'svn lock',
-            'svn log', 'svn ls', 'svn merge', 'svn mergeinfo', 'svn mkdir',
-            'svn move', 'svn mv', 'svn pd', 'svn pdel', 'svn pe', 'svn pedit',
+            'svn delete', 'svn di', 'svn diff', 'svn export', 'svn help',
+            'svn import', 'svn info', 'svn list', 'svn lock', 'svn log',
+            'svn ls', 'svn merge', 'svn mergeinfo', 'svn mkdir', 'svn move',
+            'svn mv', 'svn patch', 'svn pd', 'svn pdel', 'svn pe', 'svn pedit',
             'svn pg', 'svn pget', 'svn pl', 'svn plist', 'svn praise',
             'svn propdel', 'svn propedit', 'svn propget', 'svn proplist',
-            'svn propset', 'svn ps', 'svn pset', 'svn remove', 'svn ren',
+            'svn propset', 'svn ps', 'svn pset', 'svn relocate', 'svn remove',
             'svn rename', 'svn resolve', 'svn resolved', 'svn revert', 'svn rm',
             'svn st', 'svn stat', 'svn status', 'svn sw', 'svn switch',
-            'svn unlock', 'svn up', 'svn update',
+            'svn unlock', 'svn up', 'svn update', 'svn upgrade',
+
+            'svnadmin crashtest', 'svnadmin create', 'svnadmin deltify',
+            'svnadmin dump', 'svnadmin help', 'svnadmin hotcopy',
+            'svnadmin list-dblogs', 'svnadmin list-unused-dblogs',
+            'svnadmin load', 'svnadmin lslocks', 'svnadmin lstxns',
+            'svnadmin pack', 'svnadmin recover', 'svnadmin rmlocks',
+            'svnadmin rmtxns', 'svnadmin setlog', 'svnadmin setrevprop',
+            'svnadmin setuuid', 'svnadmin upgrade', 'svnadmin verify',
+
+            'svndumpfilter exclude', 'svndumpfilter help',
+            'svndumpfilter include',
+
+            'svnlook author', 'svnlook cat', 'svnlook changed', 'svnlook date',
+            'svnlook diff', 'svnlook dirs-changed', 'svnlook filesize',
+            'svnlook help', 'svnlook history', 'svnlook info', 'svnlook lock',
+            'svnlook log', 'svnlook pg', 'svnlook pget', 'svnlook pl',
+            'svnlook plist', 'svnlook propget', 'svnlook proplist',
+            'svnlook tree', 'svnlook uuid', 'svnlook youngest',
+
+            'svnrdump dump', 'svnrdump help', 'svnrdump load',
+
+            'svnsync copy-revprops', 'svnsync help', 'svnsync info',
+            'svnsync init', 'svnsync initialize', 'svnsync sync',
+            'svnsync synchronize',
 
             'tac', 'tail', 'tar', 'tee', 'tempfile', 'touch', 'tr', 'tree',
             'true',

inc/geshi/basic4gl.php → vendor/easybook/geshi/geshi/basic4gl.php

@@ -337,5 +337,3 @@ $language_data = array (
         ),
     'TAB_WIDTH' => 4
 );
-
-?>

vendor/easybook/geshi/geshi/batch.php

+<?php
+/*************************************************************************************
+ * batch.php
+ * ------------
+ * Author: FraidZZ ( fraidzz [@] bk.ru )
+ * Copyright: (c) 2015 FraidZZ ( http://vk.com/fraidzz , http://www.cyberforum.ru/members/340557.html )
+ * Release Version: 1.0.8.11
+ * Date Started: 2015/03/28
+ *
+ * Windows batch file language file for GeSHi.
+ *
+ *************************************************************************************
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Windows Batch file',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+	'COMMENT_REGEXP' => array(
+		100 => '/(?:^|[&|])\\s*(?:rem|::)[^\\n]*/msi',
+		101 => '/[\\/-]\\S*/si',
+		102 => '/^\s*:[^:]\\S*/msi',
+		103 => '/(?:([%!])[^"\'~ ][^"\' ]*\\1|%%?(?:~[dpnxsatz]*)?[^"\'])/si'
+	),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+	'ESCAPE_REGEXP' => array(
+		100 => '/(?:([%!])\\S+\\1|%%(?:~[dpnxsatz]*)?[^"\'])/si'
+	),
+    'KEYWORDS' => array(
+        1 => array(
+            'echo', 'set', 'for', 'if', 'exit', 'else', 'do', 'not', 'defined', 'exist'
+            ),
+        2 => array(
+            "ASSOC", "ATTRIB", "BREAK", "BCDEDIT", "CACLS", "CD",
+			"CHCP", "CHDIR", "CHKDSK", "CHKNTFS", "CLS", "CMD", "COLOR",
+			"COMP", "COMPACT", "CONVERT", "COPY", "DATE", "DEL", "DIR",
+			"DISKCOMP", "DISKCOPY", "DISKPART", "DOSKEY", "DRIVERQUERY", "ECHO", "ENDLOCAL",
+			"ERASE", "EXIT", "FC", "FIND", "FINDSTR", "FOR", "FORMAT",
+			"FSUTIL", "FTYPE", "GPRESULT", "GRAFTABL", "HELP", "ICACLS",
+			"IF", "LABEL", "MD", "MKDIR", "MKLINK", "MODE", "MORE",
+			"MOVE", "OPENFILES", "PATH", "PAUSE", "POPD", "PRINT", "PROMPT",
+			"PUSHD", "RD", "RECOVER", "REN", "RENAME", "REPLACE", "RMDIR",
+			"ROBOCOPY", "SET", "SETLOCAL", "SC", "SCHTASKS", "SHIFT", "SHUTDOWN",
+			"SORT", "START", "SUBST", "SYSTEMINFO", "TASKLIST", "TASKKILL", "TIME",
+			"TITLE", "TREE", "TYPE", "VER", "VERIFY", "VOL", "XCOPY",
+			"WMIC", "CSCRIPT"
+            ),
+        3 => array(
+            "enabledelayedexpansion", "enableextensions"
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '+', '-', '~', '^', '@', '&', '*', '|', '/', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #800080; font-weight: bold;',
+            2 => 'color: #0080FF; font-weight: bold;',
+            3 => 'color: #0000FF; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #888888;',
+            2 => 'color: #FF1010; font-weight: bold;',
+			101 => 'color: #44aa44; font-weight: bold;',
+			100 => 'color: #888888;',
+			102 => 'color: #990000; font-weight: bold;',
+			103 => 'color: #000099; font-weight: bold;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            100 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;', 
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #44aa44; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #990000; font-weight: bold',
+			1 => 'color: #800080; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        0 => array(
+				GESHI_SEARCH => "((?:goto|call)\\s*)(\\S+)",
+				GESHI_REPLACE => "\\2",
+				GESHI_BEFORE => "\\1",
+				GESHI_MODIFIERS => "si",
+				GESHI_AFTER => ""
+			) ,
+		1 => "goto|call"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);