Updated documentation for 1.40.

wxwidgets (https://github.com/pkulchenko/wxwidgets) at 7d9d5934
wxlua (https://github.com/pkulchenko/wxlua/tree/wxwidgets311) at 430e8e3e

CONTRIBUTING.md

@@ -0,0 +1,30 @@
+# Help
+
+For questions and feature discussions, please use the the maillist or the IRC channel as described in the [community section](http://studio.zerobrane.com/community) of the project website.
+
+# Bugs
+
+When filing a bug, please help us reproduce the issue by including the following information:
+
+* Steps to reproduce the issue as well as the expected result. Screenshots also help.
+* Your operating system and the IDE version (or the latest commit if you are using the development version).
+* Any relevant configuration from the config file, if you cannot reproduce the issue with an empty config.
+* Any relevant plugins, if you cannot reproduce the issue without plugins.
+
+It always helps to make sure that the issue is still reproducible with the most recent version of the IDE.
+
+If you think that the issue is with the *debugger* (this also includes serialization issues), then open an issue in the [MobDebug repository](https://github.com/pkulchenko/MobDebug/issues).
+If the issue is with one of the *plugins*, then open an issue in the [ZeroBranePackage repository](https://github.com/pkulchenko/ZeroBranePackage/issues).
+
+# Contributing
+
+_By contributing to ZeroBrane Studio you are agreeing to release your contribution under the MIT License._
+
+Thank you for contributing to ZeroBrane Studio! Here are some things you can do to improve it:
+
+* **Fixing issues**: If you have ideas or suggestions on [fixing existing issues](https://github.com/pkulchenko/ZeroBraneStudio/issues), please update the tickets directly or send a pull request.
+* **Adding translations**: See [translation documentation](http://studio.zerobrane.com/doc-translation) for details.
+* **Implementing new features**: Please [discuss with us](http://studio.zerobrane.com/community) any significant changes you plan as early as possible.
+Try to implement the changes as a plugin first; the project already provides [plugin API](http://studio.zerobrane.com/doc-plugin) with more than [45 plugins](https://github.com/pkulchenko/ZeroBranePackage) already available.
+* **Improving documentation**: All the existing documentation is generated based on pages in [gh-pages branch](https://github.com/pkulchenko/ZeroBraneStudio/tree/gh-pages). You can provide clarifications, check the documentation for errors/typos, or fill any gaps.
+* **Spreading the word**!

LICENSE

@@ -2,7 +2,7 @@
 
 ZeroBrane Studio sources are released under the MIT License
 
-Copyright (c) 2011-2012 Paul Kulchenko (paul@kulchenko.com)
+Copyright (c) 2011-2015 Paul Kulchenko (paul@kulchenko.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
@@ -235,3 +235,286 @@ 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.
+
+--[[ Copas License ]]------------------------------------------------------
+
+Copyright © 2005-2010 Kepler Project.
+
+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.
+
+--[[ Luainspect License ]]-------------------------------------------------
+
+Copyright (C) 2010 David Manura
+
+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.
+
+--[[ Metalua License ]]----------------------------------------------------
+
+Copyright (c) 2006-2997 Fabien Fleutot <metalua@gmail.com>
+
+Metalua is available under the MIT licence.
+
+Significant parts of the compiler borrow code from other projects,
+all released under the MIT license:
+- Lua                           <http://www.lua.org>
+- Kein-Hong Man's     Yueliang  <http://luaforge.net/projects/yueliang>
+- Tomás Guisasola's   Lua Rings <http://www.keplerproject.org/rings>
+- Ben Sunshine-Hill's Pluto     <http://freshmeat.net/projects/pluto>
+- Thomas Reuben's     Bitlib    <http://luaforge.net/projects/bitlib>
+
+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.
+
+--[[ Scintilla ]]----------------------------------------------------------
+
+Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation.
+
+NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
+OR PERFORMANCE OF THIS SOFTWARE.
+
+--[[ LPeg ]]---------------------------------------------------------------
+
+Copyright © 2007-2015 Lua.org, PUC-Rio.
+
+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.
+
+--[[ LuaFileSystem ]]------------------------------------------------------
+
+Copyright © 2003 Kepler Project.
+
+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.
+
+--[[ LuaSec ]]-------------------------------------------------------------
+
+Copyright (C) 2006-2015 Bruno Silvestre, UFG
+
+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.
+
+--[[ OpenSSL ]]------------------------------------------------------------
+
+/* ====================================================================
+ * Copyright (c) 1998-2016 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED 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 OpenSSL PROJECT OR
+ * ITS 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.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */

README.md

@@ -1,9 +1,28 @@
 # Project Description
 
-[ZeroBrane Studio](http://studio.zerobrane.com/) is a lightweight Lua IDE with code completion, syntax
-highlighting, remote debugger, code analyzer, live coding, and debugging
-support for several Lua engines (LuaJIT, Löve 2D, Moai, Gideros, Corona, Marmalade Quick,
-MobileLua, GSL-shell, and others). It originated from the [Estrela Editor](http://www.luxinia.de/index.php/Estrela/).
+[ZeroBrane Studio](http://studio.zerobrane.com/) is a lightweight cross-platform Lua IDE with code completion,
+syntax highlighting, remote debugger, code analyzer, live coding,
+and debugging support for several Lua engines
+([Lua 5.1](http://studio.zerobrane.com/doc-lua-debugging),
+[Lua 5.2](http://studio.zerobrane.com/doc-lua52-debugging),
+[Lua 5.3](http://studio.zerobrane.com/doc-lua53-debugging),
+[LuaJIT](http://studio.zerobrane.com/doc-luajit-debugging),
+[LÖVE](http://notebook.kulchenko.com/zerobrane/love2d-debugging),
+[Moai](http://notebook.kulchenko.com/zerobrane/moai-debugging-with-zerobrane-studio),
+[Gideros](http://notebook.kulchenko.com/zerobrane/gideros-debugging-with-zerobrane-studio-ide),
+[Corona](http://notebook.kulchenko.com/zerobrane/debugging-and-live-coding-with-corona-sdk-applications-and-zerobrane-studio),
+[Marmalade Quick](http://notebook.kulchenko.com/zerobrane/marmalade-quick-debugging-with-zerobrane-studio),
+[Cocos2d-x](http://notebook.kulchenko.com/zerobrane/cocos2d-x-simulator-and-on-device-debugging-with-zerobrane-studio),
+[OpenResty/Nginx](http://notebook.kulchenko.com/zerobrane/debugging-openresty-nginx-lua-scripts-with-zerobrane-studio),
+[Torch7](http://notebook.kulchenko.com/zerobrane/torch-debugging-with-zerobrane-studio),
+[Redis](http://notebook.kulchenko.com/zerobrane/redis-lua-debugging-with-zerobrane-studio),
+[GSL-shell](http://notebook.kulchenko.com/zerobrane/gsl-shell-debugging-with-zerobrane-studio),
+[Adobe Lightroom](http://notebook.kulchenko.com/zerobrane/debugging-lightroom-plugins-zerobrane-studio-ide),
+[Lapis](http://notebook.kulchenko.com/zerobrane/lapis-debugging-with-zerobrane-studio),
+[Moonscript](http://notebook.kulchenko.com/zerobrane/moonscript-debugging-with-zerobrane-studio),
+and others). It originated from the [Estrela Editor](http://www.luxinia.de/index.php/Estrela/).
+
+![ZeroBrane Studio debugger screenshot](http://studio.zerobrane.com/images/debugging.png)
 
 ## Features
 
@@ -11,54 +30,68 @@ MobileLua, GSL-shell, and others). It originated from the [Estrela Editor](http:
 * Small, portable, and cross-platform (Windows, Mac OSX, and Linux).
 * Auto-completion for functions, keywords, and custom APIs.
 * Interactive console to directly test code snippets with local and remote execution.
-* Integrated debugger with local and [remote debugging](http://studio.zerobrane.com/doc-remote-debugging.html) for Lua 5.1,
-[Lua 5.2](http://studio.zerobrane.com/doc-lua52-debugging.html),
-[LuaJIT](http://studio.zerobrane.com/doc-luajit-debugging.html),
-and [other Lua engines](http://studio.zerobrane.com/documentation.html#debugging).
-* Live coding with Lua ([demo](http://notebook.kulchenko.com/zerobrane/live-coding-in-lua-bret-victor-style)),
-Löve 2D ([demo](http://notebook.kulchenko.com/zerobrane/live-coding-with-love)),
-Gideros ([demo](http://notebook.kulchenko.com/zerobrane/gideros-live-coding-with-zerobrane-studio-ide)),
-Moai ([demo](http://notebook.kulchenko.com/zerobrane/live-coding-with-moai-and-zerobrane-studio)),
-and Corona SDK ([demo](http://notebook.kulchenko.com/zerobrane/debugging-and-live-coding-with-corona-sdk-applications-and-zerobrane-studio)).
-* Support for plugin-like components:
-  - specs (`spec/`): file syntax, lexer, and keywords;
-  - apis (`api/`): for code completion and tooltips;
+* Integrated debugger with local and [remote debugging](http://studio.zerobrane.com/doc-remote-debugging)
+for [Lua 5.1](http://studio.zerobrane.com/doc-lua-debugging),
+[Lua 5.2](http://studio.zerobrane.com/doc-lua52-debugging),
+[Lua 5.3](http://studio.zerobrane.com/doc-lua53-debugging),
+[LuaJIT](http://studio.zerobrane.com/doc-luajit-debugging),
+and [other Lua engines](http://studio.zerobrane.com/documentation#debugging).
+* [Live coding](http://studio.zerobrane.com/documentation#live_coding)
+with [Lua](http://notebook.kulchenko.com/zerobrane/live-coding-in-lua-bret-victor-style),
+[LÖVE](http://notebook.kulchenko.com/zerobrane/live-coding-with-love),
+[Gideros](http://notebook.kulchenko.com/zerobrane/gideros-live-coding-with-zerobrane-studio-ide),
+[Moai](http://notebook.kulchenko.com/zerobrane/live-coding-with-moai-and-zerobrane-studio),
+[Corona SDK](http://notebook.kulchenko.com/zerobrane/debugging-and-live-coding-with-corona-sdk-applications-and-zerobrane-studio),
+GSL-shell, and other engines.
+* Function outline.
+* Fuzzy search with `Go To File`, project-wide `Go To Symbol`, and `Insert Library Function`.
+* Several ways to extend the current functionality:
+  - specs (`spec/`): specifications for file syntax, lexer, and keywords;
+  - apis (`api/`): descriptions for [code completion and tooltips](http://studio.zerobrane.com/doc-api-auto-complete);
   - interpreters (`interpreters/`): components for setting debugging and run-time project environment;
-  - config (`cfg/`): contains style, color themes, and other settings;
-  - packages (`packages/`): plugins that provide additional functionality;
+  - packages (`packages/`): [plugins](http://studio.zerobrane.com/doc-plugin) that provide additional functionality;
+  - config (`cfg/`): settings for styles, color themes, and other preferences;
+  - translations (`cfg/i18n/`): [translations](http://studio.zerobrane.com/doc-translation) of the menus and messages to other languages;
   - tools (`tools/`): additional tools.
 
 ## Documentation
 
-* A [short and simple overview](http://studio.zerobrane.com/doc-getting-started.html) for those who are new to this development environment.
-* A list of [frequently asked questions](http://studio.zerobrane.com/doc-faq.html) about the IDE.
-* [Tutorials and demos](http://studio.zerobrane.com/tutorials.html) that cover debugging and live coding for different environments.
-* [Tips and tricks](http://studio.zerobrane.com/doc-tips-and-tricks.html).
+* A [short and simple overview](http://studio.zerobrane.com/doc-getting-started) for those who are new to this development environment.
+* A list of [frequently asked questions](http://studio.zerobrane.com/doc-faq) about the IDE.
+* [Tutorials and demos](http://studio.zerobrane.com/tutorials) that cover debugging and live coding for different environments.
+* [Tips and tricks](http://studio.zerobrane.com/doc-tips-and-tricks).
 
-## Screenshot
+## Installation
 
-![ZeroBrane Studio debugger screenshot](http://studio.zerobrane.com/images/debugging.png)
+ZeroBrane Studio can be installed into and run from any folder.
+No compilation is needed, although the scripts to compile required libraries for Windows, OSX, and Linux platforms are available in the `build/` folder.
 
 ## Usage
 
 ```
 Open file(s):
-  zbstudio <filename> [<filename>...]
-  any non-option will be treated as filename
+  zbstudio [option] [<project directory>] <filename> [<filename>...]
+  non-options are treated as a project directory to set or a file to open
 
 Set project directory:
   zbstudio <project directory> [<filename>...]
   (0.39+) a directory passed as a parameter will be set as the project directory
 
-Overriding default configuration:
-  zbstudio -cfg "<luacode overriding config>" [<filename>]
+Overwrite default configuration:
+  zbstudio -cfg "<lua configuration code>" [<filename>]
   e.g.: zbstudio -cfg "editor.fontsize=12" somefile.lua
 
-Loading custom configuration:
+Load custom configuration:
   zbstudio -cfg path/file.lua [<filename>]
   e.g.: zbstudio -cfg cfg/estrela.lua
 ```
 
+If you are loading a file, you can also request the cursor to be set on a particular line or at a particular position by using `filename:<line>` and `filename:p<pos>` syntax (0.71+).
+
+## Contributing
+
+See [CONTRIBUTING](CONTRIBUTING.md).
+
 ## Author
 
 ### ZeroBrane Studio and MobDebug
@@ -71,14 +104,10 @@ Loading custom configuration:
 
 ## Where is Estrela?
 
-The projects have been merged and ZeroBrane Studio will lead the future.
-Please reassociate files with ZeroBrane Studio. To keep your history of files
-and projects copy the contents of the `EstrelaEditor.ini` in your HOME
-directory to `ZeroBraneStudio.ini`. If you have used Estrela for graphics
-shader authoring or luxinia, create/modify the `cfg/user.lua` to include the
-content of `cfg/estrela.lua` to load all tools and specifications by default
-again.
+The Estrela project has been merged into ZeroBrane Studio. If you have used Estrela
+for graphics shader authoring or luxinia, create/modify the `cfg/user.lua` and
+add `include "estrela"` (1.21+) to load all tools and specifications by default again.
   
 ## License
 
-See LICENSE file.
+See [LICENSE](LICENSE).

api/README

@@ -1,6 +0,0 @@
-This directory contains API definitions. 
-
-An API definition is a set of functions that are used 
-for displaying tooltip information on function calls or 
-autocomplete information.
-

api/glsl/std.lua

@@ -130,8 +130,14 @@ findMSB = fn "returns bit number of msb. - (intN)(intN)",
 
 discard = fn "conditionally (<0) kill a pixel before output. - ()(vecN)",
 dFdx = fn "returns approximate partial derivative with respect to window-space X. - (vecN)(vecN)",
+dFdxCoarse = fn "returns approximate partial derivative with respect to window-space X. - (vecN)(vecN)",
+dFdxFine = fn "returns approximate partial derivative with respect to window-space X. - (vecN)(vecN)",
 dFdy = fn "returns approximate partial derivative with respect to window-space Y. - (vecN)(vecN)",
-fwidth = fn "returns sum of approximate window-space partial derivatives magnitudes. - (vecN)(vecN)",
+dFdyCoarse = fn "returns approximate partial derivative with respect to window-space Y. - (vecN)(vecN)",
+dFdyFine = fn "returns approximate partial derivative with respect to window-space Y. - (vecN)(vecN)",
+fwidth = fn "returns abs sum of approximate window-space partial derivatives magnitudes. - (vecN)(vecN)",
+fwidthFine = fn "returns abs sum of approximate window-space partial derivatives magnitudes. - (vecN)(vecN)",
+fwidthCoarse = fn "returns abs sum of approximate window-space partial derivatives magnitudes. - (vecN)(vecN)",
 interpolateAtCentroid = fn "Return value of interpolant sampled inside pixel and the primitive. - (floatN)(floatN)",
 interpolateAtSample = fn "Return value of interpolant at the location fo sample. - (floatN)(floatN, int sample)",
 interpolateAtOffset = fn "Return value of interpolant sampled at fixed offset offset from pixel center. - (floatN)(floatN, vec2 offset)",
@@ -153,20 +159,35 @@ memoryBarrierShared = fn "control ordering of memory transactions issued by shad
 memoryBarrierBuffer = fn "control ordering of memory transactions issued by shader thread. - ()()",
 memoryBarrierImage = fn "control ordering of memory transactions issued by shader thread. - ()()",
 groupMemoryBarrier = fn "control ordering of memory transactions issued by shader thread. - ()()",
-imageAtomicAdd = fn "performs atomic operation on individual texels returns new value. - (uint)(imageN, intN coord, [int sample], uint data)",
-imageAtomicMin = fn "performs atomic operation on individual texels returns new value. - (uint)(imageN, intN coord, [int sample], uint data)",
-imageAtomicMax = fn "performs atomic operation on individual texels returns new value. - (uint)(imageN, intN coord, [int sample], uint data)",
-imageAtomicIncWrap = fn "performs atomic operation on individual texels returns new value. - (uint)(imageN, intN coord, [int sample], uint data)",
-imageAtomicDecWrap = fn "performs atomic operation on individual texels returns new value. - (uint)(imageN, intN coord, [int sample], uint data)",
-imageAtomicAnd = fn "performs atomic operation on individual texels returns new value. - (uint)(imageN, intN coord, [int sample], uint data)",
-imageAtomicOr = fn "performs atomic operation on individual texels returns new value. - (uint)(imageN, intN coord, [int sample], uint data)",
-imageAtomicXor = fn "performs atomic operation on individual texels returns new value. - (uint)(imageN, intN coord, [int sample], uint data)",
-imageAtomicExchange = fn "performs atomic operation on individual texels returns new value. - (uint)(imageN, intN coord, [int sample], uint data)",
-imageAtomicCompSwap = fn "performs atomic operation on individual texels returns new value. - (uint)(imageN, intN coord, [int sample], uint data)",
+imageAtomicAdd = fn "performs atomic operation on individual texels returns old value. - (uint)(imageN, intN coord, [int sample], uint data)",
+imageAtomicMin = fn "performs atomic operation on individual texels returns old value. - (uint)(imageN, intN coord, [int sample], uint data)",
+imageAtomicMax = fn "performs atomic operation on individual texels returns old value. - (uint)(imageN, intN coord, [int sample], uint data)",
+imageAtomicIncWrap = fn "performs atomic operation on individual texels returns old value. - (uint)(imageN, intN coord, [int sample], uint data)",
+imageAtomicDecWrap = fn "performs atomic operation on individual texels returns old value. - (uint)(imageN, intN coord, [int sample], uint data)",
+imageAtomicAnd = fn "performs atomic operation on individual texels returns old value. - (uint)(imageN, intN coord, [int sample], uint data)",
+imageAtomicOr = fn "performs atomic operation on individual texels returns old value. - (uint)(imageN, intN coord, [int sample], uint data)",
+imageAtomicXor = fn "performs atomic operation on individual texels returns old value. - (uint)(imageN, intN coord, [int sample], uint data)",
+imageAtomicExchange = fn "performs atomic operation on individual texels returns old value. - (uint)(imageN, intN coord, [int sample], uint data)",
+imageAtomicCompSwap = fn "performs atomic operation on individual texels returns old value. - (uint)(imageN, intN coord, [int sample], uint data)",
 imageStore = fn "stores the texel at the coordinate. - ()(imageN, intN coord, [int sample], vecN data)",
 imageLoad = fn "loads the texel at the coordinate. - (vecN)(imageN, intN coord, [int sample])",
+imageSize = fn "returns the size of the image. - (ivecN)(imageN)",
+imageSamples = fn "returns the samples of the multi-sampled image. - (int)(image2DMSN)",
+
+atomicCounterIncrement = fn "increments counter and returns old value. - (uint)(atomic_uint)",
+atomicCounterDecrement = fn "decrements counter and returns old value. - (uint)(atomic_uint)",
+atomicCounter = fn "returns current counter value. - (uint)(atomic_uint)",
+atomicMin = fn "performs atomic operation on memory location (ssbo/shared) returns old value. - (uint)(inout uint mem, uint data)",
+atomicMax = fn "performs atomic operation on memory location (ssbo/shared) returns old value. - (uint)(inout uint mem, uint data)",
+atomicAdd = fn "performs atomic operation on memory location (ssbo/shared) returns old value. - (uint)(inout uint mem, uint data)",
+atomicAnd = fn "performs atomic operation on memory location (ssbo/shared) returns old value. - (uint)(inout uint mem, uint data)",
+atomicOr  = fn "performs atomic operation on memory location (ssbo/shared) returns old value. - (uint)(inout uint mem, uint data)",
+atomicXor = fn "performs atomic operation on memory location (ssbo/shared) returns old value. - (uint)(inout uint mem, uint data)",
+atomicExchange = fn "performs atomic operation on memory location (ssbo/shared) returns old value. - (uint)(inout uint mem, uint data)",
+atomicCompSwap = fn "performs atomic operation on memory location (ssbo/shared) returns old value. - (uint)(inout uint mem, uint data)",
 
 textureSize = fn "returns the size of the texture (no lod required: Rect, MS and Buffer). - (intN)(samplerN, [int lod])",
+textureSamples = fn "returns the samples of the multi-sampled texture. - (int)(texture2DMSN)",
 textureQueryLod = fn "returns the lod values for a given coordinate. - (vec2)(samplerN, vecN coord)",
 texture = fn "performs a texture lookup. Shadow samplers require base N+1 coordinate.  Lod bias is optional (illegal for MS, Buffer, Rect). - (vec4)(samplerN, vecN coord, [float bias])",
 textureProj = fn "performas a projective texture lookup (only Nd samplers + Rect). Shadows require N+1 base coordinate, no Lod bias allowed for Rect. - (vec4)(samplerN, vecN+1 coord, [float bias])",
@@ -234,7 +255,8 @@ local keyw =
     gl_NumWorkGroups gl_WorkGroupSize gl_WorkGroupID gl_LocalInvocationID gl_GlobalInvocationID gl_LocalInvocationIndex
     local_size_x local_size_y local_size_z
     gl_BaseVertexARB gl_BaseInstanceARB gl_DrawIDARB
-    bindless_sampler bound_sampler bindless_image bound_image
+    bindless_sampler bound_sampler bindless_image bound_image early_fragment_tests
+    gl_HelperInvocation gl_CullDistance gl_MaxSamples
 
     coherent volatile restrict readonly writeonly
     image1D image2D image3D image2DRect imageCube imageBuffer image1DArray image2DArray imageCubeArray image2DMS image2DMSArray

api/lua/anttweakbar.lua

@@ -1,553 +0,0 @@
---[[// tw tweakbar | AntTweakBar UI
-      enum { TW_VERSION = 114 }
-
-      typedef enum ETwType {
-	 TW_TYPE_UNDEF,
-	 TW_TYPE_BOOLCPP,
-	 TW_TYPE_BOOL8,
-	 TW_TYPE_BOOL16,
-	 TW_TYPE_BOOL32,
-	 TW_TYPE_CHAR,
-	 TW_TYPE_INT8,
-	 TW_TYPE_UINT8,
-	 TW_TYPE_INT16,
-	 TW_TYPE_UINT16,
-	 TW_TYPE_INT32,
-	 TW_TYPE_UINT32,
-	 TW_TYPE_FLOAT,
-	 TW_TYPE_DOUBLE,
-	 TW_TYPE_COLOR32,    // 32 bits color. Order is RGBA if API is OpenGL or Direct3D10, and inversed if API is Direct3D9 (can be modified by defining 'colorOrder=...', see doc)
-	 TW_TYPE_COLOR3F,    // 3 floats color. Order is RGB.
-	 TW_TYPE_COLOR4F,    // 4 floats color. Order is RGBA.
-	 TW_TYPE_CDSTRING,   // Null-terminated C Dynamic String (pointer to an array of char dynamically allocated with malloc/realloc/strdup)
-	 TW_TYPE__TEMP1,     // 
-	 TW_TYPE_QUAT4F,     // 4 floats encoding a quaternion {qx,qy,qz,qs}
-	 TW_TYPE_QUAT4D,     // 4 doubles encoding a quaternion {qx,qy,qz,qs}
-	 TW_TYPE_DIR3F,      // direction vector represented by 3 floats
-	 TW_TYPE_DIR3D,      // direction vector represented by 3 doubles
-	 TW_TYPE_CSSTRING_LEN0   = 0x30000000,
-	 TW_TYPE_CSSTRING_LEN256 = 0x30000000 + 256,
-      } TwType;
-
-      typedef struct CTwEnumVal  {
-	 int           Value;
-	 const char *  Label;
-      } TwEnumVal;
-
-      typedef struct CTwStructMember  {
-	 const char *  Name;
-	 TwType        Type;
-	 size_t        Offset;
-	 const char *  DefString;
-      } TwStructMember;
-      
-      typedef enum ETwParamValueType {
-	 TW_PARAM_INT32,
-	 TW_PARAM_FLOAT,
-	 TW_PARAM_DOUBLE,
-	 TW_PARAM_CSTRING // Null-terminated array of char (ie, c-string)
-      } TwParamValueType;
-      
-      typedef enum ETwGraphAPI {
-	 TW_OPENGL     = 1,
-	 TW_DIRECT3D9  = 2,
-	 TW_DIRECT3D10 = 3,
-	 TW_DIRECT3D11 = 4
-      } TwGraphAPI;
-      
-      typedef enum ETwKeyModifier {
-	 TW_KMOD_NONE  = 0x0000,   // same codes as SDL keysym.mod
-	 TW_KMOD_SHIFT = 0x0003,
-	 TW_KMOD_CTRL  = 0x00c0,
-	 TW_KMOD_ALT   = 0x0100,
-	 TW_KMOD_META  = 0x0c00
-      } TwKeyModifier;
-       
-      typedef enum EKeySpecial {
-	 TW_KEY_BACKSPACE  = '\b',
-	 TW_KEY_TAB        = '\t',
-	 TW_KEY_CLEAR      = 0x0c,
-	 TW_KEY_RETURN     = '\r',
-	 TW_KEY_PAUSE      = 0x13,
-	 TW_KEY_ESCAPE     = 0x1b,
-	 TW_KEY_SPACE      = ' ',
-	 TW_KEY_DELETE     = 0x7f,
-	 TW_KEY_UP         = 273,
-	 TW_KEY_DOWN,
-	 TW_KEY_RIGHT,
-	 TW_KEY_LEFT,
-	 TW_KEY_INSERT,
-	 TW_KEY_HOME,
-	 TW_KEY_END,
-	 TW_KEY_PAGE_UP,
-	 TW_KEY_PAGE_DOWN,
-	 TW_KEY_F1,
-	 TW_KEY_F2,
-	 TW_KEY_F3,
-	 TW_KEY_F4,
-	 TW_KEY_F5,
-	 TW_KEY_F6,
-	 TW_KEY_F7,
-	 TW_KEY_F8,
-	 TW_KEY_F9,
-	 TW_KEY_F10,
-	 TW_KEY_F11,
-	 TW_KEY_F12,
-	 TW_KEY_F13,
-	 TW_KEY_F14,
-	 TW_KEY_F15,
-	 TW_KEY_LAST
-      } TwKeySpecial;
-
-      typedef enum ETwMouseAction {
-	 TW_MOUSE_RELEASED,
-	 TW_MOUSE_PRESSED  
-      } TwMouseAction;
-      
-      typedef enum ETwMouseButtonID {
-	 TW_MOUSE_LEFT   = 1,
-	 TW_MOUSE_MIDDLE = 2,
-	 TW_MOUSE_RIGHT  = 3 
-      } TwMouseButtonID;
-
-      typedef void (*TwSetVarCallback)       ( const void *value, void *clientData );
-      typedef void (*TwGetVarCallback)       (       void *value, void *clientData );
-      typedef void (*TwButtonCallback)       (                    void *clientData );
-      typedef void (*TwSummaryCallback)      ( char *summaryString, size_t summaryMaxLength, const void *value, void *clientData );
-      typedef void (*TwCopyCDStringToClient) ( char **destinationClientStringPtr, const char *sourceString );
-      typedef void (*TwErrorHandler)         ( const char *errorMessage );
-      typedef void (*TwGLUTmousebuttonfun)   ( int glutButton, int glutState, int mouseX, int mouseY );
-      typedef void (*TwGLUTmousemotionfun)   ( int mouseX, int mouseY );
-      typedef void (*TwGLUTkeyboardfun)      ( unsigned char glutKey, int mouseX, int mouseY );
-      typedef void (*TwGLUTspecialfun)       ( int glutKey, int mouseX, int mouseY );
-      
-      typedef struct CTwBar TwBar;
-
-      TwBar*      TwNewBar(                    const char *barName );
-      int         TwDeleteBar(                 TwBar *bar          );
-      int         TwDeleteAllBars(                                 );
-      int         TwSetTopBar(                 const TwBar *bar    );
-      TwBar*      TwGetTopBar(                                     );
-      int         TwSetBottomBar(              const TwBar *bar    );
-      TwBar*      TwGetBottomBar(                                  );
-      const char* TwGetBarName(                TwBar *bar          );
-      int         TwGetBarCount(                                   );
-      TwBar*      TwGetBarByIndex(             int barIndex        );
-      TwBar*      TwGetBarByName(              const char *barName );
-      int         TwRefreshBar(                TwBar *bar          );
-      int         TwAddVarRW(                  TwBar *bar, const char *name, TwType type, void *var, const char *def );
-      int         TwAddVarRO(                  TwBar *bar, const char *name, TwType type, const void *var, const char *def );
-      int         TwAddVarCB(                  TwBar *bar, const char *name, TwType type, TwSetVarCallback setCallback, TwGetVarCallback getCallback, void *clientData, const char *def );
-      int         TwAddButton(                 TwBar *bar, const char *name, TwButtonCallback callback, void *clientData, const char *def );
-      int         TwAddSeparator(              TwBar *bar, const char *name, const char *def );
-      int         TwRemoveVar(                 TwBar *bar, const char *name );
-      int         TwRemoveAllVars(             TwBar *bar );
-      int         TwDefine(                    const char *def );
-      TwType      TwDefineEnum(                const char *name, const TwEnumVal *enumValues, unsigned int nbValues );
-      TwType      TwDefineEnumFromString(      const char *name, const char *enumString );
-      TwType      TwDefineStruct(              const char *name, const TwStructMember *structMembers, unsigned int nbMembers, size_t structSize, TwSummaryCallback summaryCallback, void *summaryClientData );
-      void        TwCopyCDStringToClientFunc(  TwCopyCDStringToClient copyCDStringFunc );
-      void        TwCopyCDStringToLibrary(     char **destinationLibraryStringPtr, const char *sourceClientString );
-      int         TwGetParam(                  TwBar *bar, const char *varName, const char *paramName, TwParamValueType paramValueType, unsigned int outValueMaxCount,      void *outValues );
-      int         TwSetParam(                  TwBar *bar, const char *varName, const char *paramName, TwParamValueType paramValueType, unsigned int     inValueCount, const void *inValues );
-      int         TwInit(                      TwGraphAPI graphAPI, void *device );
-      int         TwTerminate();
-      int         TwDraw();
-      int         TwWindowSize(                int width, int height);
-      int         TwSetCurrentWindow(          int windowID); // multi-windows support
-      int         TwGetCurrentWindow();
-      int         TwWindowExists(              int windowID);
-      int         TwKeyPressed(                int key, int modifiers);
-      int         TwKeyTest(                   int key, int modifiers);
-      int         TwMouseButton(               TwMouseAction action, TwMouseButtonID button);
-      int         TwMouseMotion(               int mouseX, int mouseY);
-      int         TwMouseWheel(                int pos);
-      const char* TwGetLastError(              );
-      void        TwHandleErrors(              TwErrorHandler errorHandler);
-      int         TwEventSDL(                  const void *sdlEvent, unsigned char sdlMajorVersion, unsigned char sdlMinorVersion);
-      int         TwEventSDL12(                const void *sdlEvent);
-      int         TwEventSDL13(                const void *sdlEvent);
-      int         TwEventMouseButtonGLFW(      int glfwButton, int glfwAction );
-      int         TwEventKeyGLFW(              int glfwKey,    int glfwAction );
-      int         TwEventCharGLFW(             int glfwChar,   int glfwAction );
-      int         TwEventMouseButtonGLUT(      int glutButton, int glutState, int mouseX, int mouseY);
-      int         TwEventMouseMotionGLUT(      int mouseX,     int mouseY);
-      int         TwEventKeyboardGLUT(         unsigned char glutKey, int mouseX, int mouseY );
-      int         TwEventSpecialGLUT(          int           glutKey, int mouseX, int mouseY );
-      int         TwGLUTModifiersFunc(         int (*glutGetModifiersFunc)(void) );
-      int         TwEventSFML(                 const void *sfmlEvent, unsigned char sfmlMajorVersion, unsigned char sfmlMinorVersion);
-]]
-  --auto-generated api from ffi headers
-  local api =
-         {
-         ["TW_TYPE_UNDEF"] = { type ='value', },
-       ["TW_TYPE_BOOLCPP"] = { type ='value', },
-       ["TW_TYPE_BOOL8"] = { type ='value', },
-       ["TW_TYPE_BOOL16"] = { type ='value', },
-       ["TW_TYPE_BOOL32"] = { type ='value', },
-       ["TW_TYPE_CHAR"] = { type ='value', },
-       ["TW_TYPE_INT8"] = { type ='value', },
-       ["TW_TYPE_UINT8"] = { type ='value', },
-       ["TW_TYPE_INT16"] = { type ='value', },
-       ["TW_TYPE_UINT16"] = { type ='value', },
-       ["TW_TYPE_INT32"] = { type ='value', },
-       ["TW_TYPE_UINT32"] = { type ='value', },
-       ["TW_TYPE_FLOAT"] = { type ='value', },
-       ["TW_TYPE_DOUBLE"] = { type ='value', },
-       ["TW_TYPE_COLOR32"] = { type ='value', },
-       ["TW_TYPE_COLOR3F"] = { type ='value', },
-       ["TW_TYPE_COLOR4F"] = { type ='value', },
-       ["TW_TYPE_CDSTRING"] = { type ='value', },
-       ["TW_TYPE__TEMP1"] = { type ='value', },
-       ["TW_TYPE_QUAT4F"] = { type ='value', },
-       ["TW_TYPE_QUAT4D"] = { type ='value', },
-       ["TW_TYPE_DIR3F"] = { type ='value', },
-       ["TW_TYPE_DIR3D"] = { type ='value', },
-       ["TW_TYPE_CSSTRING_LEN0"] = { type ='value', },
-       ["TW_TYPE_CSSTRING_LEN256"] = { type ='value', },
-       ["TW_PARAM_INT32"] = { type ='value', },
-       ["TW_PARAM_FLOAT"] = { type ='value', },
-       ["TW_PARAM_DOUBLE"] = { type ='value', },
-       ["TW_PARAM_CSTRING"] = { type ='value', },
-       ["TW_OPENGL"] = { type ='value', },
-       ["TW_DIRECT3D9"] = { type ='value', },
-       ["TW_DIRECT3D10"] = { type ='value', },
-       ["TW_DIRECT3D11"] = { type ='value', },
-       ["TW_KMOD_NONE"] = { type ='value', },
-       ["TW_KMOD_SHIFT"] = { type ='value', },
-       ["TW_KMOD_CTRL"] = { type ='value', },
-       ["TW_KMOD_ALT"] = { type ='value', },
-       ["TW_KMOD_META"] = { type ='value', },
-       ["TW_KEY_BACKSPACE"] = { type ='value', },
-       ["TW_KEY_TAB"] = { type ='value', },
-       ["TW_KEY_CLEAR"] = { type ='value', },
-       ["TW_KEY_RETURN"] = { type ='value', },
-       ["TW_KEY_PAUSE"] = { type ='value', },
-       ["TW_KEY_ESCAPE"] = { type ='value', },
-       ["TW_KEY_SPACE"] = { type ='value', },
-       ["TW_KEY_DELETE"] = { type ='value', },
-       ["TW_KEY_UP"] = { type ='value', },
-       ["TW_KEY_DOWN"] = { type ='value', },
-       ["TW_KEY_RIGHT"] = { type ='value', },
-       ["TW_KEY_LEFT"] = { type ='value', },
-       ["TW_KEY_INSERT"] = { type ='value', },
-       ["TW_KEY_HOME"] = { type ='value', },
-       ["TW_KEY_END"] = { type ='value', },
-       ["TW_KEY_PAGE_UP"] = { type ='value', },
-       ["TW_KEY_PAGE_DOWN"] = { type ='value', },
-       ["TW_KEY_F1"] = { type ='value', },
-       ["TW_KEY_F2"] = { type ='value', },
-       ["TW_KEY_F3"] = { type ='value', },
-       ["TW_KEY_F4"] = { type ='value', },
-       ["TW_KEY_F5"] = { type ='value', },
-       ["TW_KEY_F6"] = { type ='value', },
-       ["TW_KEY_F7"] = { type ='value', },
-       ["TW_KEY_F8"] = { type ='value', },
-       ["TW_KEY_F9"] = { type ='value', },
-       ["TW_KEY_F10"] = { type ='value', },
-       ["TW_KEY_F11"] = { type ='value', },
-       ["TW_KEY_F12"] = { type ='value', },
-       ["TW_KEY_F13"] = { type ='value', },
-       ["TW_KEY_F14"] = { type ='value', },
-       ["TW_KEY_F15"] = { type ='value', },
-       ["TW_KEY_LAST"] = { type ='value', },
-       ["TW_MOUSE_RELEASED"] = { type ='value', },
-       ["TW_MOUSE_PRESSED"] = { type ='value', },
-       ["TW_MOUSE_LEFT"] = { type ='value', },
-       ["TW_MOUSE_MIDDLE"] = { type ='value', },
-       ["TW_MOUSE_RIGHT"] = { type ='value', },
-       ["TwNewBar"] = { type ='function',
-          description = "",
-          returns = "(TwBar*)",
-          valuetype = nil,
-          args = "(const char *barName)", },
-       ["TwDeleteBar"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(TwBar *bar)", },
-       ["TwDeleteAllBars"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "()", },
-       ["TwSetTopBar"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(const TwBar *bar)", },
-       ["TwGetTopBar"] = { type ='function',
-          description = "",
-          returns = "(TwBar*)",
-          valuetype = nil,
-          args = "()", },
-       ["TwSetBottomBar"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(const TwBar *bar)", },
-       ["TwGetBottomBar"] = { type ='function',
-          description = "",
-          returns = "(TwBar*)",
-          valuetype = nil,
-          args = "()", },
-       ["TwGetBarName"] = { type ='function',
-          description = "",
-          returns = "(const char*)",
-          valuetype = "string",
-          args = "(TwBar *bar)", },
-       ["TwGetBarCount"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "()", },
-       ["TwGetBarByIndex"] = { type ='function',
-          description = "",
-          returns = "(TwBar*)",
-          valuetype = nil,
-          args = "(int barIndex)", },
-       ["TwGetBarByName"] = { type ='function',
-          description = "",
-          returns = "(TwBar*)",
-          valuetype = nil,
-          args = "(const char *barName)", },
-       ["TwRefreshBar"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(TwBar *bar)", },
-       ["TwAddVarRW"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(TwBar *bar, const char *name, TwType type, void *var, const char *def)", },
-       ["TwAddVarRO"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(TwBar *bar, const char *name, TwType type, const void *var, const char *def)", },
-       ["TwAddVarCB"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(TwBar *bar, const char *name, TwType type, TwSetVarCallback setCallback, TwGetVarCallback getCallback, void *clientData, const char *def)", },
-       ["TwAddButton"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(TwBar *bar, const char *name, TwButtonCallback callback, void *clientData, const char *def)", },
-       ["TwAddSeparator"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(TwBar *bar, const char *name, const char *def)", },
-       ["TwRemoveVar"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(TwBar *bar, const char *name)", },
-       ["TwRemoveAllVars"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(TwBar *bar)", },
-       ["TwDefine"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(const char *def)", },
-       ["TwDefineEnum"] = { type ='function',
-          description = "",
-          returns = "(TwType)",
-          valuetype = nil,
-          args = "(const char *name, const TwEnumVal *enumValues, unsigned int nbValues)", },
-       ["TwDefineEnumFromString"] = { type ='function',
-          description = "",
-          returns = "(TwType)",
-          valuetype = nil,
-          args = "(const char *name, const char *enumString)", },
-       ["TwDefineStruct"] = { type ='function',
-          description = "",
-          returns = "(TwType)",
-          valuetype = nil,
-          args = "(const char *name, const TwStructMember *structMembers, unsigned int nbMembers, size_t structSize, TwSummaryCallback summaryCallback, void *summaryClientData)", },
-       ["TwCopyCDStringToClientFunc"] = { type ='function',
-          description = "",
-          returns = "(void)",
-          valuetype = nil,
-          args = "(TwCopyCDStringToClient copyCDStringFunc)", },
-       ["TwCopyCDStringToLibrary"] = { type ='function',
-          description = "",
-          returns = "(void)",
-          valuetype = nil,
-          args = "(char **destinationLibraryStringPtr, const char *sourceClientString)", },
-       ["TwGetParam"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(TwBar *bar, const char *varName, const char *paramName, TwParamValueType paramValueType, unsigned int outValueMaxCount,      void *outValues)", },
-       ["TwSetParam"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(TwBar *bar, const char *varName, const char *paramName, TwParamValueType paramValueType, unsigned int     inValueCount, const void *inValues)", },
-       ["TwInit"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(TwGraphAPI graphAPI, void *device)", },
-       ["TwTerminate"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "()", },
-       ["TwDraw"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "()", },
-       ["TwWindowSize"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(int width, int height)", },
-       ["TwSetCurrentWindow"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(int windowID)", },
-       ["TwGetCurrentWindow"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "()", },
-       ["TwWindowExists"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(int windowID)", },
-       ["TwKeyPressed"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(int key, int modifiers)", },
-       ["TwKeyTest"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(int key, int modifiers)", },
-       ["TwMouseButton"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(TwMouseAction action, TwMouseButtonID button)", },
-       ["TwMouseMotion"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(int mouseX, int mouseY)", },
-       ["TwMouseWheel"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(int pos)", },
-       ["TwGetLastError"] = { type ='function',
-          description = "",
-          returns = "(const char*)",
-          valuetype = "string",
-          args = "()", },
-       ["TwHandleErrors"] = { type ='function',
-          description = "",
-          returns = "(void)",
-          valuetype = nil,
-          args = "(TwErrorHandler errorHandler)", },
-       ["TwEventSDL"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(const void *sdlEvent, unsigned char sdlMajorVersion, unsigned char sdlMinorVersion)", },
-       ["TwEventSDL12"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(const void *sdlEvent)", },
-       ["TwEventSDL13"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(const void *sdlEvent)", },
-       ["TwEventMouseButtonGLFW"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(int glfwButton, int glfwAction)", },
-       ["TwEventKeyGLFW"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(int glfwKey,    int glfwAction)", },
-       ["TwEventCharGLFW"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(int glfwChar,   int glfwAction)", },
-       ["TwEventMouseButtonGLUT"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(int glutButton, int glutState, int mouseX, int mouseY)", },
-       ["TwEventMouseMotionGLUT"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(int mouseX,     int mouseY)", },
-       ["TwEventKeyboardGLUT"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(unsigned char glutKey, int mouseX, int mouseY)", },
-       ["TwEventSpecialGLUT"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(int           glutKey, int mouseX, int mouseY)", },
-       ["glutGetModifiersFunc"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(void))", },
-       ["TwEventSFML"] = { type ='function',
-          description = "",
-          returns = "(int)",
-          valuetype = nil,
-          args = "(const void *sfmlEvent, unsigned char sfmlMajorVersion, unsigned char sfmlMinorVersion)", },
-       ["TwEnumVal"] = { type ='class',
-          description = "",
-          childs =         {
-          ["Value"] = { type ='value', description = "int          ", valuetype = nil, },
-        ["Label"] = { type ='value', description = "const char * ", valuetype = "string", },
-                }
-         },
-       ["TwStructMember"] = { type ='class',
-          description = "",
-          childs =         {
-          ["Name"] = { type ='value', description = "const char * ", valuetype = "string", },
-        ["Type"] = { type ='value', description = "TwType       ", valuetype = nil, },
-        ["Offset"] = { type ='value', description = "size_t       ", valuetype = nil, },
-        ["DefString"] = { type ='value', description = "const char * ", valuetype = "string", },
-                }
-         },
-               }
-  return {
-        tw = {
-      type = 'lib',
-      description = "AntTweakBar UI",
-      childs = api,
-    },
-        tweakbar = {
-      type = 'lib',
-      description = "AntTweakBar UI",
-      childs = api,
-    },
-      }
-  

api/lua/luxmath.lua

@@ -1,823 +0,0 @@
---[[// lxm | Lux Math
-typedef float lxVector2 [ 2 ] ;
-typedef float lxVector3 [ 3 ] ;
-typedef float lxVector4 [ 4 ] ;
-typedef float lxPlane [ 4 ] ;
-typedef float lxMatrix44 [ 16 ] ;
-typedef float lxMatrix34 [ 12 ] ;
-typedef float lxQuat [ 4 ] ;
-typedef float * lxVector2PTR ;
-typedef float * lxVector3PTR ;
-typedef float * lxVector4PTR ;
-typedef float * lxPlanePTR ;
-typedef float * lxMatrix44PTR ;
-typedef float * lxMatrix34PTR ;
-typedef float * lxQuatPTR ;
-typedef const float * lxVector2CPTR ;
-typedef const float * lxVector3CPTR ;
-typedef const float * lxVector4CPTR ;
-typedef const float * lxPlaneCPTR ;
-typedef const float * lxMatrix44CPTR ;
-typedef const float * lxMatrix34CPTR ;
-typedef const float * lxQuatCPTR ;
-typedef __declspec ( align ( 16 ) ) lxMatrix44 lxMatrix44SIMD ;
-typedef __declspec ( align ( 16 ) ) lxVector4 lxVector4SIMD ;
-typedef __declspec ( align ( 16 ) ) lxVector4 lxVector3SIMD ;
-typedef struct lxFrustumPlane_s * lxFrustumPlanePTR ;
-typedef const struct lxFrustumPlane_s * lxFrustumPlaneCPTR ;
-typedef struct lxFrustum_s * lxFrustumPTR ;
-typedef const struct lxFrustum_s * lxFrustumCPTR ;
-typedef struct lxBoundingBox_s * lxBoundingBoxPTR ;
-typedef const struct lxBoundingBox_s * lxBoundingBoxCPTR ;
-typedef struct lxBoundingBoxCenter_s * lxBoundingBoxCenterPTR ;
-typedef const struct lxBoundingBoxCenter_s * lxBoundingBoxCenterCPTR ;
-typedef struct lxBoundingSphere_s * lxBoundingSpherePTR ;
-typedef const struct lxBoundingSphere_s * lxBoundingSphereCPTR ;
-typedef struct lxBoundingCone_s * lxBoundingConePTR ;
-typedef const struct lxBoundingCone_s * lxBoundingConeCPTR ;
-typedef struct lxBoundingCapsule_s * lxBoundingCapsulePTR ;
-typedef const struct lxBoundingCapsule_s * lxBoundingCapsuleCPTR ;
-typedef enum lxFrustumPlaneType_e
-{
-    LUX_FRUSTUM_TOP , LUX_FRUSTUM_BOTTOM , LUX_FRUSTUM_NEAR , LUX_FRUSTUM_FAR , LUX_FRUSTUM_LEFT , LUX_FRUSTUM_RIGHT , LUX_FRUSTUM_PLANES , }
-lxFrustumPlaneType_t ;
-typedef enum lxFrustumCornerType_e
-{
-    LUX_FRUSTUM_C_NTR , LUX_FRUSTUM_C_NTL , LUX_FRUSTUM_C_NBL , LUX_FRUSTUM_C_NBR , LUX_FRUSTUM_C_FTR , LUX_FRUSTUM_C_FTL , LUX_FRUSTUM_C_FBL , LUX_FRUSTUM_C_FBR , LUX_FRUSTUM_CORNERS , }
-lxFrustumCornerType_t ;
-typedef enum lxCullType_e
-{
-    LUX_CULL_INTERSECT = - 1 , LUX_CULL_OUTSIDE = 0 , LUX_CULL_INSIDE = 1 , }
-lxCullType_t ;
-typedef struct lxFrustumPlane_s
-{
-    lxPlane pvec ;
-    union
-    {
-        int n [ 3 ] ;
-        struct
-        {
-            int nx ;
-            int ny ;
-            int nz ;
-            int _npad ;
-        }
-        ;
-    }
-    ;
-    union
-    {
-        int p [ 3 ] ;
-        struct
-        {
-            int px ;
-            int py ;
-            int pz ;
-            int _ppad ;
-        }
-        ;
-    }
-    ;
-}
-lxFrustumPlane_t ;
-typedef struct lxFrustum_s
-{
-    lxFrustumPlane_t fplanes [ LUX_FRUSTUM_PLANES ] ;
-}
-lxFrustum_t ;
-typedef struct lxBoundingBox_s
-{
-    lxVector4 min ;
-    lxVector4 max ;
-}
-lxBoundingBox_t ;
-typedef struct lxBoundingBoxCenter_s
-{
-    lxVector4 center ;
-    lxVector4 size ;
-}
-lxBoundingBoxCenter_t ;
-typedef struct lxBoundingSphere_s
-{
-    lxVector3 center ;
-    float radius ;
-}
-lxBoundingSphere_t ;
-typedef struct lxBoundingCone_s
-{
-    lxVector4 top ;
-    lxVector4 axis ;
-    float sinDiv ;
-    float sinSqr ;
-    float cosSqr ;
-    float _pad ;
-}
-lxBoundingCone_t ;
-typedef struct lxBoundingCapsule_s
-{
-    lxVector4 origin ;
-    lxVector4 toEnd ;
-    float radius ;
-    float radiusSqr ;
-    float _pad [ 2 ] ;
-}
-lxBoundingCapsule_t ;
-booln lxMinMax_intersectsV ( const float selfminmax [ 6 ] , const float otherminmax [ 6 ] ) ;
-void lxBoundingBox_init ( lxBoundingBoxPTR bbox ) ;
-void lxBoundingBox_toCenter ( lxBoundingBoxCPTR bbox , lxVector3 center , lxVector3 size ) ;
-lxBoundingBoxPTR lxBoundingBox_copy ( lxBoundingBoxPTR dst , lxBoundingBoxCPTR src ) ;
-lxBoundingSpherePTR lxBoundingSphere_copy ( lxBoundingSpherePTR dst , lxBoundingSphereCPTR src ) ;
-lxBoundingBoxPTR lxBoundingBox_merge ( lxBoundingBoxPTR out , lxBoundingBoxCPTR a , lxBoundingBoxCPTR b ) ;
-booln lxBoundingBox_mergeChange ( lxBoundingBoxPTR out , lxBoundingBoxCPTR a , lxBoundingBoxCPTR b ) ;
-booln lxBoundingSphere_mergeChange ( lxBoundingSpherePTR out , lxBoundingSphereCPTR a , lxBoundingSphereCPTR b ) ;
-void lxBoundingBox_toCenterBox ( lxBoundingBoxCPTR box , lxBoundingBoxCenterPTR ctr ) ;
-void lxBoundingBox_fromCenterBox ( lxBoundingBoxPTR box , lxBoundingBoxCenterCPTR ctr ) ;
-lxBoundingSpherePTR lxBoundingBox_toSphere ( lxBoundingBoxCPTR bbox , lxBoundingSpherePTR sphere ) ;
-void lxBoundingBox_toSphereV ( const lxVector3 min , const lxVector3 max , lxVector3 center , float * radius ) ;
-lxBoundingCapsulePTR lxBoundingBox_toCapsule ( lxBoundingBoxCPTR bbox , lxBoundingCapsulePTR capsule ) ;
-lxBoundingBoxPTR lxBoundingBox_transform ( lxBoundingBoxPTR out , lxBoundingBoxCPTR in , lxMatrix44CPTR trans ) ;
-void lxBoundingBox_transformBoxCorners ( lxBoundingBoxCPTR in , lxMatrix44CPTR trans , lxVector3 box [ 8 ] ) ;
-void lxBoundingBox_transformV ( lxVector3 outmins , lxVector3 outmaxs , const lxVector3 mins , const lxVector3 maxs , lxMatrix44CPTR trans ) ;
-void lxBoundingBox_fromCorners ( lxBoundingBoxPTR bbox , const lxVector3 vecs [ 8 ] ) ;
-void lxBoundingCorners_fromCamera ( lxVector3 vecs [ 8 ] , lxMatrix44CPTR mat , const float fov , const float frontplane , const float backplane , const float aspect ) ;
-booln lxBoundingBox_intersect ( lxBoundingBoxCPTR a , lxBoundingBoxCPTR b ) ;
-booln lxBoundingBox_checkPoint ( lxBoundingBoxCPTR out , const lxVector3 point ) ;
-booln lxBoundingCone_checkSphere ( lxBoundingConeCPTR cone , lxBoundingSphereCPTR sphere ) ;
-void lxBoundingSphereCone_fromCamera ( lxBoundingSpherePTR sphere , lxBoundingConePTR cone , float frontplane , float backplane , const lxVector3 pos , const lxVector3 dir , float fov ) ;
-void lxBoundingCone_fromFrustumCorners ( lxBoundingConePTR cone , const lxVector3 box [ LUX_FRUSTUM_CORNERS ] ) ;
-void lxBoundingSphere_fromFrustumCorners ( lxBoundingSpherePTR sphere , const lxVector3 box [ LUX_FRUSTUM_CORNERS ] ) ;
-void lxFrustum_update ( lxFrustumPTR frustum , lxMatrix44CPTR viewproj ) ;
-booln lxFrustum_checkPoint ( lxFrustumCPTR frustum , lxVector3CPTR vec ) ;
-booln lxFrustum_checkSphere ( lxFrustumCPTR frustum , lxBoundingSphereCPTR ) ;
-booln lxFrustum_checkSphereCoherent ( lxFrustumCPTR pFrustum , lxBoundingSphereCPTR sphere , int * plane ) ;
-booln lxFrustum_checkSphereFull ( lxFrustumCPTR frustum , lxBoundingSphereCPTR ) ;
-booln lxFrustum_checkBoundingBox ( lxFrustumCPTR frustum , lxBoundingBoxCPTR bbox ) ;
-booln lxFrustum_checkBoundingBoxCoherent ( lxFrustumCPTR pFrustum , lxBoundingBoxCPTR bbox , int * plane ) ;
-lxCullType_t lxFrustum_cullBoundingBoxMaskedCoherent ( lxFrustumCPTR pFrustum , lxBoundingBoxCPTR bbox , int in_mask , int * out_mask , int * inoutstart_id ) ;
-lxCullType_t lxFrustum_cullPoints ( lxFrustumCPTR frustum , const lxVector4 * vecarray , const int numVec ) ;
-lxCullType_t lxFrustum_cullBoundingBox ( lxFrustumCPTR frustum , lxBoundingBoxCPTR bbox ) ;
-void lxFrustum_getCorners ( lxFrustumCPTR frustum , lxVector3 box [ LUX_FRUSTUM_CORNERS ] ) ;
-void lxFrustum_fromCorners ( lxFrustumPTR frustum , const lxVector3 box [ LUX_FRUSTUM_CORNERS ] ) ;
-void lxFrustum_updateSigns ( lxFrustumPTR frustum ) ;
-lxMatrix44CPTR lxMatrix44GetIdentity ( ) ;
-void lxMatrix44Identity ( lxMatrix44PTR dst ) ;
-void lxMatrix44Copy ( lxMatrix44PTR dst , lxMatrix44CPTR src ) ;
-void lxMatrix44CopyRot ( lxMatrix44PTR dst , lxMatrix44CPTR src ) ;
-void lxMatrix44CopyRotTransposed ( lxMatrix44PTR dst , lxMatrix44CPTR src ) ;
-void lxMatrix44SetTranslation ( lxMatrix44PTR dst , lxVector3CPTR translation ) ;
-void lxMatrix44SetInvTranslation ( lxMatrix44PTR dst , lxVector3CPTR translation ) ;
-void lxMatrix44SetScale ( lxMatrix44PTR dst , lxVector3CPTR scale ) ;
-void lxMatrix44PreScale ( lxMatrix44PTR dst , lxMatrix44CPTR mat , lxVector3CPTR scale ) ;
-void lxMatrix44SetRotRows ( lxMatrix44PTR dst , float a , float b , float c , float d , float e , float f , float g , float h , float i ) ;
-float * lxMatrix44GetTranslation ( lxMatrix44CPTR mat , lxVector3PTR vec ) ;
-void lxMatrix44Clear ( lxMatrix44PTR mat ) ;
-void lxMatrix44ClearRot ( lxMatrix44PTR mat ) ;
-void lxMatrix44ClearTranslation ( lxMatrix44PTR mat ) ;
-void lxMatrix44VectorTransform ( lxMatrix44CPTR mat , lxVector3PTR v1 ) ;
-void lxMatrix44VectorInvTransform ( lxMatrix44CPTR mat , lxVector3PTR pVect ) ;
-void lxMatrix44VectorRotate ( lxMatrix44CPTR mat , lxVector3PTR v1 ) ;
-void lxMatrix44VectorInvRotate ( lxMatrix44CPTR mat , lxVector3PTR pVect ) ;
-void lxMatrix44VectorTranslate ( lxMatrix44CPTR mat , lxVector3PTR pVect ) ;
-void lxMatrix44VectorInvTranslate ( lxMatrix44CPTR mat , lxVector3PTR pVect ) ;
-void lxMatrix44Multiply ( lxMatrix44PTR dst , lxMatrix44CPTR mat1 , lxMatrix44CPTR mat2 ) ;
-void lxMatrix44Multiply1 ( lxMatrix44PTR mat1 , lxMatrix44CPTR mat2 ) ;
-void lxMatrix44Multiply2 ( lxMatrix44CPTR mat1 , lxMatrix44PTR mat2 ) ;
-void lxMatrix44MultiplyFull ( lxMatrix44PTR clip , lxMatrix44CPTR proj , lxMatrix44CPTR modl ) ;
-void lxMatrix44MultiplyRot ( lxMatrix44PTR dst , lxMatrix44CPTR mat1 , lxMatrix44CPTR mat2 ) ;
-void lxMatrix44MultiplyRot1 ( lxMatrix44PTR mat1 , lxMatrix44CPTR mat2 ) ;
-void lxMatrix44MultiplyRot2 ( lxMatrix44CPTR mat1 , lxMatrix44PTR mat2 ) ;
-void lxMatrix44Orthonormalize ( lxMatrix44PTR dst , lxMatrix44PTR src ) ;
-void lxMatrix44Transpose ( lxMatrix44PTR dst , lxMatrix44CPTR src ) ;
-void lxMatrix44Transpose1 ( lxMatrix44PTR mat ) ;
-void lxMatrix44TransposeRot ( lxMatrix44PTR dst , lxMatrix44CPTR src ) ;
-void lxMatrix44TransposeRot1 ( lxMatrix44PTR mat ) ;
-void lxMatrix44TransposeRotIdentity ( lxMatrix44PTR dst , lxMatrix44CPTR src ) ;
-void lxMatrix44Invert ( lxMatrix44PTR dst , lxMatrix44CPTR src ) ;
-void lxMatrix44Invert1 ( lxMatrix44PTR mat ) ;
-void lxMatrix44AffineInvert ( lxMatrix44PTR dst , lxMatrix44CPTR src ) ;
-void lxMatrix44Orient ( lxMatrix44PTR mat , lxVector3CPTR forward , lxVector3CPTR up , int axis ) ;
-void lxMatrix44LookAt ( lxMatrix44PTR mat , lxVector3CPTR from , lxVector3CPTR to , lxVector3CPTR up ) ;
-void lxMatrix44FromEulerZYX ( lxMatrix44PTR mat , lxVector3CPTR angles ) ;
-void lxMatrix44FromEulerZYXFast ( lxMatrix44PTR mat , lxVector3CPTR angles ) ;
-void lxMatrix44FromEulerZYXdeg ( lxMatrix44PTR mat , lxVector3CPTR angles ) ;
-void lxMatrix44FromEulerXYZ ( lxMatrix44PTR mat , lxVector3PTR angles ) ;
-void lxMatrix44FromEulerXYZFast ( lxMatrix44PTR mat , lxVector3PTR angles ) ;
-void lxMatrix44FromAngleAxis ( lxMatrix44PTR mat , lxVector3CPTR axis , float cos , float sin , float oneminuscos ) ;
-void lxMatrix44FromAngleAxisFast ( lxMatrix44PTR mat , float anglerad , lxVector3CPTR axis ) ;
-void lxMatrix44RotateAngle ( lxMatrix44PTR mat , lxVector3PTR from , lxVector3PTR to ) ;
-void lxMatrix44RotateAroundVector ( lxMatrix44PTR mat , lxVector3PTR axis , float cos , float sin , float oneminuscos ) ;
-void lxMatrix44RotateAroundVectorFast ( lxMatrix44PTR mat , lxVector3PTR axis , float angleRad ) ;
-void lxMatrix44RotateAroundPointFast ( lxMatrix44PTR mat , lxVector3CPTR center , lxVector3CPTR angles ) ;
-void lxMatrix44ToEulerXYZ ( lxMatrix44CPTR mat , lxVector3PTR angles ) ;
-void lxMatrix44ToEulerZYX ( lxMatrix44CPTR mat , lxVector3PTR angles ) ;
-void lxMatrix44Perspective ( lxMatrix44PTR mat , const float fov , const float front , const float back , const float aspect ) ;
-void lxMatrix44PerspectiveInf ( lxMatrix44PTR mat , const float fov , const float front , const float aspect ) ;
-void lxMatrix44Ortho ( lxMatrix44PTR mat , const float height , const float front , const float back , const float aspect ) ;
-void lxMatrix44OrthoDirect ( lxMatrix44PTR mat , const float left , const float right , const float bottom , const float top , const float front , const float back ) ;
-void lxMatrix44PlaneProjection ( lxMatrix44PTR mat , lxVector3CPTR planenormal ) ;
-void lxMatrix44ModifyProjectionClipplane ( lxMatrix44PTR projmatrix , lxMatrix44CPTR mview , lxMatrix44CPTR mviewinv , lxVector4CPTR clipPlane ) ;
-void lxMatrix44Reflection ( lxMatrix44PTR mat , lxVector4PTR plane ) ;
-float lxMatrix44CompareRot ( lxMatrix44PTR mat1 , lxMatrix44PTR mat2 ) ;
-void lxMatrix44Swizzle1 ( lxMatrix44PTR mat , uint axis [ 3 ] , lxVector3PTR dirs ) ;
-extern const float lx_gMatrix44_ident [ 16 ] ;
-float16 lxFloat32To16 ( float fval ) ;
-float lxFloat16To32 ( float16 ival ) ;
-]]  
---auto-generated api from ffi headers
-local api =
-  {
-  ["lx_gMatrix44_ident"] = { type ='value', description = "extern const float lx_gMatrix44_ident[16]", valuetype = nil, },
-  ["LUX_FRUSTUM_TOP"] = { type ='value', },
-  ["LUX_FRUSTUM_BOTTOM"] = { type ='value', },
-  ["LUX_FRUSTUM_NEAR"] = { type ='value', },
-  ["LUX_FRUSTUM_FAR"] = { type ='value', },
-  ["LUX_FRUSTUM_LEFT"] = { type ='value', },
-  ["LUX_FRUSTUM_RIGHT"] = { type ='value', },
-  ["LUX_FRUSTUM_PLANES"] = { type ='value', },
-  ["LUX_FRUSTUM_C_NTR"] = { type ='value', },
-  ["LUX_FRUSTUM_C_NTL"] = { type ='value', },
-  ["LUX_FRUSTUM_C_NBL"] = { type ='value', },
-  ["LUX_FRUSTUM_C_NBR"] = { type ='value', },
-  ["LUX_FRUSTUM_C_FTR"] = { type ='value', },
-  ["LUX_FRUSTUM_C_FTL"] = { type ='value', },
-  ["LUX_FRUSTUM_C_FBL"] = { type ='value', },
-  ["LUX_FRUSTUM_C_FBR"] = { type ='value', },
-  ["LUX_FRUSTUM_CORNERS"] = { type ='value', },
-  ["LUX_CULL_INTERSECT"] = { type ='value', },
-  ["LUX_CULL_OUTSIDE"] = { type ='value', },
-  ["LUX_CULL_INSIDE"] = { type ='value', },
-  ["lxMinMax_intersectsV"] = { type ='function', 
-    description = "", 
-    returns = "(booln)",
-    valuetype = nil,
-    args = "(const float selfminmax [ 6 ] , const float otherminmax [ 6 ])", },
-  ["lxBoundingBox_init"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxBoundingBoxPTR bbox)", },
-  ["lxBoundingBox_toCenter"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxBoundingBoxCPTR bbox , lxVector3 center , lxVector3 size)", },
-  ["lxBoundingBox_copy"] = { type ='function', 
-    description = "", 
-    returns = "(lxBoundingBoxPTR)",
-    valuetype = "lxm.lxBoundingBox_t",
-    args = "(lxBoundingBoxPTR dst , lxBoundingBoxCPTR src)", },
-  ["lxBoundingSphere_copy"] = { type ='function', 
-    description = "", 
-    returns = "(lxBoundingSpherePTR)",
-    valuetype = "lxm.lxBoundingSphere_t",
-    args = "(lxBoundingSpherePTR dst , lxBoundingSphereCPTR src)", },
-  ["lxBoundingBox_merge"] = { type ='function', 
-    description = "", 
-    returns = "(lxBoundingBoxPTR)",
-    valuetype = "lxm.lxBoundingBox_t",
-    args = "(lxBoundingBoxPTR out , lxBoundingBoxCPTR a , lxBoundingBoxCPTR b)", },
-  ["lxBoundingBox_mergeChange"] = { type ='function', 
-    description = "", 
-    returns = "(booln)",
-    valuetype = nil,
-    args = "(lxBoundingBoxPTR out , lxBoundingBoxCPTR a , lxBoundingBoxCPTR b)", },
-  ["lxBoundingSphere_mergeChange"] = { type ='function', 
-    description = "", 
-    returns = "(booln)",
-    valuetype = nil,
-    args = "(lxBoundingSpherePTR out , lxBoundingSphereCPTR a , lxBoundingSphereCPTR b)", },
-  ["lxBoundingBox_toCenterBox"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxBoundingBoxCPTR box , lxBoundingBoxCenterPTR ctr)", },
-  ["lxBoundingBox_fromCenterBox"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxBoundingBoxPTR box , lxBoundingBoxCenterCPTR ctr)", },
-  ["lxBoundingBox_toSphere"] = { type ='function', 
-    description = "", 
-    returns = "(lxBoundingSpherePTR)",
-    valuetype = "lxm.lxBoundingSphere_t",
-    args = "(lxBoundingBoxCPTR bbox , lxBoundingSpherePTR sphere)", },
-  ["lxBoundingBox_toSphereV"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(const lxVector3 min , const lxVector3 max , lxVector3 center , float * radius)", },
-  ["lxBoundingBox_toCapsule"] = { type ='function', 
-    description = "", 
-    returns = "(lxBoundingCapsulePTR)",
-    valuetype = "lxm.lxBoundingCapsule_t",
-    args = "(lxBoundingBoxCPTR bbox , lxBoundingCapsulePTR capsule)", },
-  ["lxBoundingBox_transform"] = { type ='function', 
-    description = "", 
-    returns = "(lxBoundingBoxPTR)",
-    valuetype = "lxm.lxBoundingBox_t",
-    args = "(lxBoundingBoxPTR out , lxBoundingBoxCPTR in , lxMatrix44CPTR trans)", },
-  ["lxBoundingBox_transformBoxCorners"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxBoundingBoxCPTR in , lxMatrix44CPTR trans , lxVector3 box [ 8 ])", },
-  ["lxBoundingBox_transformV"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxVector3 outmins , lxVector3 outmaxs , const lxVector3 mins , const lxVector3 maxs , lxMatrix44CPTR trans)", },
-  ["lxBoundingBox_fromCorners"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxBoundingBoxPTR bbox , const lxVector3 vecs [ 8 ])", },
-  ["lxBoundingCorners_fromCamera"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxVector3 vecs [ 8 ] , lxMatrix44CPTR mat , const float fov , const float frontplane , const float backplane , const float aspect)", },
-  ["lxBoundingBox_intersect"] = { type ='function', 
-    description = "", 
-    returns = "(booln)",
-    valuetype = nil,
-    args = "(lxBoundingBoxCPTR a , lxBoundingBoxCPTR b)", },
-  ["lxBoundingBox_checkPoint"] = { type ='function', 
-    description = "", 
-    returns = "(booln)",
-    valuetype = nil,
-    args = "(lxBoundingBoxCPTR out , const lxVector3 point)", },
-  ["lxBoundingCone_checkSphere"] = { type ='function', 
-    description = "", 
-    returns = "(booln)",
-    valuetype = nil,
-    args = "(lxBoundingConeCPTR cone , lxBoundingSphereCPTR sphere)", },
-  ["lxBoundingSphereCone_fromCamera"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxBoundingSpherePTR sphere , lxBoundingConePTR cone , float frontplane , float backplane , const lxVector3 pos , const lxVector3 dir , float fov)", },
-  ["lxBoundingCone_fromFrustumCorners"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxBoundingConePTR cone , const lxVector3 box [ LUX_FRUSTUM_CORNERS ])", },
-  ["lxBoundingSphere_fromFrustumCorners"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxBoundingSpherePTR sphere , const lxVector3 box [ LUX_FRUSTUM_CORNERS ])", },
-  ["lxFrustum_update"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxFrustumPTR frustum , lxMatrix44CPTR viewproj)", },
-  ["lxFrustum_checkPoint"] = { type ='function', 
-    description = "", 
-    returns = "(booln)",
-    valuetype = nil,
-    args = "(lxFrustumCPTR frustum , lxVector3CPTR vec)", },
-  ["lxFrustum_checkSphere"] = { type ='function', 
-    description = "", 
-    returns = "(booln)",
-    valuetype = nil,
-    args = "(lxFrustumCPTR frustum , lxBoundingSphereCPTR)", },
-  ["lxFrustum_checkSphereCoherent"] = { type ='function', 
-    description = "", 
-    returns = "(booln)",
-    valuetype = nil,
-    args = "(lxFrustumCPTR pFrustum , lxBoundingSphereCPTR sphere , int * plane)", },
-  ["lxFrustum_checkSphereFull"] = { type ='function', 
-    description = "", 
-    returns = "(booln)",
-    valuetype = nil,
-    args = "(lxFrustumCPTR frustum , lxBoundingSphereCPTR)", },
-  ["lxFrustum_checkBoundingBox"] = { type ='function', 
-    description = "", 
-    returns = "(booln)",
-    valuetype = nil,
-    args = "(lxFrustumCPTR frustum , lxBoundingBoxCPTR bbox)", },
-  ["lxFrustum_checkBoundingBoxCoherent"] = { type ='function', 
-    description = "", 
-    returns = "(booln)",
-    valuetype = nil,
-    args = "(lxFrustumCPTR pFrustum , lxBoundingBoxCPTR bbox , int * plane)", },
-  ["lxFrustum_cullBoundingBoxMaskedCoherent"] = { type ='function', 
-    description = "", 
-    returns = "(lxCullType_t)",
-    valuetype = nil,
-    args = "(lxFrustumCPTR pFrustum , lxBoundingBoxCPTR bbox , int in_mask , int * out_mask , int * inoutstart_id)", },
-  ["lxFrustum_cullPoints"] = { type ='function', 
-    description = "", 
-    returns = "(lxCullType_t)",
-    valuetype = nil,
-    args = "(lxFrustumCPTR frustum , const lxVector4 * vecarray , const int numVec)", },
-  ["lxFrustum_cullBoundingBox"] = { type ='function', 
-    description = "", 
-    returns = "(lxCullType_t)",
-    valuetype = nil,
-    args = "(lxFrustumCPTR frustum , lxBoundingBoxCPTR bbox)", },
-  ["lxFrustum_getCorners"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxFrustumCPTR frustum , lxVector3 box [ LUX_FRUSTUM_CORNERS ])", },
-  ["lxFrustum_fromCorners"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxFrustumPTR frustum , const lxVector3 box [ LUX_FRUSTUM_CORNERS ])", },
-  ["lxFrustum_updateSigns"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxFrustumPTR frustum)", },
-  ["lxMatrix44GetIdentity"] = { type ='function', 
-    description = "", 
-    returns = "(lxMatrix44CPTR)",
-    valuetype = nil,
-    args = "()", },
-  ["lxMatrix44Identity"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst)", },
-  ["lxMatrix44Copy"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst , lxMatrix44CPTR src)", },
-  ["lxMatrix44CopyRot"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst , lxMatrix44CPTR src)", },
-  ["lxMatrix44CopyRotTransposed"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst , lxMatrix44CPTR src)", },
-  ["lxMatrix44SetTranslation"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst , lxVector3CPTR translation)", },
-  ["lxMatrix44SetInvTranslation"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst , lxVector3CPTR translation)", },
-  ["lxMatrix44SetScale"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst , lxVector3CPTR scale)", },
-  ["lxMatrix44PreScale"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst , lxMatrix44CPTR mat , lxVector3CPTR scale)", },
-  ["lxMatrix44SetRotRows"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst , float a , float b , float c , float d , float e , float f , float g , float h , float i)", },
-  ["lxMatrix44GetTranslation"] = { type ='function', 
-    description = "", 
-    returns = "(float *)",
-    valuetype = nil,
-    args = "(lxMatrix44CPTR mat , lxVector3PTR vec)", },
-  ["lxMatrix44Clear"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat)", },
-  ["lxMatrix44ClearRot"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat)", },
-  ["lxMatrix44ClearTranslation"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat)", },
-  ["lxMatrix44VectorTransform"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44CPTR mat , lxVector3PTR v1)", },
-  ["lxMatrix44VectorInvTransform"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44CPTR mat , lxVector3PTR pVect)", },
-  ["lxMatrix44VectorRotate"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44CPTR mat , lxVector3PTR v1)", },
-  ["lxMatrix44VectorInvRotate"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44CPTR mat , lxVector3PTR pVect)", },
-  ["lxMatrix44VectorTranslate"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44CPTR mat , lxVector3PTR pVect)", },
-  ["lxMatrix44VectorInvTranslate"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44CPTR mat , lxVector3PTR pVect)", },
-  ["lxMatrix44Multiply"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst , lxMatrix44CPTR mat1 , lxMatrix44CPTR mat2)", },
-  ["lxMatrix44Multiply1"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat1 , lxMatrix44CPTR mat2)", },
-  ["lxMatrix44Multiply2"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44CPTR mat1 , lxMatrix44PTR mat2)", },
-  ["lxMatrix44MultiplyFull"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR clip , lxMatrix44CPTR proj , lxMatrix44CPTR modl)", },
-  ["lxMatrix44MultiplyRot"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst , lxMatrix44CPTR mat1 , lxMatrix44CPTR mat2)", },
-  ["lxMatrix44MultiplyRot1"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat1 , lxMatrix44CPTR mat2)", },
-  ["lxMatrix44MultiplyRot2"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44CPTR mat1 , lxMatrix44PTR mat2)", },
-  ["lxMatrix44Orthonormalize"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst , lxMatrix44PTR src)", },
-  ["lxMatrix44Transpose"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst , lxMatrix44CPTR src)", },
-  ["lxMatrix44Transpose1"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat)", },
-  ["lxMatrix44TransposeRot"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst , lxMatrix44CPTR src)", },
-  ["lxMatrix44TransposeRot1"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat)", },
-  ["lxMatrix44TransposeRotIdentity"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst , lxMatrix44CPTR src)", },
-  ["lxMatrix44Invert"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst , lxMatrix44CPTR src)", },
-  ["lxMatrix44Invert1"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat)", },
-  ["lxMatrix44AffineInvert"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR dst , lxMatrix44CPTR src)", },
-  ["lxMatrix44Orient"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , lxVector3CPTR forward , lxVector3CPTR up , int axis)", },
-  ["lxMatrix44LookAt"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , lxVector3CPTR from , lxVector3CPTR to , lxVector3CPTR up)", },
-  ["lxMatrix44FromEulerZYX"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , lxVector3CPTR angles)", },
-  ["lxMatrix44FromEulerZYXFast"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , lxVector3CPTR angles)", },
-  ["lxMatrix44FromEulerZYXdeg"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , lxVector3CPTR angles)", },
-  ["lxMatrix44FromEulerXYZ"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , lxVector3PTR angles)", },
-  ["lxMatrix44FromEulerXYZFast"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , lxVector3PTR angles)", },
-  ["lxMatrix44FromAngleAxis"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , lxVector3CPTR axis , float cos , float sin , float oneminuscos)", },
-  ["lxMatrix44FromAngleAxisFast"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , float anglerad , lxVector3CPTR axis)", },
-  ["lxMatrix44RotateAngle"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , lxVector3PTR from , lxVector3PTR to)", },
-  ["lxMatrix44RotateAroundVector"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , lxVector3PTR axis , float cos , float sin , float oneminuscos)", },
-  ["lxMatrix44RotateAroundVectorFast"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , lxVector3PTR axis , float angleRad)", },
-  ["lxMatrix44RotateAroundPointFast"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , lxVector3CPTR center , lxVector3CPTR angles)", },
-  ["lxMatrix44ToEulerXYZ"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44CPTR mat , lxVector3PTR angles)", },
-  ["lxMatrix44ToEulerZYX"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44CPTR mat , lxVector3PTR angles)", },
-  ["lxMatrix44Perspective"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , const float fov , const float front , const float back , const float aspect)", },
-  ["lxMatrix44PerspectiveInf"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , const float fov , const float front , const float aspect)", },
-  ["lxMatrix44Ortho"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , const float height , const float front , const float back , const float aspect)", },
-  ["lxMatrix44OrthoDirect"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , const float left , const float right , const float bottom , const float top , const float front , const float back)", },
-  ["lxMatrix44PlaneProjection"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , lxVector3CPTR planenormal)", },
-  ["lxMatrix44ModifyProjectionClipplane"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR projmatrix , lxMatrix44CPTR mview , lxMatrix44CPTR mviewinv , lxVector4CPTR clipPlane)", },
-  ["lxMatrix44Reflection"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , lxVector4PTR plane)", },
-  ["lxMatrix44CompareRot"] = { type ='function', 
-    description = "", 
-    returns = "(float)",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat1 , lxMatrix44PTR mat2)", },
-  ["lxMatrix44Swizzle1"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(lxMatrix44PTR mat , uint axis [ 3 ] , lxVector3PTR dirs)", },
-  ["lxFloat32To16"] = { type ='function', 
-    description = "", 
-    returns = "(float16)",
-    valuetype = nil,
-    args = "(float fval)", },
-  ["lxFloat16To32"] = { type ='function', 
-    description = "", 
-    returns = "(float)",
-    valuetype = nil,
-    args = "(float16 ival)", },
-  ["lxFrustumPlane_t"] = { type ='class', 
-    description = "", 
-    childs =     {
-    ["pvec"] = { type ='value', description = "lxPlane", valuetype = nil, },
-    [""] = { type ='class', 
-      description = "", 
-      childs =       {
-      ["nx"] = { type ='value', description = "int", valuetype = nil, },
-      ["ny"] = { type ='value', description = "int", valuetype = nil, },
-      ["nz"] = { type ='value', description = "int", valuetype = nil, },
-      ["_npad"] = { type ='value', description = "int", valuetype = nil, },
-      }
-    },
-    [""] = { type ='class', 
-      description = "", 
-      childs =       {
-      ["px"] = { type ='value', description = "int", valuetype = nil, },
-      ["py"] = { type ='value', description = "int", valuetype = nil, },
-      ["pz"] = { type ='value', description = "int", valuetype = nil, },
-      ["_ppad"] = { type ='value', description = "int", valuetype = nil, },
-      }
-    },
-    }
-  },
-  ["lxFrustum_t"] = { type ='class', 
-    description = "", 
-    childs =     {
-    ["LUX_FRUSTUM_PLANES"] = { type ='value', description = "lxFrustumPlane_t fplanes]", valuetype = nil, },
-    }
-  },
-  ["lxBoundingBox_t"] = { type ='class', 
-    description = "", 
-    childs =     {
-    ["min"] = { type ='value', description = "lxVector4", valuetype = nil, },
-    ["max"] = { type ='value', description = "lxVector4", valuetype = nil, },
-    }
-  },
-  ["lxBoundingBoxCenter_t"] = { type ='class', 
-    description = "", 
-    childs =     {
-    ["center"] = { type ='value', description = "lxVector4", valuetype = nil, },
-    ["size"] = { type ='value', description = "lxVector4", valuetype = nil, },
-    }
-  },
-  ["lxBoundingSphere_t"] = { type ='class', 
-    description = "", 
-    childs =     {
-    ["center"] = { type ='value', description = "lxVector3", valuetype = nil, },
-    ["radius"] = { type ='value', description = "float", valuetype = nil, },
-    }
-  },
-  ["lxBoundingCone_t"] = { type ='class', 
-    description = "", 
-    childs =     {
-    ["top"] = { type ='value', description = "lxVector4", valuetype = nil, },
-    ["axis"] = { type ='value', description = "lxVector4", valuetype = nil, },
-    ["sinDiv"] = { type ='value', description = "float", valuetype = nil, },
-    ["sinSqr"] = { type ='value', description = "float", valuetype = nil, },
-    ["cosSqr"] = { type ='value', description = "float", valuetype = nil, },
-    ["_pad"] = { type ='value', description = "float", valuetype = nil, },
-    }
-  },
-  ["lxBoundingCapsule_t"] = { type ='class', 
-    description = "", 
-    childs =     {
-    ["origin"] = { type ='value', description = "lxVector4", valuetype = nil, },
-    ["toEnd"] = { type ='value', description = "lxVector4", valuetype = nil, },
-    ["radius"] = { type ='value', description = "float", valuetype = nil, },
-    ["radiusSqr"] = { type ='value', description = "float", valuetype = nil, },
-    ["2"] = { type ='value', description = "float _pad]", valuetype = nil, },
-    }
-  },
-  }
-return {
-  lxm = {
-    type = 'lib',
-    description = "Lux Math",
-    childs = api,
-  },
-}

api/lua/luxscene.lua

@@ -1,130 +0,0 @@
---[[// lxs | Lux Scene
-typedef enum lxMeshIndexType_e
-{
-    LUX_MESH_INDEX_UINT16 , LUX_MESH_INDEX_UINT32 , LUX_MESH_INDICES , }
-lxMeshIndexType_t ;
-void lxMeshPlane_getCounts ( int segs [ 2 ] , int * numVertices , int * numTriangleIndices , int * numOutlineIndices ) ;
-void lxMeshPlane_initTriangles ( int segs [ 2 ] , lxVector3 * pos , lxVector3 * normal , lxVector2 * uv , uint32 * indices ) ;
-void lxMeshPlane_initOutline ( int segs [ 2 ] , uint32 * indices ) ;
-void lxMeshDisc_getCounts ( int segs [ 2 ] , int * numVertices , int * numTriangleIndices , int * numOutlineIndices ) ;
-void lxMeshDisc_initTriangles ( int segs [ 2 ] , lxVector3 * pos , lxVector3 * normal , lxVector2 * uv , uint32 * indices ) ;
-void lxMeshDisc_initOutline ( int segs [ 2 ] , uint32 * indices ) ;
-void lxMeshBox_getCounts ( int segs [ 3 ] , int * numVertices , int * numTriangleIndices , int * numOutlineIndices ) ;
-void lxMeshBox_initTriangles ( int segs [ 3 ] , lxVector3 * pos , lxVector3 * normal , lxVector2 * uv , uint32 * indices ) ;
-void lxMeshBox_initOutline ( int segs [ 3 ] , uint32 * indices ) ;
-void lxMeshSphere_getCounts ( int segs [ 2 ] , int * numVertices , int * numTriangleIndices , int * numOutlineIndices ) ;
-void lxMeshSphere_initTriangles ( int segs [ 2 ] , lxVector3 * pos , lxVector3 * normal , lxVector2 * uv , uint32 * indices ) ;
-void lxMeshSphere_initOutline ( int segs [ 2 ] , uint32 * indices ) ;
-void lxMeshCylinder_getCounts ( int segs [ 3 ] , int * numVertices , int * numTriangleIndices , int * numOutlineIndices ) ;
-void lxMeshCylinder_initTriangles ( int segs [ 3 ] , lxVector3 * pos , lxVector3 * normal , lxVector2 * uv , uint32 * indices ) ;
-void lxMeshCylinder_initOutline ( int segs [ 3 ] , uint32 * indices ) ;
-void * lxVertexCacheOptimize_tipsify ( void * indices , int nTriangles , int nVertices , int k , lxMeshIndexType_t type ) ;
-void * lxVertexCacheOptimize_forsyth ( void * indices , int nTriangles , int nVertices , int vcache , lxMeshIndexType_t type ) ;
-void * lxVertexCacheOptimize_grid_castano ( void * indices , int maxTriangles , int width , int height , int vcache , lxMeshIndexType_t type , int * writtenTriangles ) ;
-
-
-]]  
---auto-generated api from ffi headers
-local api =
-  {
-  ["LUX_MESH_INDEX_UINT16"] = { type ='value', },
-  ["LUX_MESH_INDEX_UINT32"] = { type ='value', },
-  ["LUX_MESH_INDICES"] = { type ='value', },
-  ["lxMeshPlane_getCounts"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(int segs [ 2 ] , int * numVertices , int * numTriangleIndices , int * numOutlineIndices)", },
-  ["lxMeshPlane_initTriangles"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(int segs [ 2 ] , lxVector3 * pos , lxVector3 * normal , lxVector2 * uv , uint32 * indices)", },
-  ["lxMeshPlane_initOutline"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(int segs [ 2 ] , uint32 * indices)", },
-  ["lxMeshDisc_getCounts"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(int segs [ 2 ] , int * numVertices , int * numTriangleIndices , int * numOutlineIndices)", },
-  ["lxMeshDisc_initTriangles"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(int segs [ 2 ] , lxVector3 * pos , lxVector3 * normal , lxVector2 * uv , uint32 * indices)", },
-  ["lxMeshDisc_initOutline"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(int segs [ 2 ] , uint32 * indices)", },
-  ["lxMeshBox_getCounts"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(int segs [ 3 ] , int * numVertices , int * numTriangleIndices , int * numOutlineIndices)", },
-  ["lxMeshBox_initTriangles"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(int segs [ 3 ] , lxVector3 * pos , lxVector3 * normal , lxVector2 * uv , uint32 * indices)", },
-  ["lxMeshBox_initOutline"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(int segs [ 3 ] , uint32 * indices)", },
-  ["lxMeshSphere_getCounts"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(int segs [ 2 ] , int * numVertices , int * numTriangleIndices , int * numOutlineIndices)", },
-  ["lxMeshSphere_initTriangles"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(int segs [ 2 ] , lxVector3 * pos , lxVector3 * normal , lxVector2 * uv , uint32 * indices)", },
-  ["lxMeshSphere_initOutline"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(int segs [ 2 ] , uint32 * indices)", },
-  ["lxMeshCylinder_getCounts"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(int segs [ 3 ] , int * numVertices , int * numTriangleIndices , int * numOutlineIndices)", },
-  ["lxMeshCylinder_initTriangles"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(int segs [ 3 ] , lxVector3 * pos , lxVector3 * normal , lxVector2 * uv , uint32 * indices)", },
-  ["lxMeshCylinder_initOutline"] = { type ='function', 
-    description = "", 
-    returns = "()",
-    valuetype = nil,
-    args = "(int segs [ 3 ] , uint32 * indices)", },
-  ["lxVertexCacheOptimize_tipsify"] = { type ='function', 
-    description = "", 
-    returns = "(void *)",
-    valuetype = nil,
-    args = "(void * indices , int nTriangles , int nVertices , int k , lxMeshIndexType_t type)", },
-  ["lxVertexCacheOptimize_forsyth"] = { type ='function', 
-    description = "", 
-    returns = "(void *)",
-    valuetype = nil,
-    args = "(void * indices , int nTriangles , int nVertices , int vcache , lxMeshIndexType_t type)", },
-  ["lxVertexCacheOptimize_grid_castano"] = { type ='function', 
-    description = "", 
-    returns = "(void *)",
-    valuetype = nil,
-    args = "(void * indices , int maxTriangles , int width , int height , int vcache , lxMeshIndexType_t type , int * writtenTriangles)", },
-  }
-return {
-  lxs = {
-    type = 'lib',
-    description = "Lux Scene",
-    childs = api,
-  },
-}

api/lua/wxwidgets.lua

@@ -1,16 +1,24 @@
-local api = {}
-for key in pairs(wx) do
-	api[key] = {
-		type = (type(wx[key]) == "function" and "function" or "value"),
-		description = "",
-		returns = "",
-	}
+local function populateAPI(t)
+  local api = {}
+  for k,v in pairs(t) do
+    api[k] = {
+      type = (type(v) == "function" and "function" or "value"),
+      description = "",
+      returns = "",
+    }
+  end
+  return api
 end
 
 return {
-	wx = {
-		type = "lib",
-		description = "WX lib",
-		childs = api
-	}
-}
+  wx = {
+    type = "lib",
+    description = "wx lib",
+    childs = populateAPI(wx),
+  },
+  wxstc = {
+    type = "lib",
+    description = "wxSTC lib",
+    childs = populateAPI(wxstc),
+  },
+}

bin/lua53

@@ -0,0 +1 @@
+lua.app/Contents/MacOS/lua53

build/build-linux-prep-deb.sh

@@ -4,8 +4,10 @@
 
 sudo apt-get install git-core
 sudo apt-get install g++
-sudo apt-get install subversion
 sudo apt-get install libgtk2.0-dev
+sudo apt-get install libglew-dev
+sudo apt-get install cmake
+exit
 
 # install cmake as wxwidgets needs 2.8.4+ but "sudo apt-get install cmake" 
 # only installs 2.8.0 on some systems (like Ubuntu 10.4)

build/build-linux-prep-rpm.sh

@@ -4,6 +4,8 @@
 
 sudo yum install gcc-c++
 sudo yum install git
-sudo yum install svn
 sudo yum install cmake
 sudo yum install gtk2-devel
+sudo yum install wget
+sudo yum install sqlite
+sudo yum install mesa-libGL-devel

build/build-linux.sh

@@ -1,14 +1,27 @@
 #!/bin/bash
 
-if [ "$(uname -m)" = "x86_64" ]; then
-  FPIC="-fpic"
-  ARCH="x64"
-else
-  FPIC=""
-  ARCH="x86"
+# exit if the command line is empty
+if [ $# -eq 0 ]; then
+  echo "Usage: $0 LIBRARY..."
+  exit 0
 fi
 
-# ZBS binary directory
+case "$(uname -m)" in
+	x86_64)
+		FPIC="-fpic"
+		ARCH="x64"
+		;;
+	armv7l)
+		FPIC="-fpic"
+		ARCH="armhf"
+		;;
+	*)
+		FPIC=""
+		ARCH="x86"
+		;;
+esac
+
+# binary directory
 BIN_DIR="$(dirname "$PWD")/bin/linux/$ARCH"
 
 # temporary installation directory for dependencies
@@ -22,36 +35,44 @@ BUILD_FLAGS="-O2 -shared -s -I $INSTALL_DIR/include -L $INSTALL_DIR/lib $FPIC"
 
 # paths configuration
 WXWIDGETS_BASENAME="wxWidgets"
-WXWIDGETS_URL="http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk"
-
-LIBPNG_BASENAME="libpng-1.6.2"
-LIBPNG_FILENAME="$LIBPNG_BASENAME.tar.gz"
-LIBPNG_URL="http://sourceforge.net/projects/libpng/files/libpng16/1.6.2/libpng-1.6.2.tar.gz/download"
-
-ZLIB_BASENAME="zlib-1.2.8"
-ZLIB_FILENAME="$ZLIB_BASENAME.tar.gz"
-ZLIB_URL="https://github.com/madler/zlib/archive/v1.2.8.tar.gz"
+WXWIDGETS_URL="https://github.com/pkulchenko/wxWidgets.git"
 
 WXLUA_BASENAME="wxlua"
-WXLUA_URL="https://svn.code.sf.net/p/wxlua/svn/trunk"
+WXLUA_URL="https://github.com/pkulchenko/wxlua.git"
 
 LUASOCKET_BASENAME="luasocket-3.0-rc1"
 LUASOCKET_FILENAME="v3.0-rc1.zip"
 LUASOCKET_URL="https://github.com/diegonehab/luasocket/archive/$LUASOCKET_FILENAME"
 
-# exit if the command line is empty
-if [ $# -eq 0 ]; then
-  echo "Usage: $0 LIBRARY..."
-  exit 0
-fi
+LUASEC_BASENAME="luasec-0.6"
+LUASEC_FILENAME="$LUASEC_BASENAME.zip"
+LUASEC_URL="https://github.com/brunoos/luasec/archive/$LUASEC_FILENAME"
+
+LFS_BASENAME="v_1_6_3"
+LFS_FILENAME="$LFS_BASENAME.tar.gz"
+LFS_URL="https://github.com/keplerproject/luafilesystem/archive/$LFS_FILENAME"
+
+LPEG_BASENAME="lpeg-1.0.0"
+LPEG_FILENAME="$LPEG_BASENAME.tar.gz"
+LPEG_URL="http://www.inf.puc-rio.br/~roberto/lpeg/$LPEG_FILENAME"
+
+WXWIDGETSDEBUG="--disable-debug"
+WXLUABUILD="MinSizeRel"
 
 # iterate through the command line arguments
 for ARG in "$@"; do
   case $ARG in
   5.2)
+    BUILD_LUA=true
     BUILD_52=true
     ;;
+  5.3)
+    BUILD_LUA=true
+    BUILD_53=true
+    BUILD_FLAGS="$BUILD_FLAGS -DLUA_COMPAT_APIINTCASTS"
+    ;;
   jit)
+    BUILD_LUA=true
     BUILD_JIT=true
     ;;
   wxwidgets)
@@ -63,14 +84,30 @@ for ARG in "$@"; do
   wxlua)
     BUILD_WXLUA=true
     ;;
+  luasec)
+    BUILD_LUASEC=true
+    ;;
   luasocket)
     BUILD_LUASOCKET=true
     ;;
+  lfs)
+    BUILD_LFS=true
+    ;;
+  lpeg)
+    BUILD_LPEG=true
+    ;;
+  debug)
+    WXWIDGETSDEBUG="--enable-debug=max --enable-debug_gdb"
+    WXLUABUILD="Debug"
+    ;;
   all)
     BUILD_WXWIDGETS=true
     BUILD_LUA=true
     BUILD_WXLUA=true
     BUILD_LUASOCKET=true
+    BUILD_LUASEC=true
+    BUILD_LFS=true
+    BUILD_LPEG=true
     ;;
   *)
     echo "Error: invalid argument $ARG"
@@ -91,9 +128,9 @@ if [ ! "$(which cmake)" ]; then
   exit 1
 fi
 
-# check for svn
-if [ ! "$(which svn)" ]; then
-  echo "Error: svn isn't found. Please install console SVN client."
+# check for git
+if [ ! "$(which git)" ]; then
+  echo "Error: git isn't found. Please install console GIT client."
   exit 1
 fi
 
@@ -113,63 +150,57 @@ LUA_BASENAME="lua-5.1.5"
 if [ $BUILD_52 ]; then
   LUAV="52"
   LUAS=$LUAV
-  LUA_BASENAME="lua-5.2.2"
+  LUA_BASENAME="lua-5.2.4"
 fi
 
 LUA_FILENAME="$LUA_BASENAME.tar.gz"
 LUA_URL="http://www.lua.org/ftp/$LUA_FILENAME"
 
-if [ $BUILD_JIT ]; then
-  LUA_BASENAME="LuaJIT-2.0.2"
+if [ $BUILD_53 ]; then
+  LUAV="53"
+  LUAS=$LUAV
+  LUA_BASENAME="lua-5.3.1"
   LUA_FILENAME="$LUA_BASENAME.tar.gz"
-  LUA_URL="http://luajit.org/download/$LUA_FILENAME"
+  LUA_URL="http://www.lua.org/ftp/$LUA_FILENAME"
+fi
+
+if [ $BUILD_JIT ]; then
+  LUA_BASENAME="luajit"
+  LUA_URL="https://github.com/pkulchenko/luajit.git"
 fi
 
 # build wxWidgets
 if [ $BUILD_WXWIDGETS ]; then
-  # first build get/configure libpng as v1.6 is needed
-  wget -c "$LIBPNG_URL" -O "$LIBPNG_FILENAME" || { echo "Error: failed to download libpng"; exit 1; }
-  tar -xzf "$LIBPNG_FILENAME"
-  (cd "$LIBPNG_BASENAME"; ./configure --with-libpng-prefix=wxpng_; make $MAKEFLAGS)
-
-  wget -c "$ZLIB_URL" -O "$ZLIB_FILENAME" || { echo "Error: failed to download zlib"; exit 1; }
-  tar -xzf "$ZLIB_FILENAME"
-  (cd "$ZLIB_BASENAME"; ./configure; make $MAKEFLAGS)
-
-  svn co "$WXWIDGETS_URL" "$WXWIDGETS_BASENAME" || { echo "Error: failed to checkout wxWidgets"; exit 1; }
-  # replace src/png with the libpng folder
-  rm -rf "$WXWIDGETS_BASENAME/src/png"
-  mv "$LIBPNG_BASENAME" "$WXWIDGETS_BASENAME/src/png"
-
-  # replace src/zlib with the zlib folder
-  rm -rf "$WXWIDGETS_BASENAME/src/zlib"
-  mv "$ZLIB_BASENAME" "$WXWIDGETS_BASENAME/src/zlib"
+  git clone "$WXWIDGETS_URL" "$WXWIDGETS_BASENAME" || { echo "Error: failed to get wxWidgets"; exit 1; }
 
   cd "$WXWIDGETS_BASENAME"
-  ./configure --prefix="$INSTALL_DIR" --disable-debug --disable-shared --enable-unicode \
+  ./configure --prefix="$INSTALL_DIR" $WXWIDGETSDEBUG --disable-shared --enable-unicode \
+    --enable-compat28 \
     --with-libjpeg=builtin --with-libpng=builtin --with-libtiff=no --with-expat=no \
     --with-zlib=builtin --disable-richtext --with-gtk=2 \
     CFLAGS="-Os -fPIC" CXXFLAGS="-Os -fPIC"
-  # update gzio to gzlib as this has changed between zlib 1.2.3 to 1.2.8
-  sed -i 's/gzio.c/gzlib.c/' Makefile
   make $MAKEFLAGS || { echo "Error: failed to build wxWidgets"; exit 1; }
   make install
   cd ..
-  rm -rf "$WXWIDGETS_BASENAME" "$LIBPNG_FILENAME"
+  rm -rf "$WXWIDGETS_BASENAME"
 fi
 
 # build Lua
 if [ $BUILD_LUA ]; then
-  wget -c "$LUA_URL" -O "$LUA_FILENAME" || { echo "Error: failed to download Lua"; exit 1; }
-  tar -xzf "$LUA_FILENAME"
+  if [ $BUILD_JIT ]; then
+    git clone "$LUA_URL" "$LUA_BASENAME"
+    (cd "$LUA_BASENAME"; git checkout v2.0.4)
+  else
+    wget -c "$LUA_URL" -O "$LUA_FILENAME" || { echo "Error: failed to download Lua"; exit 1; }
+    tar -xzf "$LUA_FILENAME"
+  fi
   cd "$LUA_BASENAME"
 
   if [ $BUILD_JIT ]; then
     make CCOPT="-DLUAJIT_ENABLE_LUA52COMPAT" || { echo "Error: failed to build Lua"; exit 1; }
     make install PREFIX="$INSTALL_DIR"
-    cp "$INSTALL_DIR/bin/luajit" "$INSTALL_DIR/bin/lua"
-    # move luajit to lua as it's expected by luasocket and other components
-    cp "$INSTALL_DIR"/include/luajit*/* "$INSTALL_DIR/include/"
+    cp "$INSTALL_DIR"/bin/luajit "$INSTALL_DIR/bin/lua"
+    # don't copy luajit includes as the libraries should be compiled using Lua headers
   else
     # use POSIX as it has minimum dependencies (no readline and no ncurses required)
     # LUA_USE_DLOPEN is required for loading libraries
@@ -184,19 +215,27 @@ fi
 
 # build wxLua
 if [ $BUILD_WXLUA ]; then
-  svn co "$WXLUA_URL" "$WXLUA_BASENAME" || { echo "Error: failed to checkout wxLua"; exit 1; }
+  git clone "$WXLUA_URL" "$WXLUA_BASENAME" || { echo "Error: failed to get wxWidgets"; exit 1; }
   cd "$WXLUA_BASENAME/wxLua"
+  git checkout wxwidgets311
+
   # the following patches wxlua source to fix live coding support in wxlua apps
   # http://www.mail-archive.com/wxlua-users@lists.sourceforge.net/msg03225.html
   sed -i 's/\(m_wxlState = wxLuaState(wxlState.GetLuaState(), wxLUASTATE_GETSTATE|wxLUASTATE_ROOTSTATE);\)/\/\/ removed by ZBS build process \/\/ \1/' modules/wxlua/wxlcallb.cpp
-  cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" -DCMAKE_BUILD_TYPE=MinSizeRel -DBUILD_SHARED_LIBS=FALSE \
+
+  # remove "Unable to call an unknown method..." error as it leads to a leak
+  # see http://sourceforge.net/p/wxlua/mailman/message/34629522/ for details
+  sed -i '/Unable to call an unknown method/{N;s/.*/    \/\/ removed by ZBS build process/}' modules/wxlua/wxlbind.cpp
+
+  cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" -DCMAKE_BUILD_TYPE=$WXLUABUILD -DBUILD_SHARED_LIBS=FALSE \
     -DwxWidgets_CONFIG_EXECUTABLE="$INSTALL_DIR/bin/wx-config" \
-    -DwxWidgets_COMPONENTS="stc;html;aui;adv;core;net;base" \
-    -DwxLuaBind_COMPONENTS="stc;html;aui;adv;core;net;base" -DwxLua_LUA_LIBRARY_USE_BUILTIN=FALSE \
+    -DwxWidgets_COMPONENTS="stc;gl;html;aui;adv;core;net;base" \
+    -DwxLuaBind_COMPONENTS="stc;gl;html;aui;adv;core;net;base" -DwxLua_LUA_LIBRARY_USE_BUILTIN=FALSE \
     -DwxLua_LUA_INCLUDE_DIR="$INSTALL_DIR/include" -DwxLua_LUA_LIBRARY="$INSTALL_DIR/lib/liblua.a" .
   (cd modules/luamodule; make $MAKEFLAGS) || { echo "Error: failed to build wxLua"; exit 1; }
-  (cd modules/luamodule; make install/strip)
+  (cd modules/luamodule; make install)
   [ -f "$INSTALL_DIR/lib/libwx.so" ] || { echo "Error: libwx.so isn't found"; exit 1; }
+  [ "$WXLUABUILD" != "Debug" ] && strip --strip-unneeded "$INSTALL_DIR/lib/libwx.so"
   cd ../..
   rm -rf "$WXLUA_BASENAME"
 fi
@@ -207,10 +246,10 @@ if [ $BUILD_LUASOCKET ]; then
   unzip "$LUASOCKET_FILENAME"
   cd "$LUASOCKET_BASENAME"
   mkdir -p "$INSTALL_DIR/lib/lua/$LUAV/"{mime,socket}
-  gcc $BUILD_FLAGS -o "$INSTALL_DIR/lib/lua/$LUAV/mime/core.so" src/mime.c -llua \
+  gcc $BUILD_FLAGS -o "$INSTALL_DIR/lib/lua/$LUAV/mime/core.so" src/mime.c \
     || { echo "Error: failed to build LuaSocket"; exit 1; }
   gcc $BUILD_FLAGS -o "$INSTALL_DIR/lib/lua/$LUAV/socket/core.so" \
-    src/{auxiliar.c,buffer.c,except.c,inet.c,io.c,luasocket.c,options.c,select.c,tcp.c,timeout.c,udp.c,usocket.c} -llua \
+    src/{auxiliar.c,buffer.c,except.c,inet.c,io.c,luasocket.c,options.c,select.c,tcp.c,timeout.c,udp.c,usocket.c} \
     || { echo "Error: failed to build LuaSocket"; exit 1; }
   mkdir -p "$INSTALL_DIR/share/lua/$LUAV/socket"
   cp src/{ftp.lua,http.lua,smtp.lua,tp.lua,url.lua} "$INSTALL_DIR/share/lua/$LUAV/socket"
@@ -221,15 +260,72 @@ if [ $BUILD_LUASOCKET ]; then
   rm -rf "$LUASOCKET_FILENAME" "$LUASOCKET_BASENAME"
 fi
 
+# build lfs
+if [ $BUILD_LFS ]; then
+  wget --no-check-certificate -c "$LFS_URL" -O "$LFS_FILENAME" || { echo "Error: failed to download lfs"; exit 1; }
+  tar -xzf "$LFS_FILENAME"
+  mv "luafilesystem-$LFS_BASENAME" "$LFS_BASENAME"
+  cd "$LFS_BASENAME/src"
+  mkdir -p "$INSTALL_DIR/lib/lua/$LUAD/"
+  gcc $BUILD_FLAGS -o "$INSTALL_DIR/lib/lua/$LUAD/lfs.so" lfs.c \
+    || { echo "Error: failed to build lfs"; exit 1; }
+  [ -f "$INSTALL_DIR/lib/lua/$LUAD/lfs.so" ] || { echo "Error: lfs.so isn't found"; exit 1; }
+  cd ../..
+  rm -rf "$LFS_FILENAME" "$LFS_BASENAME"
+fi
+
+# build lpeg
+if [ $BUILD_LPEG ]; then
+  wget --no-check-certificate -c "$LPEG_URL" -O "$LPEG_FILENAME" || { echo "Error: failed to download lpeg"; exit 1; }
+  tar -xzf "$LPEG_FILENAME"
+  cd "$LPEG_BASENAME"
+  mkdir -p "$INSTALL_DIR/lib/lua/$LUAD/"
+  gcc $BUILD_FLAGS -o "$INSTALL_DIR/lib/lua/$LUAD/lpeg.so" lptree.c lpvm.c lpcap.c lpcode.c lpprint.c \
+    || { echo "Error: failed to build lpeg"; exit 1; }
+  [ -f "$INSTALL_DIR/lib/lua/$LUAD/lpeg.so" ] || { echo "Error: lpeg.so isn't found"; exit 1; }
+  cd ..
+  rm -rf "$LPEG_FILENAME" "$LPEG_BASENAME"
+fi
+
+# build LuaSec
+if [ $BUILD_LUASEC ]; then
+  # build LuaSec
+  wget --no-check-certificate -c "$LUASEC_URL" -O "$LUASEC_FILENAME" || { echo "Error: failed to download LuaSec"; exit 1; }
+  unzip "$LUASEC_FILENAME"
+  # the folder in the archive is "luasec-luasec-....", so need to fix
+  mv "luasec-$LUASEC_BASENAME" $LUASEC_BASENAME
+  cd "$LUASEC_BASENAME"
+  gcc $BUILD_FLAGS -o "$INSTALL_DIR/lib/lua/$LUAD/ssl.so" \
+    src/luasocket/{timeout.c,buffer.c,io.c,usocket.c} src/{context.c,x509.c,ssl.c} -Isrc \
+    -lssl -lcrypto \
+    || { echo "Error: failed to build LuaSec"; exit 1; }
+  cp src/ssl.lua "$INSTALL_DIR/share/lua/$LUAD"
+  mkdir -p "$INSTALL_DIR/share/lua/$LUAD/ssl"
+  cp src/https.lua "$INSTALL_DIR/share/lua/$LUAD/ssl"
+  [ -f "$INSTALL_DIR/lib/lua/$LUAD/ssl.so" ] || { echo "Error: ssl.so isn't found"; exit 1; }
+  strip --strip-unneeded "$INSTALL_DIR/lib/lua/$LUAD/ssl.so"
+  cd ..
+  rm -rf "$LUASEC_FILENAME" "$LUASEC_BASENAME"
+fi
+
 # now copy the compiled dependencies to ZBS binary directory
 mkdir -p "$BIN_DIR" || { echo "Error: cannot create directory $BIN_DIR"; exit 1; }
 [ $BUILD_LUA ] && cp "$INSTALL_DIR/bin/lua$LUAS" "$BIN_DIR"
-[ $BUILD_WXLUA ] && cp "$INSTALL_DIR/lib/libwx.so" "$BIN_DIR"
+[ $BUILD_WXLUA ] && cp "$INSTALL_DIR/lib/libwx.so" "$BIN_DIR/clibs"
+[ $BUILD_LFS ] && cp "$INSTALL_DIR/lib/lua/$LUAD/lfs.so" "$BIN_DIR/clibs$LUAS"
+[ $BUILD_LPEG ] && cp "$INSTALL_DIR/lib/lua/$LUAD/lpeg.so" "$BIN_DIR/clibs$LUAS"
+
 if [ $BUILD_LUASOCKET ]; then
   mkdir -p "$BIN_DIR/clibs$LUAS/"{mime,socket}
   cp "$INSTALL_DIR/lib/lua/$LUAV/mime/core.so" "$BIN_DIR/clibs$LUAS/mime"
   cp "$INSTALL_DIR/lib/lua/$LUAV/socket/core.so" "$BIN_DIR/clibs$LUAS/socket"
 fi
 
+if [ $BUILD_LUASEC ]; then
+  cp "$INSTALL_DIR/lib/lua/$LUAD/ssl.so" "$BIN_DIR/clibs$LUAS"
+  cp "$INSTALL_DIR/share/lua/$LUAD/ssl.lua" ../lualibs
+  cp "$INSTALL_DIR/share/lua/$LUAD/ssl/https.lua" ../lualibs/ssl
+fi
+
 echo "*** Build has been successfully completed ***"
 exit 0

build/build-macosx.sh

@@ -1,6 +1,12 @@
 #!/bin/bash
 
-# ZBS binary directory
+# exit if the command line is empty
+if [ $# -eq 0 ]; then
+  echo "Usage: $0 LIBRARY..."
+  exit 0
+fi
+
+# binary directory
 BIN_DIR="$(dirname "$PWD")/bin"
 
 # temporary installation directory for dependencies
@@ -9,7 +15,7 @@ INSTALL_DIR="$PWD/deps"
 # Mac OS X global settings
 MACOSX_ARCH="i386"
 MACOSX_VERSION="10.6"
-MACOSX_SDK_PATH="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
+MACOSX_SDK_PATH="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
 
 # number of parallel jobs used for building
 MAKEFLAGS="-j4"
@@ -24,22 +30,27 @@ BUILD_FLAGS="-O2 -arch x86_64 -dynamiclib -undefined dynamic_lookup $MACOSX_FLAG
 
 # paths configuration
 WXWIDGETS_BASENAME="wxWidgets"
-WXWIDGETS_URL="http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk"
+WXWIDGETS_URL="https://github.com/pkulchenko/wxWidgets.git"
 
 WXLUA_BASENAME="wxlua"
-WXLUA_URL="https://svn.code.sf.net/p/wxlua/svn/trunk"
+WXLUA_URL="https://github.com/pkulchenko/wxlua.git"
 
 LUASOCKET_BASENAME="luasocket-3.0-rc1"
 LUASOCKET_FILENAME="v3.0-rc1.zip"
 LUASOCKET_URL="https://github.com/diegonehab/luasocket/archive/$LUASOCKET_FILENAME"
 
-# exit if the command line is empty
-if [ $# -eq 0 ]; then
-  echo "Usage: $0 LIBRARY..."
-  exit 0
-fi
+LUASEC_BASENAME="luasec-0.6"
+LUASEC_FILENAME="$LUASEC_BASENAME.zip"
+LUASEC_URL="https://github.com/brunoos/luasec/archive/$LUASEC_FILENAME"
+
+LFS_BASENAME="v_1_6_3"
+LFS_FILENAME="$LFS_BASENAME.tar.gz"
+LFS_URL="https://github.com/keplerproject/luafilesystem/archive/$LFS_FILENAME"
+
+LPEG_BASENAME="lpeg-1.0.0"
+LPEG_FILENAME="$LPEG_BASENAME.tar.gz"
+LPEG_URL="http://www.inf.puc-rio.br/~roberto/lpeg/$LPEG_FILENAME"
 
-WXLUASTRIP="/strip"
 WXWIDGETSDEBUG="--disable-debug"
 WXLUABUILD="MinSizeRel"
 
@@ -47,9 +58,16 @@ WXLUABUILD="MinSizeRel"
 for ARG in "$@"; do
   case $ARG in
   5.2)
+    BUILD_LUA=true
     BUILD_52=true
     ;;
+  5.3)
+    BUILD_LUA=true
+    BUILD_53=true
+    BUILD_FLAGS="$BUILD_FLAGS -DLUA_COMPAT_APIINTCASTS"
+    ;;
   jit)
+    BUILD_LUA=true
     BUILD_JIT=true
     ;;
   wxwidgets)
@@ -61,11 +79,19 @@ for ARG in "$@"; do
   wxlua)
     BUILD_WXLUA=true
     ;;
+  luasec)
+    BUILD_LUASEC=true
+    ;;
   luasocket)
     BUILD_LUASOCKET=true
     ;;
+  lfs)
+    BUILD_LFS=true
+    ;;
+  lpeg)
+    BUILD_LPEG=true
+    ;;
   debug)
-    WXLUASTRIP=""
     WXWIDGETSDEBUG="--enable-debug=max"
     WXLUABUILD="Debug"
     ;;
@@ -74,6 +100,9 @@ for ARG in "$@"; do
     BUILD_LUA=true
     BUILD_WXLUA=true
     BUILD_LUASOCKET=true
+    BUILD_LUASEC=true
+    BUILD_LFS=true
+    BUILD_LPEG=true
     ;;
   *)
     echo "Error: invalid argument $ARG"
@@ -94,9 +123,9 @@ if [ ! "$(which cmake)" ]; then
   exit 1
 fi
 
-# check for svn
-if [ ! "$(which svn)" ]; then
-  echo "Error: svn isn't found. Please install console SVN client."
+# check for git
+if [ ! "$(which git)" ]; then
+  echo "Error: git isn't found. Please install console GIT client."
   exit 1
 fi
 
@@ -116,34 +145,47 @@ LUA_BASENAME="lua-5.1.5"
 if [ $BUILD_52 ]; then
   LUAV="52"
   LUAS=$LUAV
-  LUA_BASENAME="lua-5.2.2"
+  LUA_BASENAME="lua-5.2.4"
 fi
 
 LUA_FILENAME="$LUA_BASENAME.tar.gz"
 LUA_URL="http://www.lua.org/ftp/$LUA_FILENAME"
 
-if [ $BUILD_JIT ]; then
-  LUA_BASENAME="LuaJIT-2.0.2"
+if [ $BUILD_53 ]; then
+  LUAV="53"
+  LUAS=$LUAV
+  LUA_BASENAME="lua-5.3.1"
   LUA_FILENAME="$LUA_BASENAME.tar.gz"
-  LUA_URL="http://luajit.org/download/$LUA_FILENAME"
+  LUA_URL="http://www.lua.org/ftp/$LUA_FILENAME"
+fi
+
+if [ $BUILD_JIT ]; then
+  LUA_BASENAME="luajit"
+  LUA_URL="https://github.com/pkulchenko/luajit.git"
 fi
 
 # build wxWidgets
 if [ $BUILD_WXWIDGETS ]; then
-  svn co "$WXWIDGETS_URL" "$WXWIDGETS_BASENAME" || { echo "Error: failed to checkout wxWidgets"; exit 1; }
+  git clone "$WXWIDGETS_URL" "$WXWIDGETS_BASENAME" || { echo "Error: failed to get wxWidgets"; exit 1; }
   cd "$WXWIDGETS_BASENAME"
   MINSDK=""
   if [ -d $MACOSX_SDK_PATH ]; then
     MINSDK="--with-macosx-sdk=$MACOSX_SDK_PATH"
   fi
-  # fix auto-complete crash by reverting an earlier revision
-  # http://trac.wxwidgets.org/ticket/15008#comment:12
-  svn merge -r 74098:74097 .
   ./configure --prefix="$INSTALL_DIR" $WXWIDGETSDEBUG --disable-shared --enable-unicode \
+    --enable-compat28 \
     --with-libjpeg=builtin --with-libpng=builtin --with-libtiff=no --with-expat=no \
     --with-zlib=builtin --disable-richtext \
     --enable-macosx_arch=$MACOSX_ARCH --with-macosx-version-min=$MACOSX_VERSION $MINSDK \
     --with-osx_cocoa CFLAGS="-Os" CXXFLAGS="-Os"
+
+  PATTERN="defined( __WXMAC__ )\$"
+  if [ "$(grep -c "$PATTERN" src/aui/tabart.cpp)" -ne "1" ]; then
+    echo "Incorrect pattern for a fix in tabart.cpp."
+    exit 1
+  fi
+  sed -i "" "s/$PATTERN/0/" src/aui/tabart.cpp
+
   make $MAKEFLAGS || { echo "Error: failed to build wxWidgets"; exit 1; }
   make install
   cd ..
@@ -152,8 +194,13 @@ fi
 
 # build Lua
 if [ $BUILD_LUA ]; then
-  wget -c "$LUA_URL" -O "$LUA_FILENAME" || { echo "Error: failed to download Lua"; exit 1; }
-  tar -xzf "$LUA_FILENAME"
+  if [ $BUILD_JIT ]; then
+    git clone "$LUA_URL" "$LUA_BASENAME"
+    (cd "$LUA_BASENAME"; git checkout v2.0.4)
+  else
+    wget -c "$LUA_URL" -O "$LUA_FILENAME" || { echo "Error: failed to download Lua"; exit 1; }
+    tar -xzf "$LUA_FILENAME"
+  fi
   cd "$LUA_BASENAME"
 
   if [ $BUILD_JIT ]; then
@@ -161,8 +208,6 @@ if [ $BUILD_LUA ]; then
     make install PREFIX="$INSTALL_DIR"
     cp "src/luajit" "$INSTALL_DIR/bin/lua"
     cp "src/liblua.dylib" "$INSTALL_DIR/lib"
-    # move luajit to lua as it's expected by luasocket and other components
-    cp "$INSTALL_DIR"/include/luajit*/* "$INSTALL_DIR/include/"
   else
     sed -i "" 's/PLATS=/& macosx_dylib/' Makefile
 
@@ -184,8 +229,10 @@ fi
 
 # build wxLua
 if [ $BUILD_WXLUA ]; then
-  svn co "$WXLUA_URL" "$WXLUA_BASENAME" || { echo "Error: failed to checkout wxLua"; exit 1; }
+  git clone "$WXLUA_URL" "$WXLUA_BASENAME" || { echo "Error: failed to get wxWidgets"; exit 1; }
   cd "$WXLUA_BASENAME/wxLua"
+  git checkout wxwidgets311
+
   MINSDK=""
   if [ -d $MACOSX_SDK_PATH ]; then
     MINSDK="CMAKE_OSX_SYSROOT=$MACOSX_SDK_PATH"
@@ -193,16 +240,21 @@ if [ $BUILD_WXLUA ]; then
   # the following patches wxlua source to fix live coding support in wxlua apps
   # http://www.mail-archive.com/wxlua-users@lists.sourceforge.net/msg03225.html
   sed -i "" 's/\(m_wxlState = wxLuaState(wxlState.GetLuaState(), wxLUASTATE_GETSTATE|wxLUASTATE_ROOTSTATE);\)/\/\/ removed by ZBS build process \/\/ \1/' modules/wxlua/wxlcallb.cpp
+
+  # remove "Unable to call an unknown method..." error as it leads to a leak
+  # see http://sourceforge.net/p/wxlua/mailman/message/34629522/ for details
+  sed -i "" -e '/Unable to call an unknown method/{N' -e 's/.*/    \/\/ removed by ZBS build process/' -e '}' modules/wxlua/wxlbind.cpp
+
   cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" -DCMAKE_BUILD_TYPE=$WXLUABUILD -DBUILD_SHARED_LIBS=FALSE \
     -DCMAKE_OSX_ARCHITECTURES=$MACOSX_ARCH -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_VERSION $MINSDK \
     -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DwxWidgets_CONFIG_EXECUTABLE="$INSTALL_DIR/bin/wx-config" \
-    -DwxWidgets_COMPONENTS="stc;html;aui;adv;core;net;base" \
-    -DwxLuaBind_COMPONENTS="stc;html;aui;adv;core;net;base" -DwxLua_LUA_LIBRARY_USE_BUILTIN=FALSE \
+    -DwxWidgets_COMPONENTS="stc;gl;html;aui;adv;core;net;base" \
+    -DwxLuaBind_COMPONENTS="stc;gl;html;aui;adv;core;net;base" -DwxLua_LUA_LIBRARY_USE_BUILTIN=FALSE \
     -DwxLua_LUA_INCLUDE_DIR="$INSTALL_DIR/include" -DwxLua_LUA_LIBRARY="$INSTALL_DIR/lib/liblua.dylib" .
   (cd modules/luamodule; make $MAKEFLAGS) || { echo "Error: failed to build wxLua"; exit 1; }
-  (cd modules/luamodule; make install$WXLUASTRIP)
-  if [ $WXLUASTRIP ]; then strip -u -r "$INSTALL_DIR/lib/libwx.dylib"; fi
+  (cd modules/luamodule; make install)
   [ -f "$INSTALL_DIR/lib/libwx.dylib" ] || { echo "Error: libwx.dylib isn't found"; exit 1; }
+  [ "$WXLUABUILD" != "Debug" ] && strip -u -r "$INSTALL_DIR/lib/libwx.dylib"
   cd ../..
   rm -rf "$WXLUA_BASENAME"
 fi
@@ -230,6 +282,54 @@ if [ $BUILD_LUASOCKET ]; then
   rm -rf "$LUASOCKET_FILENAME" "$LUASOCKET_BASENAME"
 fi
 
+# build lfs
+if [ $BUILD_LFS ]; then
+  wget --no-check-certificate -c "$LFS_URL" -O "$LFS_FILENAME" || { echo "Error: failed to download lfs"; exit 1; }
+  tar -xzf "$LFS_FILENAME"
+  mv "luafilesystem-$LFS_BASENAME" "$LFS_BASENAME"
+  cd "$LFS_BASENAME/src"
+  mkdir -p "$INSTALL_DIR/lib/lua/$LUAD/"
+  gcc $BUILD_FLAGS -o "$INSTALL_DIR/lib/lua/$LUAD/lfs.dylib" lfs.c \
+    || { echo "Error: failed to build lfs"; exit 1; }
+  [ -f "$INSTALL_DIR/lib/lua/$LUAD/lfs.dylib" ] || { echo "Error: lfs.dylib isn't found"; exit 1; }
+  cd ../..
+  rm -rf "$LFS_FILENAME" "$LFS_BASENAME"
+fi
+
+# build lpeg
+if [ $BUILD_LPEG ]; then
+  wget --no-check-certificate -c "$LPEG_URL" -O "$LPEG_FILENAME" || { echo "Error: failed to download lpeg"; exit 1; }
+  tar -xzf "$LPEG_FILENAME"
+  cd "$LPEG_BASENAME"
+  mkdir -p "$INSTALL_DIR/lib/lua/$LUAD/"
+  gcc $BUILD_FLAGS -o "$INSTALL_DIR/lib/lua/$LUAD/lpeg.dylib" lptree.c lpvm.c lpcap.c lpcode.c lpprint.c \
+    || { echo "Error: failed to build lpeg"; exit 1; }
+  [ -f "$INSTALL_DIR/lib/lua/$LUAD/lpeg.dylib" ] || { echo "Error: lpeg.dylib isn't found"; exit 1; }
+  cd ..
+  rm -rf "$LPEG_FILENAME" "$LPEG_BASENAME"
+fi
+
+# build LuaSec
+if [ $BUILD_LUASEC ]; then
+  # build LuaSec
+  wget --no-check-certificate -c "$LUASEC_URL" -O "$LUASEC_FILENAME" || { echo "Error: failed to download LuaSec"; exit 1; }
+  unzip "$LUASEC_FILENAME"
+  # the folder in the archive is "luasec-luasec-....", so need to fix
+  mv "luasec-$LUASEC_BASENAME" $LUASEC_BASENAME
+  cd "$LUASEC_BASENAME"
+  gcc $BUILD_FLAGS -o "$INSTALL_DIR/lib/lua/$LUAD/ssl.dylib" \
+    src/luasocket/{timeout.c,buffer.c,io.c,usocket.c} src/{context.c,x509.c,ssl.c} -Isrc \
+    -lssl -lcrypto \
+    || { echo "Error: failed to build LuaSec"; exit 1; }
+  cp src/ssl.lua "$INSTALL_DIR/share/lua/$LUAD"
+  mkdir -p "$INSTALL_DIR/share/lua/$LUAD/ssl"
+  cp src/https.lua "$INSTALL_DIR/share/lua/$LUAD/ssl"
+  [ -f "$INSTALL_DIR/lib/lua/$LUAD/ssl.dylib" ] || { echo "Error: ssl.dylib isn't found"; exit 1; }
+  strip -u -r "$INSTALL_DIR/lib/lua/$LUAD/ssl.dylib"
+  cd ..
+  rm -rf "$LUASEC_FILENAME" "$LUASEC_BASENAME"
+fi
+
 # now copy the compiled dependencies to ZBS binary directory
 mkdir -p "$BIN_DIR" || { echo "Error: cannot create directory $BIN_DIR"; exit 1; }
 
@@ -238,12 +338,21 @@ if [ $BUILD_LUA ]; then
   cp "$INSTALL_DIR/bin/lua$LUAS" "$BIN_DIR/lua.app/Contents/MacOS"
   cp "$INSTALL_DIR/bin/lua$LUAS" "$INSTALL_DIR/lib/liblua$LUAS.dylib" "$BIN_DIR"
 fi
-[ $BUILD_WXLUA ] && cp "$INSTALL_DIR/lib/libwx.dylib" "$BIN_DIR"
+[ $BUILD_WXLUA ] && cp "$INSTALL_DIR/lib/libwx.dylib" "$BIN_DIR/clibs"
+[ $BUILD_LFS ] && cp "$INSTALL_DIR/lib/lua/$LUAD/lfs.dylib" "$BIN_DIR/clibs$LUAS"
+[ $BUILD_LPEG ] && cp "$INSTALL_DIR/lib/lua/$LUAD/lpeg.dylib" "$BIN_DIR/clibs$LUAS"
+
 if [ $BUILD_LUASOCKET ]; then
   mkdir -p "$BIN_DIR/clibs$LUAS/"{mime,socket}
   cp "$INSTALL_DIR/lib/lua/$LUAV/mime/core.dylib" "$BIN_DIR/clibs$LUAS/mime"
   cp "$INSTALL_DIR/lib/lua/$LUAV/socket/core.dylib" "$BIN_DIR/clibs$LUAS/socket"
 fi
 
+if [ $BUILD_LUASEC ]; then
+  cp "$INSTALL_DIR/lib/lua/$LUAD/ssl.dylib" "$BIN_DIR/clibs$LUAS"
+  cp "$INSTALL_DIR/share/lua/$LUAD/ssl.lua" ../lualibs
+  cp "$INSTALL_DIR/share/lua/$LUAD/ssl/https.lua" ../lualibs/ssl
+fi
+
 echo "*** Build has been successfully completed ***"
 exit 0

build/build-win32.sh

@@ -1,6 +1,12 @@
 #!/bin/bash
 
-# ZBS binary directory
+# exit if the command line is empty
+if [ $# -eq 0 ]; then
+  echo "Usage: $0 LIBRARY..."
+  exit 0
+fi
+
+# binary directory
 BIN_DIR="$(dirname "$PWD")/bin"
 
 # temporary installation directory for dependencies
@@ -14,33 +20,34 @@ BUILD_FLAGS="-O2 -shared -s -I $INSTALL_DIR/include -L $INSTALL_DIR/lib"
 
 # paths configuration
 WXWIDGETS_BASENAME="wxWidgets"
-WXWIDGETS_URL="http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk"
+WXWIDGETS_URL="https://github.com/pkulchenko/wxWidgets.git"
 
 WXLUA_BASENAME="wxlua"
-WXLUA_URL="https://svn.code.sf.net/p/wxlua/svn/trunk"
+WXLUA_URL="https://github.com/pkulchenko/wxlua.git"
 
 LUASOCKET_BASENAME="luasocket-3.0-rc1"
 LUASOCKET_FILENAME="v3.0-rc1.zip"
 LUASOCKET_URL="https://github.com/diegonehab/luasocket/archive/$LUASOCKET_FILENAME"
 
-OPENSSL_BASENAME="openssl-1.0.1e"
+OPENSSL_BASENAME="openssl-1.0.2h"
 OPENSSL_FILENAME="$OPENSSL_BASENAME.tar.gz"
 OPENSSL_URL="http://www.openssl.org/source/$OPENSSL_FILENAME"
 
-LUASEC_BASENAME="luasec-0.4.1"
+LUASEC_BASENAME="luasec-0.6"
 LUASEC_FILENAME="$LUASEC_BASENAME.zip"
 LUASEC_URL="https://github.com/brunoos/luasec/archive/$LUASEC_FILENAME"
 
+LFS_BASENAME="v_1_6_3"
+LFS_FILENAME="$LFS_BASENAME.tar.gz"
+LFS_URL="https://github.com/keplerproject/luafilesystem/archive/$LFS_FILENAME"
+
+LPEG_BASENAME="lpeg-1.0.0"
+LPEG_FILENAME="$LPEG_BASENAME.tar.gz"
+LPEG_URL="http://www.inf.puc-rio.br/~roberto/lpeg/$LPEG_FILENAME"
+
 WINAPI_BASENAME="winapi"
 WINAPI_URL="https://github.com/stevedonovan/winapi.git"
 
-# exit if the command line is empty
-if [ $# -eq 0 ]; then
-  echo "Usage: $0 LIBRARY..."
-  exit 0
-fi
-
-WXLUASTRIP="/strip"
 WXWIDGETSDEBUG="--disable-debug"
 WXLUABUILD="MinSizeRel"
 
@@ -48,9 +55,16 @@ WXLUABUILD="MinSizeRel"
 for ARG in "$@"; do
   case $ARG in
   5.2)
+    BUILD_LUA=true
     BUILD_52=true
     ;;
+  5.3)
+    BUILD_LUA=true
+    BUILD_53=true
+    BUILD_FLAGS="$BUILD_FLAGS -DLUA_COMPAT_APIINTCASTS"
+    ;;
   jit)
+    BUILD_LUA=true
     BUILD_JIT=true
     ;;
   wxwidgets)
@@ -71,11 +85,16 @@ for ARG in "$@"; do
   winapi)
     BUILD_WINAPI=true
     ;;
+  lfs)
+    BUILD_LFS=true
+    ;;
+  lpeg)
+    BUILD_LPEG=true
+    ;;
   zbstudio)
     BUILD_ZBSTUDIO=true
     ;;
   debug)
-    WXLUASTRIP=""
     WXWIDGETSDEBUG="--enable-debug=max --enable-debug_gdb"
     WXLUABUILD="Debug"
     ;;
@@ -86,6 +105,9 @@ for ARG in "$@"; do
     BUILD_LUASOCKET=true
     BUILD_WINAPI=true
     BUILD_ZBSTUDIO=true
+    BUILD_LUASEC=true
+    BUILD_LFS=true
+    BUILD_LPEG=true
     ;;
   *)
     echo "Error: invalid argument $ARG"
@@ -106,14 +128,8 @@ if [ ! "$(which cmake)" ]; then
   exit 1
 fi
 
-# check for svn
-if [[ ($BUILD_WXWIDGETS || $BUILD_LUA) && ! "$(which svn)" ]]; then
-  echo "Error: svn isn't found. Please install console SVN client."
-  exit 1
-fi
-
 # check for git
-if [[ $BUILD_WINAPI && ! "$(which git)" ]]; then
+if [[ ! "$(which git)" ]]; then
   echo "Error: git isn't found. Please install console GIT client."
   exit 1
 fi
@@ -128,33 +144,45 @@ fi
 mkdir -p "$INSTALL_DIR" || { echo "Error: cannot create directory $INSTALL_DIR"; exit 1; }
 
 LUAV="51"
+LUAD="5.1"
 LUAS=""
 LUA_BASENAME="lua-5.1.5"
 
 if [ $BUILD_52 ]; then
   LUAV="52"
+  LUAD="5.2"
   LUAS=$LUAV
-  LUA_BASENAME="lua-5.2.2"
+  LUA_BASENAME="lua-5.2.4"
 fi
 
 LUA_FILENAME="$LUA_BASENAME.tar.gz"
 LUA_URL="http://www.lua.org/ftp/$LUA_FILENAME"
+LUA_COMPAT=""
+
+if [ $BUILD_53 ]; then
+  LUAV="53"
+  LUAD="5.3"
+  LUAS=$LUAV
+  LUA_BASENAME="lua-5.3.1"
+  LUA_FILENAME="$LUA_BASENAME.tar.gz"
+  LUA_URL="http://www.lua.org/ftp/$LUA_FILENAME"
+  LUA_COMPAT="MYCFLAGS=-DLUA_COMPAT_MODULE"
+fi
 
 if [ $BUILD_JIT ]; then
-  LUA_BASENAME="LuaJIT-2.0.2"
-  LUA_FILENAME="$LUA_BASENAME.tar.gz"
-  LUA_URL="http://luajit.org/download/$LUA_FILENAME"
+  LUA_BASENAME="luajit"
+  LUA_URL="https://github.com/pkulchenko/luajit.git"
 fi
 
 # build wxWidgets
 if [ $BUILD_WXWIDGETS ]; then
-  svn co "$WXWIDGETS_URL" "$WXWIDGETS_BASENAME" || { echo "Error: failed to checkout wxWidgets"; exit 1; }
-  svn revert -R "$WXWIDGETS_BASENAME"
+  git clone "$WXWIDGETS_URL" "$WXWIDGETS_BASENAME" || { echo "Error: failed to get wxWidgets"; exit 1; }
   cd "$WXWIDGETS_BASENAME"
   ./configure --prefix="$INSTALL_DIR" $WXWIDGETSDEBUG --disable-shared --enable-unicode \
+    --enable-compat28 \
     --with-libjpeg=builtin --with-libpng=builtin --with-libtiff=no --with-expat=no \
     --with-zlib=builtin --disable-richtext \
-    CFLAGS="-Os -fno-keep-inline-dllexport" CXXFLAGS="-Os -fno-keep-inline-dllexport"
+    CFLAGS="-Os -fno-keep-inline-dllexport" CXXFLAGS="-Os -fno-keep-inline-dllexport -DNO_CXX11_REGEX"
   make $MAKEFLAGS || { echo "Error: failed to build wxWidgets"; exit 1; }
   make install
   cd ..
@@ -163,17 +191,30 @@ fi
 
 # build Lua
 if [ $BUILD_LUA ]; then
-  wget -c "$LUA_URL" -O "$LUA_FILENAME" || { echo "Error: failed to download Lua"; exit 1; }
-  tar -xzf "$LUA_FILENAME"
+  if [ $BUILD_JIT ]; then
+    git clone "$LUA_URL" "$LUA_BASENAME"
+    (cd "$LUA_BASENAME"; git checkout v2.0.4)
+  else
+    wget -c "$LUA_URL" -O "$LUA_FILENAME" || { echo "Error: failed to download Lua"; exit 1; }
+    tar -xzf "$LUA_FILENAME"
+  fi
   cd "$LUA_BASENAME"
   if [ $BUILD_JIT ]; then
     make CCOPT="-DLUAJIT_ENABLE_LUA52COMPAT" || { echo "Error: failed to build Lua"; exit 1; }
     make install PREFIX="$INSTALL_DIR"
-    cp "$INSTALL_DIR/bin/luajit.exe" "$INSTALL_DIR/bin/lua.exe"
-    # move luajit to lua as it's expected by luasocket and other components
-    cp "$INSTALL_DIR"/include/luajit*/* "$INSTALL_DIR/include/"
+    cp "$INSTALL_DIR/bin/luajit" "$INSTALL_DIR/bin/lua.exe"
   else
-    make mingw || { echo "Error: failed to build Lua"; exit 1; }
+    # need to patch Lua io to support large (>2GB) files on Windows:
+    # http://lua-users.org/lists/lua-l/2015-05/msg00370.html
+    cat <<EOF >>src/luaconf.h
+#if defined(liolib_c) && defined(__MINGW32__)
+#include <sys/types.h>
+#define l_fseek(f,o,w) fseeko64(f,o,w)
+#define l_ftell(f) ftello64(f)
+#define l_seeknum off64_t
+#endif
+EOF
+    make mingw $LUA_COMPAT || { echo "Error: failed to build Lua"; exit 1; }
     make install INSTALL_TOP="$INSTALL_DIR"
   fi
   cp src/lua$LUAV.dll "$INSTALL_DIR/lib"
@@ -185,11 +226,12 @@ fi
 
 # build wxLua
 if [ $BUILD_WXLUA ]; then
-  svn co "$WXLUA_URL" "$WXLUA_BASENAME" || { echo "Error: failed to checkout wxLua"; exit 1; }
-  svn revert -R "$WXLUA_BASENAME"
+  git clone "$WXLUA_URL" "$WXLUA_BASENAME" || { echo "Error: failed to get wxWidgets"; exit 1; }
   cd "$WXLUA_BASENAME/wxLua"
+  git checkout wxwidgets311
+
   sed -i 's|:-/\(.\)/|:-\1:/|' "$INSTALL_DIR/bin/wx-config"
-  sed -i 's/execute_process(COMMAND/& sh/' build/CMakewxAppLib.cmake modules/wxstedit/build/CMakewxAppLib.cmake
+  sed -i 's/execute_process(COMMAND/& sh/' build/CMakewxAppLib.cmake
 
   # the following patches wxlua source to fix live coding support in wxlua apps
   # http://www.mail-archive.com/wxlua-users@lists.sourceforge.net/msg03225.html
@@ -201,18 +243,24 @@ if [ $BUILD_WXLUA ]; then
   # (temporary) fix for compilation issue in wxlua in Windows using mingw (r184)
   sed -i 's/defined(__MINGW32__) || defined(__GNUWIN32__)/0/' modules/wxbind/src/wxcore_bind.cpp
 
-  [ -f "$INSTALL_DIR/lib/libwxscintilla-2.9.a" ] && cp "$INSTALL_DIR/lib/libwxscintilla-2.9.a" "$INSTALL_DIR/lib/libwx_mswu_scintilla-2.9.a"
+  # remove "Unable to call an unknown method..." error as it leads to a leak
+  # see http://sourceforge.net/p/wxlua/mailman/message/34629522/ for details
+  sed -i '/Unable to call an unknown method/{N;s/.*/    \/\/ removed by ZBS build process/}' modules/wxlua/wxlbind.cpp
+
   [ -f "$INSTALL_DIR/lib/libwxscintilla-3.0.a" ] && cp "$INSTALL_DIR/lib/libwxscintilla-3.0.a" "$INSTALL_DIR/lib/libwx_mswu_scintilla-3.0.a"
+  [ -f "$INSTALL_DIR/lib/libwxscintilla-3.1.a" ] && cp "$INSTALL_DIR/lib/libwxscintilla-3.1.a" "$INSTALL_DIR/lib/libwx_mswu_scintilla-3.1.a"
 
   echo "set_target_properties(wxLuaModule PROPERTIES LINK_FLAGS -static)" >> modules/luamodule/CMakeLists.txt
   cmake -G "MSYS Makefiles" -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" -DCMAKE_BUILD_TYPE=$WXLUABUILD -DBUILD_SHARED_LIBS=FALSE \
+    -DCMAKE_CXX_FLAGS="-DLUA_COMPAT_MODULE" \
     -DwxWidgets_CONFIG_EXECUTABLE="$INSTALL_DIR/bin/wx-config" \
-    -DwxWidgets_COMPONENTS="stc;html;aui;adv;core;net;base" \
-    -DwxLuaBind_COMPONENTS="stc;html;aui;adv;core;net;base" -DwxLua_LUA_LIBRARY_USE_BUILTIN=FALSE \
-    -DwxLua_LUA_INCLUDE_DIR="$INSTALL_DIR/include" -DwxLua_LUA_LIBRARY="$INSTALL_DIR/lib/lua51.dll" .
+    -DwxWidgets_COMPONENTS="stc;gl;html;aui;adv;core;net;base" \
+    -DwxLuaBind_COMPONENTS="stc;gl;html;aui;adv;core;net;base" -DwxLua_LUA_LIBRARY_USE_BUILTIN=FALSE \
+    -DwxLua_LUA_INCLUDE_DIR="$INSTALL_DIR/include" -DwxLua_LUA_LIBRARY="$INSTALL_DIR/lib/lua$LUAV.dll" .
   (cd modules/luamodule; make $MAKEFLAGS) || { echo "Error: failed to build wxLua"; exit 1; }
-  (cd modules/luamodule; make install$WXLUASTRIP)
+  (cd modules/luamodule; make install)
   [ -f "$INSTALL_DIR/bin/libwx.dll" ] || { echo "Error: libwx.dll isn't found"; exit 1; }
+  [ "$WXLUABUILD" != "Debug" ] && strip --strip-unneeded "$INSTALL_DIR/bin/libwx.dll"
   cd ../..
   rm -rf "$WXLUA_BASENAME"
 fi
@@ -222,30 +270,59 @@ if [ $BUILD_LUASOCKET ]; then
   wget --no-check-certificate -c "$LUASOCKET_URL" -O "$LUASOCKET_FILENAME" || { echo "Error: failed to download LuaSocket"; exit 1; }
   unzip "$LUASOCKET_FILENAME"
   cd "$LUASOCKET_BASENAME"
-  mkdir -p "$INSTALL_DIR/lib/lua/$LUAV/"{mime,socket}
-  gcc $BUILD_FLAGS -o "$INSTALL_DIR/lib/lua/$LUAV/mime/core.dll" src/mime.c -llua$LUAV \
+  mkdir -p "$INSTALL_DIR/lib/lua/$LUAD/"{mime,socket}
+  gcc $BUILD_FLAGS -o "$INSTALL_DIR/lib/lua/$LUAD/mime/core.dll" src/mime.c -llua$LUAV \
     || { echo "Error: failed to build LuaSocket"; exit 1; }
-  gcc $BUILD_FLAGS -DLUASOCKET_INET_PTON -D_WIN32_WINNT=0x0501 -o "$INSTALL_DIR/lib/lua/$LUAV/socket/core.dll" \
+  gcc $BUILD_FLAGS -DLUASOCKET_INET_PTON -D_WIN32_WINNT=0x0501 -o "$INSTALL_DIR/lib/lua/$LUAD/socket/core.dll" \
     src/{auxiliar.c,buffer.c,except.c,inet.c,io.c,luasocket.c,options.c,select.c,tcp.c,timeout.c,udp.c,wsocket.c} -lwsock32 -lws2_32 -llua$LUAV \
     || { echo "Error: failed to build LuaSocket"; exit 1; }
-  mkdir -p "$INSTALL_DIR/share/lua/$LUAV/socket"
-  cp src/{ftp.lua,http.lua,smtp.lua,tp.lua,url.lua} "$INSTALL_DIR/share/lua/$LUAV/socket"
-  cp src/{ltn12.lua,mime.lua,socket.lua} "$INSTALL_DIR/share/lua/$LUAV"
-  [ -f "$INSTALL_DIR/lib/lua/$LUAV/mime/core.dll" ] || { echo "Error: mime/core.dll isn't found"; exit 1; }
-  [ -f "$INSTALL_DIR/lib/lua/$LUAV/socket/core.dll" ] || { echo "Error: socket/core.dll isn't found"; exit 1; }
+  mkdir -p "$INSTALL_DIR/share/lua/$LUAD/socket"
+  cp src/{ftp.lua,http.lua,smtp.lua,tp.lua,url.lua} "$INSTALL_DIR/share/lua/$LUAD/socket"
+  cp src/{ltn12.lua,mime.lua,socket.lua} "$INSTALL_DIR/share/lua/$LUAD"
+  [ -f "$INSTALL_DIR/lib/lua/$LUAD/mime/core.dll" ] || { echo "Error: mime/core.dll isn't found"; exit 1; }
+  [ -f "$INSTALL_DIR/lib/lua/$LUAD/socket/core.dll" ] || { echo "Error: socket/core.dll isn't found"; exit 1; }
   cd ..
   rm -rf "$LUASOCKET_FILENAME" "$LUASOCKET_BASENAME"
 fi
 
+# build lfs
+if [ $BUILD_LFS ]; then
+  wget --no-check-certificate -c "$LFS_URL" -O "$LFS_FILENAME" || { echo "Error: failed to download lfs"; exit 1; }
+  tar -xzf "$LFS_FILENAME"
+  mv "luafilesystem-$LFS_BASENAME" "$LFS_BASENAME"
+  cd "$LFS_BASENAME/src"
+  mkdir -p "$INSTALL_DIR/lib/lua/$LUAD/"
+  gcc $BUILD_FLAGS -o "$INSTALL_DIR/lib/lua/$LUAD/lfs.dll" lfs.c -llua$LUAV \
+    || { echo "Error: failed to build lfs"; exit 1; }
+  [ -f "$INSTALL_DIR/lib/lua/$LUAD/lfs.dll" ] || { echo "Error: lfs.dll isn't found"; exit 1; }
+  cd ../..
+  rm -rf "$LFS_FILENAME" "$LFS_BASENAME"
+fi
+
+
+# build lpeg
+if [ $BUILD_LPEG ]; then
+  wget --no-check-certificate -c "$LPEG_URL" -O "$LPEG_FILENAME" || { echo "Error: failed to download lpeg"; exit 1; }
+  tar -xzf "$LPEG_FILENAME"
+  cd "$LPEG_BASENAME"
+  mkdir -p "$INSTALL_DIR/lib/lua/$LUAD/"
+  gcc $BUILD_FLAGS -o "$INSTALL_DIR/lib/lua/$LUAD/lpeg.dll" lptree.c lpvm.c lpcap.c lpcode.c lpprint.c -llua$LUAV \
+    || { echo "Error: failed to build lpeg"; exit 1; }
+  [ -f "$INSTALL_DIR/lib/lua/$LUAD/lpeg.dll" ] || { echo "Error: lpeg.dll isn't found"; exit 1; }
+  cd ..
+  rm -rf "$LPEG_FILENAME" "$LPEG_BASENAME"
+fi
+
 # build LuaSec
 if [ $BUILD_LUASEC ]; then
   # build openSSL
   wget --no-check-certificate -c "$OPENSSL_URL" -O "$OPENSSL_FILENAME" || { echo "Error: failed to download OpenSSL"; exit 1; }
   tar -xzf "$OPENSSL_FILENAME"
   cd "$OPENSSL_BASENAME"
-  bash Configure mingw
+  RANLIB="$(which ranlib)" bash Configure mingw shared
   make
   make install_sw INSTALLTOP="$INSTALL_DIR"
+  strip --strip-unneeded "$INSTALL_DIR/bin/libeay32.dll" "$INSTALL_DIR/bin/ssleay32.dll"
   cd ..
   rm -rf "$OPENSSL_FILENAME" "$OPENSSL_BASENAME"
 
@@ -255,11 +332,15 @@ if [ $BUILD_LUASEC ]; then
   # the folder in the archive is "luasec-luasec-....", so need to fix
   mv "luasec-$LUASEC_BASENAME" $LUASEC_BASENAME
   cd "$LUASEC_BASENAME"
-  gcc $BUILD_FLAGS -o "$INSTALL_DIR/lib/lua/5.1/ssl.dll" \
-    src/{timeout.c,buffer.c,io.c,context.c,ssl.c,wsocket.c} -lssl -lcrypto -lws2_32 -lgdi32 -llua51 \
+  gcc $BUILD_FLAGS -o "$INSTALL_DIR/lib/lua/$LUAD/ssl.dll" \
+    -DLUASEC_INET_NTOP -DWINVER=0x0501 -D_WIN32_WINNT=0x0501 -DNTDDI_VERSION=0x05010300 \
+    src/luasocket/{timeout.c,buffer.c,io.c,wsocket.c} src/{context.c,x509.c,ssl.c} -Isrc "$INSTALL_DIR/bin/ssleay32.dll" "$INSTALL_DIR/bin/libeay32.dll" -lws2_32 -lgdi32 -llua$LUAV \
     || { echo "Error: failed to build LuaSec"; exit 1; }
-  cp src/{ssl.lua,https.lua} "$INSTALL_DIR/share/lua/5.1"
-  [ -f "$INSTALL_DIR/lib/lua/5.1/ssl.dll" ] || { echo "Error: luasec.dll isn't found"; exit 1; }
+  cp src/ssl.lua "$INSTALL_DIR/share/lua/$LUAD"
+  mkdir -p "$INSTALL_DIR/share/lua/$LUAD/ssl"
+  cp src/https.lua "$INSTALL_DIR/share/lua/$LUAD/ssl"
+  [ -f "$INSTALL_DIR/lib/lua/$LUAD/ssl.dll" ] || { echo "Error: ssl.dll isn't found"; exit 1; }
+  strip --strip-unneeded "$INSTALL_DIR/lib/lua/$LUAD/ssl.dll"
   cd ..
   rm -rf "$LUASEC_FILENAME" "$LUASEC_BASENAME"
 fi
@@ -268,9 +349,9 @@ fi
 if [ $BUILD_WINAPI ]; then
   git clone "$WINAPI_URL" "$WINAPI_BASENAME"
   cd "$WINAPI_BASENAME"
-  gcc $BUILD_FLAGS -DPSAPI_VERSION=1 -o "$INSTALL_DIR/lib/lua/5.1/winapi.dll" winapi.c wutils.c -lpsapi -lmpr -llua51 \
+  gcc $BUILD_FLAGS -DPSAPI_VERSION=1 -o "$INSTALL_DIR/lib/lua/$LUAD/winapi.dll" winapi.c wutils.c -lpsapi -lmpr -llua$LUAV \
     || { echo "Error: failed to build winapi"; exit 1; }
-  [ -f "$INSTALL_DIR/lib/lua/5.1/winapi.dll" ] || { echo "Error: winapi.dll isn't found"; exit 1; }
+  [ -f "$INSTALL_DIR/lib/lua/$LUAD/winapi.dll" ] || { echo "Error: winapi.dll isn't found"; exit 1; }
   cd ..
   rm -rf "$WINAPI_BASENAME"
 fi
@@ -287,14 +368,22 @@ fi
 mkdir -p "$BIN_DIR" || { echo "Error: cannot create directory $BIN_DIR"; exit 1; }
 
 [ $BUILD_LUA ] && cp "$INSTALL_DIR/bin/lua$LUAS.exe" "$INSTALL_DIR/lib/lua$LUAV.dll" "$BIN_DIR"
-[ $BUILD_WXLUA ] && cp "$INSTALL_DIR/bin/libwx.dll" "$BIN_DIR/wx.dll"
-[ $BUILD_WINAPI ] && cp "$INSTALL_DIR/lib/lua/5.1/winapi.dll" "$BIN_DIR"
-[ $BUILD_LUASEC ] && cp "$INSTALL_DIR/lib/lua/5.1/ssl.dll" "$BIN_DIR"
+[ $BUILD_WXLUA ] && cp "$INSTALL_DIR/bin/libwx.dll" "$BIN_DIR/clibs$LUAS/wx.dll"
+[ $BUILD_WINAPI ] && cp "$INSTALL_DIR/lib/lua/$LUAD/winapi.dll" "$BIN_DIR/clibs$LUAS"
+[ $BUILD_LFS ] && cp "$INSTALL_DIR/lib/lua/$LUAD/lfs.dll" "$BIN_DIR/clibs$LUAS"
+[ $BUILD_LPEG ] && cp "$INSTALL_DIR/lib/lua/$LUAD/lpeg.dll" "$BIN_DIR/clibs$LUAS"
 
 if [ $BUILD_LUASOCKET ]; then
   mkdir -p "$BIN_DIR/clibs$LUAS/"{mime,socket}
-  cp "$INSTALL_DIR/lib/lua/$LUAV/mime/core.dll" "$BIN_DIR/clibs$LUAS/mime"
-  cp "$INSTALL_DIR/lib/lua/$LUAV/socket/core.dll" "$BIN_DIR/clibs$LUAS/socket"
+  cp "$INSTALL_DIR/lib/lua/$LUAD/mime/core.dll" "$BIN_DIR/clibs$LUAS/mime"
+  cp "$INSTALL_DIR/lib/lua/$LUAD/socket/core.dll" "$BIN_DIR/clibs$LUAS/socket"
+fi
+
+if [ $BUILD_LUASEC ]; then
+  cp "$INSTALL_DIR/bin/"{ssleay32.dll,libeay32.dll} "$BIN_DIR"
+  cp "$INSTALL_DIR/lib/lua/$LUAD/ssl.dll" "$BIN_DIR/clibs$LUAS"
+  cp "$INSTALL_DIR/share/lua/$LUAD/ssl.lua" ../lualibs
+  cp "$INSTALL_DIR/share/lua/$LUAD/ssl/https.lua" ../lualibs/ssl
 fi
 
 # To build lua5.1.dll proxy:

build/messages.lua

@@ -9,6 +9,10 @@
 -- You can also update an existing file with new messages by running:
 --  > bin\lua.exe build/messages.lua cfg/i18n/ru.lua
 
+-- store `print` function as it's modified by wxlua and LuaJIT doesn't like
+-- what wxlua has done in that function.
+local print = print
+
 local iswindows = os.getenv('WINDIR') or (os.getenv('OS') or ''):match('[Ww]indows')
 if iswindows or not pcall(require, "wx") then
   package.cpath = (iswindows and 'bin/?.dll;' or 'bin/lib?.dylib;') .. package.cpath
@@ -50,15 +54,20 @@ end
 
 local file = ... -- pass an existing file name as a parameter
 local messages = {}
-for _, mask in ipairs({"zbstudio/*.lua", "src/main.lua", "src/editor/*.lua"}) do
+for _, mask in ipairs({"src/main.lua", "src/editor/*.lua"}) do
   for _, file in ipairs(FileSysGet(mask, wx.wxFILE)) do
     local content = FileRead(file)
     for msg in content:gmatch("[^%w]TR(%b())") do
       -- remove brackets aroung ("foo")
       -- extract message from ("foo", count)
       msg = msg:gsub("^%(", ""):gsub("%)$", ""):gsub([[(["']), .+]], "%1")
-      messages[msg] = messages[msg] or {}
-      messages[msg][file] = (messages[msg][file] or 0) + 1
+      if not msg:find([=[^["']]=]) or not msg:find([=[["']$]=]) then
+        io.stderr:write(("Call with a non-string 'TR(%s)' ignored in '%s'.\n")
+          :format(msg, file))
+      else
+        messages[msg] = messages[msg] or {}
+        messages[msg][file] = (messages[msg][file] or 0) + 1
+      end
     end
   end
 end
@@ -74,9 +83,12 @@ end
 local plural = existing[0] and ("  [0] = "..existing[0].."\n") or ""
 existing[0] = nil
 
+local en = loadfile("cfg/i18n/en.lua")() -- load 'en' with translations that require pluralization
+
 local msgs = {}
 for m, files in pairs(messages) do
-  local str = "  ["..m.."] = "..(existing[m] or 'nil, --')
+  local str = "  ["..m.."] = "
+  ..(existing[m] or (en[m:gsub([=[^['"]]=],''):gsub([=[['"]$]=],'')] and '{}, --' or 'nil, --'))
   str = str:gsub(" %-%-.*$", "").." -- "
   for f in pairs(files) do str = str .. f .. ", " end
   msgs[#msgs+1] = str:gsub(", $", "")
@@ -86,7 +98,7 @@ end
 table.sort(msgs)
 print("return {\n"..plural..table.concat(msgs, "\n").."\n}")
 if next(existing) then
-  local str = "-- no match found for the following elements: "
+  local str = "No match found for the following elements: "
   for msg in pairs(existing) do str = str .. msg .. ", " end
-  print((str:gsub(", $", "")))
+  io.stderr:write((str:gsub(", $", "\n")))
 end

build/win32_starter.c

@@ -8,6 +8,7 @@
 #define _WIN32_WINNT 0x0502
 #endif
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <winbase.h>
 #include <stdlib.h>
@@ -52,9 +53,7 @@ static const char *luacode =
 "function(err) msg('Uncaught lua script exception',debug.traceback(err)) end)"
 ;
 
-#if defined(_WIN32) && defined (_MSC_VER)
-
-PCHAR*	CommandLineToArgvA(PCHAR CmdLine,int* _argc)
+PCHAR* CommandLineToArgv(PCHAR CmdLine,int* _argc)
 {
   PCHAR* argv;
   PCHAR  _argv;
@@ -70,8 +69,7 @@ PCHAR*	CommandLineToArgvA(PCHAR CmdLine,int* _argc)
   len = strlen(CmdLine);
   i = ((len+2)/2)*sizeof(PVOID) + sizeof(PVOID);
 
-  argv = (PCHAR*)GlobalAlloc(GMEM_FIXED,
-    i + (len+2)*sizeof(CHAR));
+  argv = (PCHAR*)GlobalAlloc(GMEM_FIXED, i + (len+2)*sizeof(CHAR));
 
   _argv = (PCHAR)(((PUCHAR)argv)+i);
 
@@ -134,15 +132,17 @@ PCHAR*	CommandLineToArgvA(PCHAR CmdLine,int* _argc)
   return argv;
 }
 
+PCHAR WideCharToUTF8(LPCWSTR text) {
+  int size_needed = WideCharToMultiByte(CP_UTF8, 0, text, -1, NULL, 0, NULL, NULL);
+  PCHAR buffer = (PCHAR)GlobalAlloc(GMEM_FIXED, size_needed);
+  WideCharToMultiByte(CP_UTF8, 0, text, -1, buffer, size_needed, NULL, NULL);
+  return buffer;
+}
+
 int WINAPI WinMain(HINSTANCE hInstance,  HINSTANCE hPrevInstance,  LPSTR lpCmdLine, int nCmdShow)
 {
   int argc;
-  char ** argv = CommandLineToArgvA(GetCommandLineA(),&argc);
-
-#else
-int main (int argc, char *argv[])
-{
-#endif
+  char ** argv = CommandLineToArgv(WideCharToUTF8(GetCommandLineW()),&argc);
   HINSTANCE hinstLib;
 
   char buffer[MAX_PATH],*file;
@@ -154,17 +154,11 @@ int main (int argc, char *argv[])
       MB_OK|MB_ICONERROR);
     return 0;
   }
-  if (file!=NULL)
-    *file = 0; // finish the string, I don't need the appname
-  //int i;
-  //for (i=0;i<argc; i++)
-  //		printf("%d %s\n",i,argv[i]);
+  if (file!=NULL) *file = 0; // finish the string, don't need the appname
 
   SetCurrentDirectory(buffer);
 
-
-  SetDllDirectory(".\\bin\\");
-  hinstLib = LoadLibrary("lua51.dll");
+  hinstLib = LoadLibrary(".\\bin\\lua51.dll");
   if (hinstLib != NULL)
   {
     luaL_newstate = (voidfunc*) GetProcAddress(hinstLib, "luaL_newstate");
@@ -204,18 +198,17 @@ int main (int argc, char *argv[])
           lua_pcall(L,0,0,0);
         else
           MessageBox(NULL,
-          TEXT("An unexpected error occured while loading the lua chunk."),
-          TEXT("Failed to start editor"),
-          MB_OK|MB_ICONERROR);
+            TEXT("An unexpected error occured while loading the lua chunk."),
+            TEXT("Failed to start editor"),
+            MB_OK|MB_ICONERROR);
       } else
         MessageBox(NULL,
-        TEXT("Couldn't initialize a luastate"),
-        TEXT("Failed to start editor"),
-        MB_OK|MB_ICONERROR);
+          TEXT("Couldn't initialize a luastate"),
+          TEXT("Failed to start editor"),
+          MB_OK|MB_ICONERROR);
     } else {
       MessageBox(NULL,
-        TEXT("Could not load all functions that are supposed to be located in the lua51.dll\n"
-        "This is not supposed to be happening..."),
+        TEXT("Could not load all functions that are supposed to be located in lua51.dll."),
         TEXT("Failed to start editor"),
         MB_OK|MB_ICONERROR);
     }
@@ -224,7 +217,7 @@ int main (int argc, char *argv[])
     FreeLibrary(hinstLib);
   } else {
     MessageBox(NULL,
-      TEXT("The lua51.dll could not be found or loaded, please check the working directory of the application.\n"),
+      TEXT("lua51.dll could not be found or loaded, please check the working directory of the application."),
       TEXT("Failed to initialize editor"),
       MB_OK|MB_ICONERROR);
   }

cfg/estrela.lua

@@ -1,16 +1,14 @@
--- If you have used Estrela before, please copy this content
--- to your user.lua file in the cfg/ directory
+-- If you have used Estrela for graphics shader authoring or luxinia,
+-- create/modify the `user.lua` file in the current folder
+-- and add `include "estrela"` (1.21+) to load all tools and specifications by default again.
 
 -- load all tools, specs, and interpreters
 local all = function() return true end
 load.tools(all)
 load.specs(all)
-load.interpreters(all)
 
 -- this flag means that toggling between projects, will not affect the 
 -- list of opened files (old estrela default).
--- zbstudio defaults here to true, meaning that you get 
--- per-project list of openend files
 projectautoopen = false
 
 -- default search paths for luxinia

cfg/i18n/cn.lua

@@ -1,231 +1,350 @@
 return {
-  ["%d instance"] = "%d 个体", -- src\editor\findreplace.lua
+  ["%s event failed: %s"] = "%s 事件失败: %s", -- src\editor\package.lua
+  ["%s%% formatted..."] = "%s%% 格式化后...", -- src\editor\print.lua
+  ["%s%% loaded..."] = "%s%% 载入后...", -- src\editor\commands.lua
   ["&About"] = "关于(&A)", -- src\editor\menu_help.lua
   ["&Add Watch"] = "添加监视(&A)", -- src\editor\debugger.lua
   ["&Break"] = "中断", -- src\editor\menu_project.lua
-  ["&Close Page"] = "关闭页面", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["&Close Page"] = "关闭页面", -- src\editor\gui.lua, src\editor\menu_file.lua
+  ["&Community"] = "访问社区", -- src\editor\menu_help.lua
   ["&Compile"] = "编译", -- src\editor\menu_project.lua
-  ["&Copy"] = "复制", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Copy Value"] = "复制值", -- src\editor\debugger.lua
+  ["&Copy"] = "复制", -- src\editor\gui.lua, src\editor\editor.lua, src\editor\menu_edit.lua
   ["&Default Layout"] = "布局", -- src\editor\menu_view.lua
   ["&Delete Watch"] = "删除监视", -- src\editor\debugger.lua
-  ["&Down"] = "往下", -- src\editor\findreplace.lua
+  ["&Delete"] = "删除", -- src\editor\filetree.lua
+  ["&Documentation"] = "文件编制", -- src\editor\menu_help.lua
+  ["&Edit Project Directory"] = "编辑项目目录", -- src\editor\filetree.lua
+  ["&Edit Value"] = "编辑值", -- src\editor\debugger.lua
   ["&Edit Watch"] = "编辑监视", -- src\editor\debugger.lua
   ["&Edit"] = "编辑", -- src\editor\menu_edit.lua
   ["&File"] = "文件", -- src\editor\menu_file.lua
-  ["&Find All"] = "查找全部", -- src\editor\findreplace.lua
-  ["&Find Next"] = "查找下一个", -- src\editor\findreplace.lua
   ["&Find"] = "查找", -- src\editor\menu_search.lua
   ["&Fold/Unfold All"] = "全 折叠/展开", -- src\editor\menu_edit.lua
-  ["&Goto Line"] = "到...行", -- src\editor\menu_search.lua
+  ["&Frequently Asked Questions"] = "常见问题解答", -- src\editor\menu_help.lua
+  ["&Getting Started Guide"] = "入门指南", -- src\editor\menu_help.lua
   ["&Help"] = "帮助", -- src\editor\menu_help.lua
+  ["&New Directory"] = "创建新目录", -- src\editor\filetree.lua
   ["&New"] = "新建", -- src\editor\menu_file.lua
   ["&Open..."] = "打开...", -- src\editor\menu_file.lua
   ["&Output/Console Window"] = "输出/主控台视窗", -- src\editor\menu_view.lua
-  ["&Paste"] = "粘贴", -- src\editor\editor.lua, src\editor\menu_edit.lua
-  ["&Project"] = "项目", -- src\editor\menu_project.lua, src\editor\inspect.lua
-  ["&Redo"] = "重做", -- src\editor\editor.lua, src\editor\menu_edit.lua
-  ["&Replace All"] = "全替换", -- src\editor\findreplace.lua
-  ["&Replace"] = "替换", -- src\editor\findreplace.lua, src\editor\menu_search.lua
+  ["&Paste"] = "粘贴", -- src\editor\gui.lua, src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Print..."] = "打印...", -- src\editor\print.lua
+  ["&Project Page"] = "项目页面", -- src\editor\menu_help.lua
+  ["&Project"] = "项目", -- src\editor\menu_project.lua
+  ["&Redo"] = "重做", -- src\editor\gui.lua, src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Rename"] = "重命名", -- src\editor\filetree.lua
+  ["&Replace"] = "替换", -- src\editor\menu_search.lua
   ["&Run"] = "执行", -- src\editor\menu_project.lua
-  ["&Save"] = "保存", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["&Save"] = "保存", -- src\editor\gui.lua, src\editor\menu_file.lua
   ["&Search"] = "搜索", -- src\editor\menu_search.lua
-  ["&Sort"] = "分类", -- src\editor\menu_search.lua
+  ["&Select Command"] = "选择命令", -- src\editor\gui.lua
+  ["&Sort"] = "分类", -- src\editor\menu_edit.lua
   ["&Stack Window"] = "叠视窗/堆栈视窗", -- src\editor\menu_view.lua
   ["&Start Debugger Server"] = "开启除错器伺服机", -- src\editor\menu_project.lua
-  ["&Subdirectories"] = "子文件夹", -- src\editor\findreplace.lua
-  ["&Undo"] = "撤消", -- src\editor\editor.lua, src\editor\menu_edit.lua
-  ["&Up"] = "往上", -- src\editor\findreplace.lua
+  ["&Status Bar"] = "状态栏", -- src\editor\menu_view.lua
+  ["&Tool Bar"] = "工具栏", -- src\editor\menu_view.lua
+  ["&Tutorials"] = "学习指南", -- src\editor\menu_help.lua
+  ["&Undo"] = "撤消", -- src\editor\gui.lua, src\editor\editor.lua, src\editor\menu_edit.lua
   ["&View"] = "视图", -- src\editor\menu_view.lua
   ["&Watch Window"] = "监视视窗", -- src\editor\menu_view.lua
   ["About %s"] = "关于 %s", -- src\editor\menu_help.lua
+  ["Add To Scratchpad"] = "添加到剪贴板", -- src\editor\editor.lua
   ["Add Watch Expression"] = "添加监视表达式", -- src\editor\editor.lua
-  ["Add to Scratchpad"] = "添加至暂存器", -- src\editor\editor.lua
   ["All files"] = "全部文件", -- src\editor\commands.lua
   ["Allow external process to start debugging"] = "允许外部进程开启除错", -- src\editor\menu_project.lua
   ["Analyze the source code"] = "分析源代码", -- src\editor\inspect.lua
   ["Analyze"] = "分析", -- src\editor\inspect.lua
   ["Auto Complete Identifiers"] = "自动补全标识符", -- src\editor\menu_edit.lua
   ["Auto complete while typing"] = "当输入时自动补全", -- src\editor\menu_edit.lua
-  ["Break execution at the next executed line of code"] = "执行下一语句之后中断执行", -- src\editor\menu_project.lua, src\editor\gui.lua
-  ["C&lear Output Window"] = "清除输出视窗", -- src\editor\menu_project.lua
+  ["Binary file is shown as read-only as it is only partially loaded."] = "二进制文件只能加载显示为只读属性", -- src\editor\commands.lua
+  ["Bookmark"] = "标记", -- src\editor\menu_edit.lua
+  ["Break execution at the next executed line of code"] = "执行下一语句之后中断执行", -- src\editor\toolbar.lua, src\editor\menu_project.lua
+  ["Breakpoint"] = "断点调试", -- src\editor\menu_project.lua
+  ["C&lear Console Window"] = "清除控制台视窗", -- src\editor\gui.lua
+  ["C&lear Output Window"] = "清除输出视窗", -- src\editor\gui.lua, src\editor\menu_project.lua
   ["C&omment/Uncomment"] = "注释/消除注释", -- src\editor\menu_edit.lua
-  ["Can't debug the script in the active editor window."] = "不能在现行编辑视窗对脚本进行除错", -- src\editor\debugger.lua
-  ["Can't find file '%s' in the current project to activate for debugging. Update the project or open the file in the editor before debugging."] = "在当前项目中寻找不到文件 '%s' 以进行激活然后除错, 更新项目或是在编辑器里开启文件后再除错", -- src\editor\debugger.lua
+  ["Can't evaluate the expression while the application is running."] = "应用程序运行时不能对表达式求值", -- src\editor\debugger.lua
+  ["Can't open file '%s': %s"] = "不能打开文件 '%s': %s", -- src\editor\findreplace.lua, src\editor\package.lua, src\editor\inspect.lua, src\editor\outline.lua
   ["Can't process auto-recovery record; invalid format: %s."] = "不能处理自动恢复存档: %s", -- src\editor\commands.lua
+  ["Can't replace in read-only text."] = "不能替换只读属性的文本", -- src\editor\findreplace.lua
   ["Can't run the entry point script ('%s')."] = "不能执行entry point脚本 ('%s')", -- src\editor\debugger.lua
+  ["Can't start debugger server at %s:%d: %s."] = "不能启动调试器服务器在  %s:%d: %s.", -- src\editor\debugger.lua
+  ["Can't start debugging for '%s'."] = "不能启动调试编译到 '%s'.", -- src\editor\debugger.lua
   ["Can't start debugging session due to internal error '%s'."] = "除错动作失败 '%s'.", -- src\editor\debugger.lua
   ["Can't start debugging without an opened file or with the current file not being saved ('%s')."] = "不能启动除错，没有文档被开启或当前更改过的文档还没保存('%s')", -- src\editor\debugger.lua
-  ["Cancel"] = "取消", -- src\editor\findreplace.lua
-  ["Choose ..."] = "请选 ...", -- src\editor\menu_project.lua
-  ["Choose a project directory"] = "选择项目文件夹", -- src\editor\findreplace.lua, src\editor\menu_project.lua
-  ["Clear &Dynamic Words"] = "清除动态词汇", -- src\editor\menu_edit.lua
+  ["Can't stop debugger server as it is not started."] = "不能终止一个未启动的调试器", -- src\editor\debugger.lua
+  ["Cancelled by the user."] = "被用户取消", -- src\editor\findreplace.lua
+  ["Choose a directory to map"] = "选择一个映射目录", -- src\editor\filetree.lua
+  ["Choose a project directory"] = "选择项目文件夹", -- src\editor\toolbar.lua, src\editor\menu_project.lua, src\editor\filetree.lua
+  ["Choose a search directory"] = "选择一个搜索目录", -- src\editor\findreplace.lua
+  ["Choose..."] = "请选...", -- src\editor\findreplace.lua, src\editor\menu_project.lua, src\editor\filetree.lua
+  ["Clear Bookmarks In Project"] = nil, -- src\editor\markers.lua
+  ["Clear Breakpoints In Project"] = nil, -- src\editor\markers.lua
+  ["Clear Items"] = "清除项目", -- src\editor\findreplace.lua, src\editor\menu_file.lua
+  ["Clear items from this list"] = "从该列表清除项目", -- src\editor\menu_file.lua
   ["Clear the output window before compiling or debugging"] = "编译或除错前清除输出视窗", -- src\editor\menu_project.lua
   ["Close &Other Pages"] = "关闭其他页面", -- src\editor\gui.lua
   ["Close A&ll Pages"] = "关闭全部页面", -- src\editor\gui.lua
+  ["Close Search Results Pages"] = nil, -- src\editor\gui.lua
   ["Close the current editor window"] = "关闭当前编译视窗", -- src\editor\menu_file.lua
   ["Co&ntinue"] = "继续", -- src\editor\menu_project.lua
   ["Col: %d"] = "列: %d", -- src\editor\editor.lua
+  ["Command Line Parameters..."] = "命令行参数...", -- src\editor\gui.lua, src\editor\menu_project.lua
+  ["Command line parameters"] = "命令行参数", -- src\editor\menu_project.lua
   ["Comment or uncomment current or selected lines"] = "注释/消除注释 当前或被选的语句", -- src\editor\menu_edit.lua
-  ["Compilation error"] = "编译错误", -- src\editor\debugger.lua, src\editor\commands.lua
+  ["Compilation error"] = "编译错误", -- src\editor\commands.lua, src\editor\debugger.lua
   ["Compilation successful; %.0f%% success rate (%d/%d)."] = "编译成功; 成功率: %.0f%% (%d/%d).", -- src\editor\commands.lua
   ["Compile the current file"] = "编译当前的文档", -- src\editor\menu_project.lua
   ["Complete &Identifier"] = "补全标识符", -- src\editor\menu_edit.lua
   ["Complete the current identifier"] = "补全当前标识符", -- src\editor\menu_edit.lua
+  ["Consider removing backslash from escape sequence '%s'."] = "考虑删除反斜杠转义序列 '%s'.", -- src\editor\commands.lua
+  ["Copy Full Path"] = "复制完整路径", -- src\editor\gui.lua, src\editor\filetree.lua
   ["Copy selected text to clipboard"] = "复制被选的text到clipboard", -- src\editor\menu_edit.lua
+  ["Correct &Indentation"] = "正确缩进", -- src\editor\menu_edit.lua
   ["Couldn't activate file '%s' for debugging; continuing without it."] = "不能激活 '%s' 以除错; 省略后继续进行", -- src\editor\debugger.lua
-  ["Create an empty document"] = "新建空文档", -- src\editor\menu_file.lua, src\editor\gui.lua
-  ["Cu&t"] = "剪切", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["Create an empty document"] = "新建空文档", -- src\editor\toolbar.lua, src\editor\menu_file.lua
+  ["Cu&t"] = "剪切", -- src\editor\gui.lua, src\editor\editor.lua, src\editor\menu_edit.lua
   ["Cut selected text to clipboard"] = "剪切被选的text到clipboard", -- src\editor\menu_edit.lua
   ["Debugger server started at %s:%d."] = "除错伺服器起始于 %s:%d.", -- src\editor\debugger.lua
+  ["Debugger server stopped at %s:%d."] = "调试器终止于 %s:%d.", -- src\editor\debugger.lua
   ["Debugging session completed (%s)."] = "除错会话完成 (%s)", -- src\editor\debugger.lua
   ["Debugging session started in '%s'."] = "除错会话于 '%s' 起始", -- src\editor\debugger.lua
-  ["Debugging suspended at %s:%s (couldn't activate the file)."] = "除错挂起于 %s:%s (不能激活文档).", -- src\editor\debugger.lua
-  ["Directory"] = "文件夹", -- src\editor\findreplace.lua
+  ["Debugging suspended at '%s:%s' (couldn't activate the file)."] = "除错挂起于 '%s:%s' (不能激活文档).", -- src\editor\debugger.lua
+  ["Detach &Process"] = "分离流程", -- src\editor\menu_project.lua
+  ["Disable Indexing For '%s'"] = "禁用索引到 '%s'", -- src\editor\outline.lua
+  ["Do you want to delete '%s'?"] = "是否要删除 '%s'?", -- src\editor\filetree.lua
+  ["Do you want to overwrite it?"] = "是否要覆盖？", -- src\editor\commands.lua
   ["Do you want to reload it?"] = "需要重新导入吗?", -- src\editor\editor.lua
   ["Do you want to save the changes to '%s'?"] = "需要把更改保存于 '%s'?", -- src\editor\commands.lua
   ["E&xit"] = "离开", -- src\editor\menu_file.lua
+  ["Enable Indexing"] = "启用索引", -- src\editor\outline.lua
   ["Enter Lua code and press Enter to run it."] = "输入Lua代码然后按 <Enter> 以执行", -- src\editor\shellbox.lua
-  ["Enter line number"] = "输入行号码", -- src\editor\menu_search.lua
+  ["Enter command line parameters"] = "输入命令行参数", -- src\editor\menu_project.lua
+  ["Enter replacement text"] = "输入替换文本", -- src\editor\editor.lua
   ["Error while loading API file: %s"] = "导入API档时出错误: %s", -- src\editor\autocomplete.lua
   ["Error while loading configuration file: %s"] = "导入configuration档时出错误: %s", -- src\editor\style.lua
   ["Error while processing API file: %s"] = "处理API档时出错误: %s", -- src\editor\autocomplete.lua
   ["Error while processing configuration file: %s"] = "处理configuration档时出错误: %s", -- src\editor\style.lua
   ["Error"] = "错误", -- src\editor\commands.lua
-  ["Evaluate in Console"] = "在主控台中估值", -- src\editor\editor.lua
+  ["Evaluate In Console"] = "在控制台里评估", -- src\editor\editor.lua
   ["Execute the current project/file and keep updating the code to see immediate results"] = "执行当前项目/文档和更新代码以便得到执行结果", -- src\editor\menu_project.lua
-  ["Execute the current project/file"] = "执行当前项目/文档", -- src\editor\menu_project.lua
+  ["Execute the current project/file"] = "执行当前项目/文档", -- src\editor\toolbar.lua, src\editor\menu_project.lua
   ["Execution error"] = "执行出错误", -- src\editor\debugger.lua
   ["Exit program"] = "离开程式", -- src\editor\menu_file.lua
-  ["Expr"] = "表达式", -- src\editor\debugger.lua
-  ["Expression"] = "表达式", -- src\editor\debugger.lua
   ["File '%s' has been modified on disk."] = "磁碟上的文档 '%s' 已被更改", -- src\editor\editor.lua
-  ["File '%s' has more recent timestamp than restored '%s'; please review before saving."] = 
-  "文档 '%s' 的时间戳比 '%s' 更新近; 请检验后再保存", -- src\editor\commands.lua
-  ["File '%s' no longer exists."] = "文档 '%s' 已不存在", -- src\editor\editor.lua, src\editor\menu_file.lua
-  ["File Type"] = "文档类", -- src\editor\findreplace.lua
+  ["File '%s' has more recent timestamp than restored '%s'; please review before saving."] = "文档 '%s' 的时间戳比 '%s' 更新近; 请检验后再保存", -- src\editor\commands.lua
+  ["File '%s' is missing and can't be recovered."] = "文件 '%s' 已经失踪且无法恢复", -- src\editor\commands.lua
+  ["File '%s' no longer exists."] = "文档 '%s' 已不存在", -- src\editor\menu_file.lua, src\editor\editor.lua
+  ["File already exists."] = "文件已经存在", -- src\editor\commands.lua
   ["File history"] = "文档历史", -- src\editor\menu_file.lua
   ["Find &In Files"] = "在文档中查找", -- src\editor\menu_search.lua
   ["Find &Next"] = "查找下一个", -- src\editor\menu_search.lua
   ["Find &Previous"] = "查找上一个", -- src\editor\menu_search.lua
-  ["Find In Files"] = "在文档中查找", -- src\editor\findreplace.lua
+  ["Find and insert library function"] = "查找并插入库函数", -- src\editor\menu_search.lua
   ["Find and replace text in files"] = "在文档中查找text然后更换", -- src\editor\menu_search.lua
-  ["Find and replace text"] = "查找text然后更换", -- src\editor\menu_search.lua, src\editor\gui.lua
+  ["Find and replace text"] = "查找text然后更换", -- src\editor\toolbar.lua, src\editor\menu_search.lua
+  ["Find in files"] = "在文档中查找", -- src\editor\toolbar.lua
+  ["Find next"] = nil, -- src\editor\toolbar.lua
   ["Find text in files"] = "在文档中查找text", -- src\editor\menu_search.lua
-  ["Find text"] = "查找text", -- src\editor\menu_search.lua, src\editor\gui.lua
+  ["Find text"] = "查找text", -- src\editor\toolbar.lua, src\editor\menu_search.lua
   ["Find the earlier text occurence"] = "查找之前出现的text", -- src\editor\menu_search.lua
   ["Find the next text occurrence"] = "查找之後将出现的text", -- src\editor\menu_search.lua
-  ["Find"] = "查找", -- src\editor\findreplace.lua
   ["Fold or unfold all code folds"] = "折叠/展开所有代码折叠", -- src\editor\menu_edit.lua
+  ["Fold or unfold current line"] = nil, -- src\editor\menu_edit.lua
+  ["Fold/Unfold Current &Line"] = nil, -- src\editor\menu_edit.lua
+  ["Formatting page %d..."] = "格式化页面 %d...", -- src\editor\print.lua
+  ["Found %d instance."] = "发现 %d 实例", -- src\editor\findreplace.lua
   ["Found auto-recovery record and restored saved session."] = "找到自动恢复存档和恢复已存对话", -- src\editor\commands.lua
-  ["Found"] = "找到", -- src\editor\findreplace.lua
   ["Full &Screen"] = "全屏", -- src\editor\menu_view.lua
-  ["Go to a selected line"] = "到所选的行", -- src\editor\menu_search.lua
-  ["Goto Line"] = "到...行", -- src\editor\menu_search.lua
+  ["Go To Definition"] = "转到定义", -- src\editor\editor.lua
+  ["Go To File..."] = "转到文件...", -- src\editor\menu_search.lua
+  ["Go To Line..."] = "到...行", -- src\editor\menu_search.lua
+  ["Go To Next Bookmark"] = "转到下一个标签", -- src\editor\menu_edit.lua
+  ["Go To Next Breakpoint"] = "转到下一个断点", -- src\editor\menu_project.lua
+  ["Go To Previous Bookmark"] = "转到上一个标签", -- src\editor\menu_edit.lua
+  ["Go To Previous Breakpoint"] = "转到上一个断点", -- src\editor\menu_project.lua
+  ["Go To Symbol..."] = "转到符号...", -- src\editor\menu_search.lua
+  ["Go to file"] = "转到文件", -- src\editor\menu_search.lua
+  ["Go to line"] = "到...行", -- src\editor\menu_search.lua
+  ["Go to symbol"] = "转到符号", -- src\editor\menu_search.lua
+  ["Hide '.%s' Files"] = "隐藏 '.%s' 文件", -- src\editor\filetree.lua
   ["INS"] = "INS", -- src\editor\editor.lua
-  ["In Files"] = "在档案里", -- src\editor\findreplace.lua
-  ["Jump to a function definition..."] = "跳到函数定义", -- src\editor\editor.lua
+  ["Ignore and don't index symbols from files in the selected directory"] = "忽略并不索引制定路径里的文件符号", -- src\editor\outline.lua
+  ["Ignored error in debugger initialization code: %s."] = "无视调试器中的初始化代码错误： %s.", -- src\editor\debugger.lua
+  ["Indexing %d files: '%s'..."] = "索引 %d 文件： '%s'...", -- src\editor\outline.lua
+  ["Indexing completed."] = "索引完成", -- src\editor\outline.lua
+  ["Insert Library Function..."] = "插入库函数...", -- src\editor\menu_search.lua
   ["Known Files"] = "所知的文档", -- src\editor\commands.lua
   ["Ln: %d"] = "行: %d", -- src\editor\editor.lua
-  ["Local console"] = "本地主控台", -- src\editor\shellbox.lua, src\editor\gui.lua
+  ["Local console"] = "本地主控台", -- src\editor\gui.lua, src\editor\shellbox.lua
   ["Lua &Interpreter"] = "Lua 解释器", -- src\editor\menu_project.lua
+  ["Map Directory..."] = "映射目录...", -- src\editor\filetree.lua
   ["Mapped remote request for '%s' to '%s'."] = "映射远程请求 '%s' 至 '%s'", -- src\editor\debugger.lua
-  ["Match &case"] = "case匹配", -- src\editor\findreplace.lua
-  ["Match &whole word"] = "全句匹配", -- src\editor\findreplace.lua
+  ["Markers Window"] = "标记窗口", -- src\editor\menu_view.lua
+  ["Markers"] = "标记", -- src\editor\markers.lua
+  ["Match case"] = "case匹配", -- src\editor\toolbar.lua
+  ["Match whole word"] = "全句匹配", -- src\editor\toolbar.lua
   ["Mixed end-of-line encodings detected."] = "发现混杂的EOL编码", -- src\editor\commands.lua
+  ["Navigate"] = "导航", -- src\editor\menu_search.lua
+  ["New &File"] = "新文件", -- src\editor\filetree.lua
   ["OVR"] = "OVR", -- src\editor\editor.lua
-  ["Open an existing document"] = "打开现存文档", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Open With Default Program"] = "用默认程序启动", -- src\editor\filetree.lua
+  ["Open an existing document"] = "打开现存文档", -- src\editor\toolbar.lua, src\editor\menu_file.lua
   ["Open file"] = "打开文档", -- src\editor\commands.lua
-  ["Options"] = "选项", -- src\editor\findreplace.lua
-  ["Output (running)"] = "输出 (进行中)", -- src\editor\output.lua
-  ["Output"] = "输出", -- src\editor\output.lua, src\editor\settings.lua, src\editor\gui.lua
+  ["Outline Window"] = "大纲视窗", -- src\editor\menu_view.lua
+  ["Outline"] = "大纲", -- src\editor\outline.lua
+  ["Output (running)"] = "输出 (进行中)", -- src\editor\debugger.lua, src\editor\output.lua
+  ["Output (suspended)"] = "输出 （暂停中）", -- src\editor\debugger.lua
+  ["Output"] = "输出", -- src\editor\debugger.lua, src\editor\output.lua, src\editor\gui.lua, src\editor\settings.lua
+  ["Page Setup..."] = "页面设置...", -- src\editor\print.lua
   ["Paste text from the clipboard"] = "从clipboard粘贴text", -- src\editor\menu_edit.lua
   ["Preferences"] = "首选项", -- src\editor\menu_edit.lua
+  ["Prepend '!' to force local execution."] = "预先用'！'进行局部强制执行", -- src\editor\shellbox.lua
   ["Prepend '=' to show complex values on multiple lines."] = "在多行展现复杂值请前置 '='", -- src\editor\shellbox.lua
   ["Press cancel to abort."] = "按 <cancel> 以退出", -- src\editor\commands.lua
+  ["Print the current document"] = "打印当前文档", -- src\editor\print.lua
   ["Program '%s' started in '%s' (pid: %d)."] = "程式 '%s' 执行于 '%s' (pid: %d).", -- src\editor\output.lua
   ["Program can't start because conflicting process is running as '%s'."] = "程序不能启动因为有名为 '%s' 的冲突进程", -- src\editor\output.lua
   ["Program completed in %.2f seconds (pid: %d)."] = "程序于 %.2f 秒完成 (pid: %d).", -- src\editor\output.lua
   ["Program starting as '%s'."] = "程式以 '%s' 执行", -- src\editor\output.lua
   ["Program stopped (pid: %d)."] = "程式停止 (pid: %d).", -- src\editor\debugger.lua
   ["Program unable to run as '%s'."] = "程式不能以 '%s' 执行", -- src\editor\output.lua
-  ["Project Directory"] = "项目文件夹", -- src\editor\menu_project.lua
-  ["Project"] = "项目", -- src\editor\settings.lua, src\editor\gui.lua
+  ["Project Directory"] = "项目文件夹", -- src\editor\menu_project.lua, src\editor\filetree.lua
+  ["Project history"] = "项目历史", -- src\editor\menu_file.lua
+  ["Project"] = "项目", -- src\editor\filetree.lua
   ["Project/&FileTree Window"] = "项目/文档树 视窗", -- src\editor\menu_view.lua
+  ["Provide command line parameters"] = "提供命令行参数", -- src\editor\menu_project.lua
+  ["Queued %d files to index."] = "【排列 %d 文件到索引", -- src\editor\menu_search.lua
   ["R/O"] = "唯读", -- src\editor\editor.lua
   ["R/W"] = "读写", -- src\editor\editor.lua
   ["Re&place In Files"] = "在文档中替换", -- src\editor\menu_search.lua
+  ["Re-indent selected lines"] = "重新缩进选择行", -- src\editor\menu_edit.lua
+  ["Reached end of selection and wrapped around."] = "到达选项底部并停留", -- src\editor\findreplace.lua
+  ["Reached end of text and wrapped around."] = "到达文本底部并停留", -- src\editor\findreplace.lua
   ["Recent Files"] = "最近的文档", -- src\editor\menu_file.lua
+  ["Recent Projects"] = "近期项目", -- src\editor\menu_file.lua
   ["Redo last edit undone"] = "重做最后被取消的编辑", -- src\editor\menu_edit.lua
+  ["Refresh Index"] = "刷新索引", -- src\editor\outline.lua
+  ["Refresh Search Results"] = nil, -- src\editor\gui.lua
+  ["Refresh indexed symbols from files in the selected directory"] = "刷新指定路径文件里的索引符号", -- src\editor\outline.lua
+  ["Refresh"] = "刷新", -- src\editor\filetree.lua
   ["Refused a request to start a new debugging session as there is one in progress already."] = "因为有另一个除错在进行，拒绝开启新的除错对话", -- src\editor\debugger.lua
-  ["Regular &expression"] = "正则表达式", -- src\editor\findreplace.lua
+  ["Regular expression"] = "正则表达式", -- src\editor\toolbar.lua
   ["Remote console"] = "远程主控台", -- src\editor\shellbox.lua
-  ["Replace A&ll"] = "更换全部", -- src\editor\findreplace.lua
-  ["Replace"] = "更换", -- src\editor\findreplace.lua
+  ["Rename All Instances"] = "重命名所有实例", -- src\editor\editor.lua
+  ["Replace All Selections"] = "替换所有选项", -- src\editor\editor.lua
+  ["Replace all"] = "更换全部", -- src\editor\toolbar.lua
+  ["Replace next instance"] = "替换下一个实例", -- src\editor\toolbar.lua
+  ["Replaced %d instance."] = "替换 %d 实例", -- src\editor\findreplace.lua
   ["Replaced an invalid UTF8 character with %s."] = "以%s更换无效的UTF8字元", -- src\editor\commands.lua
-  ["Replaced"] = "更换", -- src\editor\findreplace.lua
-  ["Replacing"] = "更换中", -- src\editor\findreplace.lua
   ["Reset to default layout"] = "重置缺省布局", -- src\editor\menu_view.lua
-  ["Resets the dynamic word list for autocompletion"] = "为自动补全重置动态word list", -- src\editor\menu_edit.lua
-  ["Run as Scratchpad"] = "以Scratchpad执行", -- src\editor\menu_project.lua
+  ["Run As Scratchpad"] = "以Scratchpad执行", -- src\editor\menu_project.lua
+  ["Run To Cursor"] = "移动到'光标'", -- src\editor\menu_project.lua, src\editor\editor.lua
+  ["Run as Scratchpad"] = "以Scratchpad执行", -- src\editor\toolbar.lua
+  ["Run to cursor"] = "移动到光标", -- src\editor\toolbar.lua, src\editor\menu_project.lua
   ["S&top Debugging"] = "停止除错", -- src\editor\menu_project.lua
   ["S&top Process"] = "停止进程", -- src\editor\menu_project.lua
-  ["Save &As..."] = "另存为...", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Save &As..."] = "另存为...", -- src\editor\gui.lua, src\editor\menu_file.lua
   ["Save A&ll"] = "全部存档", -- src\editor\menu_file.lua
   ["Save Changes?"] = "存档更新?", -- src\editor\commands.lua
-  ["Save all open documents"] = "保存所有开启的文档", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Save all open documents"] = "保存所有开启的文档", -- src\editor\toolbar.lua, src\editor\menu_file.lua
   ["Save file as"] = "文档另存为", -- src\editor\commands.lua
   ["Save file?"] = "保存文档?", -- src\editor\commands.lua
   ["Save the current document to a file with a new name"] = "用新档案名称保存当前文档", -- src\editor\menu_file.lua
-  ["Save the current document"] = "保存当前文档", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Save the current document"] = "保存当前文档", -- src\editor\toolbar.lua, src\editor\menu_file.lua
   ["Saved auto-recover at %s."] = "在 %s 存档自动恢复", -- src\editor\commands.lua
-  ["Scope"] = "范围", -- src\editor\findreplace.lua
   ["Scratchpad error"] = "暂存器错误", -- src\editor\debugger.lua
-  ["Searching for"] = "搜索", -- src\editor\findreplace.lua
-  ["Select &All"] = "选全部", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["Search direction"] = "搜索方向", -- src\editor\toolbar.lua
+  ["Search in selection"] = "搜索指定项目", -- src\editor\toolbar.lua
+  ["Search in subdirectories"] = "搜索子目录", -- src\editor\toolbar.lua
+  ["Searching for '%s'."] = "搜索 '%s'.", -- src\editor\findreplace.lua
+  ["Sel: %d/%d"] = "选择： %d/%d", -- src\editor\editor.lua
+  ["Select &All"] = "选全部", -- src\editor\gui.lua, src\editor\editor.lua, src\editor\menu_edit.lua
+  ["Select And Find Next"] = "搜索并寻找下一个", -- src\editor\menu_search.lua
+  ["Select And Find Previous"] = "搜索并寻找上一个", -- src\editor\menu_search.lua
   ["Select all text in the editor"] = "选编辑器内的所有text", -- src\editor\menu_edit.lua
+  ["Select the word under cursor and find its next occurrence"] = "选择光标下的词汇并找到下一个", -- src\editor\menu_search.lua
+  ["Select the word under cursor and find its previous occurrence"] = "选择光标下的词汇并找到上一个", -- src\editor\menu_search.lua
+  ["Set As Start File"] = "设置为启动文件", -- src\editor\filetree.lua
   ["Set From Current File"] = "从当前文档设置", -- src\editor\menu_project.lua
-  ["Set project directory from current file"] = "从当前文档设置项目文件夹", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Set To Project Directory"] = "设置到项目目录", -- src\editor\findreplace.lua
+  ["Set To Selected Directory"] = "设置到选定目录", -- src\editor\filetree.lua
+  ["Set project directory from current file"] = "从当前文档设置项目文件夹", -- src\editor\toolbar.lua, src\editor\menu_project.lua
+  ["Set project directory to the selected one"] = "设置项目目录到优先级", -- src\editor\filetree.lua
+  ["Set search directory"] = "选择搜索目录", -- src\editor\toolbar.lua
   ["Set the interpreter to be used"] = "设置解释器", -- src\editor\menu_project.lua
-  ["Set the project directory to be used"] = "设置项目文件夹", -- src\editor\menu_project.lua
+  ["Set the project directory to be used"] = "设置项目文件夹", -- src\editor\menu_project.lua, src\editor\filetree.lua
   ["Settings: System"] = "设置: 系统", -- src\editor\menu_edit.lua
   ["Settings: User"] = "设置: 用户", -- src\editor\menu_edit.lua
-  ["Show &Tooltip"] = "展现tooltip", -- src\editor\menu_edit.lua
+  ["Show &Tooltip"] = "展现工具提示", -- src\editor\menu_edit.lua
+  ["Show All Files"] = "显示所有文件", -- src\editor\filetree.lua
+  ["Show Hidden Files"] = "显示隐藏文件", -- src\editor\filetree.lua
+  ["Show Location"] = "显示位置", -- src\editor\gui.lua, src\editor\filetree.lua
+  ["Show all files"] = "显示所有文件", -- src\editor\filetree.lua
+  ["Show context"] = "显示上下文", -- src\editor\toolbar.lua
+  ["Show files previously hidden"] = "显示之前的隐藏文件", -- src\editor\filetree.lua
+  ["Show multiple result windows"] = "显示多个结果窗口", -- src\editor\toolbar.lua
   ["Show tooltip for current position; place cursor after opening bracket of function"] = "在当前的位置展现tooltip; 把游标放置于函数的开括号之后", -- src\editor\menu_edit.lua
-  ["Sort selected lines"] = "对被选的行进行排列", -- src\editor\menu_search.lua
+  ["Show/Hide the status bar"] = "显示/隐藏状态栏", -- src\editor\menu_view.lua
+  ["Show/Hide the toolbar"] = "显示/隐藏工具栏", -- src\editor\menu_view.lua
+  ["Sort By Name"] = "按名称排序", -- src\editor\outline.lua
+  ["Sort selected lines"] = "对被选的行进行排列", -- src\editor\menu_edit.lua
+  ["Source"] = "来源", -- src\editor\menu_edit.lua
   ["Stack"] = "堆栈", -- src\editor\debugger.lua
   ["Start &Debugging"] = "开始除错", -- src\editor\menu_project.lua
-  ["Start debugging"] = "开始除错", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Start or continue debugging"] = "启动或继续调试", -- src\editor\toolbar.lua, src\editor\menu_project.lua
   ["Step &Into"] = "除错运行 进入子程序/函数", -- src\editor\menu_project.lua
   ["Step &Over"] = "除错运行 掠过子程序/函数", -- src\editor\menu_project.lua
   ["Step O&ut"] = "除错运行 离开子程序/函数", -- src\editor\menu_project.lua
-  ["Step into"] = "除错运行 进入子程序/函数", -- src\editor\menu_project.lua, src\editor\gui.lua
-  ["Step out of the current function"] = "除错运行 离开当前的函数", -- src\editor\menu_project.lua, src\editor\gui.lua
-  ["Step over"] = "除错运行 掠过子程序/函数", -- src\editor\menu_project.lua, src\editor\gui.lua
-  ["Stop the currently running process"] = "终止目前进行着的进程", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Step into"] = "除错运行 进入子程序/函数", -- src\editor\toolbar.lua, src\editor\menu_project.lua
+  ["Step out of the current function"] = "除错运行 离开当前的函数", -- src\editor\toolbar.lua, src\editor\menu_project.lua
+  ["Step over"] = "除错运行 掠过子程序/函数", -- src\editor\toolbar.lua, src\editor\menu_project.lua
+  ["Stop debugging and continue running the process"] = "终止调试但允许进程继续运行", -- src\editor\toolbar.lua, src\editor\menu_project.lua
+  ["Stop the currently running process"] = "终止目前进行着的进程", -- src\editor\toolbar.lua, src\editor\menu_project.lua
   ["Switch to or from full screen mode"] = "切换全屏模式", -- src\editor\menu_view.lua
+  ["Symbol Index"] = "符号索引", -- src\editor\outline.lua
   ["Text not found."] = "寻找不到text", -- src\editor\findreplace.lua
   ["The API file must be located in a subdirectory of the API directory."] = "API file必须存放在API文件夹中的子文件夹", -- src\editor\autocomplete.lua
-  ["Toggle Break&point"] = "切换中断点", -- src\editor\menu_project.lua
-  ["Toggle breakpoint"] = "切换中断点", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Toggle Bookmark"] = "切换'标签'", -- src\editor\markers.lua, src\editor\menu_edit.lua
+  ["Toggle Breakpoint"] = "切换中断点", -- src\editor\markers.lua, src\editor\menu_project.lua
+  ["Toggle bookmark"] = "切换标签", -- src\editor\toolbar.lua, src\editor\menu_edit.lua, src\editor\markers.lua
+  ["Toggle breakpoint"] = "切换中断点", -- src\editor\markers.lua, src\editor\toolbar.lua
   ["Tr&ace"] = "追踪", -- src\editor\menu_project.lua
   ["Trace execution showing each executed line"] = "执行追踪展示每一执行过的语句", -- src\editor\menu_project.lua
+  ["Unable to create directory '%s'."] = "无法建立目录", -- src\editor\filetree.lua
+  ["Unable to create file '%s'."] = "无法建立文件 '%s'.", -- src\editor\filetree.lua
+  ["Unable to delete directory '%s': %s"] = "无法删除目录 '%s': %s", -- src\editor\filetree.lua
+  ["Unable to delete file '%s': %s"] = "无法删除文件 '%s': %s", -- src\editor\filetree.lua
   ["Unable to load file '%s'."] = "导出文件失败 '%s'.", -- src\editor\commands.lua
+  ["Unable to rename file '%s'."] = "无法重命名文件 '%s'.", -- src\editor\filetree.lua
   ["Unable to save file '%s': %s"] = "保存文件失败 '%s': %s", -- src\editor\commands.lua
   ["Unable to stop program (pid: %d), code %d."] = "停止程序失败 (pid: %d), 代码 %d.", -- src\editor\debugger.lua
   ["Undo last edit"] = "清除前编辑动作", -- src\editor\menu_edit.lua
+  ["Unmap Directory"] = "禁止映射目录", -- src\editor\filetree.lua
+  ["Unset '%s' As Start File"] = "不设置 '%s' 为启动文件", -- src\editor\filetree.lua
+  ["Updated %d file."] = "更新 %d 文件", -- src\editor\findreplace.lua
+  ["Updating symbol index and settings..."] = "更新符号索引和设置", -- src\editor\outline.lua
+  ["Use %s to close."] = "使用 %s 来关闭", -- src\editor\findreplace.lua
   ["Use '%s' to see full description."] = "用 '%s' 来看全解析", -- src\editor\editor.lua
   ["Use '%s' to show line endings and '%s' to convert them."] = "用 '%s' 来显示语句的终结和 '%s' 来进行转换", -- src\editor\commands.lua
   ["Use 'clear' to clear the shell output and the history."] = "用 'clear' 来清除shell的输出和历史", -- src\editor\shellbox.lua
   ["Use Shift-Enter for multiline code."] = "用 <Shift-Enter> 来处理多行代码", -- src\editor\shellbox.lua
-  ["Value"] = "数值", -- src\editor\debugger.lua
+  ["View the markers window"] = "检视标签窗口", -- src\editor\menu_view.lua
+  ["View the outline window"] = "检视大纲窗口", -- src\editor\menu_view.lua
   ["View the output/console window"] = "查看输出/主控台视窗", -- src\editor\menu_view.lua
   ["View the project/filetree window"] = "查看项目/文件树视窗", -- src\editor\menu_view.lua
-  ["View the stack window"] = "查看堆栈视窗", -- src\editor\menu_view.lua, src\editor\gui.lua
-  ["View the watch window"] = "查看监视视窗", -- src\editor\menu_view.lua, src\editor\gui.lua
+  ["View the stack window"] = "查看堆栈视窗", -- src\editor\toolbar.lua, src\editor\menu_view.lua
+  ["View the watch window"] = "查看监视视窗", -- src\editor\toolbar.lua, src\editor\menu_view.lua
   ["Watch"] = "监视", -- src\editor\debugger.lua
   ["Welcome to the interactive Lua interpreter."] = "欢迎来到互动 Lua interpreter.", -- src\editor\shellbox.lua
-  ["Wrap ar&ound"] = "卷绕", -- src\editor\findreplace.lua
+  ["Wrap around"] = "卷绕", -- src\editor\toolbar.lua
   ["You must save the program first."] = "必须先保存程序", -- src\editor\commands.lua
-  ["on line %d"] = "在 %d 行", -- src\editor\debugger.lua, src\editor\commands.lua
+  ["Zoom In"] = "放大", -- src\editor\menu_view.lua
+  ["Zoom Out"] = "缩小", -- src\editor\menu_view.lua
+  ["Zoom to 100%"] = "缩放到实际大小", -- src\editor\menu_view.lua
+  ["Zoom"] = "缩放", -- src\editor\menu_view.lua
+  ["on line %d"] = "在 %d 行", -- src\editor\debugger.lua, src\editor\editor.lua, src\editor\commands.lua
   ["traced %d instruction"] = "追踪 %d 指令", -- src\editor\debugger.lua
+  ["unknown error"] = "未知错误", -- src\editor\debugger.lua
 }

cfg/i18n/de.lua

@@ -1,94 +1,128 @@
 return {
   [0] = function(c) return c == 1 and 1 or 2 end, -- plural
-  ["%d instance"] = {"%d Instanz", "%d Instanzen"}, -- src\editor\findreplace.lua
   ["%s event failed: %s"] = "Ereignis fehlgeschlagen : %s", -- src\editor\package.lua
+  ["%s%% formatted..."] = "%s%% formatiert...", -- src\editor\print.lua
+  ["%s%% loaded..."] = "%s%% geladen...", -- src\editor\commands.lua
   ["&About"] = "&Über", -- src\editor\menu_help.lua
   ["&Add Watch"] = "&Beobachtungspunkt hinzufügen", -- src\editor\debugger.lua
   ["&Break"] = "&Unterbrechung", -- src\editor\menu_project.lua
-  ["&Close Page"] = "S&eite schließen", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["&Close Page"] = "S&eite schließen", -- src\editor\gui.lua, src\editor\menu_file.lua
+  ["&Community"] = "&Community", -- src\editor\menu_help.lua
   ["&Compile"] = "&Compiler", -- src\editor\menu_project.lua
-  ["&Copy"] = "&Kopieren", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Copy Value"] = "Wert kopieren", -- src\editor\debugger.lua
+  ["&Copy"] = "&Kopieren", -- src\editor\gui.lua, src\editor\editor.lua, src\editor\menu_edit.lua
   ["&Default Layout"] = "Standard-&Layout", -- src\editor\menu_view.lua
   ["&Delete Watch"] = "&Beobachtungspunkt entfernen", -- src\editor\debugger.lua
-  ["&Down"] = "&Runter", -- src\editor\findreplace.lua
+  ["&Delete"] = "&Entfernen", -- src\editor\filetree.lua
+  ["&Documentation"] = "&Dokumentation", -- src\editor\menu_help.lua
+  ["&Edit Project Directory"] = "Projektverzeichnis ändern", -- src\editor\filetree.lua
+  ["&Edit Value"] = "Wert editieren", -- src\editor\debugger.lua
   ["&Edit Watch"] = "&Beobachtungspunkt bearbeiten", -- src\editor\debugger.lua
   ["&Edit"] = "&Bearbeiten", -- src\editor\menu_edit.lua
   ["&File"] = "&Datei", -- src\editor\menu_file.lua
-  ["&Find All"] = "&Alle finden", -- src\editor\findreplace.lua
-  ["&Find Next"] = "&Nächsten finden", -- src\editor\findreplace.lua
   ["&Find"] = "&Finden", -- src\editor\menu_search.lua
   ["&Fold/Unfold All"] = "A&lles ein-/ausklappen", -- src\editor\menu_edit.lua
-  ["&Goto Line"] = "&Gehe zu Zeile", -- src\editor\menu_search.lua
+  ["&Frequently Asked Questions"] = "&FAQ", -- src\editor\menu_help.lua
+  ["&Getting Started Guide"] = "&Anfängerleitfaden", -- src\editor\menu_help.lua
   ["&Help"] = "&Hilfe", -- src\editor\menu_help.lua
+  ["&New Directory"] = "&Neuer Ordner", -- src\editor\filetree.lua
   ["&New"] = "&Neu", -- src\editor\menu_file.lua
   ["&Open..."] = "&Öffnen...", -- src\editor\menu_file.lua
   ["&Output/Console Window"] = "&Ausgabefenster/Konsole", -- src\editor\menu_view.lua
-  ["&Paste"] = "&Einfügen", -- src\editor\editor.lua, src\editor\menu_edit.lua
-  ["&Project"] = "&Projekt", -- src\editor\menu_project.lua, src\editor\inspect.lua
-  ["&Redo"] = "&Wiederholen", -- src\editor\editor.lua, src\editor\menu_edit.lua
-  ["&Replace All"] = "&Alles ersetzen", -- src\editor\findreplace.lua
-  ["&Replace"] = "&Ersetzen", -- src\editor\findreplace.lua, src\editor\menu_search.lua
+  ["&Paste"] = "&Einfügen", -- src\editor\gui.lua, src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Print..."] = "Drucken", -- src\editor\print.lua
+  ["&Project Page"] = "&Projektseite", -- src\editor\menu_help.lua
+  ["&Project"] = "&Projekt", -- src\editor\menu_project.lua
+  ["&Redo"] = "&Wiederholen", -- src\editor\gui.lua, src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Rename"] = "&Umbenennen", -- src\editor\filetree.lua
+  ["&Replace"] = "&Ersetzen", -- src\editor\menu_search.lua
   ["&Run"] = "&Starten", -- src\editor\menu_project.lua
-  ["&Save"] = "&Speichern", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["&Save"] = "&Speichern", -- src\editor\gui.lua, src\editor\menu_file.lua
   ["&Search"] = "&Suchen", -- src\editor\menu_search.lua
-  ["&Sort"] = "&Sortieren", -- src\editor\menu_search.lua
+  ["&Select Command"] = "Kommando auswählen", -- src\editor\gui.lua
+  ["&Sort"] = "&Sortieren", -- src\editor\menu_edit.lua
   ["&Stack Window"] = "&Stapel/Stack", -- src\editor\menu_view.lua
   ["&Start Debugger Server"] = "De&bugserver starten", -- src\editor\menu_project.lua
-  ["&Subdirectories"] = "&Unterverzeichnisse", -- src\editor\findreplace.lua
-  ["&Undo"] = "&Rückgängig", -- src\editor\editor.lua, src\editor\menu_edit.lua
-  ["&Up"] = "&Hoch", -- src\editor\findreplace.lua
+  ["&Status Bar"] = "S&tatuszeile", -- src\editor\menu_view.lua
+  ["&Tool Bar"] = "&Werkzeugleiste", -- src\editor\menu_view.lua
+  ["&Tutorials"] = "&Tutorien", -- src\editor\menu_help.lua
+  ["&Undo"] = "&Rückgängig", -- src\editor\gui.lua, src\editor\editor.lua, src\editor\menu_edit.lua
   ["&View"] = "&Ansicht", -- src\editor\menu_view.lua
   ["&Watch Window"] = "&Beobachtungspunkte", -- src\editor\menu_view.lua
-  [".&bak on Replace"] = ".&bak bei Ersetzen", -- src\editor\findreplace.lua
   ["About %s"] = "Über %s", -- src\editor\menu_help.lua
-  ["Add Watch Expression"] = "Beobachtungspunkt hinzufügen", -- src\editor\editor.lua
   ["Add To Scratchpad"] = "Zu Entwurf hinzufügen", -- src\editor\editor.lua
+  ["Add Watch Expression"] = "Beobachtungspunkt hinzufügen", -- src\editor\editor.lua
   ["All files"] = "Alle Dateien", -- src\editor\commands.lua
   ["Allow external process to start debugging"] = "Externem Prozeß erlauben, den Debugger zu starten", -- src\editor\menu_project.lua
   ["Analyze the source code"] = "Quellcode analysieren", -- src\editor\inspect.lua
   ["Analyze"] = "&Analyseroutine", -- src\editor\inspect.lua
   ["Auto Complete Identifiers"] = "Auto-Vervollständigen von Bezeichnern", -- src\editor\menu_edit.lua
   ["Auto complete while typing"] = "Auto-Vervollständigen beim Tippen", -- src\editor\menu_edit.lua
-  ["Break execution at the next executed line of code"] = "Programmausführung bei der nächsten ausgeführten Zeile stoppen", -- src\editor\menu_project.lua, src\editor\gui.lua
-  ["C&lear Output Window"] = "Ausgabefenster &löschen", -- src\editor\menu_project.lua
-  ["C&omment/Uncomment"] = "(Aus-)/&Kommentieren", -- src\editor\menu_edit.lua
-  ["Can't debug the script in the active editor window."] = "Script kann im aktiven Editorfenster nicht gedebuggt werden.", -- src\editor\debugger.lua
-  ["Can't find file '%s' in the current project to activate for debugging. Update the project or open the file in the editor before debugging."] = "Kann Datei '%s' zwecks Debugging im aktuellen Projekt nicht finden. Bitte Projekt aktualisieren oder Datei in den Editor laden.", -- src\editor\debugger.lua
+  ["Binary file is shown as read-only as it is only partially loaded."] = "Binärdatei ist als schreibgeschützt angezeigt, da sie nur teilweise geladen wurde.", -- src\editor\commands.lua
+  ["Bookmark"] = "Lese&zeichen", -- src\editor\menu_edit.lua
+  ["Break execution at the next executed line of code"] = "Programmausführung bei der nächsten ausgeführten Zeile stoppen", -- src\editor\toolbar.lua, src\editor\menu_project.lua
+  ["Breakpoint"] = "Haltepunkt", -- src\editor\menu_project.lua
+  ["C&lear Console Window"] = "Konsole &leeren", -- src\editor\gui.lua
+  ["C&lear Output Window"] = "Ausgabefenster l&öschen", -- src\editor\gui.lua, src\editor\menu_project.lua
+  ["C&omment/Uncomment"] = "(Aus-)/K&ommentieren", -- src\editor\menu_edit.lua
+  ["Can't evaluate the expression while the application is running."] = "Kann den Ausdruck nicht auswerten solange die Anwendung läuft.", -- src\editor\debugger.lua
+  ["Can't open file '%s': %s"] = "Kann Datei '%s' nicht öffnen: %s", -- src\editor\findreplace.lua, src\editor\package.lua, src\editor\inspect.lua, src\editor\outline.lua
   ["Can't process auto-recovery record; invalid format: %s."] = "Auto-Wiederherstellen nicht möglich; ungültiges Format: %s.", -- src\editor\commands.lua
+  ["Can't replace in read-only text."] = "Ersetzen in schreibgeschütztem Text nicht möglich.", -- src\editor\findreplace.lua
   ["Can't run the entry point script ('%s')."] = "Kann Script für Einsprungspunkt ('%s') nicht ausführen.", -- src\editor\debugger.lua
+  ["Can't start debugger server at %s:%d: %s."] = "Kann Debugserver nicht starten (%s:%d): %s.", -- src\editor\debugger.lua
+  ["Can't start debugging for '%s'."] = "Kann Debuggen nicht starten für '%s'.", -- src\editor\debugger.lua
   ["Can't start debugging session due to internal error '%s'."] = "Debugging kann nicht gestartet werden wegen internem Fehler '%s'.", -- src\editor\debugger.lua
-  ["Can't start debugging without an opened file or with the current file not being saved ('%s')."] = "Debugging kann nicht gestartet werden ohne geöffnete Datei oder wenn die aktuelle Datei nicht gespeichert ist ('%s').", -- src\editor\debugger.lua
-  ["Cancel"] = "Abbrechen", -- src\editor\findreplace.lua
-  ["Choose ..."] = "Wählen...", -- src\editor\menu_project.lua
-  ["Choose a project directory"] = "Projektverzeichnis auswählen", -- src\editor\findreplace.lua, src\editor\menu_project.lua
-  ["Clear &Dynamic Words"] = "&Dynamic Words löschen", -- src\editor\menu_edit.lua
+  ["Can't start debugging without an opened file or with the current file not being saved ('%s')."] = "Debugging kann ohne geöffnete Datei nicht gestartet werden oder wenn die aktuelle Datei nicht gespeichert ist ('%s').", -- src\editor\debugger.lua
+  ["Can't stop debugger server as it is not started."] = "Kann Debugserver nicht stoppen wenn er vorher nicht gestartet wurde.", -- src\editor\debugger.lua
+  ["Cancelled by the user."] = "Durch Benutzer abgebrochen.", -- src\editor\findreplace.lua
+  ["Choose a directory to map"] = "Bitte Verzeichnis wählen zum virtuellen Einbinden", -- src\editor\filetree.lua
+  ["Choose a project directory"] = "Projektverzeichnis auswählen", -- src\editor\toolbar.lua, src\editor\menu_project.lua, src\editor\filetree.lua
+  ["Choose a search directory"] = "Bitte Verzeichnis zum Durchsuchen auswählen.", -- src\editor\findreplace.lua
+  ["Choose..."] = "Wählen...", -- src\editor\findreplace.lua, src\editor\menu_project.lua, src\editor\filetree.lua
+  ["Clear Bookmarks In Project"] = "Projekt-Lesezeichen löschen", -- src\editor\markers.lua
+  ["Clear Breakpoints In Project"] = "Projekt-Haltepunkte löschen", -- src\editor\markers.lua
+  ["Clear Items"] = "Liste &löschen", -- src\editor\findreplace.lua, src\editor\menu_file.lua
+  ["Clear items from this list"] = "Diese Liste löschen", -- src\editor\menu_file.lua
   ["Clear the output window before compiling or debugging"] = "Vor Kompilieren oder Debuggen das Ausgabefenster löschen", -- src\editor\menu_project.lua
   ["Close &Other Pages"] = "A&ndere Seiten schließen", -- src\editor\gui.lua
   ["Close A&ll Pages"] = "&Alle Seiten schließen", -- src\editor\gui.lua
+  ["Close Search Results Pages"] = "Suchergebnisse schließen", -- src\editor\gui.lua
   ["Close the current editor window"] = "Aktuelles Editorfenster schließen", -- src\editor\menu_file.lua
   ["Co&ntinue"] = "&Fortsetzen", -- src\editor\menu_project.lua
   ["Col: %d"] = "Spalte: %d", -- src\editor\editor.lua
+  ["Command Line Parameters..."] = "Kommandozeilenparameter...", -- src\editor\gui.lua, src\editor\menu_project.lua
+  ["Command line parameters"] = "Kommandozeilenparameter", -- src\editor\menu_project.lua
   ["Comment or uncomment current or selected lines"] = "Ausgewählte bzw. aktive Zeile (un-)kommentieren", -- src\editor\menu_edit.lua
-  ["Compilation error"] = "Fehler beim Kompilieren", -- src\editor\debugger.lua, src\editor\commands.lua
+  ["Compilation error"] = "Fehler beim Kompilieren", -- src\editor\commands.lua, src\editor\debugger.lua
   ["Compilation successful; %.0f%% success rate (%d/%d)."] = "Kompilieren erfolgreich; Erfolgsquote von %.0f%% (%d/%d).", -- src\editor\commands.lua
   ["Compile the current file"] = "Aktuelle Datei kompilieren", -- src\editor\menu_project.lua
   ["Complete &Identifier"] = "&Bezeichner vervollständigen", -- src\editor\menu_edit.lua
   ["Complete the current identifier"] = " Aktuellen Bezeichner vervollständigen", -- src\editor\menu_edit.lua
+  ["Consider removing backslash from escape sequence '%s'."] = "Möglicherweise muß `\' aus '%s' entfernt werden.", -- src\editor\commands.lua
+  ["Copy Full Path"] = "Kopiere Pfadangabe", -- src\editor\gui.lua, src\editor\filetree.lua
   ["Copy selected text to clipboard"] = "Text in Zwischenablage kopieren", -- src\editor\menu_edit.lua
+  ["Correct &Indentation"] = "E&inzug korrigieren", -- src\editor\menu_edit.lua
   ["Couldn't activate file '%s' for debugging; continuing without it."] = "Konnte Datei '%s' zwecks nicht Debugging aktivieren; fahre ohne die Datei fort.", -- src\editor\debugger.lua
-  ["Create an empty document"] = "Leeres Dokument anlegen", -- src\editor\menu_file.lua, src\editor\gui.lua
-  ["Cu&t"] = "A&usschneiden", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["Create an empty document"] = "Leeres Dokument anlegen", -- src\editor\toolbar.lua, src\editor\menu_file.lua
+  ["Cu&t"] = "A&usschneiden", -- src\editor\gui.lua, src\editor\editor.lua, src\editor\menu_edit.lua
   ["Cut selected text to clipboard"] = "Schneide ausgewählten Text in die Zwischenablage hinein", -- src\editor\menu_edit.lua
-  ["Debugger server started at %s:%d."] = "Debugserver gestartet an %s:%d.", -- src\editor\debugger.lua
+  ["Debugger server started at %s:%d."] = "Debugserver gestartet als %s:%d.", -- src\editor\debugger.lua
+  ["Debugger server stopped at %s:%d."] = "Debugserver gestoppt als %s:%d.", -- src\editor\debugger.lua
   ["Debugging session completed (%s)."] = "Debugging Session beendet (%s).", -- src\editor\debugger.lua
   ["Debugging session started in '%s'."] = "Debugging Session gestartet '%s'.", -- src\editor\debugger.lua
-  ["Debugging suspended at %s:%s (couldn't activate the file)."] = "Debugging angehalten bei %s:%s (konnte Datei nicht aktivieren).", -- src\editor\debugger.lua
-  ["Directory"] = "Verzeichnis", -- src\editor\findreplace.lua
+  ["Debugging suspended at '%s:%s' (couldn't activate the file)."] = "Debugging angehalten bei '%s:%s' (konnte Datei nicht aktivieren).", -- src\editor\debugger.lua
+  ["Detach &Process"] = "Prozeß abkoppeln", -- src\editor\menu_project.lua
+  ["Disable Indexing For '%s'"] = "Indizieren ausschalten für '%s'", -- src\editor\outline.lua
+  ["Do you want to delete '%s'?"] = "Soll '%s' gelöscht werden?", -- src\editor\filetree.lua
+  ["Do you want to overwrite it?"] = "Überschreiben?", -- src\editor\commands.lua
   ["Do you want to reload it?"] = "Neu laden?", -- src\editor\editor.lua
   ["Do you want to save the changes to '%s'?"] = "Änderungen an '%s' speichern?", -- src\editor\commands.lua
   ["E&xit"] = "&Beenden", -- src\editor\menu_file.lua
+  ["Enable Indexing"] = "Indizieren aktivieren", -- src\editor\outline.lua
   ["Enter Lua code and press Enter to run it."] = "Lua-Code eingeben und Enter drücken zum Ausführen.", -- src\editor\shellbox.lua
-  ["Enter line number"] = "Zeilennummer eingeben", -- src\editor\menu_search.lua
+  ["Enter command line parameters"] = "Kommandozeilenparameter eingeben", -- src\editor\menu_project.lua
+  ["Enter replacement text"] = "Neuen Text eingeben", -- src\editor\editor.lua
   ["Error while loading API file: %s"] = "Fehler beim Laden von API-Datei: %s", -- src\editor\autocomplete.lua
   ["Error while loading configuration file: %s"] = "Fehler beim Laden von Konfigurationsdatei: %s", -- src\editor\style.lua
   ["Error while processing API file: %s"] = "Fehler beim Lesen von API-Datei: %s", -- src\editor\autocomplete.lua
@@ -96,141 +130,222 @@ return {
   ["Error"] = "Fehler", -- src\editor\commands.lua
   ["Evaluate In Console"] = "In Konsole auswerten", -- src\editor\editor.lua
   ["Execute the current project/file and keep updating the code to see immediate results"] = "Aktuelles Projekt/ aktuelle Datei ausführen und Quellcode ändern, um Ergebnisse in Echtzeit zu sehen", -- src\editor\menu_project.lua
-  ["Execute the current project/file"] = "Aktuelles Projekt/ aktuelle Datei ausführen", -- src\editor\menu_project.lua
+  ["Execute the current project/file"] = "Aktuelles Projekt/ aktuelle Datei ausführen", -- src\editor\toolbar.lua, src\editor\menu_project.lua
   ["Execution error"] = "Fehler bei Ausführung", -- src\editor\debugger.lua
   ["Exit program"] = "Programm beenden", -- src\editor\menu_file.lua
-  ["Expr"] = "Ausdr.", -- src\editor\debugger.lua
-  ["Expression"] = "Ausdruck", -- src\editor\debugger.lua
   ["File '%s' has been modified on disk."] = "Datei '%s' wurde auf der Festplatte geändert.", -- src\editor\editor.lua
   ["File '%s' has more recent timestamp than restored '%s'; please review before saving."] = "Datei '%s' hat neueren Zeitstempel als wiederhergestellte Datei '%s'; bitte vor dem Speichern kontrollieren.", -- src\editor\commands.lua
-  ["File '%s' no longer exists."] = "Datei '%s' existiert nicht mehr.", -- src\editor\editor.lua, src\editor\menu_file.lua
-  ["File Type"] = "Dateityp", -- src\editor\findreplace.lua
+  ["File '%s' is missing and can't be recovered."] = "Datei '%s' fehlt und kann nicht wiederhergestellt werden.", -- src\editor\commands.lua
+  ["File '%s' no longer exists."] = "Datei '%s' existiert nicht mehr.", -- src\editor\menu_file.lua, src\editor\editor.lua
+  ["File already exists."] = "Datei existiert bereits.", -- src\editor\commands.lua
   ["File history"] = "Dateiverlauf", -- src\editor\menu_file.lua
   ["Find &In Files"] = "Finde &in Dateien", -- src\editor\menu_search.lua
   ["Find &Next"] = "Finde &Nächste", -- src\editor\menu_search.lua
   ["Find &Previous"] = "Finde &Vorherige", -- src\editor\menu_search.lua
-  ["Find In Files"] = "Finde in Dateien", -- src\editor\findreplace.lua
+  ["Find and insert library function"] = "Suchen und Einfügen von Funktion aus Bibliothek", -- src\editor\menu_search.lua
   ["Find and replace text in files"] = "Finde und ersetze Text in Dateien", -- src\editor\menu_search.lua
-  ["Find and replace text"] = "Finde und ersetze Text", -- src\editor\menu_search.lua, src\editor\gui.lua
+  ["Find and replace text"] = "Finde und ersetze Text", -- src\editor\toolbar.lua, src\editor\menu_search.lua
+  ["Find in files"] = "Finde in dateien", -- src\editor\toolbar.lua
+  ["Find next"] = "Finde nächste", -- src\editor\toolbar.lua
   ["Find text in files"] = "Finde Text in Dateien", -- src\editor\menu_search.lua
-  ["Find text"] = "Finde Text", -- src\editor\menu_search.lua, src\editor\gui.lua
+  ["Find text"] = "Finde Text", -- src\editor\toolbar.lua, src\editor\menu_search.lua
   ["Find the earlier text occurence"] = "Finde vorheriges Auftreten des Textes", -- src\editor\menu_search.lua
   ["Find the next text occurrence"] = "Finde nächstes Auftreten des Textes", -- src\editor\menu_search.lua
-  ["Find"] = "Finden", -- src\editor\findreplace.lua
   ["Fold or unfold all code folds"] = "Alle Stellen im Code ein-/ausklappen ", -- src\editor\menu_edit.lua
+  ["Fold or unfold current line"] = "Aktuelle Zeile ein-/ausklappen", -- src\editor\menu_edit.lua
+  ["Fold/Unfold Current &Line"] = "Aktue&lle Zeile ein-/ausklappen", -- src\editor\menu_edit.lua
+  ["Formatting page %d..."] = "Seite %d formatieren...", -- src\editor\print.lua
+  ["Found %d instance."] = {"Eine Instanz gefunden", "%d Instanzen gefunden."}, -- src\editor\findreplace.lua
   ["Found auto-recovery record and restored saved session."] = "Autowiederherstellen-Aufzeichnung gefunden und vorherige Sitzung wiederhergestellt.", -- src\editor\commands.lua
-  ["Found"] = "Gefunden", -- src\editor\findreplace.lua
   ["Full &Screen"] = "&Vollbild", -- src\editor\menu_view.lua
   ["Go To Definition"] = "Gehe zu Definition", -- src\editor\editor.lua
-  ["Go to a selected line"] = "Gehe zu ausgewählter Zeile", -- src\editor\menu_search.lua
-  ["Goto Line"] = "Gehe zu Zeile", -- src\editor\menu_search.lua
+  ["Go To File..."] = "Gehe zu Datei...", -- src\editor\menu_search.lua
+  ["Go To Line..."] = "Gehe zu Zeile...", -- src\editor\menu_search.lua
+  ["Go To Next Bookmark"] = "Zu nächstem Lesezeichen", -- src\editor\menu_edit.lua
+  ["Go To Next Breakpoint"] = "Gehe zu nächstem Haltepunkt", -- src\editor\menu_project.lua
+  ["Go To Previous Bookmark"] = "Zu vorherigem Lesezeichen", -- src\editor\menu_edit.lua
+  ["Go To Previous Breakpoint"] = "Gehe zu vorigem Haltepunkt", -- src\editor\menu_project.lua
+  ["Go To Symbol..."] = "Gehe zu Symbol...", -- src\editor\menu_search.lua
+  ["Go to file"] = "Gehe zu Datei", -- src\editor\menu_search.lua
+  ["Go to line"] = "Gehe zu Zeile", -- src\editor\menu_search.lua
+  ["Go to symbol"] = "Gehe zu Symbol", -- src\editor\menu_search.lua
+  ["Hide '.%s' Files"] = "Verstecke '.%s' Dateien", -- src\editor\filetree.lua
   ["INS"] = "INS", -- src\editor\editor.lua
-  ["In Files"] = "In Dateien", -- src\editor\findreplace.lua
-  ["Jump to a function definition..."] = "Springe zu Funktions-Definition...", -- src\editor\editor.lua
+  ["Ignore and don't index symbols from files in the selected directory"] = "Dateien im ausgewählten Verzeichnis ignorieren und keine Symbole indizieren.", -- src\editor\outline.lua
+  ["Ignored error in debugger initialization code: %s."] = "Ignorierter Fehler im Debugger-Init-Code: %s.", -- src\editor\debugger.lua
+  ["Indexing %d files: '%s'..."] = "%d Dateien indizieren: '%s'...", -- src\editor\outline.lua
+  ["Indexing completed."] = "Indizierung abgeschlossen.", -- src\editor\outline.lua
+  ["Insert Library Function..."] = "Füge Funktion aus Bibliothek ein", -- src\editor\menu_search.lua
   ["Known Files"] = "Bekannte Dateien", -- src\editor\commands.lua
   ["Ln: %d"] = "Zeile: %d", -- src\editor\editor.lua
-  ["Local console"] = "Lokale Konsole", -- src\editor\shellbox.lua, src\editor\gui.lua
+  ["Local console"] = "Lokale Konsole", -- src\editor\gui.lua, src\editor\shellbox.lua
   ["Lua &Interpreter"] = "&Lua Interpreter", -- src\editor\menu_project.lua
-  ["Mapped remote request for '%s' to '%s'."] = "Mapped remote request for '%s' to '%s'.", -- src\editor\debugger.lua
-  ["Match &case"] = "&Groß-/Kleinschreibung", -- src\editor\findreplace.lua
-  ["Match &whole word"] = "Ganzes &Wort", -- src\editor\findreplace.lua
+  ["Map Directory..."] = "Verzeichnis virtuell einbinden...", -- src\editor\filetree.lua
+  ["Mapped remote request for '%s' to '%s'."] = "Fern-Aufforderung für '%s' auf '%s' abgebildet.", -- src\editor\debugger.lua
+  ["Markers Window"] = "Markierungs-Fenster", -- src\editor\menu_view.lua
+  ["Markers"] = "Markierungen", -- src\editor\markers.lua
+  ["Match case"] = "Groß-/Kleinschreibung", -- src\editor\toolbar.lua
+  ["Match whole word"] = "Ganzes Wort", -- src\editor\toolbar.lua
   ["Mixed end-of-line encodings detected."] = "Gemischte End-of-Line Kodierung entdeckt.", -- src\editor\commands.lua
+  ["Navigate"] = "Navigieren", -- src\editor\menu_search.lua
+  ["New &File"] = "Neue &Datei", -- src\editor\filetree.lua
   ["OVR"] = "OVR", -- src\editor\editor.lua
-  ["Open an existing document"] = "Öffne existierendes Dokument", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Open With Default Program"] = "Mit Standardanwendung öffnen", -- src\editor\filetree.lua
+  ["Open an existing document"] = "Öffne existierendes Dokument", -- src\editor\toolbar.lua, src\editor\menu_file.lua
   ["Open file"] = "Öffne Datei", -- src\editor\commands.lua
-  ["Options"] = "Optionen", -- src\editor\findreplace.lua
-  ["Output (running)"] = "Ausgabe (ausgeführt)", -- src\editor\output.lua
-  ["Output"] = "Ausgabe", -- src\editor\output.lua, src\editor\settings.lua, src\editor\gui.lua
+  ["Outline Window"] = "Übersichtsfenster", -- src\editor\menu_view.lua
+  ["Outline"] = "Übersicht", -- src\editor\outline.lua
+  ["Output (running)"] = "Ausgabe (ausgeführt)", -- src\editor\debugger.lua, src\editor\output.lua
+  ["Output (suspended)"] = "Ausgabe (angehalten)", -- src\editor\debugger.lua
+  ["Output"] = "Ausgabe", -- src\editor\debugger.lua, src\editor\output.lua, src\editor\gui.lua, src\editor\settings.lua
+  ["Page Setup..."] = "Seite einrichten...", -- src\editor\print.lua
   ["Paste text from the clipboard"] = "Text aus Zwischenablage einfügen", -- src\editor\menu_edit.lua
   ["Preferences"] = "Einstellungen", -- src\editor\menu_edit.lua
+  ["Prepend '!' to force local execution."] = "'!' voranstellen um lokale Ausführung zu erzwingen.", -- src\editor\shellbox.lua
   ["Prepend '=' to show complex values on multiple lines."] = "'=' voranstellen, um komplexe Ausdrücke auf mehrere Zeilen zu verteilen.", -- src\editor\shellbox.lua
   ["Press cancel to abort."] = "Abbrechen Drücken zum Beenden.", -- src\editor\commands.lua
+  ["Print the current document"] = "Drucke aktuelles Dokument", -- src\editor\print.lua
   ["Program '%s' started in '%s' (pid: %d)."] = "Programm '%s' gestartet in '%s' (pid : %d).", -- src\editor\output.lua
   ["Program can't start because conflicting process is running as '%s'."] = "Programm kann nicht starten, da blockierender Prozeß als '%s' läuft.", -- src\editor\output.lua
   ["Program completed in %.2f seconds (pid: %d)."] = "Programm beendet nach %.2f Sekunden (pid : %d).", -- src\editor\output.lua
   ["Program starting as '%s'."] = "Programm gestartet als '%s'.", -- src\editor\output.lua
   ["Program stopped (pid: %d)."] = "Programm gestoppt (pid: %d).", -- src\editor\debugger.lua
   ["Program unable to run as '%s'."] = "Programm kann nicht als '%s' laufen.", -- src\editor\output.lua
-  ["Project Directory"] = "&Projektverzeichnis", -- src\editor\menu_project.lua
-  ["Project"] = "Projekt", -- src\editor\settings.lua, src\editor\gui.lua
+  ["Project Directory"] = "&Projektverzeichnis", -- src\editor\menu_project.lua, src\editor\filetree.lua
+  ["Project history"] = "Liste bisheriger Projekte", -- src\editor\menu_file.lua
+  ["Project"] = "Projekt", -- src\editor\filetree.lua
   ["Project/&FileTree Window"] = "&Projekt/Datei Fenster", -- src\editor\menu_view.lua
+  ["Provide command line parameters"] = "Kommandozeilenparameter angeben", -- src\editor\menu_project.lua
+  ["Queued %d files to index."] = "%d Dateien zum Indizieren vorgemerkt.", -- src\editor\menu_search.lua
   ["R/O"] = "R/O", -- src\editor\editor.lua
   ["R/W"] = "R/W", -- src\editor\editor.lua
   ["Re&place In Files"] = "Ersetze in &Dateien", -- src\editor\menu_search.lua
+  ["Re-indent selected lines"] = "Ausgewählte Zeilen neu einrücken", -- src\editor\menu_edit.lua
+  ["Reached end of selection and wrapped around."] = "Ende der Auswahl erreicht, setze am Anfang fort", -- src\editor\findreplace.lua
+  ["Reached end of text and wrapped around."] = "Ende des Textes erreicht, setze am Beginn fort.", -- src\editor\findreplace.lua
   ["Recent Files"] = "Letzte Dateien", -- src\editor\menu_file.lua
+  ["Recent Projects"] = "Letzte Projekte", -- src\editor\menu_file.lua
   ["Redo last edit undone"] = "Stelle letzte rückgängig gemachte Bearbeitung wieder her", -- src\editor\menu_edit.lua
+  ["Refresh Index"] = "Index erneuern", -- src\editor\outline.lua
+  ["Refresh Search Results"] = "Suchergebnisse aktualisieren", -- src\editor\gui.lua
+  ["Refresh indexed symbols from files in the selected directory"] = "Erneuere indizierte Symbole in Dateien des ausgewählten Verzeichnisses", -- src\editor\outline.lua
+  ["Refresh"] = "Aktualisieren", -- src\editor\filetree.lua
   ["Refused a request to start a new debugging session as there is one in progress already."] = "Starten einer neuen Debuggingsession abgelehnt, da bereits eine läuft.", -- src\editor\debugger.lua
-  ["Regular &expression"] = "&Regulärer Ausdruck", -- src\editor\findreplace.lua
-  ["Remote console"] = "Fensteuerungs-Konsole", -- src\editor\shellbox.lua
+  ["Regular expression"] = "Regulärer Ausdruck", -- src\editor\toolbar.lua
+  ["Remote console"] = "Fernsteuerungs-Konsole", -- src\editor\shellbox.lua
   ["Rename All Instances"] = "Umbenennen aller Instanzen", -- src\editor\editor.lua
-  ["Replace A&ll"] = "A&lles ersetzen", -- src\editor\findreplace.lua
-  ["Replace"] = "Ersetzen", -- src\editor\findreplace.lua
+  ["Replace All Selections"] = "Alle Auswahlen ersetzen", -- src\editor\editor.lua
+  ["Replace all"] = "Alles ersetzen", -- src\editor\toolbar.lua
+  ["Replace next instance"] = "Nächste Instanz ersetzen", -- src\editor\toolbar.lua
+  ["Replaced %d instance."] = {"Eine Instanz ersetzt.", "%d Instanzen ersetzt."}, -- src\editor\findreplace.lua
   ["Replaced an invalid UTF8 character with %s."] = "Unbekanntes UTF8-Symbol ersetzt mit %s.", -- src\editor\commands.lua
-  ["Replaced"] = "Ersetzt:", -- src\editor\findreplace.lua
-  ["Replacing"] = "Am Ersetzen", -- src\editor\findreplace.lua
   ["Reset to default layout"] = "Standard-Layout wiederherstellen", -- src\editor\menu_view.lua
-  ["Resets the dynamic word list for autocompletion"] = "Zurücksetzen der Liste der dynamischen Wörter für Autovervollständigung", -- src\editor\menu_edit.lua
-  ["Run as Scratchpad"] = "Als &Entwurf starten", -- src\editor\menu_project.lua
+  ["Run As Scratchpad"] = "Als &Entwurf starten", -- src\editor\menu_project.lua
+  ["Run To Cursor"] = "Stoppe Ausführung an Cursorposition", -- src\editor\menu_project.lua, src\editor\editor.lua
+  ["Run as Scratchpad"] = "Als &Entwurf starten", -- src\editor\toolbar.lua
+  ["Run to cursor"] = "Stoppe Ausführung an Cursorposition", -- src\editor\toolbar.lua, src\editor\menu_project.lua
   ["S&top Debugging"] = "Debugging a&nhalten", -- src\editor\menu_project.lua
   ["S&top Process"] = "Prozeß &anhalten", -- src\editor\menu_project.lua
-  ["Save &As..."] = "S&peichern als...", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Save &As..."] = "S&peichern als...", -- src\editor\gui.lua, src\editor\menu_file.lua
   ["Save A&ll"] = "&Alle Speichern", -- src\editor\menu_file.lua
   ["Save Changes?"] = "Änderungen speichern?", -- src\editor\commands.lua
-  ["Save all open documents"] = "Alle offenen Dokumente speichern", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Save all open documents"] = "Alle offenen Dokumente speichern", -- src\editor\toolbar.lua, src\editor\menu_file.lua
   ["Save file as"] = "Datei speichern als", -- src\editor\commands.lua
   ["Save file?"] = "Datei speichern?", -- src\editor\commands.lua
   ["Save the current document to a file with a new name"] = "Aktuelles Dokument unter neuem Namen speichern", -- src\editor\menu_file.lua
-  ["Save the current document"] = "Aktuelles Dokument speichern", -- src\editor\menu_file.lua, src\editor\gui.lua
-  ["Saved auto-recover at %s."] = "Autowiederherstellen gespeichert unter %s.", -- src\editor\commands.lua
-  ["Scope"] = "Richtung", -- src\editor\findreplace.lua
+  ["Save the current document"] = "Aktuelles Dokument speichern", -- src\editor\toolbar.lua, src\editor\menu_file.lua
+  ["Saved auto-recover at %s."] = "%s Autowiederherstellen gespeichert.", -- src\editor\commands.lua
   ["Scratchpad error"] = "Fehler im Entwurf", -- src\editor\debugger.lua
-  ["Searching for"] = "Suchen nach", -- src\editor\findreplace.lua
-  ["Select &All"] = "&Alles Auswählen", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["Search direction"] = "Suchrichtung", -- src\editor\toolbar.lua
+  ["Search in selection"] = "Suche in Auswahl", -- src\editor\toolbar.lua
+  ["Search in subdirectories"] = "Suche in Unterverzeichnissen", -- src\editor\toolbar.lua
+  ["Searching for '%s'."] = "Suche nach '%s'.", -- src\editor\findreplace.lua
+  ["Sel: %d/%d"] = "Ausgew.: %d/%d", -- src\editor\editor.lua
+  ["Select &All"] = "&Alles Auswählen", -- src\editor\gui.lua, src\editor\editor.lua, src\editor\menu_edit.lua
+  ["Select And Find Next"] = "Auswählen und nächstes finden", -- src\editor\menu_search.lua
+  ["Select And Find Previous"] = "Auswählen und vorheriges finden", -- src\editor\menu_search.lua
   ["Select all text in the editor"] = "Kompletten Text im Editor auswählen", -- src\editor\menu_edit.lua
+  ["Select the word under cursor and find its next occurrence"] = "Wort unter dem Cursor auswählen und nächstes Auftauchen finden", -- src\editor\menu_search.lua
+  ["Select the word under cursor and find its previous occurrence"] = "Wort unter dem Cursor auswählen und vorheriges Auftauchen finden", -- src\editor\menu_search.lua
+  ["Set As Start File"] = "Als Startdatei definieren.", -- src\editor\filetree.lua
   ["Set From Current File"] = "Anhand der aktuellen Datei festlegen", -- src\editor\menu_project.lua
-  ["Set project directory from current file"] = "Lege Projektverzeichnis anhand der aktuellen Datei fest", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Set To Project Directory"] = "Setze als Projektverzeichnis", -- src\editor\findreplace.lua
+  ["Set To Selected Directory"] = "Setze auf ausgewähltes Verzeichnis", -- src\editor\filetree.lua
+  ["Set project directory from current file"] = "Lege Projektverzeichnis anhand der aktuellen Datei fest", -- src\editor\toolbar.lua, src\editor\menu_project.lua
+  ["Set project directory to the selected one"] = "Setze Projektverzeichnis auf das aktuell ausgewählte", -- src\editor\filetree.lua
+  ["Set search directory"] = "Setze Suchverzeichnis", -- src\editor\toolbar.lua
   ["Set the interpreter to be used"] = "Wähle zu benutzenden Interpreter aus", -- src\editor\menu_project.lua
-  ["Set the project directory to be used"] = "Lege zu benutzendes Projektverzeichnis fest", -- src\editor\menu_project.lua
+  ["Set the project directory to be used"] = "Lege zu benutzendes Projektverzeichnis fest", -- src\editor\menu_project.lua, src\editor\filetree.lua
   ["Settings: System"] = "Einstellungen: System", -- src\editor\menu_edit.lua
   ["Settings: User"] = "Einstellungen: Nutzer", -- src\editor\menu_edit.lua
   ["Show &Tooltip"] = "&Tooltip zeigen", -- src\editor\menu_edit.lua
+  ["Show All Files"] = "Zeige alle Dateien", -- src\editor\filetree.lua
+  ["Show Hidden Files"] = "Zeige versteckte Dateien", -- src\editor\filetree.lua
   ["Show Location"] = "Ordner öffnen", -- src\editor\gui.lua, src\editor\filetree.lua
+  ["Show all files"] = "Zeige alle Dateien", -- src\editor\filetree.lua
+  ["Show context"] = "Zeige Kontext", -- src\editor\toolbar.lua
+  ["Show files previously hidden"] = "Zeige Dateien die zuvor versteckt wurden", -- src\editor\filetree.lua
+  ["Show multiple result windows"] = "Zeige mehrere Ergebnisfenster", -- src\editor\toolbar.lua
   ["Show tooltip for current position; place cursor after opening bracket of function"] = "Zeige Tooltip für aktuelle Position; setze Cursor hinter die öffnende Klammer der Funktion", -- src\editor\menu_edit.lua
-  ["Sort selected lines"] = "Ausgewählte Zeilen sortieren", -- src\editor\menu_search.lua
+  ["Show/Hide the status bar"] = "Statuszeile zeigen/verstecken", -- src\editor\menu_view.lua
+  ["Show/Hide the toolbar"] = "Werkzeugleiste zeigen/verstecken", -- src\editor\menu_view.lua
+  ["Sort By Name"] = "Sortiere nach Namen", -- src\editor\outline.lua
+  ["Sort selected lines"] = "Ausgewählte Zeilen sortieren", -- src\editor\menu_edit.lua
+  ["Source"] = "Source", -- src\editor\menu_edit.lua
   ["Stack"] = "Stack", -- src\editor\debugger.lua
   ["Start &Debugging"] = "&Debugging starten", -- src\editor\menu_project.lua
-  ["Start debugging"] = "Debugging starten", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Start or continue debugging"] = "Debuggen starten/fortsetzen", -- src\editor\toolbar.lua, src\editor\menu_project.lua
   ["Step &Into"] = "Schritt h&inein", -- src\editor\menu_project.lua
   ["Step &Over"] = "&Überspringen", -- src\editor\menu_project.lua
   ["Step O&ut"] = "Schritt &raus", -- src\editor\menu_project.lua
-  ["Step into"] = "Schritt hinein", -- src\editor\menu_project.lua, src\editor\gui.lua
-  ["Step out of the current function"] = "Schritt aus der aktuellen Funktion heraus", -- src\editor\menu_project.lua, src\editor\gui.lua
-  ["Step over"] = "Überspringen", -- src\editor\menu_project.lua, src\editor\gui.lua
-  ["Stop the currently running process"] = "Aktuell laufenden Prozeß stoppen", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Step into"] = "Schritt hinein", -- src\editor\toolbar.lua, src\editor\menu_project.lua
+  ["Step out of the current function"] = "Schritt aus der aktuellen Funktion heraus", -- src\editor\toolbar.lua, src\editor\menu_project.lua
+  ["Step over"] = "Überspringen", -- src\editor\toolbar.lua, src\editor\menu_project.lua
+  ["Stop debugging and continue running the process"] = "Beende debuggen und setze den Prozeß fort", -- src\editor\toolbar.lua, src\editor\menu_project.lua
+  ["Stop the currently running process"] = "Aktuell laufenden Prozeß stoppen", -- src\editor\toolbar.lua, src\editor\menu_project.lua
   ["Switch to or from full screen mode"] = "Vollbild an/aus", -- src\editor\menu_view.lua
+  ["Symbol Index"] = "Symbolindex", -- src\editor\outline.lua
   ["Text not found."] = "Text nicht gefunden.", -- src\editor\findreplace.lua
-  ["The API file must be located in a subdirectory of the API directory."] = "Die API-Datei muß sich in einem Unterverzeichnis des API-Vereichnisses befinden.", -- src\editor\autocomplete.lua
-  ["Toggle Break&point"] = "&Haltepunkt an/aus", -- src\editor\menu_project.lua
-  ["Toggle breakpoint"] = "Haltepunkt an/aus", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["The API file must be located in a subdirectory of the API directory."] = "Die API-Datei muß sich in einem Unterverzeichnis des API-Verzeichnisses befinden.", -- src\editor\autocomplete.lua
+  ["Toggle Bookmark"] = "Lesezeichen setzen/löschen", -- src\editor\markers.lua, src\editor\menu_edit.lua
+  ["Toggle Breakpoint"] = "Haltepunkt an/aus", -- src\editor\markers.lua, src\editor\menu_project.lua
+  ["Toggle bookmark"] = "Lesezeichen setzen/löschen", -- src\editor\toolbar.lua, src\editor\menu_edit.lua, src\editor\markers.lua
+  ["Toggle breakpoint"] = "Haltepunkt an/aus", -- src\editor\markers.lua, src\editor\toolbar.lua
   ["Tr&ace"] = "Ablauf &verfolgen", -- src\editor\menu_project.lua
   ["Trace execution showing each executed line"] = "Ablaufverfolgung zeigt jede ausgeführte Zeile an", -- src\editor\menu_project.lua
+  ["Unable to create directory '%s'."] = "Kann kein Verzeichnis '%s' erstellen.", -- src\editor\filetree.lua
+  ["Unable to create file '%s'."] = "Kann Datei '%s' nicht erstellen.", -- src\editor\filetree.lua
+  ["Unable to delete directory '%s': %s"] = "Scheitern beim Löschen von Verzeichnis '%s': %s", -- src\editor\filetree.lua
+  ["Unable to delete file '%s': %s"] = "Kann Datei '%s' nicht löschen: %s", -- src\editor\filetree.lua
   ["Unable to load file '%s'."] = "Scheitern beim Laden von Datei '%s'.", -- src\editor\commands.lua
+  ["Unable to rename file '%s'."] = "Scheitern beim umbenennen von Datei '%s'.", -- src\editor\filetree.lua
   ["Unable to save file '%s': %s"] = "Scheitern beim Speichern von Datei '%s' : %s", -- src\editor\commands.lua
   ["Unable to stop program (pid: %d), code %d."] = "Scheitern beim Stoppen des Prozesses (pid : %d), code %d.", -- src\editor\debugger.lua
   ["Undo last edit"] = "Letzte Änderung rückgängig machen", -- src\editor\menu_edit.lua
+  ["Unmap Directory"] = "virtuelle Einbindung beenden", -- src\editor\filetree.lua
+  ["Unset '%s' As Start File"] = "'%s' ist nicht mehr Startdatei", -- src\editor\filetree.lua
+  ["Updated %d file."] = {"Eine Datei aktualisiert", "%d Dateien aktualisiert."}, -- src\editor\findreplace.lua
+  ["Updating symbol index and settings..."] = "Aktualisiere Symbolindex und Einstellungen...", -- src\editor\outline.lua
+  ["Use %s to close."] = "%s zum Schließen.", -- src\editor\findreplace.lua
   ["Use '%s' to see full description."] = "'%s' für eine komplette Beschreibung.", -- src\editor\editor.lua
   ["Use '%s' to show line endings and '%s' to convert them."] = "'%s' um Zeilenende-Codes zu sehen, und '%s' um sie zu konvertieren.", -- src\editor\commands.lua
   ["Use 'clear' to clear the shell output and the history."] = "'clear' um Ausgabefenster und Verlauf zu löschen.", -- src\editor\shellbox.lua
   ["Use Shift-Enter for multiline code."] = "<Umsch-Eingabetaste> für Code in mehreren Zeilen.", -- src\editor\shellbox.lua
-  ["Value"] = "Wert", -- src\editor\debugger.lua
+  ["View the markers window"] = "Betrachte Markierungsfenster", -- src\editor\menu_view.lua
+  ["View the outline window"] = "Übersichtsfenster ansehen", -- src\editor\menu_view.lua
   ["View the output/console window"] = "Ausgabe-/Konsolenfenster ansehen", -- src\editor\menu_view.lua
   ["View the project/filetree window"] = "Projekt-/Dateifenster ansehen", -- src\editor\menu_view.lua
-  ["View the stack window"] = "Stapel/Stack-Fenster ansehen", -- src\editor\menu_view.lua, src\editor\gui.lua
-  ["View the watch window"] = "Fenster für Beobachtungspunkte ansehen", -- src\editor\menu_view.lua, src\editor\gui.lua
+  ["View the stack window"] = "Stapel/Stack-Fenster ansehen", -- src\editor\toolbar.lua, src\editor\menu_view.lua
+  ["View the watch window"] = "Fenster für Beobachtungspunkte ansehen", -- src\editor\toolbar.lua, src\editor\menu_view.lua
   ["Watch"] = "Beobachtungspunkte", -- src\editor\debugger.lua
   ["Welcome to the interactive Lua interpreter."] = "Willkommen zum interaktiven Lua-Interpretr!", -- src\editor\shellbox.lua
-  ["Wrap ar&ound"] = "Am Anfang fortsetzen", -- src\editor\findreplace.lua
+  ["Wrap around"] = "Am Anfang fortsetzen", -- src\editor\toolbar.lua
   ["You must save the program first."] = "Erst das Programm speichern.", -- src\editor\commands.lua
-  ["on line %d"] = "in Zeile %d", -- src\editor\debugger.lua, src\editor\commands.lua, src\editor\editor.lua
-  ["traced %d instruction"] = {"%d Anweisung verfolgt", "%d Anweisungen verfolgt"} -- src\editor\debugger.lua
+  ["Zoom In"] = "Hineinzoomen", -- src\editor\menu_view.lua
+  ["Zoom Out"] = "Herauszoomen", -- src\editor\menu_view.lua
+  ["Zoom to 100%"] = "Zoom zurücksetzen (100%)", -- src\editor\menu_view.lua
+  ["Zoom"] = "Zoom", -- src\editor\menu_view.lua
+  ["on line %d"] = "in Zeile %d", -- src\editor\debugger.lua, src\editor\editor.lua, src\editor\commands.lua
+  ["traced %d instruction"] = {"%d Anweisung verfolgt", "%d Anweisungen verfolgt"}, -- src\editor\debugger.lua
+  ["unknown error"] = "Unbekannter Fehler", -- src\editor\debugger.lua
 }