diff --git a/.dir-locals.el b/.dir-locals.el
index 35cc689167b..8f4be11b372 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,4 +1,4 @@
-((c-mode . ((indent-tabs-mode . t)
+((c-mode . ((indent-tabs-mode . nil)
(tab-width . 4)
(c-basic-offset . 4)
(c-file-offsets . ((block-open . 0)
@@ -6,7 +6,7 @@
(substatement-open . 0)
))))
- (c++-mode . ((indent-tabs-mode . t)
+ (c++-mode . ((indent-tabs-mode . nil)
(tab-width . 4)
(c-basic-offset . 4)
(c-file-offsets . ((block-open . 0)
diff --git a/.gitignore b/.gitignore
index 113a5bac3b6..7ad1add4d8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,10 +20,12 @@ encryptedstack.cpp
encryptedstack.h
stacksecurity_encrypted.cpp
util/perfect/perfect.linux-*
-extensions/*/*/*.xml
-extensions/*/*/*.lci
-extensions/*/*/*.lcm
-extensions/*/*/*.lce
+**/extensions/*/*/*.xml
+**/extensions/*/*/*.lci
+**/extensions/*/*/*.lcm
+**/extensions/*/*/*.lce
+**/extensions/*/*/api.lcdoc
+*/src/.lci/*
# Compiled source and intermediates #
###################
@@ -116,13 +118,22 @@ sdks/
# Ignore prebuilts #
###################
+prebuilt/bin
prebuilt/include
prebuilt/lib
+prebuilt/share
prebuilt/build
prebuilt/packaged
prebuilt/fetched
+prebuilt/unpacked
# Stamp files and generated C files
###################################
stamp-mlc*
_mlc
+
+# Built Notes #
+#################
+LiveCodeNotes-*
+LiveCodeUpdates-*
+LiveCodeUserGuide-*
diff --git a/.mention-bot b/.mention-bot
new file mode 100644
index 00000000000..1c94340c518
--- /dev/null
+++ b/.mention-bot
@@ -0,0 +1,3 @@
+{
+ "requiredOrgs": ["livecode"]
+}
diff --git a/.travis.yml b/.travis.yml
index 878e612ef51..deee19ecbdf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,16 @@ os:
- linux
- osx
+# Use a Travis image containing an Xcode we support
+# This prevents surprise upgrades!
+osx_image: xcode7.3
+
language: c++
+compiler:
+ - clang
+ - gcc
+
# Skip vulcan CI branches
branches:
only:
@@ -28,38 +36,65 @@ env:
- secure: "R/JfoBMrkhCGWhfWM1m3gPHuLtMBlp2SIK1R9BaPbRsbGBUJmAg9V0g0YXSaw8SVxoyuiL/jsLtHPfDeub9oTxrYydew+6/4KaoQdG7EGXQJfBhH2f0ag/hTKJfXnmZX9jMMnTxPf5Axjq+w4E6sKkU2+d1oAJRhrqzYNwDhVlc="
- CXX_STD: "c++11"
+jdk:
+ - openjdk8
+
+# Build using clang on mac and gcc on linux
+matrix:
+ exclude:
+ - os: osx
+ compiler: gcc
+ - os: linux
+ compiler: clang
+
# Install any required tools
before_install:
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then sudo gem install xcpretty ; fi
+ - |
+ if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then
+ rvm --default use 2.2.1
+ gem install xcpretty
+ fi
+
+ - |
+ if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then
+ sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+ sudo apt-get -qq update
+ sudo apt-get -qq install g++-4.9
+ fi
# Set up the source tree by fetching Linux-specific prebuilt objects
install:
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then (cd prebuilt && ./fetch-libraries.sh linux) ; fi
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then (cd prebuilt && ./fetch-libraries.sh linux x86_64) ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then (cd prebuilt && ./fetch-libraries.sh mac) ; fi
# Bootstrap the LCB compiler, build the default target set and run a
# the default test suite.
-script: >
+script: |
case "${TRAVIS_OS_NAME}" in
linux)
- BUILD_PLATFORM=linux ;
- CHECK_COMMAND=xvfb-run ;
- LICENSE_DIR="${HOME}/.runrev/licenses" ;
+ BUILD_PLATFORM=linux
+ CHECK_COMMAND=xvfb-run
+ LICENSE_DIR="${HOME}/.runrev/licenses"
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${JAVA_HOME}/jre/lib/amd64/server"
+ export CXX="g++-4.9"
+ export CC="gcc-4.9"
;;
osx)
- BUILD_PLATFORM=mac ;
- CHECK_COMMAND= ;
- LICENSE_DIR="${HOME}/Library/Application Support/RunRev/Licenses" ;
- export XCODEBUILD="set -o pipefail && xcodebuild" ;
- export XCODEBUILD_FILTER="| xcpretty" ;
+ BUILD_PLATFORM=mac
+ CHECK_COMMAND=
+ LICENSE_DIR="${HOME}/Library/Application Support/RunRev/Licenses"
+ export XCODE_TARGET_SDK=macosx10.11
+ export XCODEBUILD="set -o pipefail && xcodebuild"
+ export XCODEBUILD_FILTER="| xcpretty"
+ export JAVA_HOME=$(/usr/libexec/java_home)
;;
esac
- if [[ -z "${COVERITY_SCAN_BRANCH}" ]]; then
+ if [[ "${COVERITY_SCAN_BRANCH}" != "1" ]]; then
mkdir -p "${LICENSE_DIR}" &&
touch "${LICENSE_DIR}/livecode-firstrun.lcf" &&
make all-${BUILD_PLATFORM} &&
- ${CHECK_COMMAND} make check-${BUILD_PLATFORM}
+ ${CHECK_COMMAND} make check-${BUILD_PLATFORM} V=1
fi
addons:
@@ -78,6 +113,7 @@ addons:
# Packages needed for building LiveCode
apt:
packages:
+ - gawk
- libx11-dev
- libxext-dev
- libxrender-dev
@@ -89,5 +125,5 @@ addons:
- libgtk2.0-dev
- libpopt-dev
- libesd0-dev
- - liblcms-dev
- - xvfb
\ No newline at end of file
+ - liblcms2-dev
+ - xvfb
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 72cf4760235..88c0a73b65e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -90,80 +90,9 @@ When the pull request is merged, the status should be set to "AWAITING_BUILD".
## Coding style
-### C++ coding style
-
-The majority of the engine is written in C++, but the style treats C++ as an improved version of C, and doesn't use the whole of the language's feature set. In particular:
-
-* The engine doesn't use exceptions or RTTI (run time type information).
-* Templates are used sparingly, and typically as "sanitized macros" for efficiency purposes or for resource management.
-* No standard C++ library is used (i.e. you cannot use anything in the `std` namespace)
-
-#### Naming convention
-
-The engine source code follows a standard naming convention.
-
-Variable and function names should be descriptive. Don't be scared of verbosity (but don't go too overboard on symbol lengths)
-
-
-Variable names:
-* should be lowercase, with words separated by underscores ("\_")
-* should be prefixed to indicate scope:
- * "t\_": local variables
- * "p\_": in parameters
- * "r\_": out parameters
- * "x\_": in-out parameters
- * "m\_": class or struct instance member variables
- * "s\_": class, function, or file-local static variables
- * "g\_": global variables
- * example: `t_foo_bar`
-
-Constants' names (including enum members):
-* should be camel-case
-* should prefixed with `kMC` and the module name
-* example: `kMCModuleFooBar`
-
-Function names:
-* should generally be camel-case
-* public / exported functions should have names prefixed with "MC" followed by the module name.
-* file-local static functions may also be in lower-case and underscore-separated
-* example: `MCFooBar()`
-
-#### Coding practices
-
-* Declare and initialize local variables on separate lines
-* Initialize all variables to a base value, e.g.
- * pointers to `nil`
- * bools to `true` or `false`
- * numbers to 0
-* Only pass `bool` values to conditions (e.g. `if`, `while`, etc.). Don't assume that `nil`/`null`/`0` are false.
-* Always check the success of memory allocations; if the calling code can't handle memory failure then prefix the line that allocates with `/* UNCHECKED */`
-* Avoid using preprocessor macros to abbreviate code; use inline and/or template functions instead
-* Use implicit resource management (e.g. `MCAutoStringRef`) wherever reasonably possible
-* Functions should not modify "out" function parameters until immediately before returning, and only on success
-* `goto` is only usually acceptable for implementing cleanup-on-error
-* Avoid using the ternary operator (` ? : `)
-* Use a bit-field when declaring boolean values in a struct or class (e.g. `bool m_bool_member : 1`)
-* Whenever adding a function, add a comment that explains precisely:
- * What the function does, under what conditions it succeeds, and how it behaves when it fails
- * What the function expects as inputs, and what outputs it generates
-
-#### Layout and style
-
-* Indent with tabs, using a 4-space tab width.
-* All curly braces should be on a line on their own. They should be indented to match the level of the construct they relate to. For example:
-
- ````
- if (/* */)
- {
- /* */
- }
- ````
-* Use a single space after the `for`, `while`, `if`, and `switch` keywords, as in the example above.
-* Don't insert a space between a function or macro name and its parameter list
-* Insert a single space after each comma (",")
-* Insert a single space before and after binary operators (e.g. `x == y`)
-* Put a single statement on each line
-* Split overly-long lines (> 80 characters) appropriately. Try to place a line-break after any binary operators or commas.
-* Use a single blank line to separate different areas of code with in a function.
-* Use a single blank line between function and type definitions
-* Separate significant areas of code with comment bars, e.g. a line containing only 80 slash characters ("/")
+See the separate documentation for:
+
+- [C++ coding style](docs/development/C++-style.md) and
+ [use of C++ language features](docs/development/C++-features.md)
+
+- [LiveCode Builder coding style](docs/guides/LiveCode%20Builder%20Style%20Guide.md)
diff --git a/INSTALL-android.md b/INSTALL-android.md
deleted file mode 100644
index 1007649edf3..00000000000
--- a/INSTALL-android.md
+++ /dev/null
@@ -1,123 +0,0 @@
-# Compiling LiveCode for Android
-
-
-
-Copyright © 2015 LiveCode Ltd., Edinburgh, UK
-
-## Dependencies
-
-### Host system
-
-We recommend performing Android builds on a Linux system. It is also possible to build for Android on Mac OS X.
-
-The main non-standard dependency needed for building LiveCode is a Java Development Kit (JDK). At least JDK 7 is required.
-
-### Installing the Android SDK and NDK
-
-LiveCode requires both the Android Software Development Kit (SDK) and Native Development Kit (NDK). You can download both from the [Android Developers site](https://developer.android.com/sdk/index.html).
-
-Extract both the NDK and SDK to a suitable directory, e.g. `~/android/toolchain`. For example, you would run:
-
-````bash
-mkdir -p ~/android/toolchain
-cd ~/android/toolchain
-
-tar -xf ~/Downloads/android-sdk_r24.1.2-linux.tgz
-7z x ~/Downloads/android-ndk-r10e-linux-x86_64.bin
-````
-
-Update the SDK:
-
- android-sdk-linux/tools/android update sdk --no-ui
-
-### Setting up the ARM toolchain
-
-Create a standalone toolchain (this simplifies setting up the build environment):
-
-````bash
-android-ndk-r10e/build/tools/make-standalone-toolchain.sh \
- --toolchain=arm-linux-androideabi-clang3.5 \
- --platform=android-10 \
- --install-dir=${HOME}/android/toolchain/standalone
-````
-
-Add a couple of symlinks to allow the engine configuration script to find the Android toolchain:
-
-````bash
-ln -s android-ndk-r10e android-ndk
-ln -s android-sdk-linux android-sdk
-````
-
-## Configuring LiveCode
-
-### Build environment
-
-The Android build expects a large number of environment variables to be set. If the environment variables aren't set, the build process will attempt to guess sensible defaults. If you've set up the directory structure as described above, the make command should detect everything automatically and these variables shouldn't be necessary.
-
-The following script will set up the environment variables correctly. You may need to edit it depending on where your JDK and ARM toolchain are installed:
-
-````bash
-ARCH=armv6
-TRIPLE=arm-linux-androideabi
-
-TOOLCHAIN=${HOME}/android/toolchain # Edit me!
-
-# Java SDK
-JAVA_SDK=/usr/lib/jvm/java-7-openjdk-amd64/ # Edit me!
-
-# Build tools
-BINDIR=$TOOLCHAIN/standalone/bin
-COMMON_FLAGS="-target ${TRIPLE} -march=${ARCH}"
-
-CC="${BINDIR}/${TRIPLE}-clang ${COMMON_FLAGS} -integrated-as"
-CXX="${BINDIR}/${TRIPLE}-clang ${COMMON_FLAGS} -integrated-as"
-LINK="${BINDIR}/${TRIPLE}-clang ${COMMON_FLAGS} -fuse-ld=bfd"
-AR="${BINDIR}/${TRIPLE}-ar"
-
-# Android platform information
-ANDROID_NDK_VERSION=r10e
-ANDROID_PLATFORM=android-10
-ANDROID_NDK=${TOOLCHAIN}/android-ndk-r10e
-ANDROID_SDK=${TOOLCHAIN}/android-sdk-linux
-ANDROID_BUILD_TOOLS=23.0.1
-
-export JAVA_SDK
-export CC CXX LINK AR
-export ANDROID_PLATFORM ANDROID_NDK ANDROID_SDK ANDROID_BUILD_TOOLS
-````
-
-### Generating makefiles
-
-The gyp-based build system generates a set of makefiles which are used to control the build process.
-
-To generate makefiles in a `build-android-armv6`, simply run:
-
- make config-android
-
-To provide detailed configuration options, you can use the `config.sh` script. For more information, run:
-
- ./config.sh --help
-
-## Compiling LiveCode
-
-Normally, it'll be enough just to use the top-level makefile:
-
- make -k compile-android
-
-Otherwise, you'll need to build a target in the gyp-generated makefiles:
-
- make -C build-android-armv6/livecode development
-
-## Standard build environment
-
-**Note:** The following information is provided for reference purposes. It should be possible to build LiveCode for Android on any modern Linux desktop distribution or recent version of Mac OS.
-
-The Linux build environment used for compiling LiveCode for Android is based on Debian Wheezy x86-64, with the following additional packages installed:
-
-* git
-* bzip2
-* p7zip-full
-* zip
-* python
-* build-essential
-* openjdk-7-jdk
diff --git a/INSTALL-emscripten.md b/INSTALL-emscripten.md
deleted file mode 100644
index 9cb182af344..00000000000
--- a/INSTALL-emscripten.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# Compiling LiveCode to JavaScript for HTML5
-
-
-
-Copyright © 2015 LiveCode Ltd., Edinburgh, UK
-
-**Warning**: Emscripten (HTML5) platform support for LiveCode is experimental and not recommended for production use.
-
-## Dependencies
-
-You will need a 64-bit Linux machine or VM with at least 4 GB of RAM
-(8 GB is recommended).
-
-### Emscripten SDK
-
-Unsurprisingly, the Emscripten SDK must be installed in order to build
-an Emscripten engine.
-
-1. Download the portable Emscripten SDK from . Put it in `/opt/emsdk_portable`, for example.
-
-2. Check which SDKs are available by running:
-
- /opt/emsdk_portable/emsdk list
-
-3. Install and activate the "incoming" SDK by running:
-
- /opt/emsdk_portable/emsdk install sdk-incoming-64bit
- /opt/emsdk_portable/emsdk activate sdk-incoming-64bit
-
- This will take a really long time and use an insane amount of RAM.
-
-## Build environment
-
-Before building for Emscripten, source the Emscripten SDK script that sets up the environment correctly. You need to source it with the `.` or `source` command rather than just running it.
-
- source /opt/emsdk_portable/emsdk_env.sh
-
-## Configuring LiveCode
-
-To configure LiveCode, run:
-
- make config-emscripten
-
-This will generate make control files in the `build-emscripten` directory. You can also run `config.sh` directly.
-
-## Compiling LiveCode
-
-To compile LiveCode, run:
-
- make compile-emscripten
-
-This will generate outputs in the `emscripten-bin` directory.
-
-## Running LiveCode
-
-**Note**: See also the "HTML5 Deployment" guide, available in the in-IDE dictionary.
-
-Use the desktop build of the LiveCode IDE to run the standalone builder and create an "HTML5" standalone.
-
-Once you've created a standalone, you can open the HTML file in a web browser to try out the engine.
-
-Some web browsers (including Google Chrome) have JavaScript security policies that won't allow you to run the engine from a local filesystem. For these browsers, you will need to run a local web server. You can use the following steps to launch a local-only webserver listening on port 8080:
-
- cd /path/to/my/standalone
- python -m SimpleHTTPServer 8080
-
-You can then load http://localhost:8080/ in a web browser to view your standalone HTML5 engine.
-
diff --git a/INSTALL-linux.md b/INSTALL-linux.md
deleted file mode 100644
index 8c6756daef0..00000000000
--- a/INSTALL-linux.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# Compiling LiveCode for Linux
-
-
-
-Copyright © 2015 LiveCode Ltd., Edinburgh, UK
-
-## Dependencies
-
-LiveCode has several dependencies that are needed in order to build it on Linux. In general, it is enough to install the tools and libraries that would be typically used to compile a GNOME application written in C++.
-
-Obviously, the exact packages required vary depending on which Linux distribution you use, and how recent it is. For examples of the packages you may need, please see the "Standard build environments" section later in this document.
-
-## Build environment
-
-The LiveCode build obeys all of the standard make environment variables, including:
-
-* `CC`: C compiler command
-* `CXX`: C++ compiler command
-
-There are some additional environment variables that it understands:
-
-* `CXX_STD`: which version of the C++ standard to use (`c++11` is recommended)
-
-## Configuring LiveCode
-
-To configure LiveCode, simply run:
-
- make config-linux
-
-This will generate make control files in the `build-linux-` directory. For example, if you are compiling on an x86-64 system, this will create a `build-linux-x86_64` directory.
-
-To provide detailed configuration options, you can use the `config.sh` script. For more information, run:
-
- ./config.sh --help
-
-## Compiling LiveCode
-
-Usually, you can just run:
-
- make -k
-
-However, if you wish to compile something more specific than "everything", you'll need to run the top level Makefile generated by gyp. For example:
-
- make -C build-linux-x86_64/livecode development
-
-## Standard build environments
-
-**Note:** The following information is provided for reference purposes. It should be possible to build and run LiveCode on any modern Linux desktop distribution.
-
-The x86-64 and x86 Linux build environments used for compiling
-LiveCode are based on Debian Wheezy.
-
-The following additional packages are installed:
-
-* build-essential
-* automake
-* libtool
-* git
-* curl
-* flex
-* bison
-* libx11-dev
-* libxext-dev
-* libxrender-dev
-* libxft-dev
-* libxinerama-dev
-* libxv-dev
-* libxcursor-dev
-* libfreetype6-dev
-* libpopt-dev
-* libesd0-dev
-* liblcms-dev
-* pkg-config
-* libgtk2.0-dev
-* zip
diff --git a/INSTALL-mac.md b/INSTALL-mac.md
deleted file mode 100644
index 3ac195eb95d..00000000000
--- a/INSTALL-mac.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# Compiling LiveCode for Mac OS X and iOS
-
-
-
-Copyright © 2015-2016 LiveCode Ltd., Edinburgh, UK
-
-## Dependencies
-
-### Required dependencies
-
-You must install Xcode. This will allow you to build LiveCode for:
-
-* iPhone OS
-* iPhoneSimulator
-
-You will not be able to compile the OS X desktop version of LiveCode
-unless you install some older OS X SDKs; see the next section for details.
-
-### Optional dependencies
-
-By default, LiveCode is compiled for a large number of versions of iPhoneSimulator, and requires quite a lot of Apple SDKs to be installed.
-
-Create a directory on your hard disk (say, `/Applications/Xcode-Dev/`).
-
-Download and install each of the following versions of Xcode, placing their app bundles into the specified paths:
-
-| Xcode version | App path |
-| ------------- | --------------------------------------- |
-| 8.0 | /Applications/Xcode-Dev/Xcode_8_0.app |
-| 7.2.1 | /Applications/Xcode-Dev/Xcode_7_2_1.app |
-| 6.2 | /Applications/Xcode-Dev/Xcode_6_2.app |
-| 5.1.1 [1] | /Applications/Xcode-Dev/Xcode_5_1_1.app |
-| 4.3.3 [2] | /Applications/Xcode-Dev/Xcode_4_3_3.app |
-
-Notes:
-1. Required for OS X build excluding "revvideograbber" extension
-2. Required for "revvideograbber" extension
-
-Make sure you run and verify each of the versions of Xcode. Download and install any extra SDKs you need using the "Xcode → Preferences → Downloads" window.
-
-Make `/Applications/Xcode-Dev/Xcode.app` a symlink to the latest version of Xcode available. For example, run:
-
- cd /Applications/Xcode-Dev
- ln -s Xcode_8_0_0.app Xcode.app
-
-After checking out the LiveCode git repository, you need to run a tool to finalize the Xcode setup and to make sure all of the necessary SDKs are installed. If LiveCode is checked out to `~/git/livecode`, run:
-
- cd /Applications/Xcode-Dev/
- sh ~/git/livecode/tools/setup_xcode_sdks.sh
-
-If you want the setup tool to copy the required SDKs out of the Xcode
-app bundles (so that you can safely delete all but the latest Xcode to
-save disk space), you can run:
-
- sh ~/git/livecode/tools/setup_xcode_sdks.sh --cache
-
-## Configuring LiveCode
-
-### Build environment
-
-If you have installed the `Xcode.app` to a non-standard location, or you wish to switch between multiple versions of Xcode, you will need to set the `XCODEBUILD` environment variable. For example:
-
- export XCODEBUILD=/Applications/Xcode-Dev/Xcode.app
-
-### Generating Xcode project files
-
-To generate Xcode project files for OS X desktop builds, run:
-
- make config-mac
-
-This will generate project files in the `build-mac` directory. You can open and use these in Xcode.
-
-To generate Xcode project files for iOS, run:
-
- make config-ios
-
-This will generate several build directories with Xcode project files: one for each version of iPhoneOS or iPhoneSimulator.
-
-If you want to just build for the newest supported version of the iPhoneOS SDK, you can simply run:
-
- make config-ios-iphoneos
-
-To provide detailed configuration options, you can use the `config.sh` script. For more information, run:
-
- ./config.sh --help
-
-## Compiling LiveCode
-
-You can open the generated project files in Xcode and compile from there using the normal Xcode build procedure.
-
-You can also compile the engine from the command line using make, for example:
-
- make compile-mac
-
-The same applies for the iPhoneOS and iPhoneSimulator builds. For example, you can compile for the newest supported version of the iPhoneSimulator SDK using:
-
- make compile-ios-iphonesimulator
diff --git a/INSTALL-win.md b/INSTALL-win.md
deleted file mode 100644
index 8a894a8e0dc..00000000000
--- a/INSTALL-win.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# Compiling LiveCode for Windows
-
-
-
-Copyright © 2015 LiveCode Ltd., Edinburgh, UK
-
-## Dependencies
-
-The Windows build scripts currently don't have any ability to auto-discover tools, so you need to **install all of the build dependencies to their default locations**.
-
-### git
-
-You will need to install [git for Windows](https://git-scm.com/download/win) in order to obtain the LiveCode source code from GitHub.
-
-### Microsoft Visual Studio
-
-You will need to download & install [Microsoft Visual Studio 2010 Express](http://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso) (or Professional, if available).
-
-In addition, you should install:
-
-* [Microsoft Speech SDK 5.1](https://www.microsoft.com/en-gb/download/details.aspx?id=10121)
-* Microsoft Speech SDK 4.0 - this can be harder to find, but [this link](ftp://ftp.boulder.ibm.com/software/viavoicesdk/sapi4sdk.exe) may work
-
-### Cygwin
-
-The build currently requires the use of some tools from the Cygwin distribution of GNU and other open source tools.
-
-You need to [install Cygwin](https://cygwin.com/install.html), along with the following additional packages:
-
-* make
-* bash
-* bison
-* flex
-* curl
-* zip
-* unzip
-
-### Other tools
-
-The build process also requires:
-
-* [ActiveState Perl](https://www.activestate.com/activeperl/downloads) Community Edition
-* [Python 2.7](https://www.python.org/) (Python 3 isn't supported)
-
-## Configuring LiveCode
-
-Once you have checked out the source code from git, you can run:
-
-````
-cmd /C configure.bat
-````
-
-(Or just run `configure.bat` by double-clicking on it from Windows Explorer)
-
-This will generate a set of Visual Studio project files in the `build-win-x86/livecode` directory.
-
-## Compiling LiveCode
-
-To compile LiveCode, you can either open the `build-win-x86/livecode/livecode.sln` solution file in Visual Studio, or you can run:
-
-````
-cd build-win-x86
-cmd /C ..\make.cmd
-````
-
-Note that if you are using Visual Studio 2010 Express you won't be able to compile the revbrowser extension.
diff --git a/Installer/package.txt b/Installer/package.txt
index 79baaccafb2..340c42d04f9 100644
--- a/Installer/package.txt
+++ b/Installer/package.txt
@@ -26,6 +26,8 @@
// LiveCode
installer LiveCode
+ if BaseEdition is Commercial then
+ additional manifest "../Installer/commercial-package.txt"
include Misc
include Toolset
include Plugins
@@ -40,6 +42,12 @@ installer LiveCode
include Externals
with TargetFolder as [[ToolsFolder]]/Runtime/Windows/x86-32 do
set TargetPlatform to Windows
+ set TargetArchitecture to x86
+ include Runtime
+ include Externals
+ with TargetFolder as [[ToolsFolder]]/Runtime/Windows/x86-64 do
+ set TargetPlatform to Windows
+ set TargetArchitecture to x86_64
include Runtime
include Externals
with TargetFolder as [[ToolsFolder]]/Runtime/Linux/x86-32 do
@@ -58,9 +66,9 @@ installer LiveCode
// set TargetArchitecture to armv6-hf
// include Runtime
// include Externals
- with TargetFolder as "[[ToolsFolder]]/Runtime/Mac OS X/x86-32" do
+ with TargetFolder as "[[ToolsFolder]]/Runtime/Mac OS X/x86-64" do
set TargetPlatform to MacOSX
- set TargetArchitectures to i386
+ set TargetArchitectures to x86_64
include Runtime
include Externals
if TargetPlatform is MacOSX then
@@ -81,13 +89,15 @@ installer LiveCode
desktop application "repo:Installer/application.desktop" as "runrev-[[ProductTag]]-[[TargetArchitecture]]"
if TargetEdition is Community then
desktop icon "repo:Installer/application.png" as "runrev-[[ProductTag]]-[[TargetArchitecture]]"
+ if TargetEdition is CommunityPlus then
+ desktop icon "private:engine/rsrc/CommunityPlus/android-notify-icon.png" as "runrev-[[ProductTag]]-[[TargetArchitecture]]"
if TargetEdition is Indy then
desktop icon "private:engine/rsrc/Indy/android-notify-icon.png" as "runrev-[[ProductTag]]-[[TargetArchitecture]]"
if TargetEdition is Business then
desktop icon "private:engine/rsrc/Business/android-notify-icon.png" as "runrev-[[ProductTag]]-[[TargetArchitecture]]"
include Uninstaller
- if BaseEdition is Commercial then
- additional manifest "../Installer/commercial-package.txt"
+ if TargetEdition is CommunityPlus then
+ include Commercial.CommunityPlusComponents
if TargetEdition is Indy then
include Commercial.IndyComponents
if TargetEdition is Business then
@@ -98,7 +108,19 @@ component Runtime
component Externals
include Externals.[[TargetPlatform]]
+ if TargetEdition is "Business" then
+ include Commercial.BusinessExternals
+ if TargetEdition is "Indy" then
+ include Commercial.IndyExternals
+ if TargetEdition is "CommunityPlus" then
+ include Commercial.CommunityPlusExternals
include Databases.[[TargetPlatform]]
+ if TargetEdition is "Business" then
+ include Commercial.BusinessDatabases
+ if TargetEdition is "Indy" then
+ include Commercial.IndyDatabases
+ if TargetEdition is "CommunityPlus" then
+ include Commercial.CommunityPlusDatabases
if TargetPlatform is Linux then
include Externals.CEF.Linux
if TargetPlatform is Windows then
@@ -138,6 +160,9 @@ component Misc
if TargetEdition is "Community" then
textfile "ide:License Agreement.txt"
textfile "ide:about.txt"
+ if TargetEdition is "CommunityPlus" then
+ textfile "private:CommunityPlus License Agreement.txt" as "License Agreement.txt"
+ textfile "private:about.txt"
if TargetEdition is "Indy" then
textfile "private:License Agreement.txt"
textfile "private:about.txt"
@@ -371,64 +396,120 @@ component Documentation
rfolder "ide:Documentation/html_viewer/resources/media"
into [[ToolsFolder]]/Documentation/html_viewer/resources/data place
- rfolder "ide:Documentation/html_viewer/resources/data/[[TargetEdition]]/api"
- rfolder "ide:Documentation/html_viewer/resources/data/[[TargetEdition]]/guide"
+ rfolder "ide:Documentation/html_viewer/resources/data/api"
+ rfolder "ide:Documentation/html_viewer/resources/data/api_livecode_script"
+ rfolder "ide:Documentation/html_viewer/resources/data/api_livecode_builder"
+ rfolder "ide:Documentation/html_viewer/resources/data/guide"
into [[ToolsFolder]]/Documentation/pdf place
- file "repo:LiveCode[[TargetEdition]]UserGuide-[[EscapedVersionTag]].pdf" as "LiveCode User Guide.pdf"
+ file "repo:LiveCodeUserGuide-[[EscapedVersionTag]].pdf" as "LiveCode User Guide.pdf"
component Extensions
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.widget.native.mac.button
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.widget.native.mac.textfield
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.widget.native.android.button
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.widget.native.android.field
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.widget.native.ios.button
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.widget.native.emscripten.button
into [[ToolsFolder]]/Extensions place
rfolder macosx:packaged_extensions/com.livecode.widget.browser
into [[ToolsFolder]]/Extensions place
rfolder macosx:packaged_extensions/com.livecode.widget.clock
into [[ToolsFolder]]/Extensions place
- rfolder macosx:packaged_extensions/com.livecode.widget.colorSwatch
+ rfolder macosx:packaged_extensions/com.livecode.widget.colorswatch
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.widget.gradientrampeditor
into [[ToolsFolder]]/Extensions place
- rfolder macosx:packaged_extensions/com.livecode.widget.gradientRampEditor
+ rfolder macosx:packaged_extensions/com.livecode.widget.linegraph
into [[ToolsFolder]]/Extensions place
- rfolder macosx:packaged_extensions/com.livecode.widget.lineGraph
+ rfolder macosx:packaged_extensions/com.livecode.widget.headerbar
into [[ToolsFolder]]/Extensions place
- rfolder macosx:packaged_extensions/com.livecode.widget.headerBar
+ rfolder macosx:packaged_extensions/com.livecode.widget.iconpicker
into [[ToolsFolder]]/Extensions place
- rfolder macosx:packaged_extensions/com.livecode.widget.iconPicker
+ rfolder macosx:packaged_extensions/com.livecode.library.androidbgaudio
into [[ToolsFolder]]/Extensions place
- rfolder macosx:packaged_extensions/com.livecode.library.iconSVG
+ rfolder macosx:packaged_extensions/com.livecode.library.androidaudiorecorder
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.library.androidutils
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.library.iconsvg
into [[ToolsFolder]]/Extensions place
rfolder macosx:packaged_extensions/com.livecode.library.json
into [[ToolsFolder]]/Extensions place
rfolder macosx:packaged_extensions/com.livecode.widget.navbar
into [[ToolsFolder]]/Extensions place
- rfolder macosx:packaged_extensions/com.livecode.widget.paletteActions
+ rfolder macosx:packaged_extensions/com.livecode.widget.paletteactions
into [[ToolsFolder]]/Extensions place
rfolder macosx:packaged_extensions/com.livecode.widget.segmented
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.widget.spinner
into [[ToolsFolder]]/Extensions place
rfolder macosx:packaged_extensions/com.livecode.widget.svgpath
into [[ToolsFolder]]/Extensions place
rfolder macosx:packaged_extensions/com.livecode.widget.switchbutton
into [[ToolsFolder]]/Extensions place
- rfolder macosx:packaged_extensions/com.livecode.widget.treeView
+ rfolder macosx:packaged_extensions/com.livecode.library.toast
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.widget.treeview
into [[ToolsFolder]]/Extensions place
rfolder macosx:packaged_extensions/com.livecode.library.widgetutils
into [[ToolsFolder]]/Extensions place
rfolder macosx:packaged_extensions/com.livecode.widget.tile
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.library.scriptitems
+
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.library.diff
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.library.drawing
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.library.dropbox
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.library.extension-utils
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.library.getopt
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.library.httpd
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.library.messageauthentication
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.library.mime
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.library.oauth2
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.library.qr
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.library.objectrepository
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.library.native.mac.statusmenu
+
+ include TimeZone
component Toolchain.MacOSX
into [[ToolsFolder]]/Toolchain place
executable macosx:lc-compile as lc-compile
executable macosx:lc-run as lc-run
+ executable macosx:lc-compile-ffi-java as lc-compile-ffi-java
rfolder macosx:modules
component Toolchain.Windows
into [[ToolsFolder]]/Toolchain place
- executable windows:lc-compile.exe as lc-compile.exe
- executable windows:lc-run.exe as lc-run.exe
- rfolder windows:modules
+ executable win-[[TargetArchitecture]]:lc-compile.exe as lc-compile.exe
+ executable win-[[TargetArchitecture]]:lc-run.exe as lc-run.exe
+ executable win-[[TargetArchitecture]]:lc-compile-ffi-java.exe as lc-compile-ffi-java.exe
+ rfolder win-[[TargetArchitecture]]:modules
component Toolchain.Linux
into [[ToolsFolder]]/Toolchain place
executable linux-[[TargetArchitecture]]:lc-compile as lc-compile
executable linux-[[TargetArchitecture]]:lc-run as lc-run
+ executable linux-[[TargetArchitecture]]:lc-compile-ffi-java as lc-compile-ffi-java
rfolder linux-[[TargetArchitecture]]:modules
////////////////////////////////////////////////////////////////////////////////
@@ -447,13 +528,13 @@ component Mobile.Linux
component Engine.Windows
into [[TargetFolder]] place
- executable windows:LiveCode[[EditionTagUpper]].exe as [[ProductName]].exe
- executable windows:revpdfprinter.dll
- executable windows:revsecurity.dll
+ executable win-[[TargetArchitecture]]:LiveCode[[EditionTagUpper]].exe as [[ProductName]].exe
+ executable win-[[TargetArchitecture]]:revpdfprinter.dll
+ executable win-[[TargetArchitecture]]:revsecurity.dll
component Mobile.Windows
into "[[ToolsFolder]]/Externals" place
- executable windows:revandroid.dll
+ executable win-[[TargetArchitecture]]:revandroid.dll
//////////
@@ -498,13 +579,13 @@ component Runtime.Linux
component Runtime.Windows
into [[TargetFolder]] place
- executable windows:standalone[[BaseEditionTagLower]].exe as Standalone
- file "windows:w32-manifest-template.xml"
- file "windows:w32-manifest-template-dpiaware.xml"
- file "windows:w32-manifest-template-trustinfo.xml"
+ executable win-[[TargetArchitecture]]:standalone[[BaseEditionTagLower]].exe as Standalone
+ file "win-[[TargetArchitecture]]:w32-manifest-template.xml"
+ file "win-[[TargetArchitecture]]:w32-manifest-template-dpiaware.xml"
+ file "win-[[TargetArchitecture]]:w32-manifest-template-trustinfo.xml"
into [[TargetFolder]]/Support place
- executable windows:revpdfprinter.dll
- executable windows:revsecurity.dll
+ executable win-[[TargetArchitecture]]:revpdfprinter.dll
+ executable win-[[TargetArchitecture]]:revsecurity.dll
into "[[TargetFolder]]/Support/Sample Icons" place
file "ide:Resources/Sample Icons/genericapp.ico"
file "ide:Resources/Sample Icons/genericdoc.ico"
@@ -531,139 +612,209 @@ component Runtime.Emscripten
component Runtime.Android
into "[[ToolsFolder]]/Runtime/Android" place
- file android:Classes[[BaseEditionTagUpper]] as Classes
- file android:Manifest.xml
- file android:livecode_inputcontrol.xml
- file android:notify_icon.png
- executable android:Standalone[[BaseEditionTagUpper]] as Standalone
- executable android:RevZip
- executable android:RevXml
- executable android:RevDb
- executable android:DbSqlite
- executable android:DbMysql
- executable android:RevSecurity
+ file android-armeabi-v7a:Classes[[BaseEditionTagUpper]] as Classes
+ file android-armeabi-v7a:Manifest.xml
+ file android-armeabi-v7a:livecode_inputcontrol.xml
+ file android-armeabi-v7a:notify_icon.png
+ file android-armeabi-v7a:nfc_tech_filter.xml
+ file android-armeabi-v7a:file_provider_paths.xml
+ with TargetFolder as [[ToolsFolder]]/Runtime/Android/armeabi-v7a do
+ set TargetArchitecture to armeabi-v7a
+ include Runtime.Android.Arch
+ with TargetFolder as [[ToolsFolder]]/Runtime/Android/arm64-v8a do
+ set TargetArchitecture to arm64-v8a
+ include Runtime.Android.Arch
+ with TargetFolder as [[ToolsFolder]]/Runtime/Android/x86 do
+ set TargetArchitecture to x86
+ include Runtime.Android.Arch
+ with TargetFolder as [[ToolsFolder]]/Runtime/Android/x86_64 do
+ set TargetArchitecture to x86_64
+ include Runtime.Android.Arch
+
+component Runtime.Android.Arch
+ into [[TargetFolder]] place
+ executable android-[[TargetArchitecture]]:Standalone[[BaseEditionTagUpper]] as Standalone
+ executable android-[[TargetArchitecture]]:RevZip
+ executable android-[[TargetArchitecture]]:RevXml
+ executable android-[[TargetArchitecture]]:RevDb
+ executable android-[[TargetArchitecture]]:DbSqlite
+ executable android-[[TargetArchitecture]]:DbMysql
+ executable android-[[TargetArchitecture]]:RevSecurity
+ executable android-[[TargetArchitecture]]:RevPdfPrinter
//////////
component Runtime.iOS
- into "[[ToolsFolder]]/Runtime/iOS/Simulator-6_1" place
- executable ios:iphonesimulator6.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
- executable ios:iphonesimulator6.1/revsecurity.ios-extension as RevSecurity
- executable ios:iphonesimulator6.1/revpdfprinter.ios-extension as RevPdfPrinter
- executable ios:iphonesimulator6.1/revzip.ios-extension as RevZip
- executable ios:iphonesimulator6.1/revxml.ios-extension as RevXml
- executable ios:iphonesimulator6.1/revdb.ios-extension as RevDb
- executable ios:iphonesimulator6.1/dbsqlite.ios-extension as DbSqlite
- executable ios:iphonesimulator6.1/dbmysql.ios-extension as DbMysql
- file ios:iphonesimulator6.1/mobile-template.plist as "Settings.plist"
- file ios:iphonesimulator6.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
- file ios:iphonesimulator6.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
- file ios:iphonesimulator6.1/mobile-disable-ats-template.plist as "DisableATS.plist"
- file ios:iphonesimulator6.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
- file ios:iphonesimulator6.1/fontmap as "fontmap"
- into "[[ToolsFolder]]/Runtime/iOS/Simulator-7_1" place
- executable ios:iphonesimulator7.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator6.1/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
- executable ios:iphonesimulator7.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator6.1/revsecurity.dylib
- executable ios:iphonesimulator7.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator6.1/revpdfprinter.dylib
- executable ios:iphonesimulator7.1/revzip.ios-extension as RevZip base ios:iphonesimulator6.1/revzip.dylib
- executable ios:iphonesimulator7.1/revxml.ios-extension as RevXml base ios:iphonesimulator6.1/revxml.dylib
- executable ios:iphonesimulator7.1/revdb.ios-extension as RevDb base ios:iphonesimulator6.1/revdb.dylib
- executable ios:iphonesimulator7.1/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator6.1/dbsqlite.dylib
- executable ios:iphonesimulator7.1/dbmysql.ios-extension as DbMysql base ios:iphonesimulator6.1/dbmysql.dylib
- file ios:iphonesimulator7.1/mobile-template.plist as "Settings.plist"
- file ios:iphonesimulator7.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
- file ios:iphonesimulator7.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
- file ios:iphonesimulator7.1/mobile-disable-ats-template.plist as "DisableATS.plist"
- file ios:iphonesimulator7.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
- file ios:iphonesimulator7.1/fontmap as "fontmap"
- into "[[ToolsFolder]]/Runtime/iOS/Simulator-8_2" place
- executable ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator6.1/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
- executable ios:iphonesimulator8.2/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator6.1/revsecurity.dylib
- executable ios:iphonesimulator8.2/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator6.1/revpdfprinter.dylib
- executable ios:iphonesimulator8.2/revzip.ios-extension as RevZip base ios:iphonesimulator6.1/revzip.dylib
- executable ios:iphonesimulator8.2/revxml.ios-extension as RevXml base ios:iphonesimulator6.1/revxml.dylib
- executable ios:iphonesimulator8.2/revdb.ios-extension as RevDb base ios:iphonesimulator6.1/revdb.dylib
- executable ios:iphonesimulator8.2/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator6.1/dbsqlite.dylib
- executable ios:iphonesimulator8.2/dbmysql.ios-extension as DbMysql base ios:iphonesimulator6.1/dbmysql.dylib
- file ios:iphonesimulator8.2/mobile-template.plist as "Settings.plist"
- file ios:iphonesimulator8.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
- file ios:iphonesimulator8.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
- file ios:iphonesimulator8.2/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
- file ios:iphonesimulator8.2/mobile-disable-ats-template.plist as "DisableATS.plist"
- file ios:iphonesimulator8.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
- file ios:iphonesimulator8.2/fontmap as "fontmap"
- into "[[ToolsFolder]]/Runtime/iOS/Simulator-9_2" place
- executable ios:iphonesimulator9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
- executable ios:iphonesimulator9.2/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
- executable ios:iphonesimulator9.2/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
- executable ios:iphonesimulator9.2/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
- executable ios:iphonesimulator9.2/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
- executable ios:iphonesimulator9.2/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
- executable ios:iphonesimulator9.2/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
- executable ios:iphonesimulator9.2/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
- file ios:iphonesimulator9.2/mobile-template.plist as "Settings.plist"
- file ios:iphonesimulator9.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
- file ios:iphonesimulator9.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
- file ios:iphonesimulator9.2/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
- file ios:iphonesimulator9.2/mobile-disable-ats-template.plist as "DisableATS.plist"
- file ios:iphonesimulator9.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
- file ios:iphonesimulator9.2/fontmap as "fontmap"
- into "[[ToolsFolder]]/Runtime/iOS/Simulator-10_0" place
- executable ios:iphonesimulator10.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
- executable ios:iphonesimulator10.0/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
- executable ios:iphonesimulator10.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
- executable ios:iphonesimulator10.0/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
- executable ios:iphonesimulator10.0/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
- executable ios:iphonesimulator10.0/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
- executable ios:iphonesimulator10.0/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
- executable ios:iphonesimulator10.0/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
- file ios:iphonesimulator10.0/mobile-template.plist as "Settings.plist"
- file ios:iphonesimulator10.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
- file ios:iphonesimulator10.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
- file ios:iphonesimulator10.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
- file ios:iphonesimulator10.0/mobile-disable-ats-template.plist as "DisableATS.plist"
- file ios:iphonesimulator10.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
- file ios:iphonesimulator10.0/fontmap as "fontmap"
- into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
- executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
- executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
- executable ios:iphoneos9.2/revpdfprinter.ios-extension as RevPdfPrinter
- executable ios:iphoneos9.2/revzip.ios-extension as RevZip
- executable ios:iphoneos9.2/revxml.ios-extension as RevXml
- executable ios:iphoneos9.2/revdb.ios-extension as RevDb
- executable ios:iphoneos9.2/dbsqlite.ios-extension as DbSqlite
- executable ios:iphoneos9.2/dbmysql.ios-extension as DbMysql
- file ios:iphoneos9.2/mobile-device-template.plist as "Settings.plist"
- file ios:iphoneos9.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
- file ios:iphoneos9.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
- file ios:iphoneos9.2/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
- file ios:iphoneos9.2/template-entitlements.xcent as "Entitlements.xcent"
- file ios:iphoneos9.2/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
- file ios:iphoneos9.2/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
- file ios:iphoneos9.2/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
- file ios:iphoneos9.2/mobile-disable-ats-template.plist as "DisableATS.plist"
- file ios:iphoneos9.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
- file ios:iphoneos9.2/fontmap as "fontmap"
- into "[[ToolsFolder]]/Runtime/iOS/Device-10_0" place
- executable ios:iphoneos10.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].lcext
- executable ios:iphoneos10.0/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.lcext
- executable ios:iphoneos10.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.lcext
- executable ios:iphoneos10.0/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.lcext
- executable ios:iphoneos10.0/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.lcext
- executable ios:iphoneos10.0/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.lcext
- executable ios:iphoneos10.0/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.lcext
- executable ios:iphoneos10.0/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.lcext
- file ios:iphoneos10.0/mobile-device-template.plist as "Settings.plist"
- file ios:iphoneos10.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
- file ios:iphoneos10.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
- file ios:iphoneos10.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
- file ios:iphoneos10.0/template-entitlements.xcent as "Entitlements.xcent"
- file ios:iphoneos10.0/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
- file ios:iphoneos10.0/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
- file ios:iphoneos10.0/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
- file ios:iphoneos10.0/mobile-disable-ats-template.plist as "DisableATS.plist"
- file ios:iphoneos10.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
- file ios:iphoneos10.0/fontmap as "fontmap"
+ into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_2" place
+ executable ios:iphonesimulator11.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
+ executable ios:iphonesimulator11.2/revsecurity.ios-extension as RevSecurity
+ executable ios:iphonesimulator11.2/revpdfprinter.ios-extension as RevPdfPrinter
+ executable ios:iphonesimulator11.2/revzip.ios-extension as RevZip
+ executable ios:iphonesimulator11.2/revxml.ios-extension as RevXml
+ executable ios:iphonesimulator11.2/revdb.ios-extension as RevDb
+ executable ios:iphonesimulator11.2/dbsqlite.ios-extension as DbSqlite
+ executable ios:iphonesimulator11.2/dbmysql.ios-extension as DbMysql
+ file ios:iphonesimulator11.2/mobile-template.plist as "Settings.plist"
+ file ios:iphonesimulator11.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
+ file ios:iphonesimulator11.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
+ file ios:iphonesimulator11.2/mobile-disable-ats-template.plist as "DisableATS.plist"
+ file ios:iphonesimulator11.2/fontmap as "fontmap"
+ file ios:iphonesimulator11.2/template.storyboard as "template.storyboard"
+ into "[[ToolsFolder]]/Runtime/iOS/Simulator-12_1" place
+ executable ios:iphonesimulator12.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator11.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
+ executable ios:iphonesimulator12.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator11.2/revsecurity.dylib
+ executable ios:iphonesimulator12.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator11.2/revpdfprinter.dylib
+ executable ios:iphonesimulator12.1/revzip.ios-extension as RevZip base ios:iphonesimulator11.2/revzip.dylib
+ executable ios:iphonesimulator12.1/revxml.ios-extension as RevXml base ios:iphonesimulator11.2/revxml.dylib
+ executable ios:iphonesimulator12.1/revdb.ios-extension as RevDb base ios:iphonesimulator11.2/revdb.dylib
+ executable ios:iphonesimulator12.1/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator11.2/dbsqlite.dylib
+ executable ios:iphonesimulator12.1/dbmysql.ios-extension as DbMysql base ios:iphonesimulator11.2/dbmysql.dylib
+ file ios:iphonesimulator12.1/mobile-template.plist as "Settings.plist"
+ file ios:iphonesimulator12.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
+ file ios:iphonesimulator12.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
+ file ios:iphonesimulator12.1/mobile-disable-ats-template.plist as "DisableATS.plist"
+ file ios:iphonesimulator12.1/fontmap as "fontmap"
+ file ios:iphonesimulator12.1/template.storyboard as "template.storyboard"
+ into "[[ToolsFolder]]/Runtime/iOS/Simulator-13_2" place
+ executable ios:iphonesimulator13.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator11.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
+ executable ios:iphonesimulator13.2/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator11.2/revsecurity.dylib
+ executable ios:iphonesimulator13.2/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator11.2/revpdfprinter.dylib
+ executable ios:iphonesimulator13.2/revzip.ios-extension as RevZip base ios:iphonesimulator11.2/revzip.dylib
+ executable ios:iphonesimulator13.2/revxml.ios-extension as RevXml base ios:iphonesimulator11.2/revxml.dylib
+ executable ios:iphonesimulator13.2/revdb.ios-extension as RevDb base ios:iphonesimulator11.2/revdb.dylib
+ executable ios:iphonesimulator13.2/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator11.2/dbsqlite.dylib
+ executable ios:iphonesimulator13.2/dbmysql.ios-extension as DbMysql base ios:iphonesimulator11.2/dbmysql.dylib
+ file ios:iphonesimulator13.2/mobile-template.plist as "Settings.plist"
+ file ios:iphonesimulator13.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
+ file ios:iphonesimulator13.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
+ file ios:iphonesimulator13.2/mobile-disable-ats-template.plist as "DisableATS.plist"
+ file ios:iphonesimulator13.2/fontmap as "fontmap"
+ file ios:iphonesimulator13.2/template.storyboard as "template.storyboard"
+ into "[[ToolsFolder]]/Runtime/iOS/Simulator-14_4" place
+ executable ios:iphonesimulator14.4/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator11.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
+ executable ios:iphonesimulator14.4/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator11.2/revsecurity.dylib
+ executable ios:iphonesimulator14.4/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator11.2/revpdfprinter.dylib
+ executable ios:iphonesimulator14.4/revzip.ios-extension as RevZip base ios:iphonesimulator11.2/revzip.dylib
+ executable ios:iphonesimulator14.4/revxml.ios-extension as RevXml base ios:iphonesimulator11.2/revxml.dylib
+ executable ios:iphonesimulator14.4/revdb.ios-extension as RevDb base ios:iphonesimulator11.2/revdb.dylib
+ executable ios:iphonesimulator14.4/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator11.2/dbsqlite.dylib
+ executable ios:iphonesimulator14.4/dbmysql.ios-extension as DbMysql base ios:iphonesimulator11.2/dbmysql.dylib
+ file ios:iphonesimulator14.4/mobile-template.plist as "Settings.plist"
+ file ios:iphonesimulator14.4/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
+ file ios:iphonesimulator14.4/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
+ file ios:iphonesimulator14.4/mobile-disable-ats-template.plist as "DisableATS.plist"
+ file ios:iphonesimulator14.4/fontmap as "fontmap"
+ file ios:iphonesimulator14.4/template.storyboard as "template.storyboard"
+ into "[[ToolsFolder]]/Runtime/iOS/Simulator-14_5" place
+ executable ios:iphonesimulator14.5/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator11.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
+ executable ios:iphonesimulator14.5/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator11.2/revsecurity.dylib
+ executable ios:iphonesimulator14.5/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator11.2/revpdfprinter.dylib
+ executable ios:iphonesimulator14.5/revzip.ios-extension as RevZip base ios:iphonesimulator11.2/revzip.dylib
+ executable ios:iphonesimulator14.5/revxml.ios-extension as RevXml base ios:iphonesimulator11.2/revxml.dylib
+ executable ios:iphonesimulator14.5/revdb.ios-extension as RevDb base ios:iphonesimulator11.2/revdb.dylib
+ executable ios:iphonesimulator14.5/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator11.2/dbsqlite.dylib
+ executable ios:iphonesimulator14.5/dbmysql.ios-extension as DbMysql base ios:iphonesimulator11.2/dbmysql.dylib
+ file ios:iphonesimulator14.5/mobile-template.plist as "Settings.plist"
+ file ios:iphonesimulator14.5/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
+ file ios:iphonesimulator14.5/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
+ file ios:iphonesimulator14.5/mobile-disable-ats-template.plist as "DisableATS.plist"
+ file ios:iphonesimulator14.5/fontmap as "fontmap"
+ file ios:iphonesimulator14.5/template.storyboard as "template.storyboard"
+ into "[[ToolsFolder]]/Runtime/iOS/Device-11_2" place
+ executable ios:iphoneos11.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
+ executable ios:iphoneos11.2/revsecurity.ios-extension as RevSecurity
+ executable ios:iphoneos11.2/revpdfprinter.ios-extension as RevPdfPrinter
+ executable ios:iphoneos11.2/revzip.ios-extension as RevZip
+ executable ios:iphoneos11.2/revxml.ios-extension as RevXml
+ executable ios:iphoneos11.2/revdb.ios-extension as RevDb
+ executable ios:iphoneos11.2/dbsqlite.ios-extension as DbSqlite
+ executable ios:iphoneos11.2/dbmysql.ios-extension as DbMysql
+ file ios:iphoneos11.2/mobile-device-template.plist as "Settings.plist"
+ file ios:iphoneos11.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
+ file ios:iphoneos11.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
+ file ios:iphoneos11.2/template-entitlements.xcent as "Entitlements.xcent"
+ file ios:iphoneos11.2/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
+ file ios:iphoneos11.2/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
+ file ios:iphoneos11.2/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
+ file ios:iphoneos11.2/mobile-disable-ats-template.plist as "DisableATS.plist"
+ file ios:iphoneos11.2/fontmap as "fontmap"
+ file ios:iphoneos11.2/template.storyboard as "template.storyboard"
+ into "[[ToolsFolder]]/Runtime/iOS/Device-12_1" place
+ executable ios:iphoneos12.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos11.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
+ executable ios:iphoneos12.1/revsecurity.ios-extension as RevSecurity base ios:iphoneos11.2/revsecurity.ios-extension
+ executable ios:iphoneos12.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos11.2/revpdfprinter.ios-extension
+ executable ios:iphoneos12.1/revzip.ios-extension as RevZip base ios:iphoneos11.2/revzip.ios-extension
+ executable ios:iphoneos12.1/revxml.ios-extension as RevXml base ios:iphoneos11.2/revxml.ios-extension
+ executable ios:iphoneos12.1/revdb.ios-extension as RevDb base ios:iphoneos11.2/revdb.ios-extension
+ executable ios:iphoneos12.1/dbsqlite.ios-extension as DbSqlite base ios:iphoneos11.2/dbsqlite.ios-extension
+ executable ios:iphoneos12.1/dbmysql.ios-extension as DbMysql base ios:iphoneos11.2/dbmysql.ios-extension
+ file ios:iphoneos12.1/mobile-device-template.plist as "Settings.plist"
+ file ios:iphoneos12.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
+ file ios:iphoneos12.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
+ file ios:iphoneos12.1/template-entitlements.xcent as "Entitlements.xcent"
+ file ios:iphoneos12.1/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
+ file ios:iphoneos12.1/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
+ file ios:iphoneos12.1/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
+ file ios:iphoneos12.1/mobile-disable-ats-template.plist as "DisableATS.plist"
+ file ios:iphoneos12.1/fontmap as "fontmap"
+ file ios:iphoneos12.1/template.storyboard as "template.storyboard"
+ into "[[ToolsFolder]]/Runtime/iOS/Device-13_2" place
+ executable ios:iphoneos13.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos11.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
+ executable ios:iphoneos13.2/revsecurity.ios-extension as RevSecurity base ios:iphoneos11.2/revsecurity.ios-extension
+ executable ios:iphoneos13.2/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos11.2/revpdfprinter.ios-extension
+ executable ios:iphoneos13.2/revzip.ios-extension as RevZip base ios:iphoneos11.2/revzip.ios-extension
+ executable ios:iphoneos13.2/revxml.ios-extension as RevXml base ios:iphoneos11.2/revxml.ios-extension
+ executable ios:iphoneos13.2/revdb.ios-extension as RevDb base ios:iphoneos11.2/revdb.ios-extension
+ executable ios:iphoneos13.2/dbsqlite.ios-extension as DbSqlite base ios:iphoneos11.2/dbsqlite.ios-extension
+ executable ios:iphoneos13.2/dbmysql.ios-extension as DbMysql base ios:iphoneos11.2/dbmysql.ios-extension
+ file ios:iphoneos13.2/mobile-device-template.plist as "Settings.plist"
+ file ios:iphoneos13.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
+ file ios:iphoneos13.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
+ file ios:iphoneos13.2/template-entitlements.xcent as "Entitlements.xcent"
+ file ios:iphoneos13.2/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
+ file ios:iphoneos13.2/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
+ file ios:iphoneos13.2/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
+ file ios:iphoneos13.2/mobile-disable-ats-template.plist as "DisableATS.plist"
+ file ios:iphoneos13.2/fontmap as "fontmap"
+ file ios:iphoneos13.2/template.storyboard as "template.storyboard"
+ into "[[ToolsFolder]]/Runtime/iOS/Device-14_4" place
+ executable ios:iphoneos14.4/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos11.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
+ executable ios:iphoneos14.4/revsecurity.ios-extension as RevSecurity base ios:iphoneos11.2/revsecurity.ios-extension
+ executable ios:iphoneos14.4/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos11.2/revpdfprinter.ios-extension
+ executable ios:iphoneos14.4/revzip.ios-extension as RevZip base ios:iphoneos11.2/revzip.ios-extension
+ executable ios:iphoneos14.4/revxml.ios-extension as RevXml base ios:iphoneos11.2/revxml.ios-extension
+ executable ios:iphoneos14.4/revdb.ios-extension as RevDb base ios:iphoneos11.2/revdb.ios-extension
+ executable ios:iphoneos14.4/dbsqlite.ios-extension as DbSqlite base ios:iphoneos11.2/dbsqlite.ios-extension
+ executable ios:iphoneos14.4/dbmysql.ios-extension as DbMysql base ios:iphoneos11.2/dbmysql.ios-extension
+ file ios:iphoneos14.4/mobile-device-template.plist as "Settings.plist"
+ file ios:iphoneos14.4/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
+ file ios:iphoneos14.4/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
+ file ios:iphoneos14.4/template-entitlements.xcent as "Entitlements.xcent"
+ file ios:iphoneos14.4/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
+ file ios:iphoneos14.4/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
+ file ios:iphoneos14.4/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
+ file ios:iphoneos14.4/mobile-disable-ats-template.plist as "DisableATS.plist"
+ file ios:iphoneos14.4/fontmap as "fontmap"
+ file ios:iphoneos14.4/template.storyboard as "template.storyboard"
+ into "[[ToolsFolder]]/Runtime/iOS/Device-14_5" place
+ executable ios:iphoneos14.5/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos11.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
+ executable ios:iphoneos14.5/revsecurity.ios-extension as RevSecurity base ios:iphoneos11.2/revsecurity.ios-extension
+ executable ios:iphoneos14.5/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos11.2/revpdfprinter.ios-extension
+ executable ios:iphoneos14.5/revzip.ios-extension as RevZip base ios:iphoneos11.2/revzip.ios-extension
+ executable ios:iphoneos14.5/revxml.ios-extension as RevXml base ios:iphoneos11.2/revxml.ios-extension
+ executable ios:iphoneos14.5/revdb.ios-extension as RevDb base ios:iphoneos11.2/revdb.ios-extension
+ executable ios:iphoneos14.5/dbsqlite.ios-extension as DbSqlite base ios:iphoneos11.2/dbsqlite.ios-extension
+ executable ios:iphoneos14.5/dbmysql.ios-extension as DbMysql base ios:iphoneos11.2/dbmysql.ios-extension
+ file ios:iphoneos14.5/mobile-device-template.plist as "Settings.plist"
+ file ios:iphoneos14.5/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
+ file ios:iphoneos14.5/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
+ file ios:iphoneos14.5/template-entitlements.xcent as "Entitlements.xcent"
+ file ios:iphoneos14.5/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
+ file ios:iphoneos14.5/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
+ file ios:iphoneos14.5/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
+ file ios:iphoneos14.5/mobile-disable-ats-template.plist as "DisableATS.plist"
+ file ios:iphoneos14.5/fontmap as "fontmap"
+ file ios:iphoneos14.5/template.storyboard as "template.storyboard"
////////////////////////////////////////////////////////////////////////////////
@@ -680,81 +831,74 @@ component Externals.Linux
component Externals.Windows
into [[TargetFolder]]/Externals place
- executable windows:revspeech.dll
- executable windows:revvideograbber.dll
- executable windows:revxml.dll
- executable windows:revbrowser.dll
- executable windows:revzip.dll
- executable windows:revfont.dll
+ executable win-[[TargetArchitecture]]:revspeech.dll
+ executable win-[[TargetArchitecture]]:revxml.dll
+ executable win-[[TargetArchitecture]]:revbrowser.dll
+ executable win-[[TargetArchitecture]]:revzip.dll
declare external "Speech" using revspeech.dll
- declare external "Video Grabber" using revvideograbber.dll
declare external "XML" using revxml.dll
declare external "Browser" using revbrowser.dll
declare external "Revolution Zip" using revzip.dll
- declare external "Font Support" using revfont.dll
//////////
component Externals.MacOSX
into [[TargetFolder]]/Externals place
executable macosx:revspeech.bundle
- executable macosx:revvideograbber.bundle
executable macosx:revxml.bundle
executable macosx:revbrowser.bundle
executable macosx:revzip.bundle
- executable macosx:revfont.bundle
declare external "Speech" using revspeech.bundle
- declare external "Video Grabber" using revvideograbber.bundle
declare external "XML" using revxml.bundle
declare external "Browser" using revbrowser.bundle
declare external "Revolution Zip" using revzip.bundle
- declare external "Font Support" using revfont.bundle
//////////
component Externals.CEF.Linux
into [[TargetFolder]]/Externals/CEF place
- executable linux-[[TargetArchitecture]]:revbrowser-cefprocess
- executable linux-[[TargetArchitecture]]:libbrowser-cefprocess
- executable linux-[[TargetArchitecture]]:CEF/libcef.so
- executable linux-[[TargetArchitecture]]:CEF/libffmpegsumo.so
- executable linux-[[TargetArchitecture]]:CEF/libpdf.so
- rfolder linux-[[TargetArchitecture]]:CEF/locales
- file linux-[[TargetArchitecture]]:CEF/cef.pak
- file linux-[[TargetArchitecture]]:CEF/cef_100_percent.pak
- file linux-[[TargetArchitecture]]:CEF/cef_200_percent.pak
- file linux-[[TargetArchitecture]]:CEF/cef_extensions.pak
- file linux-[[TargetArchitecture]]:CEF/icudtl.dat
- file linux-[[TargetArchitecture]]:CEF/natives_blob.bin
- file linux-[[TargetArchitecture]]:CEF/snapshot_blob.bin
+ executable linux-[[TargetArchitecture]]:Externals/CEF/libcef.so
+ executable linux-[[TargetArchitecture]]:Externals/CEF/libEGL.so
+ executable linux-[[TargetArchitecture]]:Externals/CEF/libGLESv2.so
+ executable linux-[[TargetArchitecture]]:Externals/CEF/chrome-sandbox
+ rfolder linux-[[TargetArchitecture]]:Externals/CEF/locales
+ file linux-[[TargetArchitecture]]:Externals/CEF/cef.pak
+ file linux-[[TargetArchitecture]]:Externals/CEF/cef_100_percent.pak
+ file linux-[[TargetArchitecture]]:Externals/CEF/cef_200_percent.pak
+ file linux-[[TargetArchitecture]]:Externals/CEF/cef_extensions.pak
+ file linux-[[TargetArchitecture]]:Externals/CEF/icudtl.dat
+ file linux-[[TargetArchitecture]]:Externals/CEF/natives_blob.bin
+ file linux-[[TargetArchitecture]]:Externals/CEF/snapshot_blob.bin
+ file linux-[[TargetArchitecture]]:Externals/CEF/v8_context_snapshot.bin
+ into [[TargetFolder]]/Externals/CEF/swiftshader place
+ executable linux-[[TargetArchitecture]]:Externals/CEF/swiftshader/libEGL.so
+ executable linux-[[TargetArchitecture]]:Externals/CEF/swiftshader/libGLESv2.so
// Horrible workaround for a libCEF bug
into [[TargetFolder]] place
- file linux-[[TargetArchitecture]]:CEF/icudtl.dat
- file linux-[[TargetArchitecture]]:CEF/natives_blob.bin
- file linux-[[TargetArchitecture]]:CEF/snapshot_blob.bin
executable linux-[[TargetArchitecture]]:revbrowser-cefprocess
executable linux-[[TargetArchitecture]]:libbrowser-cefprocess
component Externals.CEF.Windows
into [[TargetFolder]]/Externals/CEF place
- executable windows:libbrowser-cefprocess.exe
- executable windows:revbrowser-cefprocess.exe
- executable windows:CEF/libcef.dll
- executable windows:CEF/d3dcompiler_43.dll
- executable windows:CEF/d3dcompiler_46.dll
- executable windows:CEF/d3dcompiler_47.dll
- executable windows:CEF/ffmpegsumo.dll
- executable windows:CEF/libEGL.dll
- executable windows:CEF/libGLESv2.dll
- executable windows:CEF/pdf.dll
- rfolder windows:CEF/locales
- file windows:CEF/cef.pak
- file windows:CEF/cef_100_percent.pak
- file windows:CEF/cef_200_percent.pak
- file windows:CEF/cef_extensions.pak
- file windows:CEF/icudtl.dat
- file windows:CEF/natives_blob.bin
- file windows:CEF/snapshot_blob.bin
+ executable win-[[TargetArchitecture]]:libbrowser-cefprocess.exe
+ executable win-[[TargetArchitecture]]:revbrowser-cefprocess.exe
+ executable win-[[TargetArchitecture]]:Externals/CEF/libcef.dll
+ executable win-[[TargetArchitecture]]:Externals/CEF/d3dcompiler_47.dll
+ executable win-[[TargetArchitecture]]:Externals/CEF/libEGL.dll
+ executable win-[[TargetArchitecture]]:Externals/CEF/libGLESv2.dll
+ executable win-[[TargetArchitecture]]:Externals/CEF/chrome_elf.dll
+ rfolder win-[[TargetArchitecture]]:Externals/CEF/locales
+ file win-[[TargetArchitecture]]:Externals/CEF/cef.pak
+ file win-[[TargetArchitecture]]:Externals/CEF/cef_100_percent.pak
+ file win-[[TargetArchitecture]]:Externals/CEF/cef_200_percent.pak
+ file win-[[TargetArchitecture]]:Externals/CEF/cef_extensions.pak
+ file win-[[TargetArchitecture]]:Externals/CEF/icudtl.dat
+ file win-[[TargetArchitecture]]:Externals/CEF/natives_blob.bin
+ file win-[[TargetArchitecture]]:Externals/CEF/snapshot_blob.bin
+ file win-[[TargetArchitecture]]:Externals/CEF/v8_context_snapshot.bin
+ into [[TargetFolder]]/Externals/CEF/swiftshader place
+ executable win-[[TargetArchitecture]]:Externals/CEF/swiftshader/libEGL.dll
+ executable win-[[TargetArchitecture]]:Externals/CEF/swiftshader/libGLESv2.dll
////////////////////////////////////////////////////////////////////////////////
@@ -771,28 +915,22 @@ component Databases.Linux
declare dbdriver "ODBC" using dbodbc.so
declare dbdriver "PostgreSQL" using dbpostgresql.so
declare dbdriver "SqLite" using dbsqlite.so
- ifnot TargetEdition is "Community" then
- declare dbdriver "Oracle" using dboracle.so
//////////
component Databases.Windows
into "[[TargetFolder]]/Externals" place
- executable windows:revdb.dll
+ executable win-[[TargetArchitecture]]:revdb.dll
into "[[TargetFolder]]/Externals/Database Drivers" place
- executable windows:dbmysql.dll
- executable windows:dbodbc.dll
- executable windows:dbpostgresql.dll
- executable windows:dbsqlite.dll
- ifnot TargetEdition is "Community" then
- executable private:oracle_libraries/dboracle.dll
+ executable win-[[TargetArchitecture]]:dbmysql.dll
+ executable win-[[TargetArchitecture]]:dbodbc.dll
+ executable win-[[TargetArchitecture]]:dbpostgresql.dll
+ executable win-[[TargetArchitecture]]:dbsqlite.dll
declare external "Database" using revdb.dll
declare dbdriver "MySQL" using dbmysql.dll
declare dbdriver "ODBC" using dbodbc.dll
declare dbdriver "PostgreSQL" using dbpostgresql.dll
declare dbdriver "SqLite" using dbsqlite.dll
- ifnot TargetEdition is "Community" then
- declare dbdriver "Oracle" using dboracle.dll
//////////
@@ -804,31 +942,70 @@ component Databases.MacOSX
executable macosx:dbodbc.bundle
executable macosx:dbpostgresql.bundle
executable macosx:dbsqlite.bundle
- ifnot TargetEdition is "Community" then
- executable private:oracle_libraries/dboracle.bundle
declare external "Database" using revdb.bundle
declare dbdriver "MySQL" using dbmysql.bundle
declare dbdriver "ODBC" using dbodbc.bundle
declare dbdriver "PostgreSQL" using dbpostgresql.bundle
declare dbdriver "SqLite" using dbsqlite.bundle
- ifnot TargetEdition is "Community" then
- declare dbdriver "Oracle" using dboracle.bundle
////////////////////////////////////////////////////////////////////////////////
component Toolset
into [[ToolsFolder]] place
rfolder ide:Toolset
+ emit variable TargetEdition to "[[ToolsFolder]]/edition.txt"
into [[ToolsFolder]]/Toolset/libraries place
stack ide-support:revdeploylibraryandroid.livecodescript
stack ide-support:revdeploylibraryios.livecodescript
+ stack ide-support:revdeploylibraryemscripten.livecodescript
stack ide-support:revliburl.livecodescript
stack ide-support:revsaveasandroidstandalone.livecodescript
stack ide-support:revsaveasemscriptenstandalone.livecodescript
stack ide-support:revsaveasiosstandalone.livecodescript
stack ide-support:revsaveasstandalone.livecodescript
stack ide-support:revsblibrary.livecodescript
+ stack ide-support:revhtml5urllibrary.livecodescript
file ide-support:revdocsparser.livecodescript
file ide-support:revliburl.livecodescript
////////////////////////////////////////////////////////////////////////////////
+
+component TimeZone
+ into [[ToolsFolder]]/Extensions place
+ rfolder macosx:packaged_extensions/com.livecode.library.timezone
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder android-armeabi-v7a:packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder android-arm64-v8a:packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder android-x86:packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder android-x86_64:packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder ios:iphonesimulator11.2/packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder ios:iphonesimulator12.1/packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder ios:iphonesimulator13.2/packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder ios:iphonesimulator14.4/packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder ios:iphonesimulator14.5/packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder ios:iphoneos11.2/packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder ios:iphoneos12.1/packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder ios:iphoneos13.2/packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder ios:iphoneos14.4/packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder ios:iphoneos14.5/packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder win-x86:packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder win-x86_64:packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder linux-x86_64:packaged_extensions/com.livecode.library.timezone/code
+ into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
+ rfolder linux-x86:packaged_extensions/com.livecode.library.timezone/code
diff --git a/Livecode.config b/Livecode.config
deleted file mode 100644
index ec48679e4c0..00000000000
--- a/Livecode.config
+++ /dev/null
@@ -1,23 +0,0 @@
-// ADD PREDEFINED MACROS HERE!
-
-#define X11
-#define TARGET_PLATFORM_LINUX
-#define TARGET_PLATFORM_POSIX
-#define _LINUX
-#define LINUX
-#define _LINUX_DESKTOP
-#define GTKTHEME
-#define HAVE___THREAD
-#define MCSSL
-#define MODE_DEVELOPMENT
-#define FEATURE_PROPERTY_LISTENER
-#define FEATURE_MPLAYER
-#define PLATFORM_STRING "Linux"
-#define _HAS_VSNPRINTF
-#define _DEBUG
-#undef LEGACY_SYSTEM
-
-// libpcre definitions
-#define SUPPORT_PCRE16
-#define SUPPORT_UCP
-#define SUPPORT_UTF
diff --git a/Livecode.creator b/Livecode.creator
deleted file mode 100644
index e94cbbd3027..00000000000
--- a/Livecode.creator
+++ /dev/null
@@ -1 +0,0 @@
-[General]
diff --git a/Livecode.files b/Livecode.files
deleted file mode 100644
index 5d14036fe37..00000000000
--- a/Livecode.files
+++ /dev/null
@@ -1,4950 +0,0 @@
-builder/archive_builder.livecodescript
-builder/builder_tool.livecodescript
-builder/builder_utilities.livecodescript
-builder/docs_builder.livecodescript
-builder/engine_builder.livecodescript
-builder/installer_utilities.livecodescript
-builder/markdown_compiler.livecodescript
-builder/package_compiler.livecodescript
-builder/release_notes_builder.livecodescript
-builder/server_builder.livecodescript
-builder/tools_builder.livecodescript
-config/android.gypi
-config/arch.gypi
-config/configurations.gypi
-config/crosscompile.gypi
-config/debug_syms.gypi
-config/exclusions.gypi
-config/ios.gypi
-config/java.gypi
-config/linux.gypi
-config/mac.gypi
-config/paths.gypi
-config/perl.gypi
-config/target_os.gypi
-config/thirdparty.gypi
-config/win32.gypi
-engine/include/customprinter.h
-engine/rsrc/android-inputcontrol.xml
-engine/rsrc/android-manifest.xml
-engine/rsrc/android-notify-icon.png
-engine/rsrc/Default-568h@2x.png
-engine/rsrc/development.ico
-engine/rsrc/development.rc
-engine/rsrc/document.ico
-engine/rsrc/installer.ico
-engine/rsrc/installer.rc
-engine/rsrc/media_badge.png
-engine/rsrc/server.rc
-engine/rsrc/splash_image.png
-engine/rsrc/splash_logo.png
-engine/rsrc/splash_text.png
-engine/rsrc/standalone.ico
-engine/rsrc/standalone.rc
-engine/src/java/com/runrev/android/billing/PurchaseObserver.java
-engine/src/java/com/runrev/android/billing/ResponseHandler.java
-engine/src/java/com/runrev/android/nativecontrol/BrowserControl.java
-engine/src/java/com/runrev/android/nativecontrol/ExtVideoView.java
-engine/src/java/com/runrev/android/nativecontrol/InputControl.java
-engine/src/java/com/runrev/android/nativecontrol/InputView.java
-engine/src/java/com/runrev/android/nativecontrol/NativeControl.java
-engine/src/java/com/runrev/android/nativecontrol/NativeControlModule.java
-engine/src/java/com/runrev/android/nativecontrol/ScrollerControl.java
-engine/src/java/com/runrev/android/nativecontrol/VideoControl.java
-engine/src/java/com/runrev/android/AccelerationChangeListener.java
-engine/src/java/com/runrev/android/AdModule.java
-engine/src/java/com/runrev/android/Alert.java
-engine/src/java/com/runrev/android/BitmapView.java
-engine/src/java/com/runrev/android/BusyIndicator.java
-engine/src/java/com/runrev/android/CalendarEvents.java
-engine/src/java/com/runrev/android/CameraCompat.java
-engine/src/java/com/runrev/android/Contact.java
-engine/src/java/com/runrev/android/DialogModule.java
-engine/src/java/com/runrev/android/Email.java
-engine/src/java/com/runrev/android/Engine.java
-engine/src/java/com/runrev/android/EngineReceiver.java
-engine/src/java/com/runrev/android/LiveCodeActivity.java
-engine/src/java/com/runrev/android/NetworkModule.java
-engine/src/java/com/runrev/android/NotificationModule.java
-engine/src/java/com/runrev/android/OpenGLView.java
-engine/src/java/com/runrev/android/PushReceiver.java
-engine/src/java/com/runrev/android/ScreenOrientationEventListener.java
-engine/src/java/com/runrev/android/SensorModule.java
-engine/src/java/com/runrev/android/ShakeEventListener.java
-engine/src/java/com/runrev/android/SoundModule.java
-engine/src/java/com/runrev/android/TextMessaging.java
-engine/src/java/com/runrev/android/URLLoader.java
-engine/src/java/com/runrev/android/Utils.java
-engine/src/java/AppReceiver.java
-engine/src/java/AppService.java
-engine/src/java/mblandroid.java
-engine/src/java/PushReceiver.java
-engine/src/aclip.cpp
-engine/src/aclip.h
-engine/src/ans.h
-engine/src/answer.cpp
-engine/src/answer.h
-engine/src/ask.cpp
-engine/src/ask.h
-engine/src/bitmapeffect.cpp
-engine/src/bitmapeffect.h
-engine/src/bitmapeffectblur.cpp
-engine/src/bitmapeffectblur.h
-engine/src/block.cpp
-engine/src/bsdiff.h
-engine/src/bsdiff_apply.cpp
-engine/src/bsdiff_build.cpp
-engine/src/button.cpp
-engine/src/button.h
-engine/src/buttondraw.cpp
-engine/src/capsule.cpp
-engine/src/capsule.h
-engine/src/card.cpp
-engine/src/card.h
-engine/src/cardlst.cpp
-engine/src/cardlst.h
-engine/src/cdata.cpp
-engine/src/cdata.h
-engine/src/cgimageutil.cpp
-engine/src/chunk.cpp
-engine/src/chunk.h
-engine/src/cmds.cpp
-engine/src/cmds.h
-engine/src/cmdsc.cpp
-engine/src/cmdse.cpp
-engine/src/cmdsf.cpp
-engine/src/cmdsm.cpp
-engine/src/cmdsp.cpp
-engine/src/cmdss.cpp
-engine/src/color.cpp
-engine/src/color.h
-engine/src/combiners.cpp
-engine/src/constant.cpp
-engine/src/constant.h
-engine/src/context.h
-engine/src/control.cpp
-engine/src/coretextfonts.cpp
-engine/src/coretextlayout.mm
-engine/src/cpalette.cpp
-engine/src/cpalette.h
-engine/src/customprinter.cpp
-engine/src/datastructures.h
-engine/src/date.cpp
-engine/src/date.h
-engine/src/debug.cpp
-engine/src/debug.h
-engine/src/deploy.cpp
-engine/src/deploy.h
-engine/src/deploy_capsule.cpp
-engine/src/deploy_dmg.cpp
-engine/src/deploy_file.cpp
-engine/src/deploy_linux.cpp
-engine/src/deploy_macosx.cpp
-engine/src/deploy_sign.cpp
-engine/src/deploy_windows.cpp
-engine/src/deploysecurity.cpp
-engine/src/deploysecurity.h
-engine/src/desktop-ans.cpp
-engine/src/desktop-dc.cpp
-engine/src/desktop-dc.h
-engine/src/desktop-image.cpp
-engine/src/desktop-menu.cpp
-engine/src/desktop-pasteboard.cpp
-engine/src/desktop-stack.cpp
-engine/src/desktop.cpp
-engine/src/dispatch.cpp
-engine/src/dispatch.h
-engine/src/dllst.cpp
-engine/src/dllst.h
-engine/src/dsklnx.cpp
-engine/src/dsklnxmain.cpp
-engine/src/dskmac.cpp
-engine/src/dskmain.cpp
-engine/src/dskspec.cpp
-engine/src/dskw32.cpp
-engine/src/dskw32main.cpp
-engine/src/dummy.cpp
-engine/src/edittool.cpp
-engine/src/edittool.h
-engine/src/eps.cpp
-engine/src/eps.h
-engine/src/eventqueue.cpp
-engine/src/eventqueue.h
-engine/src/exec-ad.cpp
-engine/src/exec-addressbook.cpp
-engine/src/exec-array.cpp
-engine/src/exec-busyindicator.cpp
-engine/src/exec-calendar.cpp
-engine/src/exec-context.h
-engine/src/exec-datetime.cpp
-engine/src/exec-debugging.cpp
-engine/src/exec-dialog.cpp
-engine/src/exec-engine.cpp
-engine/src/exec-files.cpp
-engine/src/exec-filters.cpp
-engine/src/exec-graphics.cpp
-engine/src/exec-ide.cpp
-engine/src/exec-idletimer.cpp
-engine/src/exec-interface-aclip.cpp
-engine/src/exec-interface-button.cpp
-engine/src/exec-interface-card.cpp
-engine/src/exec-interface-control.cpp
-engine/src/exec-interface-field-chunk.cpp
-engine/src/exec-interface-field.cpp
-engine/src/exec-interface-graphic.cpp
-engine/src/exec-interface-group.cpp
-engine/src/exec-interface-image.cpp
-engine/src/exec-interface-object.cpp
-engine/src/exec-interface-player.cpp
-engine/src/exec-interface-scrollbar.cpp
-engine/src/exec-interface-stack.cpp
-engine/src/exec-interface-vclip.cpp
-engine/src/exec-interface.cpp
-engine/src/exec-interface.h
-engine/src/exec-interface2.cpp
-engine/src/exec-keywords.cpp
-engine/src/exec-keywords.h
-engine/src/exec-legacy.cpp
-engine/src/exec-logic.cpp
-engine/src/exec-mail.cpp
-engine/src/exec-math.cpp
-engine/src/exec-misc.cpp
-engine/src/exec-multimedia.cpp
-engine/src/exec-nativecontrol.cpp
-engine/src/exec-network.cpp
-engine/src/exec-notification.cpp
-engine/src/exec-orientation.cpp
-engine/src/exec-pasteboard.cpp
-engine/src/exec-pick.cpp
-engine/src/exec-printing.cpp
-engine/src/exec-scripting.cpp
-engine/src/exec-security.cpp
-engine/src/exec-sensor.cpp
-engine/src/exec-server.cpp
-engine/src/exec-sound.cpp
-engine/src/exec-store.cpp
-engine/src/exec-strings-chunk.cpp
-engine/src/exec-strings.cpp
-engine/src/exec-strings.h
-engine/src/exec-text.cpp
-engine/src/exec-textmessaging.cpp
-engine/src/exec.cpp
-engine/src/exec.h
-engine/src/executionerrors.h
-engine/src/express.cpp
-engine/src/express.h
-engine/src/external.cpp
-engine/src/external.h
-engine/src/externalv0.cpp
-engine/src/externalv1.cpp
-engine/src/externalv1.h
-engine/src/externalv1.mm
-engine/src/fiber.cpp
-engine/src/fiber.h
-engine/src/field.cpp
-engine/src/field.h
-engine/src/fieldf.cpp
-engine/src/fieldh.cpp
-engine/src/fieldhtml.cpp
-engine/src/fieldrtf.cpp
-engine/src/fields.cpp
-engine/src/fieldstyledtext.cpp
-engine/src/filedefs.h
-engine/src/flst.h
-engine/src/font.cpp
-engine/src/font.h
-engine/src/fonttable.cpp
-engine/src/foundation-legacy.cpp
-engine/src/foundation-legacy.h
-engine/src/funcs.cpp
-engine/src/funcs.h
-engine/src/funcsm.cpp
-engine/src/globals.cpp
-engine/src/globals.h
-engine/src/globdefs.h
-engine/src/gradient.cpp
-engine/src/gradient.h
-engine/src/graphic.cpp
-engine/src/graphic.h
-engine/src/graphics_util.cpp
-engine/src/graphics_util.h
-engine/src/graphicscontext.cpp
-engine/src/graphicscontext.h
-engine/src/group.cpp
-engine/src/group.h
-engine/src/handler.cpp
-engine/src/handler.h
-engine/src/hc.cpp
-engine/src/hc.h
-engine/src/hndlrlst.cpp
-engine/src/hndlrlst.h
-engine/src/ibmp.cpp
-engine/src/icondata.cpp
-engine/src/ide.cpp
-engine/src/ide.h
-engine/src/idraw.cpp
-engine/src/ifile.cpp
-engine/src/igif.cpp
-engine/src/iimport.cpp
-engine/src/ijpg.cpp
-engine/src/image.cpp
-engine/src/image.h
-engine/src/image_rep.cpp
-engine/src/image_rep.h
-engine/src/image_rep_densitymapped.cpp
-engine/src/image_rep_encoded.cpp
-engine/src/image_rep_mutable.cpp
-engine/src/image_rep_resampled.cpp
-engine/src/imagebitmap.cpp
-engine/src/imagebitmap.h
-engine/src/imagelist.cpp
-engine/src/imagelist.h
-engine/src/imageloader.cpp
-engine/src/imageloader.h
-engine/src/internal.cpp
-engine/src/internal.h
-engine/src/internal_development.cpp
-engine/src/ipng.cpp
-engine/src/iquantization.cpp
-engine/src/iquantization.h
-engine/src/iquantize_new.cpp
-engine/src/irle.cpp
-engine/src/itransform.cpp
-engine/src/iutil.cpp
-engine/src/keywords.cpp
-engine/src/keywords.h
-engine/src/legacy_spec.cpp
-engine/src/lextable.cpp
-engine/src/license.h
-engine/src/line.cpp
-engine/src/line.h
-engine/src/literal.cpp
-engine/src/literal.h
-engine/src/lnxans.cpp
-engine/src/lnxans.h
-engine/src/lnxaudio.cpp
-engine/src/lnxaudio.h
-engine/src/lnxclipboard.cpp
-engine/src/lnxcolor.cpp
-engine/src/lnxcursor.cpp
-engine/src/lnxdc.cpp
-engine/src/lnxdc.h
-engine/src/lnxdce.cpp
-engine/src/lnxdclnx.cpp
-engine/src/lnxdcs.cpp
-engine/src/lnxdnd.cpp
-engine/src/lnxdnd.h
-engine/src/lnxelevate.cpp
-engine/src/lnxflst.cpp
-engine/src/lnxflst.h
-engine/src/lnxflstold.cpp
-engine/src/lnxgtktheme.cpp
-engine/src/lnxgtkthemedrawing.cpp
-engine/src/lnxgtkthemedrawing.h
-engine/src/lnximage.cpp
-engine/src/lnximagecache.cpp
-engine/src/lnximagecache.h
-engine/src/lnxkeymapping.cpp
-engine/src/lnxmisc.cpp
-engine/src/lnxmplayer.cpp
-engine/src/lnxmplayer.h
-engine/src/lnxpasteboard.cpp
-engine/src/lnxpasteboard.h
-engine/src/lnxprefix.h
-engine/src/lnxpsprinter.cpp
-engine/src/lnxpsprinter.h
-engine/src/lnxspec.cpp
-engine/src/lnxstack.cpp
-engine/src/lnxtextlayout.cpp
-engine/src/lnxtheme.h
-engine/src/lnxtransfer.cpp
-engine/src/lnxtransfer.h
-engine/src/mac-abort.mm
-engine/src/mac-av-player.mm
-engine/src/mac-color.mm
-engine/src/mac-core.mm
-engine/src/mac-cursor.mm
-engine/src/mac-dialog.mm
-engine/src/mac-font.mm
-engine/src/mac-internal.h
-engine/src/mac-menu.mm
-engine/src/mac-pasteboard.mm
-engine/src/mac-printer.mm
-engine/src/mac-qt-player.mm
-engine/src/mac-qt-recorder.mm
-engine/src/mac-scripting.mm
-engine/src/mac-snapshot.mm
-engine/src/mac-sound.mm
-engine/src/mac-surface.mm
-engine/src/mac-window.mm
-engine/src/magnify.cpp
-engine/src/magnify.h
-engine/src/mblad.cpp
-engine/src/mblad.h
-engine/src/mblandroid.cpp
-engine/src/mblandroid.h
-engine/src/mblandroidad.cpp
-engine/src/mblandroidbrowser.cpp
-engine/src/mblandroidbusyindicator.cpp
-engine/src/mblandroidcalendar.cpp
-engine/src/mblandroidcamera.cpp
-engine/src/mblandroidcontact.cpp
-engine/src/mblandroidcontrol.cpp
-engine/src/mblandroidcontrol.h
-engine/src/mblandroiddc.cpp
-engine/src/mblandroiddialog.cpp
-engine/src/mblandroidfont.cpp
-engine/src/mblandroidfs.cpp
-engine/src/mblandroididletimer.cpp
-engine/src/mblandroidinput.cpp
-engine/src/mblandroidio.cpp
-engine/src/mblandroidjava.cpp
-engine/src/mblandroidjava.h
-engine/src/mblandroidmail.cpp
-engine/src/mblandroidmediapick.cpp
-engine/src/mblandroidmisc.cpp
-engine/src/mblandroidmm.cpp
-engine/src/mblandroidnetwork.cpp
-engine/src/mblandroidnotification.cpp
-engine/src/mblandroidorientation.cpp
-engine/src/mblandroidplayer.cpp
-engine/src/mblandroidprocess.cpp
-engine/src/mblandroidscroller.cpp
-engine/src/mblandroidsensor.cpp
-engine/src/mblandroidsound.cpp
-engine/src/mblandroidstore.cpp
-engine/src/mblandroidtextlayout.cpp
-engine/src/mblandroidtextmessaging.cpp
-engine/src/mblandroidtypeface.cpp
-engine/src/mblandroidtypeface.h
-engine/src/mblandroidurl.cpp
-engine/src/mblandroidutil.h
-engine/src/mblcalendar.cpp
-engine/src/mblcalendar.h
-engine/src/mblcamera.cpp
-engine/src/mblcontact.cpp
-engine/src/mblcontact.h
-engine/src/mblcontrol.cpp
-engine/src/mblcontrol.h
-engine/src/mbldc.cpp
-engine/src/mbldc.h
-engine/src/mbldialog.cpp
-engine/src/mblevent.h
-engine/src/mblflst.cpp
-engine/src/mblflst.h
-engine/src/mblhandlers.cpp
-engine/src/mbliphone.h
-engine/src/mbliphone.mm
-engine/src/mbliphoneactivityindicator.mm
-engine/src/mbliphonead.mm
-engine/src/mbliphoneapp.h
-engine/src/mbliphoneapp.mm
-engine/src/mbliphoneappview.mm
-engine/src/mbliphonebrowser.mm
-engine/src/mbliphonebusyindicator.mm
-engine/src/mbliphonecalendar.mm
-engine/src/mbliphonecamera.mm
-engine/src/mbliphonecontact.mm
-engine/src/mbliphonecontrol.h
-engine/src/mbliphonecontrol.mm
-engine/src/mbliphonedc.mm
-engine/src/mbliphonedialog.mm
-engine/src/mbliphoneembedded.mm
-engine/src/mbliphoneembeddedtest.mm
-engine/src/mbliphoneextra.mm
-engine/src/mbliphonefs.mm
-engine/src/mbliphonegfx.mm
-engine/src/mbliphonehooks.cpp
-engine/src/mbliphoneidletimer.mm
-engine/src/mbliphoneinput.mm
-engine/src/mbliphonemail.mm
-engine/src/mbliphonemediapick.mm
-engine/src/mbliphonemisc.mm
-engine/src/mbliphonenotification.mm
-engine/src/mbliphoneorientation.mm
-engine/src/mbliphonepick.mm
-engine/src/mbliphonepickdate.mm
-engine/src/mbliphoneplayer.mm
-engine/src/mbliphonereachability.mm
-engine/src/mbliphonescroller.mm
-engine/src/mbliphonesensor.mm
-engine/src/mbliphonesound.mm
-engine/src/mbliphonestack.mm
-engine/src/mbliphonestore.mm
-engine/src/mbliphonetextlayout.mm
-engine/src/mbliphonetextmessaging.mm
-engine/src/mbliphoneurl.mm
-engine/src/mbliphonevideo.mm
-engine/src/mbliphoneview.h
-engine/src/mblmain.cpp
-engine/src/mblnotification.cpp
-engine/src/mblnotification.h
-engine/src/mblsensor.cpp
-engine/src/mblsensor.h
-engine/src/mblsound.cpp
-engine/src/mblspec.cpp
-engine/src/mblstack.cpp
-engine/src/mblstore.cpp
-engine/src/mblstore.h
-engine/src/mblsyntax.h
-engine/src/mbltheme.cpp
-engine/src/MCBlock.h
-engine/src/mccontrol.h
-engine/src/mcerror.cpp
-engine/src/mcerror.h
-engine/src/mcio.cpp
-engine/src/mcio.h
-engine/src/mcssl.cpp
-engine/src/mcssl.h
-engine/src/mcstring.cpp
-engine/src/mcstring.h
-engine/src/mctheme.cpp
-engine/src/mctheme.h
-engine/src/mcutility.cpp
-engine/src/mcutility.h
-engine/src/md5.cpp
-engine/src/md5.h
-engine/src/menuparse.cpp
-engine/src/menuparse.h
-engine/src/meta.h
-engine/src/metacontext.cpp
-engine/src/metacontext.h
-engine/src/minizip.cpp
-engine/src/minizip.h
-engine/src/mode.h
-engine/src/mode_development.cpp
-engine/src/mode_installer.cpp
-engine/src/mode_installer_lnx.cpp
-engine/src/mode_installer_osx.cpp
-engine/src/mode_installer_w32.cpp
-engine/src/mode_server.cpp
-engine/src/mode_standalone.cpp
-engine/src/newobj.cpp
-engine/src/newobj.h
-engine/src/notify.cpp
-engine/src/notify.h
-engine/src/objdefs.h
-engine/src/object.cpp
-engine/src/object.h
-engine/src/objectprops.cpp
-engine/src/objectpropsets.cpp
-engine/src/objectpropsets.h
-engine/src/objectstream.cpp
-engine/src/objectstream.h
-engine/src/objptr.cpp
-engine/src/objptr.h
-engine/src/opensslsocket.cpp
-engine/src/operator.cpp
-engine/src/operator.h
-engine/src/osspec.h
-engine/src/osxcisupport.mm
-engine/src/osxcontext.cpp
-engine/src/osxcontext.h
-engine/src/osxcoreimage.cpp
-engine/src/osxfield.cpp
-engine/src/osxflst.cpp
-engine/src/osxflst.h
-engine/src/osximage.cpp
-engine/src/osxmisc.cpp
-engine/src/osxprefix-legacy.h
-engine/src/osxprefix.h
-engine/src/osxprinter.cpp
-engine/src/osxprinter.h
-engine/src/osxstack.cpp
-engine/src/osxtextlayout.cpp
-engine/src/osxtheme.cpp
-engine/src/osxtheme.h
-engine/src/packed.h
-engine/src/paint.h
-engine/src/paragraf.cpp
-engine/src/paragraf.h
-engine/src/paragrafattr.cpp
-engine/src/paragraph.cpp
-engine/src/paragraph.h
-engine/src/param.cpp
-engine/src/param.h
-engine/src/parentscript.cpp
-engine/src/parentscript.h
-engine/src/parsedef.h
-engine/src/parseerrors.h
-engine/src/path.cpp
-engine/src/path.h
-engine/src/pathgray.cpp
-engine/src/pathprivate.h
-engine/src/pathprocess.cpp
-engine/src/pickle.cpp
-engine/src/platform-internal.h
-engine/src/platform-recorder.cpp
-engine/src/platform-surface.cpp
-engine/src/platform-window.cpp
-engine/src/platform.cpp
-engine/src/platform.h
-engine/src/player-interface.h
-engine/src/player-legacy.cpp
-engine/src/player-legacy.h
-engine/src/player-platform.cpp
-engine/src/player-platform.h
-engine/src/player.cpp
-engine/src/player.h
-engine/src/ports.cpp
-engine/src/prefix.cpp
-engine/src/prefix.h
-engine/src/printer.cpp
-engine/src/printer.h
-engine/src/property.cpp
-engine/src/property.h
-engine/src/props.cpp
-engine/src/quicktime.cpp
-engine/src/rawarray.h
-engine/src/redraw.cpp
-engine/src/redraw.h
-engine/src/regex.cpp
-engine/src/regex.h
-engine/src/region.cpp
-engine/src/region.h
-engine/src/resolution.cpp
-engine/src/resolution.h
-engine/src/resource.h
-engine/src/rgb.cpp
-engine/src/rtf.cpp
-engine/src/rtf.h
-engine/src/rtfsupport.cpp
-engine/src/scriptenvironment.h
-engine/src/scriptpt.cpp
-engine/src/scriptpt.h
-engine/src/scrolbar.cpp
-engine/src/scrolbar.h
-engine/src/scrollbardraw.cpp
-engine/src/securemode.cpp
-engine/src/securemode.h
-engine/src/segment.cpp
-engine/src/segment.h
-engine/src/sellst.cpp
-engine/src/sellst.h
-engine/src/sha1.cpp
-engine/src/sha1.h
-engine/src/socket.h
-engine/src/socket_resolve.cpp
-engine/src/srvcgi.cpp
-engine/src/srvcgi.h
-engine/src/srvdebug.cpp
-engine/src/srvdebug.h
-engine/src/srvmac.cpp
-engine/src/srvmain.cpp
-engine/src/srvmain.h
-engine/src/srvmultipart.cpp
-engine/src/srvmultipart.h
-engine/src/srvoutput.cpp
-engine/src/srvposix.cpp
-engine/src/srvscript.cpp
-engine/src/srvscript.h
-engine/src/srvsession.cpp
-engine/src/srvsession.h
-engine/src/srvspec.cpp
-engine/src/srvstack.cpp
-engine/src/srvtheme.cpp
-engine/src/srvwindows.cpp
-engine/src/stack.cpp
-engine/src/stack.h
-engine/src/stack2.cpp
-engine/src/stack3.cpp
-engine/src/stackcache.cpp
-engine/src/stacke.cpp
-engine/src/stacklst.cpp
-engine/src/stacklst.h
-engine/src/stacksecurity.cpp
-engine/src/stacksecurity.h
-engine/src/stacktile.cpp
-engine/src/stacktile.h
-engine/src/stackview.cpp
-engine/src/statemnt.cpp
-engine/src/statemnt.h
-engine/src/styledtext.cpp
-engine/src/styledtext.h
-engine/src/surface.cpp
-engine/src/syntax.cpp
-engine/src/syntax.h
-engine/src/syscfdate.cpp
-engine/src/sysdefs.h
-engine/src/syslnxfs.cpp
-engine/src/syslnxregion.cpp
-engine/src/sysosxrandom.cpp
-engine/src/sysosxregion.cpp
-engine/src/sysspec.cpp
-engine/src/system.h
-engine/src/systhreads.h
-engine/src/sysunxdate.cpp
-engine/src/sysunxnetwork.cpp
-engine/src/sysunxrandom.cpp
-engine/src/sysunxthreads.cpp
-engine/src/sysw32fs.cpp
-engine/src/sysw32network.cpp
-engine/src/sysw32random.cpp
-engine/src/sysw32region.cpp
-engine/src/sysw32registry.cpp
-engine/src/text.cpp
-engine/src/text.h
-engine/src/textbuffer.h
-engine/src/textlayout.h
-engine/src/tilecache.cpp
-engine/src/tilecache.h
-engine/src/tilecachecg.cpp
-engine/src/tilecachegl.cpp
-engine/src/tilecachesw.cpp
-engine/src/tooltip.cpp
-engine/src/tooltip.h
-engine/src/transfer.cpp
-engine/src/transfer.h
-engine/src/typedefs.h
-engine/src/uidc.cpp
-engine/src/uidc.h
-engine/src/undolst.cpp
-engine/src/undolst.h
-engine/src/unicode.cpp
-engine/src/unicode.h
-engine/src/util.cpp
-engine/src/util.h
-engine/src/uuid.cpp
-engine/src/uuid.h
-engine/src/variable.cpp
-engine/src/variable.h
-engine/src/variable_impl.h
-engine/src/vclip.cpp
-engine/src/vclip.h
-engine/src/visual.cpp
-engine/src/visual.h
-engine/src/visualeffect.h
-engine/src/w32ans.cpp
-engine/src/w32clipboard.cpp
-engine/src/w32color.cpp
-engine/src/w32compat.cpp
-engine/src/w32compat.h
-engine/src/w32context.h
-engine/src/w32cursor.cpp
-engine/src/w32date.cpp
-engine/src/w32dc.cpp
-engine/src/w32dc.h
-engine/src/w32dce.cpp
-engine/src/w32dcs.cpp
-engine/src/w32dcw32.cpp
-engine/src/w32defs.h
-engine/src/w32dnd.cpp
-engine/src/w32dnd.h
-engine/src/w32dsk-legacy.h
-engine/src/w32flst.cpp
-engine/src/w32flst.h
-engine/src/w32icon.cpp
-engine/src/w32image.cpp
-engine/src/w32misc.cpp
-engine/src/w32prefix.cpp
-engine/src/w32prefix.h
-engine/src/w32printer.cpp
-engine/src/w32printer.h
-engine/src/w32relaunch.cpp
-engine/src/w32script.cpp
-engine/src/w32sound.cpp
-engine/src/w32stack.cpp
-engine/src/w32text.cpp
-engine/src/w32text.h
-engine/src/w32textlayout.cpp
-engine/src/w32theme.cpp
-engine/src/w32theme.h
-engine/src/w32transfer.cpp
-engine/src/w32transfer.h
-engine/app-bundle-template.gypi
-engine/bind-ios-standalone.sh
-engine/engine-sources.gypi
-engine/engine.gyp
-engine/kernel-development.gypi
-engine/kernel-installer.gypi
-engine/kernel-mode-template.gypi
-engine/kernel-server.gypi
-engine/kernel-standalone.gypi
-engine/kernel.gypi
-engine/Makefile.common
-engine/Makefile.development
-engine/Makefile.installer
-engine/Makefile.kernel
-engine/Makefile.kernel-common
-engine/Makefile.kernel-development
-engine/Makefile.kernel-server
-engine/Makefile.server
-engine/Makefile.standalone
-gyp/data/win/large-pdb-shim.cc
-gyp/tools/emacs/testdata/media.gyp
-gyp/tools/emacs/run-unit-tests.sh
-ide-support/revdeploylibraryandroid.livecodescript
-ide-support/revdeploylibraryios.livecodescript
-ide-support/revdocsparser.livecodescript
-ide-support/revliburl.livecodescript
-ide-support/revsaveasandroidstandalone.livecodescript
-ide-support/revsaveasiosstandalone.livecodescript
-ide-support/revsaveasstandalone.livecodescript
-ide-support/revsblibrary.livecodescript
-lcidlc/include/LiveCode.h
-lcidlc/src/Coder.cpp
-lcidlc/src/Coder.h
-lcidlc/src/CString.cpp
-lcidlc/src/CString.h
-lcidlc/src/EncodedSupportJava.c
-lcidlc/src/Error.cpp
-lcidlc/src/Error.h
-lcidlc/src/Interface.cpp
-lcidlc/src/Interface.h
-lcidlc/src/InterfaceGenerate.cpp
-lcidlc/src/InterfacePrivate.h
-lcidlc/src/Main.cpp
-lcidlc/src/NativeType.cpp
-lcidlc/src/NativeType.h
-lcidlc/src/Parser.cpp
-lcidlc/src/Parser.h
-lcidlc/src/Position.cpp
-lcidlc/src/Position.h
-lcidlc/src/Scanner.cpp
-lcidlc/src/Scanner.h
-lcidlc/src/Support.mm
-lcidlc/src/Value.cpp
-lcidlc/src/Value.h
-lcidlc/interface_error_test.txt
-lcidlc/lclink.sh
-lcidlc/lclinktest.sh
-lcidlc/Makefile
-libcore/include/atlsubset.h
-libcore/include/core.h
-libcore/include/filesystem.h
-libcore/include/module.h
-libcore/include/sserialize.h
-libcore/include/sserialize_lnx.h
-libcore/include/sserialize_osx.h
-libcore/include/sserialize_w32.h
-libcore/include/thread.h
-libcore/include/thunk.h
-libcore/src/binary.cpp
-libcore/src/core.cpp
-libcore/src/filesystem.cpp
-libcore/src/module.cpp
-libcore/src/sserialize.cpp
-libcore/src/sserialize_lnx.cpp
-libcore/src/sserialize_osx.cpp
-libcore/src/sserialize_w32.cpp
-libcore/src/thread.cpp
-libcore/src/thunk.cpp
-libcore/libcore.gyp
-libexternal/include/revolution/external.h
-libexternal/include/revolution/support.h
-libexternal/src/external.c
-libexternal/src/osxsupport.cpp
-libexternal/src/unxsupport.cpp
-libexternal/src/w32support.cpp
-libexternal/libexternal.gyp
-libexternalv1/include/external.h
-libexternalv1/src/external.c
-libexternalv1/libexternalv1.gyp
-libfoundation/include/foundation-auto.h
-libfoundation/include/foundation-bidi.h
-libfoundation/include/foundation-inline.h
-libfoundation/include/foundation-locale.h
-libfoundation/include/foundation-objc.h
-libfoundation/include/foundation-stdlib.h
-libfoundation/include/foundation-string.h
-libfoundation/include/foundation-text.h
-libfoundation/include/foundation-unicode.h
-libfoundation/include/foundation.h
-libfoundation/src/foundation-array.cpp
-libfoundation/src/foundation-bidi.cpp
-libfoundation/src/foundation-core.cpp
-libfoundation/src/foundation-data.cpp
-libfoundation/src/foundation-debug.cpp
-libfoundation/src/foundation-error.cpp
-libfoundation/src/foundation-list.cpp
-libfoundation/src/foundation-locale.cpp
-libfoundation/src/foundation-name.cpp
-libfoundation/src/foundation-nativechars.cpp
-libfoundation/src/foundation-number.cpp
-libfoundation/src/foundation-objc.mm
-libfoundation/src/foundation-private.h
-libfoundation/src/foundation-set.cpp
-libfoundation/src/foundation-stream.cpp
-libfoundation/src/foundation-string-cf.cpp
-libfoundation/src/foundation-string.cpp
-libfoundation/src/foundation-text.cpp
-libfoundation/src/foundation-unicode-private.h
-libfoundation/src/foundation-unicode.cpp
-libfoundation/src/foundation-unicodechars.cpp
-libfoundation/src/foundation-value.cpp
-libfoundation/libfoundation.gyp
-libgraphics/include/graphics.h
-libgraphics/src/blur.cpp
-libgraphics/src/cachetable.cpp
-libgraphics/src/context.cpp
-libgraphics/src/coretext.cpp
-libgraphics/src/graphics-internal.h
-libgraphics/src/hb-sk.cpp
-libgraphics/src/hb-sk.h
-libgraphics/src/image.cpp
-libgraphics/src/legacyblendmodes.cpp
-libgraphics/src/legacygradients.cpp
-libgraphics/src/lnxtext.cpp
-libgraphics/src/mblandroidtext.cpp
-libgraphics/src/osxtext.cpp
-libgraphics/src/path.cpp
-libgraphics/src/region.cpp
-libgraphics/src/spread.cpp
-libgraphics/src/utils.cpp
-libgraphics/src/w32text.cpp
-libgraphics/libgraphics.gyp
-prebuilt/scripts/build-curl.sh
-prebuilt/scripts/build-icu.sh
-prebuilt/scripts/build-openssl.sh
-prebuilt/build-libraries.sh
-prebuilt/fetch-libraries.sh
-prebuilt/fetch.gyp
-prebuilt/libcef.gyp
-prebuilt/libcurl.gyp
-prebuilt/libicu.gyp
-prebuilt/libopenssl.gyp
-prebuilt/package-libs.sh
-revbrowser/src/cefbrowser.cpp
-revbrowser/src/cefbrowser.h
-revbrowser/src/cefbrowser_msg.h
-revbrowser/src/cefbrowser_osx.mm
-revbrowser/src/cefbrowser_w32.cpp
-revbrowser/src/cefprocess.cpp
-revbrowser/src/cefprocess_osx.mm
-revbrowser/src/cefprocess_w32.cpp
-revbrowser/src/cefshared.h
-revbrowser/src/cefshared_osx.cpp
-revbrowser/src/cefshared_w32.cpp
-revbrowser/src/osxbrowser.h
-revbrowser/src/osxbrowser.mm
-revbrowser/src/revbrowser.cpp
-revbrowser/src/revbrowser.h
-revbrowser/src/revbrowser.rc.h
-revbrowser/src/w32browser.cpp
-revbrowser/src/w32browser.h
-revbrowser/src/WebAuthenticationPanel.h
-revbrowser/tools/make_more_helpers.sh
-revbrowser/revbrowser.gyp
-revdb/src/cdbcursor.cpp
-revdb/src/database.cpp
-revdb/src/database.h
-revdb/src/dbcursor.h
-revdb/src/dbdriver.h
-revdb/src/dbdrivercommon.cpp
-revdb/src/dbdrivercommon.h
-revdb/src/dbmysql.h
-revdb/src/dbmysqlapi.cpp
-revdb/src/dbodbc.h
-revdb/src/dbodbcapi.cpp
-revdb/src/dbpostgresql.h
-revdb/src/dbpostgresqlapi.cpp
-revdb/src/dbsqlite.h
-revdb/src/dbsqliteapi.cpp
-revdb/src/iossupport.cpp
-revdb/src/iossupport.h
-revdb/src/large_buffer.h
-revdb/src/mysql_connection.cpp
-revdb/src/mysql_cursor.cpp
-revdb/src/odbc_connection.cpp
-revdb/src/odbc_cursor.cpp
-revdb/src/osxsupport.cpp
-revdb/src/osxsupport.h
-revdb/src/postgresql_connection.cpp
-revdb/src/postgresql_cursor.cpp
-revdb/src/revdb.cpp
-revdb/src/revdb.h
-revdb/src/revdbapi.h
-revdb/src/sqlite_connection.cpp
-revdb/src/sqlite_cursor.cpp
-revdb/src/unxsupport.cpp
-revdb/src/unxsupport.h
-revdb/src/w32support.cpp
-revdb/src/w32support.h
-revdb/Makefile.server-dbmysql
-revdb/revdb.gyp
-revfont/src/osxfont.cpp
-revfont/src/revfont.cpp
-revfont/src/revfont.h
-revfont/src/w32font.cpp
-revfont/revfont.gyp
-revmobile/src/comutil.h
-revmobile/src/corecon.h
-revmobile/src/CoreSimulator.h
-revmobile/src/devemu.h
-revmobile/src/DVTiPhoneSimulatorRemoteClient.h
-revmobile/src/iPhoneSimulatorRemoteClient.h
-revmobile/src/revandroid.cpp
-revmobile/src/reviphone.mm
-revmobile/src/reviphoneproxy.mm
-revmobile/src/revmobile.cpp
-revmobile/src/util.h
-revmobile/revmobile.gyp
-revpdfprinter/src/revpdfprinter.cpp
-revpdfprinter/src/revpdfprinter.h
-revpdfprinter/src/revpdfprinter_coretext.mm
-revpdfprinter/src/revpdfprinter_ios.mm
-revpdfprinter/src/revpdfprinter_lnx.cpp
-revpdfprinter/src/revpdfprinter_osx.cpp
-revpdfprinter/src/revpdfprinter_w32.cpp
-revpdfprinter/revpdfprinter.gyp
-revspeech/src/osxspeech.cpp
-revspeech/src/osxspeech.h
-revspeech/src/revspeech.cpp
-revspeech/src/revspeech.h
-revspeech/src/w32sapi4speech.cpp
-revspeech/src/w32sapi4speech.h
-revspeech/src/w32sapi5speech.cpp
-revspeech/src/w32sapi5speech.h
-revspeech/src/w32speech.cpp
-revspeech/revspeech.gyp
-revvideograbber/src/dsDlgFunc.cpp
-revvideograbber/src/dsvideograbber.cpp
-revvideograbber/src/dsvideograbber.h
-revvideograbber/src/mcivideograbber.cpp
-revvideograbber/src/mcivideograbber.h
-revvideograbber/src/qedit.h
-revvideograbber/src/qtvideograbber.cpp
-revvideograbber/src/qtvideograbber.h
-revvideograbber/src/qtxcapture.mm
-revvideograbber/src/qtxvideograbber.h
-revvideograbber/src/qtxvideograbber.mm
-revvideograbber/src/revcapture.h
-revvideograbber/src/revcapture.mm
-revvideograbber/src/revvideograbber.cpp
-revvideograbber/src/revvideograbber.h
-revvideograbber/src/rrecapture.m
-revvideograbber/src/videograbber.h
-revvideograbber/revvideograbber.gyp
-revxml/src/cxml.h
-revxml/src/revxml.cpp
-revxml/src/revxml.h
-revxml/src/xmlattribute.cpp
-revxml/src/xmldoc.cpp
-revxml/src/xmlelement.cpp
-revxml/revxml.gyp
-revzip/src/revzip.cpp
-revzip/revzip.gyp
-thirdparty/headers/linux/include/atk/atk-enum-types.h
-thirdparty/headers/linux/include/atk/atk.h
-thirdparty/headers/linux/include/atk/atkaction.h
-thirdparty/headers/linux/include/atk/atkcomponent.h
-thirdparty/headers/linux/include/atk/atkdocument.h
-thirdparty/headers/linux/include/atk/atkeditabletext.h
-thirdparty/headers/linux/include/atk/atkgobjectaccessible.h
-thirdparty/headers/linux/include/atk/atkhyperlink.h
-thirdparty/headers/linux/include/atk/atkhyperlinkimpl.h
-thirdparty/headers/linux/include/atk/atkhypertext.h
-thirdparty/headers/linux/include/atk/atkimage.h
-thirdparty/headers/linux/include/atk/atkmisc.h
-thirdparty/headers/linux/include/atk/atknoopobject.h
-thirdparty/headers/linux/include/atk/atknoopobjectfactory.h
-thirdparty/headers/linux/include/atk/atkobject.h
-thirdparty/headers/linux/include/atk/atkobjectfactory.h
-thirdparty/headers/linux/include/atk/atkregistry.h
-thirdparty/headers/linux/include/atk/atkrelation.h
-thirdparty/headers/linux/include/atk/atkrelationset.h
-thirdparty/headers/linux/include/atk/atkrelationtype.h
-thirdparty/headers/linux/include/atk/atkselection.h
-thirdparty/headers/linux/include/atk/atkstate.h
-thirdparty/headers/linux/include/atk/atkstateset.h
-thirdparty/headers/linux/include/atk/atkstreamablecontent.h
-thirdparty/headers/linux/include/atk/atktable.h
-thirdparty/headers/linux/include/atk/atktext.h
-thirdparty/headers/linux/include/atk/atkutil.h
-thirdparty/headers/linux/include/atk/atkvalue.h
-thirdparty/headers/linux/include/cairo/cairo-features.h
-thirdparty/headers/linux/include/cairo/cairo-ft.h
-thirdparty/headers/linux/include/cairo/cairo-xlib-xrender.h
-thirdparty/headers/linux/include/cairo/cairo-xlib.h
-thirdparty/headers/linux/include/cairo/cairo.h
-thirdparty/headers/linux/include/freetype/cache/ftccache.h
-thirdparty/headers/linux/include/freetype/cache/ftccmap.h
-thirdparty/headers/linux/include/freetype/cache/ftcglyph.h
-thirdparty/headers/linux/include/freetype/cache/ftcimage.h
-thirdparty/headers/linux/include/freetype/cache/ftcmanag.h
-thirdparty/headers/linux/include/freetype/cache/ftcmru.h
-thirdparty/headers/linux/include/freetype/cache/ftcsbits.h
-thirdparty/headers/linux/include/freetype/config/ftconfig.h
-thirdparty/headers/linux/include/freetype/config/ftheader.h
-thirdparty/headers/linux/include/freetype/config/ftmodule.h
-thirdparty/headers/linux/include/freetype/config/ftoption.h
-thirdparty/headers/linux/include/freetype/config/ftstdlib.h
-thirdparty/headers/linux/include/freetype/internal/autohint.h
-thirdparty/headers/linux/include/freetype/internal/ftcalc.h
-thirdparty/headers/linux/include/freetype/internal/ftdebug.h
-thirdparty/headers/linux/include/freetype/internal/ftdriver.h
-thirdparty/headers/linux/include/freetype/internal/ftgloadr.h
-thirdparty/headers/linux/include/freetype/internal/ftmemory.h
-thirdparty/headers/linux/include/freetype/internal/ftobjs.h
-thirdparty/headers/linux/include/freetype/internal/ftrfork.h
-thirdparty/headers/linux/include/freetype/internal/ftserv.h
-thirdparty/headers/linux/include/freetype/internal/ftstream.h
-thirdparty/headers/linux/include/freetype/internal/fttrace.h
-thirdparty/headers/linux/include/freetype/internal/ftvalid.h
-thirdparty/headers/linux/include/freetype/internal/internal.h
-thirdparty/headers/linux/include/freetype/internal/pcftypes.h
-thirdparty/headers/linux/include/freetype/internal/psaux.h
-thirdparty/headers/linux/include/freetype/internal/pshints.h
-thirdparty/headers/linux/include/freetype/internal/sfnt.h
-thirdparty/headers/linux/include/freetype/internal/svbdf.h
-thirdparty/headers/linux/include/freetype/internal/svgldict.h
-thirdparty/headers/linux/include/freetype/internal/svmm.h
-thirdparty/headers/linux/include/freetype/internal/svotval.h
-thirdparty/headers/linux/include/freetype/internal/svpfr.h
-thirdparty/headers/linux/include/freetype/internal/svpostnm.h
-thirdparty/headers/linux/include/freetype/internal/svpscmap.h
-thirdparty/headers/linux/include/freetype/internal/svpsinfo.h
-thirdparty/headers/linux/include/freetype/internal/svsfnt.h
-thirdparty/headers/linux/include/freetype/internal/svttcmap.h
-thirdparty/headers/linux/include/freetype/internal/svwinfnt.h
-thirdparty/headers/linux/include/freetype/internal/svxf86nm.h
-thirdparty/headers/linux/include/freetype/internal/t1types.h
-thirdparty/headers/linux/include/freetype/internal/tttypes.h
-thirdparty/headers/linux/include/freetype/freetype.h
-thirdparty/headers/linux/include/freetype/ftbbox.h
-thirdparty/headers/linux/include/freetype/ftbdf.h
-thirdparty/headers/linux/include/freetype/ftbitmap.h
-thirdparty/headers/linux/include/freetype/ftcache.h
-thirdparty/headers/linux/include/freetype/ftchapters.h
-thirdparty/headers/linux/include/freetype/fterrdef.h
-thirdparty/headers/linux/include/freetype/fterrors.h
-thirdparty/headers/linux/include/freetype/ftglyph.h
-thirdparty/headers/linux/include/freetype/ftgzip.h
-thirdparty/headers/linux/include/freetype/ftimage.h
-thirdparty/headers/linux/include/freetype/ftincrem.h
-thirdparty/headers/linux/include/freetype/ftlist.h
-thirdparty/headers/linux/include/freetype/ftlzw.h
-thirdparty/headers/linux/include/freetype/ftmac.h
-thirdparty/headers/linux/include/freetype/ftmm.h
-thirdparty/headers/linux/include/freetype/ftmodapi.h
-thirdparty/headers/linux/include/freetype/ftmoderr.h
-thirdparty/headers/linux/include/freetype/ftotval.h
-thirdparty/headers/linux/include/freetype/ftoutln.h
-thirdparty/headers/linux/include/freetype/ftpfr.h
-thirdparty/headers/linux/include/freetype/ftrender.h
-thirdparty/headers/linux/include/freetype/ftsizes.h
-thirdparty/headers/linux/include/freetype/ftsnames.h
-thirdparty/headers/linux/include/freetype/ftstroke.h
-thirdparty/headers/linux/include/freetype/ftsynth.h
-thirdparty/headers/linux/include/freetype/ftsysio.h
-thirdparty/headers/linux/include/freetype/ftsysmem.h
-thirdparty/headers/linux/include/freetype/ftsystem.h
-thirdparty/headers/linux/include/freetype/fttrigon.h
-thirdparty/headers/linux/include/freetype/fttypes.h
-thirdparty/headers/linux/include/freetype/ftwinfnt.h
-thirdparty/headers/linux/include/freetype/ftxf86.h
-thirdparty/headers/linux/include/freetype/t1tables.h
-thirdparty/headers/linux/include/freetype/ttnameid.h
-thirdparty/headers/linux/include/freetype/tttables.h
-thirdparty/headers/linux/include/freetype/tttags.h
-thirdparty/headers/linux/include/freetype/ttunpat.h
-thirdparty/headers/linux/include/gdk/gdk.h
-thirdparty/headers/linux/include/gdk/gdkalias.h
-thirdparty/headers/linux/include/gdk/gdkcairo.h
-thirdparty/headers/linux/include/gdk/gdkcolor.h
-thirdparty/headers/linux/include/gdk/gdkcursor.h
-thirdparty/headers/linux/include/gdk/gdkdisplay.h
-thirdparty/headers/linux/include/gdk/gdkdisplaymanager.h
-thirdparty/headers/linux/include/gdk/gdkdnd.h
-thirdparty/headers/linux/include/gdk/gdkdrawable.h
-thirdparty/headers/linux/include/gdk/gdkenumtypes.h
-thirdparty/headers/linux/include/gdk/gdkevents.h
-thirdparty/headers/linux/include/gdk/gdkfont.h
-thirdparty/headers/linux/include/gdk/gdkgc.h
-thirdparty/headers/linux/include/gdk/gdki18n.h
-thirdparty/headers/linux/include/gdk/gdkimage.h
-thirdparty/headers/linux/include/gdk/gdkinput.h
-thirdparty/headers/linux/include/gdk/gdkkeys.h
-thirdparty/headers/linux/include/gdk/gdkkeysyms.h
-thirdparty/headers/linux/include/gdk/gdkpango.h
-thirdparty/headers/linux/include/gdk/gdkpixbuf.h
-thirdparty/headers/linux/include/gdk/gdkpixmap.h
-thirdparty/headers/linux/include/gdk/gdkprivate.h
-thirdparty/headers/linux/include/gdk/gdkproperty.h
-thirdparty/headers/linux/include/gdk/gdkregion.h
-thirdparty/headers/linux/include/gdk/gdkrgb.h
-thirdparty/headers/linux/include/gdk/gdkscreen.h
-thirdparty/headers/linux/include/gdk/gdkselection.h
-thirdparty/headers/linux/include/gdk/gdkspawn.h
-thirdparty/headers/linux/include/gdk/gdktypes.h
-thirdparty/headers/linux/include/gdk/gdkvisual.h
-thirdparty/headers/linux/include/gdk/gdkwindow.h
-thirdparty/headers/linux/include/gdk/gdkx.h
-thirdparty/headers/linux/include/gdk-pixbuf/gdk-pixbuf-animation.h
-thirdparty/headers/linux/include/gdk-pixbuf/gdk-pixbuf-core.h
-thirdparty/headers/linux/include/gdk-pixbuf/gdk-pixbuf-enum-types.h
-thirdparty/headers/linux/include/gdk-pixbuf/gdk-pixbuf-features.h
-thirdparty/headers/linux/include/gdk-pixbuf/gdk-pixbuf-io.h
-thirdparty/headers/linux/include/gdk-pixbuf/gdk-pixbuf-loader.h
-thirdparty/headers/linux/include/gdk-pixbuf/gdk-pixbuf-marshal.h
-thirdparty/headers/linux/include/gdk-pixbuf/gdk-pixbuf-simple-anim.h
-thirdparty/headers/linux/include/gdk-pixbuf/gdk-pixbuf-transform.h
-thirdparty/headers/linux/include/gdk-pixbuf/gdk-pixbuf.h
-thirdparty/headers/linux/include/gdk-pixbuf/gdk-pixdata.h
-thirdparty/headers/linux/include/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
-thirdparty/headers/linux/include/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
-thirdparty/headers/linux/include/glib/galloca.h
-thirdparty/headers/linux/include/glib/garray.h
-thirdparty/headers/linux/include/glib/gasyncqueue.h
-thirdparty/headers/linux/include/glib/gatomic.h
-thirdparty/headers/linux/include/glib/gbacktrace.h
-thirdparty/headers/linux/include/glib/gcache.h
-thirdparty/headers/linux/include/glib/gcompletion.h
-thirdparty/headers/linux/include/glib/gconvert.h
-thirdparty/headers/linux/include/glib/gdataset.h
-thirdparty/headers/linux/include/glib/gdate.h
-thirdparty/headers/linux/include/glib/gdir.h
-thirdparty/headers/linux/include/glib/gerror.h
-thirdparty/headers/linux/include/glib/gfileutils.h
-thirdparty/headers/linux/include/glib/ghash.h
-thirdparty/headers/linux/include/glib/ghook.h
-thirdparty/headers/linux/include/glib/gi18n-lib.h
-thirdparty/headers/linux/include/glib/gi18n.h
-thirdparty/headers/linux/include/glib/giochannel.h
-thirdparty/headers/linux/include/glib/gkeyfile.h
-thirdparty/headers/linux/include/glib/glist.h
-thirdparty/headers/linux/include/glib/gmacros.h
-thirdparty/headers/linux/include/glib/gmain.h
-thirdparty/headers/linux/include/glib/gmappedfile.h
-thirdparty/headers/linux/include/glib/gmarkup.h
-thirdparty/headers/linux/include/glib/gmem.h
-thirdparty/headers/linux/include/glib/gmessages.h
-thirdparty/headers/linux/include/glib/gnode.h
-thirdparty/headers/linux/include/glib/goption.h
-thirdparty/headers/linux/include/glib/gpattern.h
-thirdparty/headers/linux/include/glib/gprimes.h
-thirdparty/headers/linux/include/glib/gprintf.h
-thirdparty/headers/linux/include/glib/gqsort.h
-thirdparty/headers/linux/include/glib/gquark.h
-thirdparty/headers/linux/include/glib/gqueue.h
-thirdparty/headers/linux/include/glib/grand.h
-thirdparty/headers/linux/include/glib/grel.h
-thirdparty/headers/linux/include/glib/gscanner.h
-thirdparty/headers/linux/include/glib/gshell.h
-thirdparty/headers/linux/include/glib/gslice.h
-thirdparty/headers/linux/include/glib/gslist.h
-thirdparty/headers/linux/include/glib/gspawn.h
-thirdparty/headers/linux/include/glib/gstdio.h
-thirdparty/headers/linux/include/glib/gstrfuncs.h
-thirdparty/headers/linux/include/glib/gstring.h
-thirdparty/headers/linux/include/glib/gthread.h
-thirdparty/headers/linux/include/glib/gthreadpool.h
-thirdparty/headers/linux/include/glib/gtimer.h
-thirdparty/headers/linux/include/glib/gtree.h
-thirdparty/headers/linux/include/glib/gtypes.h
-thirdparty/headers/linux/include/glib/gunicode.h
-thirdparty/headers/linux/include/glib/gutils.h
-thirdparty/headers/linux/include/glib/gwin32.h
-thirdparty/headers/linux/include/gobject/gboxed.h
-thirdparty/headers/linux/include/gobject/gclosure.h
-thirdparty/headers/linux/include/gobject/genums.h
-thirdparty/headers/linux/include/gobject/gmarshal.h
-thirdparty/headers/linux/include/gobject/gobject.h
-thirdparty/headers/linux/include/gobject/gobjectnotifyqueue.c
-thirdparty/headers/linux/include/gobject/gparam.h
-thirdparty/headers/linux/include/gobject/gparamspecs.h
-thirdparty/headers/linux/include/gobject/gsignal.h
-thirdparty/headers/linux/include/gobject/gsourceclosure.h
-thirdparty/headers/linux/include/gobject/gtype.h
-thirdparty/headers/linux/include/gobject/gtypemodule.h
-thirdparty/headers/linux/include/gobject/gtypeplugin.h
-thirdparty/headers/linux/include/gobject/gvalue.h
-thirdparty/headers/linux/include/gobject/gvaluearray.h
-thirdparty/headers/linux/include/gobject/gvaluecollector.h
-thirdparty/headers/linux/include/gobject/gvaluetypes.h
-thirdparty/headers/linux/include/gtk/gtk.h
-thirdparty/headers/linux/include/gtk/gtkaboutdialog.h
-thirdparty/headers/linux/include/gtk/gtkaccelgroup.h
-thirdparty/headers/linux/include/gtk/gtkaccellabel.h
-thirdparty/headers/linux/include/gtk/gtkaccelmap.h
-thirdparty/headers/linux/include/gtk/gtkaccessible.h
-thirdparty/headers/linux/include/gtk/gtkaction.h
-thirdparty/headers/linux/include/gtk/gtkactiongroup.h
-thirdparty/headers/linux/include/gtk/gtkadjustment.h
-thirdparty/headers/linux/include/gtk/gtkalignment.h
-thirdparty/headers/linux/include/gtk/gtkarrow.h
-thirdparty/headers/linux/include/gtk/gtkaspectframe.h
-thirdparty/headers/linux/include/gtk/gtkassistant.h
-thirdparty/headers/linux/include/gtk/gtkbbox.h
-thirdparty/headers/linux/include/gtk/gtkbin.h
-thirdparty/headers/linux/include/gtk/gtkbindings.h
-thirdparty/headers/linux/include/gtk/gtkbox.h
-thirdparty/headers/linux/include/gtk/gtkbutton.h
-thirdparty/headers/linux/include/gtk/gtkcalendar.h
-thirdparty/headers/linux/include/gtk/gtkcelleditable.h
-thirdparty/headers/linux/include/gtk/gtkcelllayout.h
-thirdparty/headers/linux/include/gtk/gtkcellrenderer.h
-thirdparty/headers/linux/include/gtk/gtkcellrendereraccel.h
-thirdparty/headers/linux/include/gtk/gtkcellrenderercombo.h
-thirdparty/headers/linux/include/gtk/gtkcellrendererpixbuf.h
-thirdparty/headers/linux/include/gtk/gtkcellrendererprogress.h
-thirdparty/headers/linux/include/gtk/gtkcellrendererspin.h
-thirdparty/headers/linux/include/gtk/gtkcellrenderertext.h
-thirdparty/headers/linux/include/gtk/gtkcellrenderertoggle.h
-thirdparty/headers/linux/include/gtk/gtkcellview.h
-thirdparty/headers/linux/include/gtk/gtkcheckbutton.h
-thirdparty/headers/linux/include/gtk/gtkcheckmenuitem.h
-thirdparty/headers/linux/include/gtk/gtkclipboard.h
-thirdparty/headers/linux/include/gtk/gtkclist.h
-thirdparty/headers/linux/include/gtk/gtkcolorbutton.h
-thirdparty/headers/linux/include/gtk/gtkcolorsel.h
-thirdparty/headers/linux/include/gtk/gtkcolorseldialog.h
-thirdparty/headers/linux/include/gtk/gtkcombo.h
-thirdparty/headers/linux/include/gtk/gtkcombobox.h
-thirdparty/headers/linux/include/gtk/gtkcomboboxentry.h
-thirdparty/headers/linux/include/gtk/gtkcontainer.h
-thirdparty/headers/linux/include/gtk/gtkctree.h
-thirdparty/headers/linux/include/gtk/gtkcurve.h
-thirdparty/headers/linux/include/gtk/gtkdebug.h
-thirdparty/headers/linux/include/gtk/gtkdialog.h
-thirdparty/headers/linux/include/gtk/gtkdnd.h
-thirdparty/headers/linux/include/gtk/gtkdrawingarea.h
-thirdparty/headers/linux/include/gtk/gtkeditable.h
-thirdparty/headers/linux/include/gtk/gtkentry.h
-thirdparty/headers/linux/include/gtk/gtkentrycompletion.h
-thirdparty/headers/linux/include/gtk/gtkenums.h
-thirdparty/headers/linux/include/gtk/gtkeventbox.h
-thirdparty/headers/linux/include/gtk/gtkexpander.h
-thirdparty/headers/linux/include/gtk/gtkfilechooser.h
-thirdparty/headers/linux/include/gtk/gtkfilechooserbutton.h
-thirdparty/headers/linux/include/gtk/gtkfilechooserdialog.h
-thirdparty/headers/linux/include/gtk/gtkfilechooserwidget.h
-thirdparty/headers/linux/include/gtk/gtkfilefilter.h
-thirdparty/headers/linux/include/gtk/gtkfilesel.h
-thirdparty/headers/linux/include/gtk/gtkfilesystem.h
-thirdparty/headers/linux/include/gtk/gtkfixed.h
-thirdparty/headers/linux/include/gtk/gtkfontbutton.h
-thirdparty/headers/linux/include/gtk/gtkfontsel.h
-thirdparty/headers/linux/include/gtk/gtkframe.h
-thirdparty/headers/linux/include/gtk/gtkgamma.h
-thirdparty/headers/linux/include/gtk/gtkgc.h
-thirdparty/headers/linux/include/gtk/gtkhandlebox.h
-thirdparty/headers/linux/include/gtk/gtkhbbox.h
-thirdparty/headers/linux/include/gtk/gtkhbox.h
-thirdparty/headers/linux/include/gtk/gtkhpaned.h
-thirdparty/headers/linux/include/gtk/gtkhruler.h
-thirdparty/headers/linux/include/gtk/gtkhscale.h
-thirdparty/headers/linux/include/gtk/gtkhscrollbar.h
-thirdparty/headers/linux/include/gtk/gtkhseparator.h
-thirdparty/headers/linux/include/gtk/gtkiconfactory.h
-thirdparty/headers/linux/include/gtk/gtkicontheme.h
-thirdparty/headers/linux/include/gtk/gtkiconview.h
-thirdparty/headers/linux/include/gtk/gtkimage.h
-thirdparty/headers/linux/include/gtk/gtkimagemenuitem.h
-thirdparty/headers/linux/include/gtk/gtkimcontext.h
-thirdparty/headers/linux/include/gtk/gtkimcontextsimple.h
-thirdparty/headers/linux/include/gtk/gtkimmodule.h
-thirdparty/headers/linux/include/gtk/gtkimmulticontext.h
-thirdparty/headers/linux/include/gtk/gtkinputdialog.h
-thirdparty/headers/linux/include/gtk/gtkinvisible.h
-thirdparty/headers/linux/include/gtk/gtkitem.h
-thirdparty/headers/linux/include/gtk/gtkitemfactory.h
-thirdparty/headers/linux/include/gtk/gtklabel.h
-thirdparty/headers/linux/include/gtk/gtklayout.h
-thirdparty/headers/linux/include/gtk/gtklinkbutton.h
-thirdparty/headers/linux/include/gtk/gtklist.h
-thirdparty/headers/linux/include/gtk/gtklistitem.h
-thirdparty/headers/linux/include/gtk/gtkliststore.h
-thirdparty/headers/linux/include/gtk/gtkmain.h
-thirdparty/headers/linux/include/gtk/gtkmarshal.h
-thirdparty/headers/linux/include/gtk/gtkmenu.h
-thirdparty/headers/linux/include/gtk/gtkmenubar.h
-thirdparty/headers/linux/include/gtk/gtkmenuitem.h
-thirdparty/headers/linux/include/gtk/gtkmenushell.h
-thirdparty/headers/linux/include/gtk/gtkmenutoolbutton.h
-thirdparty/headers/linux/include/gtk/gtkmessagedialog.h
-thirdparty/headers/linux/include/gtk/gtkmisc.h
-thirdparty/headers/linux/include/gtk/gtkmodules.h
-thirdparty/headers/linux/include/gtk/gtknotebook.h
-thirdparty/headers/linux/include/gtk/gtkobject.h
-thirdparty/headers/linux/include/gtk/gtkoldeditable.h
-thirdparty/headers/linux/include/gtk/gtkoptionmenu.h
-thirdparty/headers/linux/include/gtk/gtkpagesetup.h
-thirdparty/headers/linux/include/gtk/gtkpagesetupunixdialog.h
-thirdparty/headers/linux/include/gtk/gtkpaned.h
-thirdparty/headers/linux/include/gtk/gtkpapersize.h
-thirdparty/headers/linux/include/gtk/gtkpixmap.h
-thirdparty/headers/linux/include/gtk/gtkplug.h
-thirdparty/headers/linux/include/gtk/gtkpreview.h
-thirdparty/headers/linux/include/gtk/gtkprintcontext.h
-thirdparty/headers/linux/include/gtk/gtkprinter.h
-thirdparty/headers/linux/include/gtk/gtkprintjob.h
-thirdparty/headers/linux/include/gtk/gtkprintoperation.h
-thirdparty/headers/linux/include/gtk/gtkprintoperationpreview.h
-thirdparty/headers/linux/include/gtk/gtkprintsettings.h
-thirdparty/headers/linux/include/gtk/gtkprintunixdialog.h
-thirdparty/headers/linux/include/gtk/gtkprivate.h
-thirdparty/headers/linux/include/gtk/gtkprogress.h
-thirdparty/headers/linux/include/gtk/gtkprogressbar.h
-thirdparty/headers/linux/include/gtk/gtkradioaction.h
-thirdparty/headers/linux/include/gtk/gtkradiobutton.h
-thirdparty/headers/linux/include/gtk/gtkradiomenuitem.h
-thirdparty/headers/linux/include/gtk/gtkradiotoolbutton.h
-thirdparty/headers/linux/include/gtk/gtkrange.h
-thirdparty/headers/linux/include/gtk/gtkrc.h
-thirdparty/headers/linux/include/gtk/gtkrecentchooser.h
-thirdparty/headers/linux/include/gtk/gtkrecentchooserdialog.h
-thirdparty/headers/linux/include/gtk/gtkrecentchoosermenu.h
-thirdparty/headers/linux/include/gtk/gtkrecentchooserwidget.h
-thirdparty/headers/linux/include/gtk/gtkrecentfilter.h
-thirdparty/headers/linux/include/gtk/gtkrecentmanager.h
-thirdparty/headers/linux/include/gtk/gtkruler.h
-thirdparty/headers/linux/include/gtk/gtkscale.h
-thirdparty/headers/linux/include/gtk/gtkscrollbar.h
-thirdparty/headers/linux/include/gtk/gtkscrolledwindow.h
-thirdparty/headers/linux/include/gtk/gtkselection.h
-thirdparty/headers/linux/include/gtk/gtkseparator.h
-thirdparty/headers/linux/include/gtk/gtkseparatormenuitem.h
-thirdparty/headers/linux/include/gtk/gtkseparatortoolitem.h
-thirdparty/headers/linux/include/gtk/gtksettings.h
-thirdparty/headers/linux/include/gtk/gtksignal.h
-thirdparty/headers/linux/include/gtk/gtksizegroup.h
-thirdparty/headers/linux/include/gtk/gtksocket.h
-thirdparty/headers/linux/include/gtk/gtkspinbutton.h
-thirdparty/headers/linux/include/gtk/gtkstatusbar.h
-thirdparty/headers/linux/include/gtk/gtkstatusicon.h
-thirdparty/headers/linux/include/gtk/gtkstock.h
-thirdparty/headers/linux/include/gtk/gtkstyle.h
-thirdparty/headers/linux/include/gtk/gtktable.h
-thirdparty/headers/linux/include/gtk/gtktearoffmenuitem.h
-thirdparty/headers/linux/include/gtk/gtktext.h
-thirdparty/headers/linux/include/gtk/gtktextbuffer.h
-thirdparty/headers/linux/include/gtk/gtktextbufferrichtext.h
-thirdparty/headers/linux/include/gtk/gtktextchild.h
-thirdparty/headers/linux/include/gtk/gtktextdisplay.h
-thirdparty/headers/linux/include/gtk/gtktextiter.h
-thirdparty/headers/linux/include/gtk/gtktextlayout.h
-thirdparty/headers/linux/include/gtk/gtktextmark.h
-thirdparty/headers/linux/include/gtk/gtktexttag.h
-thirdparty/headers/linux/include/gtk/gtktexttagtable.h
-thirdparty/headers/linux/include/gtk/gtktextview.h
-thirdparty/headers/linux/include/gtk/gtktipsquery.h
-thirdparty/headers/linux/include/gtk/gtktoggleaction.h
-thirdparty/headers/linux/include/gtk/gtktogglebutton.h
-thirdparty/headers/linux/include/gtk/gtktoggletoolbutton.h
-thirdparty/headers/linux/include/gtk/gtktoolbar.h
-thirdparty/headers/linux/include/gtk/gtktoolbutton.h
-thirdparty/headers/linux/include/gtk/gtktoolitem.h
-thirdparty/headers/linux/include/gtk/gtktooltips.h
-thirdparty/headers/linux/include/gtk/gtktree.h
-thirdparty/headers/linux/include/gtk/gtktreednd.h
-thirdparty/headers/linux/include/gtk/gtktreeitem.h
-thirdparty/headers/linux/include/gtk/gtktreemodel.h
-thirdparty/headers/linux/include/gtk/gtktreemodelfilter.h
-thirdparty/headers/linux/include/gtk/gtktreemodelsort.h
-thirdparty/headers/linux/include/gtk/gtktreeselection.h
-thirdparty/headers/linux/include/gtk/gtktreesortable.h
-thirdparty/headers/linux/include/gtk/gtktreestore.h
-thirdparty/headers/linux/include/gtk/gtktreeview.h
-thirdparty/headers/linux/include/gtk/gtktreeviewcolumn.h
-thirdparty/headers/linux/include/gtk/gtktypebuiltins.h
-thirdparty/headers/linux/include/gtk/gtktypeutils.h
-thirdparty/headers/linux/include/gtk/gtkuimanager.h
-thirdparty/headers/linux/include/gtk/gtkvbbox.h
-thirdparty/headers/linux/include/gtk/gtkvbox.h
-thirdparty/headers/linux/include/gtk/gtkversion.h
-thirdparty/headers/linux/include/gtk/gtkviewport.h
-thirdparty/headers/linux/include/gtk/gtkvpaned.h
-thirdparty/headers/linux/include/gtk/gtkvruler.h
-thirdparty/headers/linux/include/gtk/gtkvscale.h
-thirdparty/headers/linux/include/gtk/gtkvscrollbar.h
-thirdparty/headers/linux/include/gtk/gtkvseparator.h
-thirdparty/headers/linux/include/gtk/gtkwidget.h
-thirdparty/headers/linux/include/gtk/gtkwindow.h
-thirdparty/headers/linux/include/libgnome/gnome-config.h
-thirdparty/headers/linux/include/libgnome/gnome-exec.h
-thirdparty/headers/linux/include/libgnome/gnome-gconf.h
-thirdparty/headers/linux/include/libgnome/gnome-help.h
-thirdparty/headers/linux/include/libgnome/gnome-i18n.h
-thirdparty/headers/linux/include/libgnome/gnome-init.h
-thirdparty/headers/linux/include/libgnome/gnome-macros.h
-thirdparty/headers/linux/include/libgnome/gnome-program.h
-thirdparty/headers/linux/include/libgnome/gnome-score.h
-thirdparty/headers/linux/include/libgnome/gnome-sound.h
-thirdparty/headers/linux/include/libgnome/gnome-triggers.h
-thirdparty/headers/linux/include/libgnome/gnome-url.h
-thirdparty/headers/linux/include/libgnome/gnome-util.h
-thirdparty/headers/linux/include/libgnome/libgnome.h
-thirdparty/headers/linux/include/libgnome/libgnometypebuiltins.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-ace.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-acl.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-address.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-application-registry.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-async-ops.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-cancellation.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-context.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-directory.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-dns-sd.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-drive.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-enum-types.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-file-info.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-file-size.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-find-directory.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-handle.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-init.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-job-limit.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-mime-deprecated.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-mime-handlers.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-mime-info-cache.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-mime-monitor.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-mime-utils.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-mime.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-module-callback.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-monitor.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-ops.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-resolve.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-result.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-standard-callbacks.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-types.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-uri.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-utils.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-version.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-volume-monitor.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-volume.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs-xfer.h
-thirdparty/headers/linux/include/libgnomevfs/gnome-vfs.h
-thirdparty/headers/linux/include/pango/pango-attributes.h
-thirdparty/headers/linux/include/pango/pango-break.h
-thirdparty/headers/linux/include/pango/pango-context.h
-thirdparty/headers/linux/include/pango/pango-coverage.h
-thirdparty/headers/linux/include/pango/pango-engine.h
-thirdparty/headers/linux/include/pango/pango-enum-types.h
-thirdparty/headers/linux/include/pango/pango-font.h
-thirdparty/headers/linux/include/pango/pango-fontmap.h
-thirdparty/headers/linux/include/pango/pango-fontset.h
-thirdparty/headers/linux/include/pango/pango-glyph-item.h
-thirdparty/headers/linux/include/pango/pango-glyph.h
-thirdparty/headers/linux/include/pango/pango-item.h
-thirdparty/headers/linux/include/pango/pango-layout.h
-thirdparty/headers/linux/include/pango/pango-modules.h
-thirdparty/headers/linux/include/pango/pango-ot.h
-thirdparty/headers/linux/include/pango/pango-renderer.h
-thirdparty/headers/linux/include/pango/pango-script.h
-thirdparty/headers/linux/include/pango/pango-tabs.h
-thirdparty/headers/linux/include/pango/pango-types.h
-thirdparty/headers/linux/include/pango/pango-utils.h
-thirdparty/headers/linux/include/pango/pango.h
-thirdparty/headers/linux/include/pango/pangocairo.h
-thirdparty/headers/linux/include/pango/pangofc-decoder.h
-thirdparty/headers/linux/include/pango/pangofc-font.h
-thirdparty/headers/linux/include/pango/pangofc-fontmap.h
-thirdparty/headers/linux/include/pango/pangoft2.h
-thirdparty/headers/linux/include/pango/pangox.h
-thirdparty/headers/linux/include/pango/pangoxft-render.h
-thirdparty/headers/linux/include/pango/pangoxft.h
-thirdparty/headers/linux/include/Xft/Xft.h
-thirdparty/headers/linux/include/Xft/XftCompat.h
-thirdparty/headers/linux/include/audiofile.h
-thirdparty/headers/linux/include/aupvlist.h
-thirdparty/headers/linux/include/esd.h
-thirdparty/headers/linux/include/gdkconfig.h
-thirdparty/headers/linux/include/glib-object.h
-thirdparty/headers/linux/include/glib.h
-thirdparty/headers/linux/include/glibconfig.h
-thirdparty/headers/linux/include/glibconfig.linux.h
-thirdparty/headers/linux/include/gmodule.h
-thirdparty/headers/linux/include/icc34.h
-thirdparty/headers/linux/include/lcms.h
-thirdparty/headers/linux/include/popt.h
-thirdparty/libcairo/src/cairo-analysis-surface-private.h
-thirdparty/libcairo/src/cairo-analysis-surface.c
-thirdparty/libcairo/src/cairo-arc-private.h
-thirdparty/libcairo/src/cairo-arc.c
-thirdparty/libcairo/src/cairo-array.c
-thirdparty/libcairo/src/cairo-atomic-private.h
-thirdparty/libcairo/src/cairo-atomic.c
-thirdparty/libcairo/src/cairo-base64-stream.c
-thirdparty/libcairo/src/cairo-base85-stream.c
-thirdparty/libcairo/src/cairo-bentley-ottmann-rectangular.c
-thirdparty/libcairo/src/cairo-bentley-ottmann-rectilinear.c
-thirdparty/libcairo/src/cairo-bentley-ottmann.c
-thirdparty/libcairo/src/cairo-beos.h
-thirdparty/libcairo/src/cairo-cache-private.h
-thirdparty/libcairo/src/cairo-cache.c
-thirdparty/libcairo/src/cairo-cff-subset.c
-thirdparty/libcairo/src/cairo-clip-private.h
-thirdparty/libcairo/src/cairo-clip.c
-thirdparty/libcairo/src/cairo-color.c
-thirdparty/libcairo/src/cairo-combsort-private.h
-thirdparty/libcairo/src/cairo-compiler-private.h
-thirdparty/libcairo/src/cairo-debug.c
-thirdparty/libcairo/src/cairo-deflate-stream.c
-thirdparty/libcairo/src/cairo-deprecated.h
-thirdparty/libcairo/src/cairo-directfb-surface.c
-thirdparty/libcairo/src/cairo-directfb.h
-thirdparty/libcairo/src/cairo-drm.h
-thirdparty/libcairo/src/cairo-eagle-context.c
-thirdparty/libcairo/src/cairo-features.h
-thirdparty/libcairo/src/cairo-fixed-private.h
-thirdparty/libcairo/src/cairo-fixed-type-private.h
-thirdparty/libcairo/src/cairo-fixed.c
-thirdparty/libcairo/src/cairo-font-face-twin-data.c
-thirdparty/libcairo/src/cairo-font-face-twin.c
-thirdparty/libcairo/src/cairo-font-face.c
-thirdparty/libcairo/src/cairo-font-options.c
-thirdparty/libcairo/src/cairo-freelist-private.h
-thirdparty/libcairo/src/cairo-freelist.c
-thirdparty/libcairo/src/cairo-ft-font.c
-thirdparty/libcairo/src/cairo-ft-private.h
-thirdparty/libcairo/src/cairo-ft.h
-thirdparty/libcairo/src/cairo-gl-glyphs.c
-thirdparty/libcairo/src/cairo-gl-private.h
-thirdparty/libcairo/src/cairo-gl-surface.c
-thirdparty/libcairo/src/cairo-gl.h
-thirdparty/libcairo/src/cairo-glitz-private.h
-thirdparty/libcairo/src/cairo-glitz-surface.c
-thirdparty/libcairo/src/cairo-glitz.h
-thirdparty/libcairo/src/cairo-glx-context.c
-thirdparty/libcairo/src/cairo-gstate-private.h
-thirdparty/libcairo/src/cairo-gstate.c
-thirdparty/libcairo/src/cairo-hash-private.h
-thirdparty/libcairo/src/cairo-hash.c
-thirdparty/libcairo/src/cairo-hull.c
-thirdparty/libcairo/src/cairo-image-info-private.h
-thirdparty/libcairo/src/cairo-image-info.c
-thirdparty/libcairo/src/cairo-image-surface.c
-thirdparty/libcairo/src/cairo-list-private.h
-thirdparty/libcairo/src/cairo-lzw.c
-thirdparty/libcairo/src/cairo-malloc-private.h
-thirdparty/libcairo/src/cairo-matrix.c
-thirdparty/libcairo/src/cairo-meta-surface-private.h
-thirdparty/libcairo/src/cairo-meta-surface.c
-thirdparty/libcairo/src/cairo-misc.c
-thirdparty/libcairo/src/cairo-mutex-impl-private.h
-thirdparty/libcairo/src/cairo-mutex-list-private.h
-thirdparty/libcairo/src/cairo-mutex-private.h
-thirdparty/libcairo/src/cairo-mutex-type-private.h
-thirdparty/libcairo/src/cairo-mutex.c
-thirdparty/libcairo/src/cairo-os2-private.h
-thirdparty/libcairo/src/cairo-os2-surface.c
-thirdparty/libcairo/src/cairo-os2.h
-thirdparty/libcairo/src/cairo-output-stream-private.h
-thirdparty/libcairo/src/cairo-output-stream.c
-thirdparty/libcairo/src/cairo-paginated-private.h
-thirdparty/libcairo/src/cairo-paginated-surface-private.h
-thirdparty/libcairo/src/cairo-paginated-surface.c
-thirdparty/libcairo/src/cairo-path-bounds.c
-thirdparty/libcairo/src/cairo-path-fill.c
-thirdparty/libcairo/src/cairo-path-fixed-private.h
-thirdparty/libcairo/src/cairo-path-fixed.c
-thirdparty/libcairo/src/cairo-path-in-fill.c
-thirdparty/libcairo/src/cairo-path-private.h
-thirdparty/libcairo/src/cairo-path-stroke.c
-thirdparty/libcairo/src/cairo-path.c
-thirdparty/libcairo/src/cairo-pattern.c
-thirdparty/libcairo/src/cairo-pdf-ext-object.h
-thirdparty/libcairo/src/cairo-pdf-ext-private.h
-thirdparty/libcairo/src/cairo-pdf-ext.c
-thirdparty/libcairo/src/cairo-pdf-operators-private.h
-thirdparty/libcairo/src/cairo-pdf-operators.c
-thirdparty/libcairo/src/cairo-pdf-surface-private.h
-thirdparty/libcairo/src/cairo-pdf-surface.c
-thirdparty/libcairo/src/cairo-pdf.h
-thirdparty/libcairo/src/cairo-pen.c
-thirdparty/libcairo/src/cairo-png.c
-thirdparty/libcairo/src/cairo-polygon.c
-thirdparty/libcairo/src/cairo-private.h
-thirdparty/libcairo/src/cairo-ps-surface-private.h
-thirdparty/libcairo/src/cairo-ps-surface.c
-thirdparty/libcairo/src/cairo-ps.h
-thirdparty/libcairo/src/cairo-qt-surface.cpp
-thirdparty/libcairo/src/cairo-qt.h
-thirdparty/libcairo/src/cairo-quartz-font.c
-thirdparty/libcairo/src/cairo-quartz-image-surface.c
-thirdparty/libcairo/src/cairo-quartz-image.h
-thirdparty/libcairo/src/cairo-quartz-private.h
-thirdparty/libcairo/src/cairo-quartz-surface.c
-thirdparty/libcairo/src/cairo-quartz.h
-thirdparty/libcairo/src/cairo-rectangle.c
-thirdparty/libcairo/src/cairo-reference-count-private.h
-thirdparty/libcairo/src/cairo-region-private.h
-thirdparty/libcairo/src/cairo-region.c
-thirdparty/libcairo/src/cairo-rtree-private.h
-thirdparty/libcairo/src/cairo-rtree.c
-thirdparty/libcairo/src/cairo-scaled-font-private.h
-thirdparty/libcairo/src/cairo-scaled-font-subsets-private.h
-thirdparty/libcairo/src/cairo-scaled-font-subsets.c
-thirdparty/libcairo/src/cairo-scaled-font.c
-thirdparty/libcairo/src/cairo-script-surface.c
-thirdparty/libcairo/src/cairo-script.h
-thirdparty/libcairo/src/cairo-skia-surface.cpp
-thirdparty/libcairo/src/cairo-slope-private.h
-thirdparty/libcairo/src/cairo-slope.c
-thirdparty/libcairo/src/cairo-spans-private.h
-thirdparty/libcairo/src/cairo-spans.c
-thirdparty/libcairo/src/cairo-spline.c
-thirdparty/libcairo/src/cairo-stroke-style.c
-thirdparty/libcairo/src/cairo-surface-clipper-private.h
-thirdparty/libcairo/src/cairo-surface-clipper.c
-thirdparty/libcairo/src/cairo-surface-fallback-private.h
-thirdparty/libcairo/src/cairo-surface-fallback.c
-thirdparty/libcairo/src/cairo-surface-private.h
-thirdparty/libcairo/src/cairo-surface-wrapper-private.h
-thirdparty/libcairo/src/cairo-surface-wrapper.c
-thirdparty/libcairo/src/cairo-surface.c
-thirdparty/libcairo/src/cairo-svg-surface-private.h
-thirdparty/libcairo/src/cairo-svg-surface.c
-thirdparty/libcairo/src/cairo-svg.h
-thirdparty/libcairo/src/cairo-system.c
-thirdparty/libcairo/src/cairo-tee-surface-private.h
-thirdparty/libcairo/src/cairo-tee-surface.c
-thirdparty/libcairo/src/cairo-tor-scan-converter.c
-thirdparty/libcairo/src/cairo-toy-font-face.c
-thirdparty/libcairo/src/cairo-traps.c
-thirdparty/libcairo/src/cairo-truetype-subset-private.h
-thirdparty/libcairo/src/cairo-truetype-subset.c
-thirdparty/libcairo/src/cairo-type1-fallback.c
-thirdparty/libcairo/src/cairo-type1-private.h
-thirdparty/libcairo/src/cairo-type1-subset.c
-thirdparty/libcairo/src/cairo-type3-glyph-surface-private.h
-thirdparty/libcairo/src/cairo-type3-glyph-surface.c
-thirdparty/libcairo/src/cairo-types-private.h
-thirdparty/libcairo/src/cairo-unicode.c
-thirdparty/libcairo/src/cairo-user-font-private.h
-thirdparty/libcairo/src/cairo-user-font.c
-thirdparty/libcairo/src/cairo-version.c
-thirdparty/libcairo/src/cairo-version.h
-thirdparty/libcairo/src/cairo-vg-surface.c
-thirdparty/libcairo/src/cairo-vg.h
-thirdparty/libcairo/src/cairo-wideint-private.h
-thirdparty/libcairo/src/cairo-wideint-type-private.h
-thirdparty/libcairo/src/cairo-wideint.c
-thirdparty/libcairo/src/cairo-win32-font.c
-thirdparty/libcairo/src/cairo-win32-printing-surface.c
-thirdparty/libcairo/src/cairo-win32-private.h
-thirdparty/libcairo/src/cairo-win32-surface.c
-thirdparty/libcairo/src/cairo-win32.h
-thirdparty/libcairo/src/cairo-xcb-surface.c
-thirdparty/libcairo/src/cairo-xcb-xrender.h
-thirdparty/libcairo/src/cairo-xcb.h
-thirdparty/libcairo/src/cairo-xlib-display.c
-thirdparty/libcairo/src/cairo-xlib-private.h
-thirdparty/libcairo/src/cairo-xlib-screen.c
-thirdparty/libcairo/src/cairo-xlib-surface-private.h
-thirdparty/libcairo/src/cairo-xlib-surface.c
-thirdparty/libcairo/src/cairo-xlib-visual.c
-thirdparty/libcairo/src/cairo-xlib-xrender-private.h
-thirdparty/libcairo/src/cairo-xlib-xrender.h
-thirdparty/libcairo/src/cairo-xlib.h
-thirdparty/libcairo/src/cairo-xml-surface.c
-thirdparty/libcairo/src/cairo-xml.h
-thirdparty/libcairo/src/cairo.c
-thirdparty/libcairo/src/cairo.h
-thirdparty/libcairo/src/cairoint.h
-thirdparty/libcairo/src/check-has-hidden-symbols.c
-thirdparty/libcairo/src/check-link.c
-thirdparty/libcairo/src/pixman-access-accessors.c
-thirdparty/libcairo/src/pixman-access.c
-thirdparty/libcairo/src/pixman-accessor.h
-thirdparty/libcairo/src/pixman-arm-neon-asm.h
-thirdparty/libcairo/src/pixman-arm-neon.c
-thirdparty/libcairo/src/pixman-arm-simd.c
-thirdparty/libcairo/src/pixman-bits-image.c
-thirdparty/libcairo/src/pixman-combine32.c
-thirdparty/libcairo/src/pixman-combine32.h
-thirdparty/libcairo/src/pixman-combine64.c
-thirdparty/libcairo/src/pixman-combine64.h
-thirdparty/libcairo/src/pixman-compiler.h
-thirdparty/libcairo/src/pixman-config.h
-thirdparty/libcairo/src/pixman-conical-gradient.c
-thirdparty/libcairo/src/pixman-cpu.c
-thirdparty/libcairo/src/pixman-edge-accessors.c
-thirdparty/libcairo/src/pixman-edge-imp.h
-thirdparty/libcairo/src/pixman-edge.c
-thirdparty/libcairo/src/pixman-fast-path.c
-thirdparty/libcairo/src/pixman-general.c
-thirdparty/libcairo/src/pixman-gradient-walker.c
-thirdparty/libcairo/src/pixman-image.c
-thirdparty/libcairo/src/pixman-implementation.c
-thirdparty/libcairo/src/pixman-linear-gradient.c
-thirdparty/libcairo/src/pixman-matrix.c
-thirdparty/libcairo/src/pixman-mmx.c
-thirdparty/libcairo/src/pixman-private.h
-thirdparty/libcairo/src/pixman-radial-gradient.c
-thirdparty/libcairo/src/pixman-region.c
-thirdparty/libcairo/src/pixman-region16.c
-thirdparty/libcairo/src/pixman-region32.c
-thirdparty/libcairo/src/pixman-solid-fill.c
-thirdparty/libcairo/src/pixman-sse2.c
-thirdparty/libcairo/src/pixman-timer.c
-thirdparty/libcairo/src/pixman-trap.c
-thirdparty/libcairo/src/pixman-utils.c
-thirdparty/libcairo/src/pixman-version.h
-thirdparty/libcairo/src/pixman-vmx.c
-thirdparty/libcairo/src/pixman-x64-mmx-emulation.h
-thirdparty/libcairo/src/pixman.c
-thirdparty/libcairo/src/pixman.h
-thirdparty/libcairo/src/test-fallback-surface.c
-thirdparty/libcairo/src/test-fallback-surface.h
-thirdparty/libcairo/src/test-fallback16-surface.c
-thirdparty/libcairo/src/test-fallback16-surface.h
-thirdparty/libcairo/src/test-null-surface.c
-thirdparty/libcairo/src/test-null-surface.h
-thirdparty/libcairo/src/test-paginated-surface.c
-thirdparty/libcairo/src/test-paginated-surface.h
-thirdparty/libcairo/src/test-wrapping-surface.c
-thirdparty/libcairo/src/test-wrapping-surface.h
-thirdparty/libcairo/cairo-version.h
-thirdparty/libcairo/libcairo.gyp
-thirdparty/libcairo/score.txt
-thirdparty/libcef/include/base/internal/cef_atomicops_atomicword_compat.h
-thirdparty/libcef/include/base/internal/cef_atomicops_mac.h
-thirdparty/libcef/include/base/internal/cef_atomicops_x86_msvc.h
-thirdparty/libcef/include/base/internal/cef_bind_internal.h
-thirdparty/libcef/include/base/internal/cef_bind_internal_win.h
-thirdparty/libcef/include/base/internal/cef_callback_internal.h
-thirdparty/libcef/include/base/internal/cef_lock_impl.h
-thirdparty/libcef/include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h
-thirdparty/libcef/include/base/internal/cef_thread_checker_impl.h
-thirdparty/libcef/include/base/cef_atomic_ref_count.h
-thirdparty/libcef/include/base/cef_atomicops.h
-thirdparty/libcef/include/base/cef_basictypes.h
-thirdparty/libcef/include/base/cef_bind.h
-thirdparty/libcef/include/base/cef_bind_helpers.h
-thirdparty/libcef/include/base/cef_build.h
-thirdparty/libcef/include/base/cef_callback.h
-thirdparty/libcef/include/base/cef_callback_forward.h
-thirdparty/libcef/include/base/cef_callback_helpers.h
-thirdparty/libcef/include/base/cef_callback_list.h
-thirdparty/libcef/include/base/cef_cancelable_callback.h
-thirdparty/libcef/include/base/cef_lock.h
-thirdparty/libcef/include/base/cef_logging.h
-thirdparty/libcef/include/base/cef_macros.h
-thirdparty/libcef/include/base/cef_move.h
-thirdparty/libcef/include/base/cef_platform_thread.h
-thirdparty/libcef/include/base/cef_ref_counted.h
-thirdparty/libcef/include/base/cef_scoped_ptr.h
-thirdparty/libcef/include/base/cef_string16.h
-thirdparty/libcef/include/base/cef_template_util.h
-thirdparty/libcef/include/base/cef_thread_checker.h
-thirdparty/libcef/include/base/cef_thread_collision_warner.h
-thirdparty/libcef/include/base/cef_trace_event.h
-thirdparty/libcef/include/base/cef_tuple.h
-thirdparty/libcef/include/base/cef_weak_ptr.h
-thirdparty/libcef/include/capi/cef_app_capi.h
-thirdparty/libcef/include/capi/cef_auth_callback_capi.h
-thirdparty/libcef/include/capi/cef_base_capi.h
-thirdparty/libcef/include/capi/cef_browser_capi.h
-thirdparty/libcef/include/capi/cef_browser_process_handler_capi.h
-thirdparty/libcef/include/capi/cef_callback_capi.h
-thirdparty/libcef/include/capi/cef_client_capi.h
-thirdparty/libcef/include/capi/cef_command_line_capi.h
-thirdparty/libcef/include/capi/cef_context_menu_handler_capi.h
-thirdparty/libcef/include/capi/cef_cookie_capi.h
-thirdparty/libcef/include/capi/cef_dialog_handler_capi.h
-thirdparty/libcef/include/capi/cef_display_handler_capi.h
-thirdparty/libcef/include/capi/cef_dom_capi.h
-thirdparty/libcef/include/capi/cef_download_handler_capi.h
-thirdparty/libcef/include/capi/cef_download_item_capi.h
-thirdparty/libcef/include/capi/cef_drag_data_capi.h
-thirdparty/libcef/include/capi/cef_drag_handler_capi.h
-thirdparty/libcef/include/capi/cef_focus_handler_capi.h
-thirdparty/libcef/include/capi/cef_frame_capi.h
-thirdparty/libcef/include/capi/cef_geolocation_capi.h
-thirdparty/libcef/include/capi/cef_geolocation_handler_capi.h
-thirdparty/libcef/include/capi/cef_jsdialog_handler_capi.h
-thirdparty/libcef/include/capi/cef_keyboard_handler_capi.h
-thirdparty/libcef/include/capi/cef_life_span_handler_capi.h
-thirdparty/libcef/include/capi/cef_load_handler_capi.h
-thirdparty/libcef/include/capi/cef_menu_model_capi.h
-thirdparty/libcef/include/capi/cef_origin_whitelist_capi.h
-thirdparty/libcef/include/capi/cef_path_util_capi.h
-thirdparty/libcef/include/capi/cef_print_handler_capi.h
-thirdparty/libcef/include/capi/cef_print_settings_capi.h
-thirdparty/libcef/include/capi/cef_process_message_capi.h
-thirdparty/libcef/include/capi/cef_process_util_capi.h
-thirdparty/libcef/include/capi/cef_render_handler_capi.h
-thirdparty/libcef/include/capi/cef_render_process_handler_capi.h
-thirdparty/libcef/include/capi/cef_request_capi.h
-thirdparty/libcef/include/capi/cef_request_context_capi.h
-thirdparty/libcef/include/capi/cef_request_context_handler_capi.h
-thirdparty/libcef/include/capi/cef_request_handler_capi.h
-thirdparty/libcef/include/capi/cef_resource_bundle_handler_capi.h
-thirdparty/libcef/include/capi/cef_resource_handler_capi.h
-thirdparty/libcef/include/capi/cef_response_capi.h
-thirdparty/libcef/include/capi/cef_scheme_capi.h
-thirdparty/libcef/include/capi/cef_stream_capi.h
-thirdparty/libcef/include/capi/cef_string_visitor_capi.h
-thirdparty/libcef/include/capi/cef_task_capi.h
-thirdparty/libcef/include/capi/cef_trace_capi.h
-thirdparty/libcef/include/capi/cef_url_capi.h
-thirdparty/libcef/include/capi/cef_urlrequest_capi.h
-thirdparty/libcef/include/capi/cef_v8_capi.h
-thirdparty/libcef/include/capi/cef_values_capi.h
-thirdparty/libcef/include/capi/cef_web_plugin_capi.h
-thirdparty/libcef/include/capi/cef_xml_reader_capi.h
-thirdparty/libcef/include/capi/cef_zip_reader_capi.h
-thirdparty/libcef/include/internal/cef_export.h
-thirdparty/libcef/include/internal/cef_logging_internal.h
-thirdparty/libcef/include/internal/cef_mac.h
-thirdparty/libcef/include/internal/cef_ptr.h
-thirdparty/libcef/include/internal/cef_string.h
-thirdparty/libcef/include/internal/cef_string_list.h
-thirdparty/libcef/include/internal/cef_string_map.h
-thirdparty/libcef/include/internal/cef_string_multimap.h
-thirdparty/libcef/include/internal/cef_string_types.h
-thirdparty/libcef/include/internal/cef_string_wrappers.h
-thirdparty/libcef/include/internal/cef_thread_internal.h
-thirdparty/libcef/include/internal/cef_time.h
-thirdparty/libcef/include/internal/cef_trace_event_internal.h
-thirdparty/libcef/include/internal/cef_types.h
-thirdparty/libcef/include/internal/cef_types_mac.h
-thirdparty/libcef/include/internal/cef_types_win.h
-thirdparty/libcef/include/internal/cef_types_wrappers.h
-thirdparty/libcef/include/internal/cef_win.h
-thirdparty/libcef/include/wrapper/cef_byte_read_handler.h
-thirdparty/libcef/include/wrapper/cef_closure_task.h
-thirdparty/libcef/include/wrapper/cef_helpers.h
-thirdparty/libcef/include/wrapper/cef_message_router.h
-thirdparty/libcef/include/wrapper/cef_stream_resource_handler.h
-thirdparty/libcef/include/wrapper/cef_xml_object.h
-thirdparty/libcef/include/wrapper/cef_zip_archive.h
-thirdparty/libcef/include/cef_app.h
-thirdparty/libcef/include/cef_application_mac.h
-thirdparty/libcef/include/cef_auth_callback.h
-thirdparty/libcef/include/cef_base.h
-thirdparty/libcef/include/cef_browser.h
-thirdparty/libcef/include/cef_browser_process_handler.h
-thirdparty/libcef/include/cef_callback.h
-thirdparty/libcef/include/cef_client.h
-thirdparty/libcef/include/cef_command_line.h
-thirdparty/libcef/include/cef_context_menu_handler.h
-thirdparty/libcef/include/cef_cookie.h
-thirdparty/libcef/include/cef_dialog_handler.h
-thirdparty/libcef/include/cef_display_handler.h
-thirdparty/libcef/include/cef_dom.h
-thirdparty/libcef/include/cef_download_handler.h
-thirdparty/libcef/include/cef_download_item.h
-thirdparty/libcef/include/cef_drag_data.h
-thirdparty/libcef/include/cef_drag_handler.h
-thirdparty/libcef/include/cef_focus_handler.h
-thirdparty/libcef/include/cef_frame.h
-thirdparty/libcef/include/cef_geolocation.h
-thirdparty/libcef/include/cef_geolocation_handler.h
-thirdparty/libcef/include/cef_jsdialog_handler.h
-thirdparty/libcef/include/cef_keyboard_handler.h
-thirdparty/libcef/include/cef_life_span_handler.h
-thirdparty/libcef/include/cef_load_handler.h
-thirdparty/libcef/include/cef_menu_model.h
-thirdparty/libcef/include/cef_origin_whitelist.h
-thirdparty/libcef/include/cef_pack_resources.h
-thirdparty/libcef/include/cef_pack_strings.h
-thirdparty/libcef/include/cef_path_util.h
-thirdparty/libcef/include/cef_print_handler.h
-thirdparty/libcef/include/cef_print_settings.h
-thirdparty/libcef/include/cef_process_message.h
-thirdparty/libcef/include/cef_process_util.h
-thirdparty/libcef/include/cef_render_handler.h
-thirdparty/libcef/include/cef_render_process_handler.h
-thirdparty/libcef/include/cef_request.h
-thirdparty/libcef/include/cef_request_context.h
-thirdparty/libcef/include/cef_request_context_handler.h
-thirdparty/libcef/include/cef_request_handler.h
-thirdparty/libcef/include/cef_resource_bundle_handler.h
-thirdparty/libcef/include/cef_resource_handler.h
-thirdparty/libcef/include/cef_response.h
-thirdparty/libcef/include/cef_runnable.h
-thirdparty/libcef/include/cef_sandbox_win.h
-thirdparty/libcef/include/cef_scheme.h
-thirdparty/libcef/include/cef_stream.h
-thirdparty/libcef/include/cef_string_visitor.h
-thirdparty/libcef/include/cef_task.h
-thirdparty/libcef/include/cef_trace.h
-thirdparty/libcef/include/cef_url.h
-thirdparty/libcef/include/cef_urlrequest.h
-thirdparty/libcef/include/cef_v8.h
-thirdparty/libcef/include/cef_values.h
-thirdparty/libcef/include/cef_version.h
-thirdparty/libcef/include/cef_web_plugin.h
-thirdparty/libcef/include/cef_xml_reader.h
-thirdparty/libcef/include/cef_zip_reader.h
-thirdparty/libcef/libcef_dll/base/cef_atomicops_x86_gcc.cc
-thirdparty/libcef/libcef_dll/base/cef_bind_helpers.cc
-thirdparty/libcef/libcef_dll/base/cef_callback_helpers.cc
-thirdparty/libcef/libcef_dll/base/cef_callback_internal.cc
-thirdparty/libcef/libcef_dll/base/cef_lock.cc
-thirdparty/libcef/libcef_dll/base/cef_lock_impl.cc
-thirdparty/libcef/libcef_dll/base/cef_logging.cc
-thirdparty/libcef/libcef_dll/base/cef_ref_counted.cc
-thirdparty/libcef/libcef_dll/base/cef_string16.cc
-thirdparty/libcef/libcef_dll/base/cef_thread_checker_impl.cc
-thirdparty/libcef/libcef_dll/base/cef_thread_collision_warner.cc
-thirdparty/libcef/libcef_dll/base/cef_weak_ptr.cc
-thirdparty/libcef/libcef_dll/cpptoc/app_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/app_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/base_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/browser_process_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/client_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/client_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/completion_callback_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/completion_callback_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/context_menu_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/cookie_visitor_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/dialog_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/dialog_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/display_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/display_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/domevent_listener_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/domevent_listener_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/domvisitor_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/domvisitor_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/download_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/download_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/drag_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/drag_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/end_tracing_callback_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/end_tracing_callback_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/focus_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/focus_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/geolocation_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/geolocation_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/keyboard_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/life_span_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/life_span_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/load_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/load_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/print_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/print_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/read_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/read_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/render_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/render_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/render_process_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/render_process_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/request_context_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/request_context_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/request_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/request_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/resource_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/resource_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/string_visitor_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/string_visitor_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/task_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/task_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/urlrequest_client_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/v8accessor_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/v8accessor_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/v8handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/v8handler_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h
-thirdparty/libcef/libcef_dll/cpptoc/write_handler_cpptoc.cc
-thirdparty/libcef/libcef_dll/cpptoc/write_handler_cpptoc.h
-thirdparty/libcef/libcef_dll/ctocpp/allow_certificate_error_callback_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/allow_certificate_error_callback_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/auth_callback_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/auth_callback_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/base_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/before_download_callback_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/before_download_callback_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/binary_value_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/binary_value_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/browser_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/browser_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/browser_host_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/browser_host_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/callback_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/callback_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/command_line_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/command_line_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/context_menu_params_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/context_menu_params_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/cookie_manager_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/cookie_manager_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/dictionary_value_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/dictionary_value_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/domdocument_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/domdocument_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/domevent_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/domevent_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/domnode_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/domnode_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/download_item_callback_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/download_item_callback_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/download_item_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/download_item_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/drag_data_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/drag_data_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/frame_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/frame_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/geolocation_callback_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/geolocation_callback_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/list_value_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/list_value_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/menu_model_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/menu_model_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/post_data_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/post_data_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/post_data_element_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/post_data_element_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/print_dialog_callback_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/print_dialog_callback_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/print_job_callback_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/print_job_callback_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/print_settings_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/print_settings_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/process_message_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/process_message_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/quota_callback_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/quota_callback_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/request_context_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/request_context_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/request_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/request_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/response_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/response_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/scheme_registrar_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/scheme_registrar_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/stream_reader_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/stream_reader_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/stream_writer_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/stream_writer_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/task_runner_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/task_runner_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/urlrequest_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/urlrequest_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/v8context_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/v8context_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/v8exception_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/v8exception_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/v8stack_frame_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/v8stack_trace_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/v8value_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/v8value_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/web_plugin_info_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/xml_reader_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/xml_reader_ctocpp.h
-thirdparty/libcef/libcef_dll/ctocpp/zip_reader_ctocpp.cc
-thirdparty/libcef/libcef_dll/ctocpp/zip_reader_ctocpp.h
-thirdparty/libcef/libcef_dll/wrapper/cef_browser_info_map.h
-thirdparty/libcef/libcef_dll/wrapper/cef_byte_read_handler.cc
-thirdparty/libcef/libcef_dll/wrapper/cef_closure_task.cc
-thirdparty/libcef/libcef_dll/wrapper/cef_message_router.cc
-thirdparty/libcef/libcef_dll/wrapper/cef_stream_resource_handler.cc
-thirdparty/libcef/libcef_dll/wrapper/cef_xml_object.cc
-thirdparty/libcef/libcef_dll/wrapper/cef_zip_archive.cc
-thirdparty/libcef/libcef_dll/wrapper/libcef_dll_wrapper.cc
-thirdparty/libcef/libcef_dll/wrapper/libcef_dll_wrapper2.cc
-thirdparty/libcef/libcef_dll/transfer_util.cpp
-thirdparty/libcef/libcef_dll/transfer_util.h
-thirdparty/libcef/libcef.gyp
-thirdparty/libcurl/include/curl/curl.h
-thirdparty/libcurl/include/curl/curlbuild.h
-thirdparty/libcurl/include/curl/curlbuild.lnx.h
-thirdparty/libcurl/include/curl/curlbuild.win.h
-thirdparty/libcurl/include/curl/curlrules.h
-thirdparty/libcurl/include/curl/curlver.h
-thirdparty/libcurl/include/curl/easy.h
-thirdparty/libcurl/include/curl/mprintf.h
-thirdparty/libcurl/include/curl/multi.h
-thirdparty/libcurl/include/curl/stdcheaders.h
-thirdparty/libcurl/include/curl/typecheck-gcc.h
-thirdparty/libcurl/include/curl/types.h
-thirdparty/libexpat/lib/ascii.h
-thirdparty/libexpat/lib/asciitab.h
-thirdparty/libexpat/lib/expat.h
-thirdparty/libexpat/lib/expat_external.h
-thirdparty/libexpat/lib/iasciitab.h
-thirdparty/libexpat/lib/internal.h
-thirdparty/libexpat/lib/latin1tab.h
-thirdparty/libexpat/lib/nametab.h
-thirdparty/libexpat/lib/utf8tab.h
-thirdparty/libexpat/lib/xmlparse.c
-thirdparty/libexpat/lib/xmlrole.c
-thirdparty/libexpat/lib/xmlrole.h
-thirdparty/libexpat/lib/xmltok.c
-thirdparty/libexpat/lib/xmltok.h
-thirdparty/libexpat/lib/xmltok_impl.c
-thirdparty/libexpat/lib/xmltok_impl.h
-thirdparty/libexpat/lib/xmltok_ns.c
-thirdparty/libexpat/expat_config.h
-thirdparty/libexpat/import_expat.sh
-thirdparty/libexpat/libexpat.gyp
-thirdparty/libfreetype/include/freetype/config/ftconfig.h
-thirdparty/libfreetype/include/freetype/config/ftheader.h
-thirdparty/libfreetype/include/freetype/config/ftmodule.h
-thirdparty/libfreetype/include/freetype/config/ftoption.h
-thirdparty/libfreetype/include/freetype/config/ftstdlib.h
-thirdparty/libfreetype/include/freetype/internal/services/svbdf.h
-thirdparty/libfreetype/include/freetype/internal/services/svcid.h
-thirdparty/libfreetype/include/freetype/internal/services/svgldict.h
-thirdparty/libfreetype/include/freetype/internal/services/svgxval.h
-thirdparty/libfreetype/include/freetype/internal/services/svkern.h
-thirdparty/libfreetype/include/freetype/internal/services/svmm.h
-thirdparty/libfreetype/include/freetype/internal/services/svotval.h
-thirdparty/libfreetype/include/freetype/internal/services/svpfr.h
-thirdparty/libfreetype/include/freetype/internal/services/svpostnm.h
-thirdparty/libfreetype/include/freetype/internal/services/svpscmap.h
-thirdparty/libfreetype/include/freetype/internal/services/svpsinfo.h
-thirdparty/libfreetype/include/freetype/internal/services/svsfnt.h
-thirdparty/libfreetype/include/freetype/internal/services/svttcmap.h
-thirdparty/libfreetype/include/freetype/internal/services/svtteng.h
-thirdparty/libfreetype/include/freetype/internal/services/svttglyf.h
-thirdparty/libfreetype/include/freetype/internal/services/svwinfnt.h
-thirdparty/libfreetype/include/freetype/internal/services/svxf86nm.h
-thirdparty/libfreetype/include/freetype/internal/autohint.h
-thirdparty/libfreetype/include/freetype/internal/ftcalc.h
-thirdparty/libfreetype/include/freetype/internal/ftdebug.h
-thirdparty/libfreetype/include/freetype/internal/ftdriver.h
-thirdparty/libfreetype/include/freetype/internal/ftgloadr.h
-thirdparty/libfreetype/include/freetype/internal/ftmemory.h
-thirdparty/libfreetype/include/freetype/internal/ftobjs.h
-thirdparty/libfreetype/include/freetype/internal/ftpic.h
-thirdparty/libfreetype/include/freetype/internal/ftrfork.h
-thirdparty/libfreetype/include/freetype/internal/ftserv.h
-thirdparty/libfreetype/include/freetype/internal/ftstream.h
-thirdparty/libfreetype/include/freetype/internal/fttrace.h
-thirdparty/libfreetype/include/freetype/internal/ftvalid.h
-thirdparty/libfreetype/include/freetype/internal/internal.h
-thirdparty/libfreetype/include/freetype/internal/pcftypes.h
-thirdparty/libfreetype/include/freetype/internal/psaux.h
-thirdparty/libfreetype/include/freetype/internal/pshints.h
-thirdparty/libfreetype/include/freetype/internal/sfnt.h
-thirdparty/libfreetype/include/freetype/internal/t1types.h
-thirdparty/libfreetype/include/freetype/internal/tttypes.h
-thirdparty/libfreetype/include/freetype/freetype.h
-thirdparty/libfreetype/include/freetype/ftadvanc.h
-thirdparty/libfreetype/include/freetype/ftbbox.h
-thirdparty/libfreetype/include/freetype/ftbdf.h
-thirdparty/libfreetype/include/freetype/ftbitmap.h
-thirdparty/libfreetype/include/freetype/ftcache.h
-thirdparty/libfreetype/include/freetype/ftchapters.h
-thirdparty/libfreetype/include/freetype/ftcid.h
-thirdparty/libfreetype/include/freetype/fterrdef.h
-thirdparty/libfreetype/include/freetype/fterrors.h
-thirdparty/libfreetype/include/freetype/ftgasp.h
-thirdparty/libfreetype/include/freetype/ftglyph.h
-thirdparty/libfreetype/include/freetype/ftgxval.h
-thirdparty/libfreetype/include/freetype/ftgzip.h
-thirdparty/libfreetype/include/freetype/ftimage.h
-thirdparty/libfreetype/include/freetype/ftincrem.h
-thirdparty/libfreetype/include/freetype/ftlcdfil.h
-thirdparty/libfreetype/include/freetype/ftlist.h
-thirdparty/libfreetype/include/freetype/ftlzw.h
-thirdparty/libfreetype/include/freetype/ftmac.h
-thirdparty/libfreetype/include/freetype/ftmm.h
-thirdparty/libfreetype/include/freetype/ftmodapi.h
-thirdparty/libfreetype/include/freetype/ftmoderr.h
-thirdparty/libfreetype/include/freetype/ftotval.h
-thirdparty/libfreetype/include/freetype/ftoutln.h
-thirdparty/libfreetype/include/freetype/ftpfr.h
-thirdparty/libfreetype/include/freetype/ftrender.h
-thirdparty/libfreetype/include/freetype/ftsizes.h
-thirdparty/libfreetype/include/freetype/ftsnames.h
-thirdparty/libfreetype/include/freetype/ftstroke.h
-thirdparty/libfreetype/include/freetype/ftsynth.h
-thirdparty/libfreetype/include/freetype/ftsystem.h
-thirdparty/libfreetype/include/freetype/fttrigon.h
-thirdparty/libfreetype/include/freetype/fttypes.h
-thirdparty/libfreetype/include/freetype/ftwinfnt.h
-thirdparty/libfreetype/include/freetype/ftxf86.h
-thirdparty/libfreetype/include/freetype/t1tables.h
-thirdparty/libfreetype/include/freetype/ttnameid.h
-thirdparty/libfreetype/include/freetype/tttables.h
-thirdparty/libfreetype/include/freetype/tttags.h
-thirdparty/libfreetype/include/freetype/ttunpat.h
-thirdparty/libfreetype/include/ft2build.h
-thirdparty/libfreetype/src/autofit/afangles.c
-thirdparty/libfreetype/src/autofit/afangles.h
-thirdparty/libfreetype/src/autofit/afcjk.c
-thirdparty/libfreetype/src/autofit/afcjk.h
-thirdparty/libfreetype/src/autofit/afdummy.c
-thirdparty/libfreetype/src/autofit/afdummy.h
-thirdparty/libfreetype/src/autofit/aferrors.h
-thirdparty/libfreetype/src/autofit/afglobal.c
-thirdparty/libfreetype/src/autofit/afglobal.h
-thirdparty/libfreetype/src/autofit/afhints.c
-thirdparty/libfreetype/src/autofit/afhints.h
-thirdparty/libfreetype/src/autofit/afindic.c
-thirdparty/libfreetype/src/autofit/afindic.h
-thirdparty/libfreetype/src/autofit/aflatin.c
-thirdparty/libfreetype/src/autofit/aflatin.h
-thirdparty/libfreetype/src/autofit/aflatin2.c
-thirdparty/libfreetype/src/autofit/aflatin2.h
-thirdparty/libfreetype/src/autofit/afloader.c
-thirdparty/libfreetype/src/autofit/afloader.h
-thirdparty/libfreetype/src/autofit/afmodule.c
-thirdparty/libfreetype/src/autofit/afmodule.h
-thirdparty/libfreetype/src/autofit/afpic.c
-thirdparty/libfreetype/src/autofit/afpic.h
-thirdparty/libfreetype/src/autofit/aftypes.h
-thirdparty/libfreetype/src/autofit/afwarp.c
-thirdparty/libfreetype/src/autofit/afwarp.h
-thirdparty/libfreetype/src/autofit/autofit.c
-thirdparty/libfreetype/src/base/basepic.c
-thirdparty/libfreetype/src/base/basepic.h
-thirdparty/libfreetype/src/base/ftadvanc.c
-thirdparty/libfreetype/src/base/ftapi.c
-thirdparty/libfreetype/src/base/ftbase.c
-thirdparty/libfreetype/src/base/ftbase.h
-thirdparty/libfreetype/src/base/ftbbox.c
-thirdparty/libfreetype/src/base/ftbdf.c
-thirdparty/libfreetype/src/base/ftbitmap.c
-thirdparty/libfreetype/src/base/ftcalc.c
-thirdparty/libfreetype/src/base/ftcid.c
-thirdparty/libfreetype/src/base/ftdbgmem.c
-thirdparty/libfreetype/src/base/ftdebug.c
-thirdparty/libfreetype/src/base/ftfstype.c
-thirdparty/libfreetype/src/base/ftgasp.c
-thirdparty/libfreetype/src/base/ftgloadr.c
-thirdparty/libfreetype/src/base/ftglyph.c
-thirdparty/libfreetype/src/base/ftgxval.c
-thirdparty/libfreetype/src/base/ftinit.c
-thirdparty/libfreetype/src/base/ftlcdfil.c
-thirdparty/libfreetype/src/base/ftmac.c
-thirdparty/libfreetype/src/base/ftmm.c
-thirdparty/libfreetype/src/base/ftobjs.c
-thirdparty/libfreetype/src/base/ftotval.c
-thirdparty/libfreetype/src/base/ftoutln.c
-thirdparty/libfreetype/src/base/ftpatent.c
-thirdparty/libfreetype/src/base/ftpfr.c
-thirdparty/libfreetype/src/base/ftpic.c
-thirdparty/libfreetype/src/base/ftrfork.c
-thirdparty/libfreetype/src/base/ftsnames.c
-thirdparty/libfreetype/src/base/ftstream.c
-thirdparty/libfreetype/src/base/ftstroke.c
-thirdparty/libfreetype/src/base/ftsynth.c
-thirdparty/libfreetype/src/base/ftsystem.c
-thirdparty/libfreetype/src/base/fttrigon.c
-thirdparty/libfreetype/src/base/fttype1.c
-thirdparty/libfreetype/src/base/ftutil.c
-thirdparty/libfreetype/src/base/ftwinfnt.c
-thirdparty/libfreetype/src/base/ftxf86.c
-thirdparty/libfreetype/src/bdf/bdf.c
-thirdparty/libfreetype/src/bdf/bdf.h
-thirdparty/libfreetype/src/bdf/bdfdrivr.c
-thirdparty/libfreetype/src/bdf/bdfdrivr.h
-thirdparty/libfreetype/src/bdf/bdferror.h
-thirdparty/libfreetype/src/bdf/bdflib.c
-thirdparty/libfreetype/src/cache/ftcache.c
-thirdparty/libfreetype/src/cache/ftcbasic.c
-thirdparty/libfreetype/src/cache/ftccache.c
-thirdparty/libfreetype/src/cache/ftccache.h
-thirdparty/libfreetype/src/cache/ftccback.h
-thirdparty/libfreetype/src/cache/ftccmap.c
-thirdparty/libfreetype/src/cache/ftcerror.h
-thirdparty/libfreetype/src/cache/ftcglyph.c
-thirdparty/libfreetype/src/cache/ftcglyph.h
-thirdparty/libfreetype/src/cache/ftcimage.c
-thirdparty/libfreetype/src/cache/ftcimage.h
-thirdparty/libfreetype/src/cache/ftcmanag.c
-thirdparty/libfreetype/src/cache/ftcmanag.h
-thirdparty/libfreetype/src/cache/ftcmru.c
-thirdparty/libfreetype/src/cache/ftcmru.h
-thirdparty/libfreetype/src/cache/ftcsbits.c
-thirdparty/libfreetype/src/cache/ftcsbits.h
-thirdparty/libfreetype/src/cff/cff.c
-thirdparty/libfreetype/src/cff/cffcmap.c
-thirdparty/libfreetype/src/cff/cffcmap.h
-thirdparty/libfreetype/src/cff/cffdrivr.c
-thirdparty/libfreetype/src/cff/cffdrivr.h
-thirdparty/libfreetype/src/cff/cfferrs.h
-thirdparty/libfreetype/src/cff/cffgload.c
-thirdparty/libfreetype/src/cff/cffgload.h
-thirdparty/libfreetype/src/cff/cffload.c
-thirdparty/libfreetype/src/cff/cffload.h
-thirdparty/libfreetype/src/cff/cffobjs.c
-thirdparty/libfreetype/src/cff/cffobjs.h
-thirdparty/libfreetype/src/cff/cffparse.c
-thirdparty/libfreetype/src/cff/cffparse.h
-thirdparty/libfreetype/src/cff/cffpic.c
-thirdparty/libfreetype/src/cff/cffpic.h
-thirdparty/libfreetype/src/cff/cfftoken.h
-thirdparty/libfreetype/src/cff/cfftypes.h
-thirdparty/libfreetype/src/cid/ciderrs.h
-thirdparty/libfreetype/src/cid/cidgload.c
-thirdparty/libfreetype/src/cid/cidgload.h
-thirdparty/libfreetype/src/cid/cidload.c
-thirdparty/libfreetype/src/cid/cidload.h
-thirdparty/libfreetype/src/cid/cidobjs.c
-thirdparty/libfreetype/src/cid/cidobjs.h
-thirdparty/libfreetype/src/cid/cidparse.c
-thirdparty/libfreetype/src/cid/cidparse.h
-thirdparty/libfreetype/src/cid/cidriver.c
-thirdparty/libfreetype/src/cid/cidriver.h
-thirdparty/libfreetype/src/cid/cidtoken.h
-thirdparty/libfreetype/src/cid/type1cid.c
-thirdparty/libfreetype/src/gxvalid/gxvalid.c
-thirdparty/libfreetype/src/gxvalid/gxvalid.h
-thirdparty/libfreetype/src/gxvalid/gxvbsln.c
-thirdparty/libfreetype/src/gxvalid/gxvcommn.c
-thirdparty/libfreetype/src/gxvalid/gxvcommn.h
-thirdparty/libfreetype/src/gxvalid/gxverror.h
-thirdparty/libfreetype/src/gxvalid/gxvfeat.c
-thirdparty/libfreetype/src/gxvalid/gxvfeat.h
-thirdparty/libfreetype/src/gxvalid/gxvfgen.c
-thirdparty/libfreetype/src/gxvalid/gxvjust.c
-thirdparty/libfreetype/src/gxvalid/gxvkern.c
-thirdparty/libfreetype/src/gxvalid/gxvlcar.c
-thirdparty/libfreetype/src/gxvalid/gxvmod.c
-thirdparty/libfreetype/src/gxvalid/gxvmod.h
-thirdparty/libfreetype/src/gxvalid/gxvmort.c
-thirdparty/libfreetype/src/gxvalid/gxvmort.h
-thirdparty/libfreetype/src/gxvalid/gxvmort0.c
-thirdparty/libfreetype/src/gxvalid/gxvmort1.c
-thirdparty/libfreetype/src/gxvalid/gxvmort2.c
-thirdparty/libfreetype/src/gxvalid/gxvmort4.c
-thirdparty/libfreetype/src/gxvalid/gxvmort5.c
-thirdparty/libfreetype/src/gxvalid/gxvmorx.c
-thirdparty/libfreetype/src/gxvalid/gxvmorx.h
-thirdparty/libfreetype/src/gxvalid/gxvmorx0.c
-thirdparty/libfreetype/src/gxvalid/gxvmorx1.c
-thirdparty/libfreetype/src/gxvalid/gxvmorx2.c
-thirdparty/libfreetype/src/gxvalid/gxvmorx4.c
-thirdparty/libfreetype/src/gxvalid/gxvmorx5.c
-thirdparty/libfreetype/src/gxvalid/gxvopbd.c
-thirdparty/libfreetype/src/gxvalid/gxvprop.c
-thirdparty/libfreetype/src/gxvalid/gxvtrak.c
-thirdparty/libfreetype/src/gzip/adler32.c
-thirdparty/libfreetype/src/gzip/ftgzip.c
-thirdparty/libfreetype/src/gzip/infblock.c
-thirdparty/libfreetype/src/gzip/infblock.h
-thirdparty/libfreetype/src/gzip/infcodes.c
-thirdparty/libfreetype/src/gzip/infcodes.h
-thirdparty/libfreetype/src/gzip/inffixed.h
-thirdparty/libfreetype/src/gzip/inflate.c
-thirdparty/libfreetype/src/gzip/inftrees.c
-thirdparty/libfreetype/src/gzip/inftrees.h
-thirdparty/libfreetype/src/gzip/infutil.c
-thirdparty/libfreetype/src/gzip/infutil.h
-thirdparty/libfreetype/src/gzip/zconf.h
-thirdparty/libfreetype/src/gzip/zlib.h
-thirdparty/libfreetype/src/gzip/zutil.c
-thirdparty/libfreetype/src/gzip/zutil.h
-thirdparty/libfreetype/src/lzw/ftlzw.c
-thirdparty/libfreetype/src/lzw/ftzopen.c
-thirdparty/libfreetype/src/lzw/ftzopen.h
-thirdparty/libfreetype/src/otvalid/otvalid.c
-thirdparty/libfreetype/src/otvalid/otvalid.h
-thirdparty/libfreetype/src/otvalid/otvbase.c
-thirdparty/libfreetype/src/otvalid/otvcommn.c
-thirdparty/libfreetype/src/otvalid/otvcommn.h
-thirdparty/libfreetype/src/otvalid/otverror.h
-thirdparty/libfreetype/src/otvalid/otvgdef.c
-thirdparty/libfreetype/src/otvalid/otvgpos.c
-thirdparty/libfreetype/src/otvalid/otvgpos.h
-thirdparty/libfreetype/src/otvalid/otvgsub.c
-thirdparty/libfreetype/src/otvalid/otvjstf.c
-thirdparty/libfreetype/src/otvalid/otvmath.c
-thirdparty/libfreetype/src/otvalid/otvmod.c
-thirdparty/libfreetype/src/otvalid/otvmod.h
-thirdparty/libfreetype/src/pcf/pcf.c
-thirdparty/libfreetype/src/pcf/pcf.h
-thirdparty/libfreetype/src/pcf/pcfdrivr.c
-thirdparty/libfreetype/src/pcf/pcfdrivr.h
-thirdparty/libfreetype/src/pcf/pcferror.h
-thirdparty/libfreetype/src/pcf/pcfread.c
-thirdparty/libfreetype/src/pcf/pcfread.h
-thirdparty/libfreetype/src/pcf/pcfutil.c
-thirdparty/libfreetype/src/pcf/pcfutil.h
-thirdparty/libfreetype/src/pfr/pfr.c
-thirdparty/libfreetype/src/pfr/pfrcmap.c
-thirdparty/libfreetype/src/pfr/pfrcmap.h
-thirdparty/libfreetype/src/pfr/pfrdrivr.c
-thirdparty/libfreetype/src/pfr/pfrdrivr.h
-thirdparty/libfreetype/src/pfr/pfrerror.h
-thirdparty/libfreetype/src/pfr/pfrgload.c
-thirdparty/libfreetype/src/pfr/pfrgload.h
-thirdparty/libfreetype/src/pfr/pfrload.c
-thirdparty/libfreetype/src/pfr/pfrload.h
-thirdparty/libfreetype/src/pfr/pfrobjs.c
-thirdparty/libfreetype/src/pfr/pfrobjs.h
-thirdparty/libfreetype/src/pfr/pfrsbit.c
-thirdparty/libfreetype/src/pfr/pfrsbit.h
-thirdparty/libfreetype/src/pfr/pfrtypes.h
-thirdparty/libfreetype/src/psaux/afmparse.c
-thirdparty/libfreetype/src/psaux/afmparse.h
-thirdparty/libfreetype/src/psaux/psaux.c
-thirdparty/libfreetype/src/psaux/psauxerr.h
-thirdparty/libfreetype/src/psaux/psauxmod.c
-thirdparty/libfreetype/src/psaux/psauxmod.h
-thirdparty/libfreetype/src/psaux/psconv.c
-thirdparty/libfreetype/src/psaux/psconv.h
-thirdparty/libfreetype/src/psaux/psobjs.c
-thirdparty/libfreetype/src/psaux/psobjs.h
-thirdparty/libfreetype/src/psaux/t1cmap.c
-thirdparty/libfreetype/src/psaux/t1cmap.h
-thirdparty/libfreetype/src/psaux/t1decode.c
-thirdparty/libfreetype/src/psaux/t1decode.h
-thirdparty/libfreetype/src/pshinter/pshalgo.c
-thirdparty/libfreetype/src/pshinter/pshalgo.h
-thirdparty/libfreetype/src/pshinter/pshglob.c
-thirdparty/libfreetype/src/pshinter/pshglob.h
-thirdparty/libfreetype/src/pshinter/pshinter.c
-thirdparty/libfreetype/src/pshinter/pshmod.c
-thirdparty/libfreetype/src/pshinter/pshmod.h
-thirdparty/libfreetype/src/pshinter/pshnterr.h
-thirdparty/libfreetype/src/pshinter/pshpic.c
-thirdparty/libfreetype/src/pshinter/pshpic.h
-thirdparty/libfreetype/src/pshinter/pshrec.c
-thirdparty/libfreetype/src/pshinter/pshrec.h
-thirdparty/libfreetype/src/psnames/psmodule.c
-thirdparty/libfreetype/src/psnames/psmodule.h
-thirdparty/libfreetype/src/psnames/psnamerr.h
-thirdparty/libfreetype/src/psnames/psnames.c
-thirdparty/libfreetype/src/psnames/pspic.c
-thirdparty/libfreetype/src/psnames/pspic.h
-thirdparty/libfreetype/src/psnames/pstables.h
-thirdparty/libfreetype/src/raster/ftmisc.h
-thirdparty/libfreetype/src/raster/ftraster.c
-thirdparty/libfreetype/src/raster/ftraster.h
-thirdparty/libfreetype/src/raster/ftrend1.c
-thirdparty/libfreetype/src/raster/ftrend1.h
-thirdparty/libfreetype/src/raster/raster.c
-thirdparty/libfreetype/src/raster/rasterrs.h
-thirdparty/libfreetype/src/raster/rastpic.c
-thirdparty/libfreetype/src/raster/rastpic.h
-thirdparty/libfreetype/src/sfnt/sfdriver.c
-thirdparty/libfreetype/src/sfnt/sfdriver.h
-thirdparty/libfreetype/src/sfnt/sferrors.h
-thirdparty/libfreetype/src/sfnt/sfnt.c
-thirdparty/libfreetype/src/sfnt/sfntpic.c
-thirdparty/libfreetype/src/sfnt/sfntpic.h
-thirdparty/libfreetype/src/sfnt/sfobjs.c
-thirdparty/libfreetype/src/sfnt/sfobjs.h
-thirdparty/libfreetype/src/sfnt/ttbdf.c
-thirdparty/libfreetype/src/sfnt/ttbdf.h
-thirdparty/libfreetype/src/sfnt/ttcmap.c
-thirdparty/libfreetype/src/sfnt/ttcmap.h
-thirdparty/libfreetype/src/sfnt/ttcmapc.h
-thirdparty/libfreetype/src/sfnt/ttkern.c
-thirdparty/libfreetype/src/sfnt/ttkern.h
-thirdparty/libfreetype/src/sfnt/ttload.c
-thirdparty/libfreetype/src/sfnt/ttload.h
-thirdparty/libfreetype/src/sfnt/ttmtx.c
-thirdparty/libfreetype/src/sfnt/ttmtx.h
-thirdparty/libfreetype/src/sfnt/ttpost.c
-thirdparty/libfreetype/src/sfnt/ttpost.h
-thirdparty/libfreetype/src/sfnt/ttsbit.c
-thirdparty/libfreetype/src/sfnt/ttsbit.h
-thirdparty/libfreetype/src/sfnt/ttsbit0.c
-thirdparty/libfreetype/src/smooth/ftgrays.c
-thirdparty/libfreetype/src/smooth/ftgrays.h
-thirdparty/libfreetype/src/smooth/ftsmerrs.h
-thirdparty/libfreetype/src/smooth/ftsmooth.c
-thirdparty/libfreetype/src/smooth/ftsmooth.h
-thirdparty/libfreetype/src/smooth/ftspic.c
-thirdparty/libfreetype/src/smooth/ftspic.h
-thirdparty/libfreetype/src/smooth/smooth.c
-thirdparty/libfreetype/src/tools/ftrandom/ftrandom.c
-thirdparty/libfreetype/src/tools/apinames.c
-thirdparty/libfreetype/src/tools/test_afm.c
-thirdparty/libfreetype/src/tools/test_bbox.c
-thirdparty/libfreetype/src/tools/test_trig.c
-thirdparty/libfreetype/src/truetype/truetype.c
-thirdparty/libfreetype/src/truetype/ttdriver.c
-thirdparty/libfreetype/src/truetype/ttdriver.h
-thirdparty/libfreetype/src/truetype/tterrors.h
-thirdparty/libfreetype/src/truetype/ttgload.c
-thirdparty/libfreetype/src/truetype/ttgload.h
-thirdparty/libfreetype/src/truetype/ttgxvar.c
-thirdparty/libfreetype/src/truetype/ttgxvar.h
-thirdparty/libfreetype/src/truetype/ttinterp.c
-thirdparty/libfreetype/src/truetype/ttinterp.h
-thirdparty/libfreetype/src/truetype/ttobjs.c
-thirdparty/libfreetype/src/truetype/ttobjs.h
-thirdparty/libfreetype/src/truetype/ttpic.c
-thirdparty/libfreetype/src/truetype/ttpic.h
-thirdparty/libfreetype/src/truetype/ttpload.c
-thirdparty/libfreetype/src/truetype/ttpload.h
-thirdparty/libfreetype/src/type1/t1afm.c
-thirdparty/libfreetype/src/type1/t1afm.h
-thirdparty/libfreetype/src/type1/t1driver.c
-thirdparty/libfreetype/src/type1/t1driver.h
-thirdparty/libfreetype/src/type1/t1errors.h
-thirdparty/libfreetype/src/type1/t1gload.c
-thirdparty/libfreetype/src/type1/t1gload.h
-thirdparty/libfreetype/src/type1/t1load.c
-thirdparty/libfreetype/src/type1/t1load.h
-thirdparty/libfreetype/src/type1/t1objs.c
-thirdparty/libfreetype/src/type1/t1objs.h
-thirdparty/libfreetype/src/type1/t1parse.c
-thirdparty/libfreetype/src/type1/t1parse.h
-thirdparty/libfreetype/src/type1/t1tokens.h
-thirdparty/libfreetype/src/type1/type1.c
-thirdparty/libfreetype/src/type42/t42drivr.c
-thirdparty/libfreetype/src/type42/t42drivr.h
-thirdparty/libfreetype/src/type42/t42error.h
-thirdparty/libfreetype/src/type42/t42objs.c
-thirdparty/libfreetype/src/type42/t42objs.h
-thirdparty/libfreetype/src/type42/t42parse.c
-thirdparty/libfreetype/src/type42/t42parse.h
-thirdparty/libfreetype/src/type42/t42types.h
-thirdparty/libfreetype/src/type42/type42.c
-thirdparty/libfreetype/src/winfonts/fnterrs.h
-thirdparty/libfreetype/src/winfonts/winfnt.c
-thirdparty/libfreetype/src/winfonts/winfnt.h
-thirdparty/libfreetype/libfreetype.gyp
-thirdparty/libgif/include/gif_lib.h
-thirdparty/libgif/src/dgif_lib.c
-thirdparty/libgif/src/egif_lib.c
-thirdparty/libgif/src/gif_err.c
-thirdparty/libgif/src/gif_font.c
-thirdparty/libgif/src/gif_hash.c
-thirdparty/libgif/src/gif_hash.h
-thirdparty/libgif/src/gif_lib_private.h
-thirdparty/libgif/src/gifalloc.c
-thirdparty/libgif/src/quantize.c
-thirdparty/libgif/libgif.gyp
-thirdparty/libgif/ORIGIN.txt
-thirdparty/libgif/score.txt
-thirdparty/libharfbuzz/src/hb-ucdn/ucdn.c
-thirdparty/libharfbuzz/src/hb-ucdn/ucdn.h
-thirdparty/libharfbuzz/src/hb-ucdn/unicodedata_db.h
-thirdparty/libharfbuzz/src/hb-atomic-private.hh
-thirdparty/libharfbuzz/src/hb-blob.cc
-thirdparty/libharfbuzz/src/hb-blob.h
-thirdparty/libharfbuzz/src/hb-buffer-deserialize-json.hh
-thirdparty/libharfbuzz/src/hb-buffer-deserialize-text.hh
-thirdparty/libharfbuzz/src/hb-buffer-private.hh
-thirdparty/libharfbuzz/src/hb-buffer-serialize.cc
-thirdparty/libharfbuzz/src/hb-buffer.cc
-thirdparty/libharfbuzz/src/hb-buffer.h
-thirdparty/libharfbuzz/src/hb-cache-private.hh
-thirdparty/libharfbuzz/src/hb-common.cc
-thirdparty/libharfbuzz/src/hb-common.h
-thirdparty/libharfbuzz/src/hb-coretext.cc
-thirdparty/libharfbuzz/src/hb-coretext.h
-thirdparty/libharfbuzz/src/hb-deprecated.h
-thirdparty/libharfbuzz/src/hb-face-private.hh
-thirdparty/libharfbuzz/src/hb-face.cc
-thirdparty/libharfbuzz/src/hb-face.h
-thirdparty/libharfbuzz/src/hb-fallback-shape.cc
-thirdparty/libharfbuzz/src/hb-font-private.hh
-thirdparty/libharfbuzz/src/hb-font.cc
-thirdparty/libharfbuzz/src/hb-font.h
-thirdparty/libharfbuzz/src/hb-ft.cc
-thirdparty/libharfbuzz/src/hb-ft.h
-thirdparty/libharfbuzz/src/hb-glib.cc
-thirdparty/libharfbuzz/src/hb-glib.h
-thirdparty/libharfbuzz/src/hb-gobject-structs.cc
-thirdparty/libharfbuzz/src/hb-gobject-structs.h
-thirdparty/libharfbuzz/src/hb-gobject.h
-thirdparty/libharfbuzz/src/hb-graphite2.cc
-thirdparty/libharfbuzz/src/hb-graphite2.h
-thirdparty/libharfbuzz/src/hb-icu.cc
-thirdparty/libharfbuzz/src/hb-icu.h
-thirdparty/libharfbuzz/src/hb-mutex-private.hh
-thirdparty/libharfbuzz/src/hb-object-private.hh
-thirdparty/libharfbuzz/src/hb-open-file-private.hh
-thirdparty/libharfbuzz/src/hb-open-type-private.hh
-thirdparty/libharfbuzz/src/hb-ot-cmap-table.hh
-thirdparty/libharfbuzz/src/hb-ot-font.cc
-thirdparty/libharfbuzz/src/hb-ot-font.h
-thirdparty/libharfbuzz/src/hb-ot-head-table.hh
-thirdparty/libharfbuzz/src/hb-ot-hhea-table.hh
-thirdparty/libharfbuzz/src/hb-ot-hmtx-table.hh
-thirdparty/libharfbuzz/src/hb-ot-layout-common-private.hh
-thirdparty/libharfbuzz/src/hb-ot-layout-gdef-table.hh
-thirdparty/libharfbuzz/src/hb-ot-layout-gpos-table.hh
-thirdparty/libharfbuzz/src/hb-ot-layout-gsub-table.hh
-thirdparty/libharfbuzz/src/hb-ot-layout-gsubgpos-private.hh
-thirdparty/libharfbuzz/src/hb-ot-layout-jstf-table.hh
-thirdparty/libharfbuzz/src/hb-ot-layout-private.hh
-thirdparty/libharfbuzz/src/hb-ot-layout.cc
-thirdparty/libharfbuzz/src/hb-ot-layout.h
-thirdparty/libharfbuzz/src/hb-ot-map-private.hh
-thirdparty/libharfbuzz/src/hb-ot-map.cc
-thirdparty/libharfbuzz/src/hb-ot-maxp-table.hh
-thirdparty/libharfbuzz/src/hb-ot-name-table.hh
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-arabic-fallback.hh
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-arabic-table.hh
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-arabic.cc
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-default.cc
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-hangul.cc
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-hebrew.cc
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-indic-machine.hh
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-indic-private.hh
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-indic-table.cc
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-indic.cc
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-myanmar-machine.hh
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-myanmar.cc
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-private.hh
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-sea-machine.hh
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-sea.cc
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-thai.cc
-thirdparty/libharfbuzz/src/hb-ot-shape-complex-tibetan.cc
-thirdparty/libharfbuzz/src/hb-ot-shape-fallback-private.hh
-thirdparty/libharfbuzz/src/hb-ot-shape-fallback.cc
-thirdparty/libharfbuzz/src/hb-ot-shape-normalize-private.hh
-thirdparty/libharfbuzz/src/hb-ot-shape-normalize.cc
-thirdparty/libharfbuzz/src/hb-ot-shape-private.hh
-thirdparty/libharfbuzz/src/hb-ot-shape.cc
-thirdparty/libharfbuzz/src/hb-ot-shape.h
-thirdparty/libharfbuzz/src/hb-ot-tag.cc
-thirdparty/libharfbuzz/src/hb-ot-tag.h
-thirdparty/libharfbuzz/src/hb-ot.h
-thirdparty/libharfbuzz/src/hb-private.hh
-thirdparty/libharfbuzz/src/hb-set-private.hh
-thirdparty/libharfbuzz/src/hb-set.cc
-thirdparty/libharfbuzz/src/hb-set.h
-thirdparty/libharfbuzz/src/hb-shape-plan-private.hh
-thirdparty/libharfbuzz/src/hb-shape-plan.cc
-thirdparty/libharfbuzz/src/hb-shape-plan.h
-thirdparty/libharfbuzz/src/hb-shape.cc
-thirdparty/libharfbuzz/src/hb-shape.h
-thirdparty/libharfbuzz/src/hb-shaper-impl-private.hh
-thirdparty/libharfbuzz/src/hb-shaper-list.hh
-thirdparty/libharfbuzz/src/hb-shaper-private.hh
-thirdparty/libharfbuzz/src/hb-shaper.cc
-thirdparty/libharfbuzz/src/hb-ucdn.cc
-thirdparty/libharfbuzz/src/hb-unicode-private.hh
-thirdparty/libharfbuzz/src/hb-unicode.cc
-thirdparty/libharfbuzz/src/hb-unicode.h
-thirdparty/libharfbuzz/src/hb-uniscribe.cc
-thirdparty/libharfbuzz/src/hb-uniscribe.h
-thirdparty/libharfbuzz/src/hb-utf-private.hh
-thirdparty/libharfbuzz/src/hb-version.h
-thirdparty/libharfbuzz/src/hb-warning.cc
-thirdparty/libharfbuzz/src/hb.h
-thirdparty/libharfbuzz/src/main.cc
-thirdparty/libharfbuzz/src/ucdn.h
-thirdparty/libharfbuzz/libharfbuzz.gyp
-thirdparty/libiodbc/include/iodbcunix.h
-thirdparty/libiodbc/include/sql.h
-thirdparty/libiodbc/include/sqlext.h
-thirdparty/libiodbc/include/sqltypes.h
-thirdparty/libiodbc/include/sqlucode.h
-thirdparty/libiodbc/src/inst/dlf.c
-thirdparty/libiodbc/src/inst/dlf.h
-thirdparty/libiodbc/src/inst/Info.c
-thirdparty/libiodbc/src/inst/inifile.c
-thirdparty/libiodbc/src/inst/inifile.h
-thirdparty/libiodbc/src/inst/iodbc_error.c
-thirdparty/libiodbc/src/inst/iodbc_error.h
-thirdparty/libiodbc/src/inst/misc.c
-thirdparty/libiodbc/src/inst/misc.h
-thirdparty/libiodbc/src/inst/SQLConfigDataSource.c
-thirdparty/libiodbc/src/inst/SQLConfigDriver.c
-thirdparty/libiodbc/src/inst/SQLCreateDataSource.c
-thirdparty/libiodbc/src/inst/SQLGetAvailableDrivers.c
-thirdparty/libiodbc/src/inst/SQLGetConfigMode.c
-thirdparty/libiodbc/src/inst/SQLGetInstalledDrivers.c
-thirdparty/libiodbc/src/inst/SQLGetPrivateProfileString.c
-thirdparty/libiodbc/src/inst/SQLGetTranslator.c
-thirdparty/libiodbc/src/inst/SQLInstallDriver.c
-thirdparty/libiodbc/src/inst/SQLInstallDriverEx.c
-thirdparty/libiodbc/src/inst/SQLInstallDriverManager.c
-thirdparty/libiodbc/src/inst/SQLInstallerError.c
-thirdparty/libiodbc/src/inst/SQLInstallODBC.c
-thirdparty/libiodbc/src/inst/SQLInstallTranslator.c
-thirdparty/libiodbc/src/inst/SQLInstallTranslatorEx.c
-thirdparty/libiodbc/src/inst/SQLManageDataSource.c
-thirdparty/libiodbc/src/inst/SQLPostInstallerError.c
-thirdparty/libiodbc/src/inst/SQLReadFileDSN.c
-thirdparty/libiodbc/src/inst/SQLRemoveDefaultDataSource.c
-thirdparty/libiodbc/src/inst/SQLRemoveDriver.c
-thirdparty/libiodbc/src/inst/SQLRemoveDriverManager.c
-thirdparty/libiodbc/src/inst/SQLRemoveDSNFromIni.c
-thirdparty/libiodbc/src/inst/SQLRemoveTranslator.c
-thirdparty/libiodbc/src/inst/SQLSetConfigMode.c
-thirdparty/libiodbc/src/inst/SQLValidDSN.c
-thirdparty/libiodbc/src/inst/SQLWriteDSNToIni.c
-thirdparty/libiodbc/src/inst/SQLWriteFileDSN.c
-thirdparty/libiodbc/src/inst/SQLWritePrivateProfileString.c
-thirdparty/libiodbc/src/inst/unicode.c
-thirdparty/libiodbc/src/inst/unicode.h
-thirdparty/libiodbc/src/trace/AllocConnect.c
-thirdparty/libiodbc/src/trace/AllocEnv.c
-thirdparty/libiodbc/src/trace/AllocHandle.c
-thirdparty/libiodbc/src/trace/AllocStmt.c
-thirdparty/libiodbc/src/trace/BindCol.c
-thirdparty/libiodbc/src/trace/BindParameter.c
-thirdparty/libiodbc/src/trace/BrowseConnect.c
-thirdparty/libiodbc/src/trace/BulkOperations.c
-thirdparty/libiodbc/src/trace/Cancel.c
-thirdparty/libiodbc/src/trace/CloseCursor.c
-thirdparty/libiodbc/src/trace/ColAttribute.c
-thirdparty/libiodbc/src/trace/ColumnPrivileges.c
-thirdparty/libiodbc/src/trace/Columns.c
-thirdparty/libiodbc/src/trace/Connect.c
-thirdparty/libiodbc/src/trace/CopyDesc.c
-thirdparty/libiodbc/src/trace/DataSources.c
-thirdparty/libiodbc/src/trace/DescribeCol.c
-thirdparty/libiodbc/src/trace/DescribeParam.c
-thirdparty/libiodbc/src/trace/Disconnect.c
-thirdparty/libiodbc/src/trace/DriverConnect.c
-thirdparty/libiodbc/src/trace/Drivers.c
-thirdparty/libiodbc/src/trace/EndTran.c
-thirdparty/libiodbc/src/trace/Error.c
-thirdparty/libiodbc/src/trace/ExecDirect.c
-thirdparty/libiodbc/src/trace/Execute.c
-thirdparty/libiodbc/src/trace/ExtendedFetch.c
-thirdparty/libiodbc/src/trace/Fetch.c
-thirdparty/libiodbc/src/trace/FetchScroll.c
-thirdparty/libiodbc/src/trace/ForeignKeys.c
-thirdparty/libiodbc/src/trace/FreeConnect.c
-thirdparty/libiodbc/src/trace/FreeEnv.c
-thirdparty/libiodbc/src/trace/FreeHandle.c
-thirdparty/libiodbc/src/trace/FreeStmt.c
-thirdparty/libiodbc/src/trace/GetConnectAttr.c
-thirdparty/libiodbc/src/trace/GetConnectOption.c
-thirdparty/libiodbc/src/trace/GetCursorName.c
-thirdparty/libiodbc/src/trace/GetData.c
-thirdparty/libiodbc/src/trace/GetDescField.c
-thirdparty/libiodbc/src/trace/GetDescRec.c
-thirdparty/libiodbc/src/trace/GetDiagField.c
-thirdparty/libiodbc/src/trace/GetDiagRec.c
-thirdparty/libiodbc/src/trace/GetEnvAttr.c
-thirdparty/libiodbc/src/trace/GetFunctions.c
-thirdparty/libiodbc/src/trace/GetStmtAttr.c
-thirdparty/libiodbc/src/trace/GetStmtOption.c
-thirdparty/libiodbc/src/trace/GetTypeInfo.c
-thirdparty/libiodbc/src/trace/Info.c
-thirdparty/libiodbc/src/trace/Makefile.am
-thirdparty/libiodbc/src/trace/Makefile.in
-thirdparty/libiodbc/src/trace/MoreResults.c
-thirdparty/libiodbc/src/trace/NativeSql.c
-thirdparty/libiodbc/src/trace/NumParams.c
-thirdparty/libiodbc/src/trace/NumResultCols.c
-thirdparty/libiodbc/src/trace/ParamData.c
-thirdparty/libiodbc/src/trace/ParamOptions.c
-thirdparty/libiodbc/src/trace/Prepare.c
-thirdparty/libiodbc/src/trace/PrimaryKeys.c
-thirdparty/libiodbc/src/trace/ProcedureColumns.c
-thirdparty/libiodbc/src/trace/Procedures.c
-thirdparty/libiodbc/src/trace/proto.h
-thirdparty/libiodbc/src/trace/PutData.c
-thirdparty/libiodbc/src/trace/RowCount.c
-thirdparty/libiodbc/src/trace/SetConnectAttr.c
-thirdparty/libiodbc/src/trace/SetConnectOption.c
-thirdparty/libiodbc/src/trace/SetCursorName.c
-thirdparty/libiodbc/src/trace/SetDescField.c
-thirdparty/libiodbc/src/trace/SetDescRec.c
-thirdparty/libiodbc/src/trace/SetEnvAttr.c
-thirdparty/libiodbc/src/trace/SetPos.c
-thirdparty/libiodbc/src/trace/SetScrollOptions.c
-thirdparty/libiodbc/src/trace/SetStmtAttr.c
-thirdparty/libiodbc/src/trace/SetStmtOption.c
-thirdparty/libiodbc/src/trace/SpecialColumns.c
-thirdparty/libiodbc/src/trace/Statistics.c
-thirdparty/libiodbc/src/trace/TablePrivileges.c
-thirdparty/libiodbc/src/trace/Tables.c
-thirdparty/libiodbc/src/trace/trace.c
-thirdparty/libiodbc/src/trace/trace.h
-thirdparty/libiodbc/src/trace/Transact.c
-thirdparty/libiodbc/src/catalog.c
-thirdparty/libiodbc/src/config.h
-thirdparty/libiodbc/src/config.linux.h
-thirdparty/libiodbc/src/config.mac.ppc.h
-thirdparty/libiodbc/src/config.mac.x86.h
-thirdparty/libiodbc/src/connect.c
-thirdparty/libiodbc/src/dlproc.c
-thirdparty/libiodbc/src/dlproc.h
-thirdparty/libiodbc/src/execute.c
-thirdparty/libiodbc/src/fetch.c
-thirdparty/libiodbc/src/hdbc.c
-thirdparty/libiodbc/src/hdbc.h
-thirdparty/libiodbc/src/hdesc.h
-thirdparty/libiodbc/src/henv.c
-thirdparty/libiodbc/src/henv.h
-thirdparty/libiodbc/src/herr.c
-thirdparty/libiodbc/src/herr.h
-thirdparty/libiodbc/src/hstmt.c
-thirdparty/libiodbc/src/hstmt.h
-thirdparty/libiodbc/src/info.c
-thirdparty/libiodbc/src/iodbc.h
-thirdparty/libiodbc/src/iodbcadm.h
-thirdparty/libiodbc/src/iodbcext.h
-thirdparty/libiodbc/src/iodbcinst.h
-thirdparty/libiodbc/src/isql.h
-thirdparty/libiodbc/src/isqlext.h
-thirdparty/libiodbc/src/isqltypes.h
-thirdparty/libiodbc/src/ithread.h
-thirdparty/libiodbc/src/itrace.h
-thirdparty/libiodbc/src/main.c
-thirdparty/libiodbc/src/misc.c
-thirdparty/libiodbc/src/odbc3.c
-thirdparty/libiodbc/src/odbcinst.h
-thirdparty/libiodbc/src/prepare.c
-thirdparty/libiodbc/src/result.c
-thirdparty/libiodbc/libiodbc.gyp
-thirdparty/libiodbc/score.txt
-thirdparty/libjpeg/include/jconfig.h
-thirdparty/libjpeg/include/jerror.h
-thirdparty/libjpeg/include/jmorecfg.h
-thirdparty/libjpeg/include/jpeglib.h
-thirdparty/libjpeg/src/jcapimin.c
-thirdparty/libjpeg/src/jcapistd.c
-thirdparty/libjpeg/src/jccoefct.c
-thirdparty/libjpeg/src/jccolor.c
-thirdparty/libjpeg/src/jcdctmgr.c
-thirdparty/libjpeg/src/jchuff.c
-thirdparty/libjpeg/src/jchuff.h
-thirdparty/libjpeg/src/jcinit.c
-thirdparty/libjpeg/src/jcmainct.c
-thirdparty/libjpeg/src/jcmarker.c
-thirdparty/libjpeg/src/jcmaster.c
-thirdparty/libjpeg/src/jcomapi.c
-thirdparty/libjpeg/src/jcparam.c
-thirdparty/libjpeg/src/jcphuff.c
-thirdparty/libjpeg/src/jcprepct.c
-thirdparty/libjpeg/src/jcsample.c
-thirdparty/libjpeg/src/jctrans.c
-thirdparty/libjpeg/src/jdapimin.c
-thirdparty/libjpeg/src/jdapistd.c
-thirdparty/libjpeg/src/jdatadst.c
-thirdparty/libjpeg/src/jdatasrc.c
-thirdparty/libjpeg/src/jdcoefct.c
-thirdparty/libjpeg/src/jdcolor.c
-thirdparty/libjpeg/src/jdct.h
-thirdparty/libjpeg/src/jddctmgr.c
-thirdparty/libjpeg/src/jdhuff.c
-thirdparty/libjpeg/src/jdhuff.h
-thirdparty/libjpeg/src/jdinput.c
-thirdparty/libjpeg/src/jdmainct.c
-thirdparty/libjpeg/src/jdmarker.c
-thirdparty/libjpeg/src/jdmaster.c
-thirdparty/libjpeg/src/jdmerge.c
-thirdparty/libjpeg/src/jdphuff.c
-thirdparty/libjpeg/src/jdpostct.c
-thirdparty/libjpeg/src/jdsample.c
-thirdparty/libjpeg/src/jdtrans.c
-thirdparty/libjpeg/src/jerror.c
-thirdparty/libjpeg/src/jfdctflt.c
-thirdparty/libjpeg/src/jfdctfst.c
-thirdparty/libjpeg/src/jfdctint.c
-thirdparty/libjpeg/src/jidctflt.c
-thirdparty/libjpeg/src/jidctfst.c
-thirdparty/libjpeg/src/jidctint.c
-thirdparty/libjpeg/src/jidctred.c
-thirdparty/libjpeg/src/jinclude.h
-thirdparty/libjpeg/src/jmemmgr.c
-thirdparty/libjpeg/src/jmemnobs.c
-thirdparty/libjpeg/src/jmemsys.h
-thirdparty/libjpeg/src/jpegint.h
-thirdparty/libjpeg/src/jquant1.c
-thirdparty/libjpeg/src/jquant2.c
-thirdparty/libjpeg/src/jutils.c
-thirdparty/libjpeg/src/jversion.h
-thirdparty/libjpeg/libjpeg.gyp
-thirdparty/libjpeg/score.txt
-thirdparty/libmysql/include/errmsg.h
-thirdparty/libmysql/include/my_alloc.h
-thirdparty/libmysql/include/my_list.h
-thirdparty/libmysql/include/mysql.h
-thirdparty/libmysql/include/mysql_com.h
-thirdparty/libmysql/include/mysql_time.h
-thirdparty/libmysql/include/mysql_version.h
-thirdparty/libmysql/include/typelib.h
-thirdparty/libmysql/src/array.c
-thirdparty/libmysql/src/bchange.c
-thirdparty/libmysql/src/bmove_upp.c
-thirdparty/libmysql/src/charset-def.c
-thirdparty/libmysql/src/charset.c
-thirdparty/libmysql/src/client.c
-thirdparty/libmysql/src/client_settings.h
-thirdparty/libmysql/src/config-android.h
-thirdparty/libmysql/src/config-ios.h
-thirdparty/libmysql/src/config-lnx.h
-thirdparty/libmysql/src/config-osx.h
-thirdparty/libmysql/src/config-win.h
-thirdparty/libmysql/src/ctype-big5.c
-thirdparty/libmysql/src/ctype-bin.c
-thirdparty/libmysql/src/ctype-cp932.c
-thirdparty/libmysql/src/ctype-czech.c
-thirdparty/libmysql/src/ctype-euc_kr.c
-thirdparty/libmysql/src/ctype-eucjpms.c
-thirdparty/libmysql/src/ctype-extra.c
-thirdparty/libmysql/src/ctype-gb2312.c
-thirdparty/libmysql/src/ctype-gbk.c
-thirdparty/libmysql/src/ctype-latin1.c
-thirdparty/libmysql/src/ctype-mb.c
-thirdparty/libmysql/src/ctype-simple.c
-thirdparty/libmysql/src/ctype-sjis.c
-thirdparty/libmysql/src/ctype-tis620.c
-thirdparty/libmysql/src/ctype-uca.c
-thirdparty/libmysql/src/ctype-ucs2.c
-thirdparty/libmysql/src/ctype-ujis.c
-thirdparty/libmysql/src/ctype-utf8.c
-thirdparty/libmysql/src/ctype-win1250ch.c
-thirdparty/libmysql/src/ctype.c
-thirdparty/libmysql/src/dbug.c
-thirdparty/libmysql/src/default.c
-thirdparty/libmysql/src/dtoa.c
-thirdparty/libmysql/src/errmsg.c
-thirdparty/libmysql/src/errors.c
-thirdparty/libmysql/src/int2str.c
-thirdparty/libmysql/src/is_prefix.c
-thirdparty/libmysql/src/libmysql.c
-thirdparty/libmysql/src/list.c
-thirdparty/libmysql/src/longlong2str.c
-thirdparty/libmysql/src/m_ctype.h
-thirdparty/libmysql/src/m_string.h
-thirdparty/libmysql/src/mf_arr_appstr.c
-thirdparty/libmysql/src/mf_dirname.c
-thirdparty/libmysql/src/mf_fn_ext.c
-thirdparty/libmysql/src/mf_format.c
-thirdparty/libmysql/src/mf_loadpath.c
-thirdparty/libmysql/src/mf_pack.c
-thirdparty/libmysql/src/mf_qsort.c
-thirdparty/libmysql/src/mulalloc.c
-thirdparty/libmysql/src/my_access.c
-thirdparty/libmysql/src/my_alarm.h
-thirdparty/libmysql/src/my_alloc.c
-thirdparty/libmysql/src/my_attribute.h
-thirdparty/libmysql/src/my_base.h
-thirdparty/libmysql/src/my_charsets.h
-thirdparty/libmysql/src/my_compress.c
-thirdparty/libmysql/src/my_config.h
-thirdparty/libmysql/src/my_dbug.h
-thirdparty/libmysql/src/my_dir.h
-thirdparty/libmysql/src/my_div.c
-thirdparty/libmysql/src/my_error.c
-thirdparty/libmysql/src/my_fopen.c
-thirdparty/libmysql/src/my_fstream.c
-thirdparty/libmysql/src/my_getsystime.c
-thirdparty/libmysql/src/my_getwd.c
-thirdparty/libmysql/src/my_global.h
-thirdparty/libmysql/src/my_init.c
-thirdparty/libmysql/src/my_lib.c
-thirdparty/libmysql/src/my_malloc.c
-thirdparty/libmysql/src/my_messnc.c
-thirdparty/libmysql/src/my_net.h
-thirdparty/libmysql/src/my_once.c
-thirdparty/libmysql/src/my_open.c
-thirdparty/libmysql/src/my_pthread.c
-thirdparty/libmysql/src/my_pthread.h
-thirdparty/libmysql/src/my_read.c
-thirdparty/libmysql/src/my_realloc.c
-thirdparty/libmysql/src/my_rnd.c
-thirdparty/libmysql/src/my_static.c
-thirdparty/libmysql/src/my_static.h
-thirdparty/libmysql/src/my_strtoll10.c
-thirdparty/libmysql/src/my_symlink.c
-thirdparty/libmysql/src/my_sync.c
-thirdparty/libmysql/src/my_sys.h
-thirdparty/libmysql/src/my_thr_init.c
-thirdparty/libmysql/src/my_time.c
-thirdparty/libmysql/src/my_time.h
-thirdparty/libmysql/src/my_uctype.h
-thirdparty/libmysql/src/my_vsnprintf.c
-thirdparty/libmysql/src/my_wincond.c
-thirdparty/libmysql/src/my_winerr.c
-thirdparty/libmysql/src/my_winfile.c
-thirdparty/libmysql/src/my_xml.h
-thirdparty/libmysql/src/mysqld_error.h
-thirdparty/libmysql/src/mysys_err.h
-thirdparty/libmysql/src/mysys_priv.h
-thirdparty/libmysql/src/net_serv.c
-thirdparty/libmysql/src/pack.c
-thirdparty/libmysql/src/password.c
-thirdparty/libmysql/src/probes.h
-thirdparty/libmysql/src/sha1.c
-thirdparty/libmysql/src/sha1.h
-thirdparty/libmysql/src/sql_common.h
-thirdparty/libmysql/src/str2int.c
-thirdparty/libmysql/src/str_alloc.c
-thirdparty/libmysql/src/strcend.c
-thirdparty/libmysql/src/strend.c
-thirdparty/libmysql/src/strmake.c
-thirdparty/libmysql/src/strmov.c
-thirdparty/libmysql/src/strnlen.c
-thirdparty/libmysql/src/strnmov.c
-thirdparty/libmysql/src/strxmov.c
-thirdparty/libmysql/src/strxnmov.c
-thirdparty/libmysql/src/t_ctype.h
-thirdparty/libmysql/src/thr_alarm.h
-thirdparty/libmysql/src/typelib.c
-thirdparty/libmysql/src/vio.c
-thirdparty/libmysql/src/vio_priv.h
-thirdparty/libmysql/src/violite.h
-thirdparty/libmysql/src/viosocket.c
-thirdparty/libmysql/src/viossl.c
-thirdparty/libmysql/src/viosslfactories.c
-thirdparty/libmysql/src/xml.c
-thirdparty/libmysql/libmysql.gyp
-thirdparty/libmysql/score.txt
-thirdparty/libopenssl/include/openssl/aes.h
-thirdparty/libopenssl/include/openssl/asn1.h
-thirdparty/libopenssl/include/openssl/asn1_mac.h
-thirdparty/libopenssl/include/openssl/asn1t.h
-thirdparty/libopenssl/include/openssl/bio.h
-thirdparty/libopenssl/include/openssl/blowfish.h
-thirdparty/libopenssl/include/openssl/bn.h
-thirdparty/libopenssl/include/openssl/buffer.h
-thirdparty/libopenssl/include/openssl/camellia.h
-thirdparty/libopenssl/include/openssl/cast.h
-thirdparty/libopenssl/include/openssl/cmac.h
-thirdparty/libopenssl/include/openssl/cms.h
-thirdparty/libopenssl/include/openssl/comp.h
-thirdparty/libopenssl/include/openssl/conf.h
-thirdparty/libopenssl/include/openssl/conf_api.h
-thirdparty/libopenssl/include/openssl/crypto.h
-thirdparty/libopenssl/include/openssl/des.h
-thirdparty/libopenssl/include/openssl/des_old.h
-thirdparty/libopenssl/include/openssl/dh.h
-thirdparty/libopenssl/include/openssl/dsa.h
-thirdparty/libopenssl/include/openssl/dso.h
-thirdparty/libopenssl/include/openssl/dtls1.h
-thirdparty/libopenssl/include/openssl/e_os2.h
-thirdparty/libopenssl/include/openssl/ebcdic.h
-thirdparty/libopenssl/include/openssl/ec.h
-thirdparty/libopenssl/include/openssl/ecdh.h
-thirdparty/libopenssl/include/openssl/ecdsa.h
-thirdparty/libopenssl/include/openssl/engine.h
-thirdparty/libopenssl/include/openssl/err.h
-thirdparty/libopenssl/include/openssl/evp.h
-thirdparty/libopenssl/include/openssl/hmac.h
-thirdparty/libopenssl/include/openssl/krb5_asn.h
-thirdparty/libopenssl/include/openssl/kssl.h
-thirdparty/libopenssl/include/openssl/lhash.h
-thirdparty/libopenssl/include/openssl/md4.h
-thirdparty/libopenssl/include/openssl/md5.h
-thirdparty/libopenssl/include/openssl/mdc2.h
-thirdparty/libopenssl/include/openssl/modes.h
-thirdparty/libopenssl/include/openssl/obj_mac.h
-thirdparty/libopenssl/include/openssl/objects.h
-thirdparty/libopenssl/include/openssl/ocsp.h
-thirdparty/libopenssl/include/openssl/opensslconf.h
-thirdparty/libopenssl/include/openssl/opensslv.h
-thirdparty/libopenssl/include/openssl/ossl_typ.h
-thirdparty/libopenssl/include/openssl/pem.h
-thirdparty/libopenssl/include/openssl/pem2.h
-thirdparty/libopenssl/include/openssl/pkcs12.h
-thirdparty/libopenssl/include/openssl/pkcs7.h
-thirdparty/libopenssl/include/openssl/pqueue.h
-thirdparty/libopenssl/include/openssl/rand.h
-thirdparty/libopenssl/include/openssl/rc2.h
-thirdparty/libopenssl/include/openssl/rc4.h
-thirdparty/libopenssl/include/openssl/ripemd.h
-thirdparty/libopenssl/include/openssl/rsa.h
-thirdparty/libopenssl/include/openssl/safestack.h
-thirdparty/libopenssl/include/openssl/seed.h
-thirdparty/libopenssl/include/openssl/sha.h
-thirdparty/libopenssl/include/openssl/srp.h
-thirdparty/libopenssl/include/openssl/srtp.h
-thirdparty/libopenssl/include/openssl/ssl.h
-thirdparty/libopenssl/include/openssl/ssl2.h
-thirdparty/libopenssl/include/openssl/ssl23.h
-thirdparty/libopenssl/include/openssl/ssl3.h
-thirdparty/libopenssl/include/openssl/stack.h
-thirdparty/libopenssl/include/openssl/symhacks.h
-thirdparty/libopenssl/include/openssl/tls1.h
-thirdparty/libopenssl/include/openssl/ts.h
-thirdparty/libopenssl/include/openssl/txt_db.h
-thirdparty/libopenssl/include/openssl/ui.h
-thirdparty/libopenssl/include/openssl/ui_compat.h
-thirdparty/libopenssl/include/openssl/whrlpool.h
-thirdparty/libopenssl/include/openssl/x509.h
-thirdparty/libopenssl/include/openssl/x509_vfy.h
-thirdparty/libopenssl/include/openssl/x509v3.h
-thirdparty/libopenssl/src/dummy.cpp
-thirdparty/libopenssl/build-openssl.osx
-thirdparty/libopenssl/libopenssl.gyp
-thirdparty/libopenssl/Makefile.revsecurity
-thirdparty/libpcre/include/pcre.h
-thirdparty/libpcre/include/pcreposix.h
-thirdparty/libpcre/src/config.h
-thirdparty/libpcre/src/pcre16_byte_order.c
-thirdparty/libpcre/src/pcre16_chartables.c
-thirdparty/libpcre/src/pcre16_compile.c
-thirdparty/libpcre/src/pcre16_config.c
-thirdparty/libpcre/src/pcre16_dfa_exec.c
-thirdparty/libpcre/src/pcre16_exec.c
-thirdparty/libpcre/src/pcre16_fullinfo.c
-thirdparty/libpcre/src/pcre16_get.c
-thirdparty/libpcre/src/pcre16_globals.c
-thirdparty/libpcre/src/pcre16_jit_compile.c
-thirdparty/libpcre/src/pcre16_maketables.c
-thirdparty/libpcre/src/pcre16_newline.c
-thirdparty/libpcre/src/pcre16_ord2utf16.c
-thirdparty/libpcre/src/pcre16_refcount.c
-thirdparty/libpcre/src/pcre16_string_utils.c
-thirdparty/libpcre/src/pcre16_study.c
-thirdparty/libpcre/src/pcre16_tables.c
-thirdparty/libpcre/src/pcre16_ucd.c
-thirdparty/libpcre/src/pcre16_utf16_utils.c
-thirdparty/libpcre/src/pcre16_valid_utf16.c
-thirdparty/libpcre/src/pcre16_version.c
-thirdparty/libpcre/src/pcre16_xclass.c
-thirdparty/libpcre/src/pcre_byte_order.c
-thirdparty/libpcre/src/pcre_chartables.c
-thirdparty/libpcre/src/pcre_compile.c
-thirdparty/libpcre/src/pcre_config.c
-thirdparty/libpcre/src/pcre_dfa_exec.c
-thirdparty/libpcre/src/pcre_exec.c
-thirdparty/libpcre/src/pcre_fullinfo.c
-thirdparty/libpcre/src/pcre_get.c
-thirdparty/libpcre/src/pcre_globals.c
-thirdparty/libpcre/src/pcre_info_fullinfo.c
-thirdparty/libpcre/src/pcre_internal.h
-thirdparty/libpcre/src/pcre_jit_compile.c
-thirdparty/libpcre/src/pcre_maketables.c
-thirdparty/libpcre/src/pcre_newline.c
-thirdparty/libpcre/src/pcre_ord2utf8.c
-thirdparty/libpcre/src/pcre_refcount.c
-thirdparty/libpcre/src/pcre_string_utils.c
-thirdparty/libpcre/src/pcre_study.c
-thirdparty/libpcre/src/pcre_tables.c
-thirdparty/libpcre/src/pcre_ucd.c
-thirdparty/libpcre/src/pcre_valid_utf8.c
-thirdparty/libpcre/src/pcre_version.c
-thirdparty/libpcre/src/pcre_xclass.c
-thirdparty/libpcre/src/ucp.h
-thirdparty/libpcre/libpcre.gyp
-thirdparty/libpcre/score.txt
-thirdparty/libpng/include/png.h
-thirdparty/libpng/include/pngconf.h
-thirdparty/libpng/include/pngdebug.h
-thirdparty/libpng/include/pnginfo.h
-thirdparty/libpng/include/pnglibconf.h
-thirdparty/libpng/include/pngpriv.h
-thirdparty/libpng/include/pngstruct.h
-thirdparty/libpng/src/png.c
-thirdparty/libpng/src/pngerror.c
-thirdparty/libpng/src/pnggccrd.c
-thirdparty/libpng/src/pngget.c
-thirdparty/libpng/src/pngmem.c
-thirdparty/libpng/src/pngpread.c
-thirdparty/libpng/src/pngread.c
-thirdparty/libpng/src/pngrio.c
-thirdparty/libpng/src/pngrtran.c
-thirdparty/libpng/src/pngrutil.c
-thirdparty/libpng/src/pngset.c
-thirdparty/libpng/src/pngtrans.c
-thirdparty/libpng/src/pngvcrd.c
-thirdparty/libpng/src/pngwio.c
-thirdparty/libpng/src/pngwrite.c
-thirdparty/libpng/src/pngwtran.c
-thirdparty/libpng/src/pngwutil.c
-thirdparty/libpng/libpng.gyp
-thirdparty/libpng/score.txt
-thirdparty/libpq/include/libpq-fe.h
-thirdparty/libpq/include/postgres_ext.h
-thirdparty/libpq/src/access/attnum.h
-thirdparty/libpq/src/access/clog.h
-thirdparty/libpq/src/access/genam.h
-thirdparty/libpq/src/access/gist.h
-thirdparty/libpq/src/access/gist_private.h
-thirdparty/libpq/src/access/gistscan.h
-thirdparty/libpq/src/access/hash.h
-thirdparty/libpq/src/access/heapam.h
-thirdparty/libpq/src/access/hio.h
-thirdparty/libpq/src/access/htup.h
-thirdparty/libpq/src/access/iqual.h
-thirdparty/libpq/src/access/itup.h
-thirdparty/libpq/src/access/multixact.h
-thirdparty/libpq/src/access/nbtree.h
-thirdparty/libpq/src/access/printtup.h
-thirdparty/libpq/src/access/relscan.h
-thirdparty/libpq/src/access/rmgr.h
-thirdparty/libpq/src/access/rtree.h
-thirdparty/libpq/src/access/rtscan.h
-thirdparty/libpq/src/access/sdir.h
-thirdparty/libpq/src/access/skey.h
-thirdparty/libpq/src/access/slru.h
-thirdparty/libpq/src/access/subtrans.h
-thirdparty/libpq/src/access/transam.h
-thirdparty/libpq/src/access/tupdesc.h
-thirdparty/libpq/src/access/tupmacs.h
-thirdparty/libpq/src/access/tuptoaster.h
-thirdparty/libpq/src/access/twophase.h
-thirdparty/libpq/src/access/twophase_rmgr.h
-thirdparty/libpq/src/access/valid.h
-thirdparty/libpq/src/access/xact.h
-thirdparty/libpq/src/access/xlog.h
-thirdparty/libpq/src/access/xlog_internal.h
-thirdparty/libpq/src/access/xlogdefs.h
-thirdparty/libpq/src/access/xlogutils.h
-thirdparty/libpq/src/libpq/auth.h
-thirdparty/libpq/src/libpq/be-fsstubs.h
-thirdparty/libpq/src/libpq/crypt.h
-thirdparty/libpq/src/libpq/hba.h
-thirdparty/libpq/src/libpq/ip.h
-thirdparty/libpq/src/libpq/libpq-be.h
-thirdparty/libpq/src/libpq/libpq-fs.h
-thirdparty/libpq/src/libpq/libpq.h
-thirdparty/libpq/src/libpq/pqcomm.h
-thirdparty/libpq/src/libpq/pqformat.h
-thirdparty/libpq/src/libpq/pqsignal.h
-thirdparty/libpq/src/mb/pg_wchar.h
-thirdparty/libpq/src/nodes/bitmapset.h
-thirdparty/libpq/src/nodes/execnodes.h
-thirdparty/libpq/src/nodes/makefuncs.h
-thirdparty/libpq/src/nodes/memnodes.h
-thirdparty/libpq/src/nodes/nodeFuncs.h
-thirdparty/libpq/src/nodes/nodes.h
-thirdparty/libpq/src/nodes/params.h
-thirdparty/libpq/src/nodes/parsenodes.h
-thirdparty/libpq/src/nodes/pg_list.h
-thirdparty/libpq/src/nodes/plannodes.h
-thirdparty/libpq/src/nodes/primnodes.h
-thirdparty/libpq/src/nodes/print.h
-thirdparty/libpq/src/nodes/readfuncs.h
-thirdparty/libpq/src/nodes/relation.h
-thirdparty/libpq/src/nodes/tidbitmap.h
-thirdparty/libpq/src/nodes/value.h
-thirdparty/libpq/src/port/win32/arpa/inet.h
-thirdparty/libpq/src/port/win32/netinet/in.h
-thirdparty/libpq/src/port/win32/sys/socket.h
-thirdparty/libpq/src/port/win32/sys/wait.h
-thirdparty/libpq/src/port/win32/dlfcn.h
-thirdparty/libpq/src/port/win32/grp.h
-thirdparty/libpq/src/port/win32/netdb.h
-thirdparty/libpq/src/port/win32/pwd.h
-thirdparty/libpq/src/port/aix.h
-thirdparty/libpq/src/port/beos.h
-thirdparty/libpq/src/port/bsdi.h
-thirdparty/libpq/src/port/cygwin.h
-thirdparty/libpq/src/port/darwin.h
-thirdparty/libpq/src/port/dgux.h
-thirdparty/libpq/src/port/freebsd.h
-thirdparty/libpq/src/port/hpux.h
-thirdparty/libpq/src/port/irix.h
-thirdparty/libpq/src/port/linux.h
-thirdparty/libpq/src/port/netbsd.h
-thirdparty/libpq/src/port/nextstep.h
-thirdparty/libpq/src/port/openbsd.h
-thirdparty/libpq/src/port/osf.h
-thirdparty/libpq/src/port/pg_config_paths.h
-thirdparty/libpq/src/port/qnx4.h
-thirdparty/libpq/src/port/sco.h
-thirdparty/libpq/src/port/solaris.h
-thirdparty/libpq/src/port/sunos4.h
-thirdparty/libpq/src/port/svr4.h
-thirdparty/libpq/src/port/ultrix4.h
-thirdparty/libpq/src/port/univel.h
-thirdparty/libpq/src/port/unixware.h
-thirdparty/libpq/src/port/win32.h
-thirdparty/libpq/src/utils/acl.h
-thirdparty/libpq/src/utils/array.h
-thirdparty/libpq/src/utils/ascii.h
-thirdparty/libpq/src/utils/builtins.h
-thirdparty/libpq/src/utils/cash.h
-thirdparty/libpq/src/utils/catcache.h
-thirdparty/libpq/src/utils/date.h
-thirdparty/libpq/src/utils/datetime.h
-thirdparty/libpq/src/utils/datum.h
-thirdparty/libpq/src/utils/dynahash.h
-thirdparty/libpq/src/utils/dynamic_loader.h
-thirdparty/libpq/src/utils/elog.h
-thirdparty/libpq/src/utils/errcodes.h
-thirdparty/libpq/src/utils/flatfiles.h
-thirdparty/libpq/src/utils/fmgrtab.h
-thirdparty/libpq/src/utils/formatting.h
-thirdparty/libpq/src/utils/geo_decls.h
-thirdparty/libpq/src/utils/guc.h
-thirdparty/libpq/src/utils/guc_tables.h
-thirdparty/libpq/src/utils/help_config.h
-thirdparty/libpq/src/utils/hsearch.h
-thirdparty/libpq/src/utils/inet.h
-thirdparty/libpq/src/utils/int8.h
-thirdparty/libpq/src/utils/inval.h
-thirdparty/libpq/src/utils/logtape.h
-thirdparty/libpq/src/utils/lsyscache.h
-thirdparty/libpq/src/utils/memutils.h
-thirdparty/libpq/src/utils/nabstime.h
-thirdparty/libpq/src/utils/numeric.h
-thirdparty/libpq/src/utils/palloc.h
-thirdparty/libpq/src/utils/pg_crc.h
-thirdparty/libpq/src/utils/pg_locale.h
-thirdparty/libpq/src/utils/pg_lzcompress.h
-thirdparty/libpq/src/utils/pg_rusage.h
-thirdparty/libpq/src/utils/portal.h
-thirdparty/libpq/src/utils/ps_status.h
-thirdparty/libpq/src/utils/rel.h
-thirdparty/libpq/src/utils/relcache.h
-thirdparty/libpq/src/utils/resowner.h
-thirdparty/libpq/src/utils/selfuncs.h
-thirdparty/libpq/src/utils/syscache.h
-thirdparty/libpq/src/utils/timestamp.h
-thirdparty/libpq/src/utils/tqual.h
-thirdparty/libpq/src/utils/tuplesort.h
-thirdparty/libpq/src/utils/tuplestore.h
-thirdparty/libpq/src/utils/typcache.h
-thirdparty/libpq/src/utils/varbit.h
-thirdparty/libpq/src/c.h
-thirdparty/libpq/src/copydir.c
-thirdparty/libpq/src/crypt.c
-thirdparty/libpq/src/dirmod.c
-thirdparty/libpq/src/elog.c
-thirdparty/libpq/src/encnames.c
-thirdparty/libpq/src/error.c
-thirdparty/libpq/src/exec.c
-thirdparty/libpq/src/fe-auth.c
-thirdparty/libpq/src/fe-auth.h
-thirdparty/libpq/src/fe-connect.c
-thirdparty/libpq/src/fe-exec.c
-thirdparty/libpq/src/fe-lobj.c
-thirdparty/libpq/src/fe-misc.c
-thirdparty/libpq/src/fe-print.c
-thirdparty/libpq/src/fe-protocol2.c
-thirdparty/libpq/src/fe-protocol3.c
-thirdparty/libpq/src/fe-secure.c
-thirdparty/libpq/src/fmgr.h
-thirdparty/libpq/src/fseeko.c
-thirdparty/libpq/src/getaddrinfo.c
-thirdparty/libpq/src/getaddrinfo.h
-thirdparty/libpq/src/gethostname.c
-thirdparty/libpq/src/getopt.c
-thirdparty/libpq/src/getopt_long.c
-thirdparty/libpq/src/getrusage.c
-thirdparty/libpq/src/gettimeofday.c
-thirdparty/libpq/src/inet_aton.c
-thirdparty/libpq/src/ip.c
-thirdparty/libpq/src/isinf.c
-thirdparty/libpq/src/kill.c
-thirdparty/libpq/src/libpq-int.h
-thirdparty/libpq/src/md5.c
-thirdparty/libpq/src/memcmp.c
-thirdparty/libpq/src/miscadmin.h
-thirdparty/libpq/src/my_pg_config.h
-thirdparty/libpq/src/noblock.c
-thirdparty/libpq/src/open.c
-thirdparty/libpq/src/path.c
-thirdparty/libpq/src/pg_config.h
-thirdparty/libpq/src/pg_config.linux.h
-thirdparty/libpq/src/pg_config.mac.i386.h
-thirdparty/libpq/src/pg_config.mac.ppc.h
-thirdparty/libpq/src/pg_config.win32.h
-thirdparty/libpq/src/pg_config_manual.h
-thirdparty/libpq/src/pg_config_os.h
-thirdparty/libpq/src/pg_config_paths.h
-thirdparty/libpq/src/pgsleep.c
-thirdparty/libpq/src/pgstrcasecmp.c
-thirdparty/libpq/src/pipe.c
-thirdparty/libpq/src/port.h
-thirdparty/libpq/src/postgres.h
-thirdparty/libpq/src/postgres_fe.h
-thirdparty/libpq/src/pqexpbuffer.c
-thirdparty/libpq/src/pqexpbuffer.h
-thirdparty/libpq/src/pqsignal.c
-thirdparty/libpq/src/pqsignal.h
-thirdparty/libpq/src/pthread-win32.c
-thirdparty/libpq/src/pthread-win32.h
-thirdparty/libpq/src/qsort.c
-thirdparty/libpq/src/rand.c
-thirdparty/libpq/src/random.c
-thirdparty/libpq/src/rint.c
-thirdparty/libpq/src/security.c
-thirdparty/libpq/src/sema.c
-thirdparty/libpq/src/shmem.c
-thirdparty/libpq/src/signal.c
-thirdparty/libpq/src/snprintf.c
-thirdparty/libpq/src/socket.c
-thirdparty/libpq/src/sprompt.c
-thirdparty/libpq/src/srandom.c
-thirdparty/libpq/src/strdup.c
-thirdparty/libpq/src/strdup.h
-thirdparty/libpq/src/strerror.c
-thirdparty/libpq/src/strtol.c
-thirdparty/libpq/src/strtoul.c
-thirdparty/libpq/src/thread.c
-thirdparty/libpq/src/timer.c
-thirdparty/libpq/src/unsetenv.c
-thirdparty/libpq/src/wchar.c
-thirdparty/libpq/src/win32.c
-thirdparty/libpq/src/win32.h
-thirdparty/libpq/libpq.gyp
-thirdparty/libpq/score.txt
-thirdparty/libskia/include/config/sk_stdint.h
-thirdparty/libskia/include/config/SkUserConfig.h
-thirdparty/libskia/include/core/Sk64.h
-thirdparty/libskia/include/core/SkAdvancedTypefaceMetrics.h
-thirdparty/libskia/include/core/SkAnnotation.h
-thirdparty/libskia/include/core/SkBitmap.h
-thirdparty/libskia/include/core/SkBitmapDevice.h
-thirdparty/libskia/include/core/SkBlitRow.h
-thirdparty/libskia/include/core/SkBounder.h
-thirdparty/libskia/include/core/SkCanvas.h
-thirdparty/libskia/include/core/SkChecksum.h
-thirdparty/libskia/include/core/SkChunkAlloc.h
-thirdparty/libskia/include/core/SkClipStack.h
-thirdparty/libskia/include/core/SkColor.h
-thirdparty/libskia/include/core/SkColorFilter.h
-thirdparty/libskia/include/core/SkColorPriv.h
-thirdparty/libskia/include/core/SkColorShader.h
-thirdparty/libskia/include/core/SkColorTable.h
-thirdparty/libskia/include/core/SkComposeShader.h
-thirdparty/libskia/include/core/SkData.h
-thirdparty/libskia/include/core/SkDataTable.h
-thirdparty/libskia/include/core/SkDeque.h
-thirdparty/libskia/include/core/SkDevice.h
-thirdparty/libskia/include/core/SkDeviceProperties.h
-thirdparty/libskia/include/core/SkDither.h
-thirdparty/libskia/include/core/SkDocument.h
-thirdparty/libskia/include/core/SkDraw.h
-thirdparty/libskia/include/core/SkDrawFilter.h
-thirdparty/libskia/include/core/SkDrawLooper.h
-thirdparty/libskia/include/core/SkEmptyShader.h
-thirdparty/libskia/include/core/SkEndian.h
-thirdparty/libskia/include/core/SkError.h
-thirdparty/libskia/include/core/SkFixed.h
-thirdparty/libskia/include/core/SkFlate.h
-thirdparty/libskia/include/core/SkFlattenable.h
-thirdparty/libskia/include/core/SkFlattenableBuffers.h
-thirdparty/libskia/include/core/SkFlattenableSerialization.h
-thirdparty/libskia/include/core/SkFloatBits.h
-thirdparty/libskia/include/core/SkFloatingPoint.h
-thirdparty/libskia/include/core/SkFontHost.h
-thirdparty/libskia/include/core/SkFontLCDConfig.h
-thirdparty/libskia/include/core/SkGeometry.h
-thirdparty/libskia/include/core/SkGraphics.h
-thirdparty/libskia/include/core/SkImage.h
-thirdparty/libskia/include/core/SkImageDecoder.h
-thirdparty/libskia/include/core/SkImageEncoder.h
-thirdparty/libskia/include/core/SkImageFilter.h
-thirdparty/libskia/include/core/SkImageFilterUtils.h
-thirdparty/libskia/include/core/SkImageGenerator.h
-thirdparty/libskia/include/core/SkImageInfo.h
-thirdparty/libskia/include/core/SkInstCnt.h
-thirdparty/libskia/include/core/SkLineClipper.h
-thirdparty/libskia/include/core/SkMallocPixelRef.h
-thirdparty/libskia/include/core/SkMask.h
-thirdparty/libskia/include/core/SkMaskFilter.h
-thirdparty/libskia/include/core/SkMath.h
-thirdparty/libskia/include/core/SkMatrix.h
-thirdparty/libskia/include/core/SkMetaData.h
-thirdparty/libskia/include/core/SkOSFile.h
-thirdparty/libskia/include/core/SkPackBits.h
-thirdparty/libskia/include/core/SkPaint.h
-thirdparty/libskia/include/core/SkPaintOptionsAndroid.h
-thirdparty/libskia/include/core/SkPath.h
-thirdparty/libskia/include/core/SkPathEffect.h
-thirdparty/libskia/include/core/SkPathMeasure.h
-thirdparty/libskia/include/core/SkPathRef.h
-thirdparty/libskia/include/core/SkPicture.h
-thirdparty/libskia/include/core/SkPixelRef.h
-thirdparty/libskia/include/core/SkPoint.h
-thirdparty/libskia/include/core/SkPostConfig.h
-thirdparty/libskia/include/core/SkPreConfig.h
-thirdparty/libskia/include/core/SkRasterizer.h
-thirdparty/libskia/include/core/SkReader32.h
-thirdparty/libskia/include/core/SkRect.h
-thirdparty/libskia/include/core/SkRefCnt.h
-thirdparty/libskia/include/core/SkRegion.h
-thirdparty/libskia/include/core/SkRRect.h
-thirdparty/libskia/include/core/SkScalar.h
-thirdparty/libskia/include/core/SkShader.h
-thirdparty/libskia/include/core/SkSize.h
-thirdparty/libskia/include/core/SkStream.h
-thirdparty/libskia/include/core/SkString.h
-thirdparty/libskia/include/core/SkStringUtils.h
-thirdparty/libskia/include/core/SkStrokeRec.h
-thirdparty/libskia/include/core/SkSurface.h
-thirdparty/libskia/include/core/SkTArray.h
-thirdparty/libskia/include/core/SkTDArray.h
-thirdparty/libskia/include/core/SkTDict.h
-thirdparty/libskia/include/core/SkTDStack.h
-thirdparty/libskia/include/core/SkTemplates.h
-thirdparty/libskia/include/core/SkThread.h
-thirdparty/libskia/include/core/SkTileGridPicture.h
-thirdparty/libskia/include/core/SkTime.h
-thirdparty/libskia/include/core/SkTInternalLList.h
-thirdparty/libskia/include/core/SkTLazy.h
-thirdparty/libskia/include/core/SkTrace.h
-thirdparty/libskia/include/core/SkTRegistry.h
-thirdparty/libskia/include/core/SkTSearch.h
-thirdparty/libskia/include/core/SkTypeface.h
-thirdparty/libskia/include/core/SkTypes.h
-thirdparty/libskia/include/core/SkUnitMapper.h
-thirdparty/libskia/include/core/SkUnPreMultiply.h
-thirdparty/libskia/include/core/SkUtils.h
-thirdparty/libskia/include/core/SkWeakRefCnt.h
-thirdparty/libskia/include/core/SkWriter32.h
-thirdparty/libskia/include/core/SkXfermode.h
-thirdparty/libskia/include/device/xps/SkConstexprMath.h
-thirdparty/libskia/include/device/xps/SkXPSDevice.h
-thirdparty/libskia/include/effects/Sk1DPathEffect.h
-thirdparty/libskia/include/effects/Sk2DPathEffect.h
-thirdparty/libskia/include/effects/SkArithmeticMode.h
-thirdparty/libskia/include/effects/SkAvoidXfermode.h
-thirdparty/libskia/include/effects/SkBicubicImageFilter.h
-thirdparty/libskia/include/effects/SkBitmapSource.h
-thirdparty/libskia/include/effects/SkBlurDrawLooper.h
-thirdparty/libskia/include/effects/SkBlurImageFilter.h
-thirdparty/libskia/include/effects/SkBlurMaskFilter.h
-thirdparty/libskia/include/effects/SkColorFilterImageFilter.h
-thirdparty/libskia/include/effects/SkColorMatrix.h
-thirdparty/libskia/include/effects/SkColorMatrixFilter.h
-thirdparty/libskia/include/effects/SkComposeImageFilter.h
-thirdparty/libskia/include/effects/SkCornerPathEffect.h
-thirdparty/libskia/include/effects/SkDashPathEffect.h
-thirdparty/libskia/include/effects/SkDiscretePathEffect.h
-thirdparty/libskia/include/effects/SkDisplacementMapEffect.h
-thirdparty/libskia/include/effects/SkDrawExtraPathEffect.h
-thirdparty/libskia/include/effects/SkDropShadowImageFilter.h
-thirdparty/libskia/include/effects/SkEmbossMaskFilter.h
-thirdparty/libskia/include/effects/SkGradientShader.h
-thirdparty/libskia/include/effects/SkKernel33MaskFilter.h
-thirdparty/libskia/include/effects/SkLayerDrawLooper.h
-thirdparty/libskia/include/effects/SkLayerRasterizer.h
-thirdparty/libskia/include/effects/SkLerpXfermode.h
-thirdparty/libskia/include/effects/SkLightingImageFilter.h
-thirdparty/libskia/include/effects/SkLumaColorFilter.h
-thirdparty/libskia/include/effects/SkMagnifierImageFilter.h
-thirdparty/libskia/include/effects/SkMatrixConvolutionImageFilter.h
-thirdparty/libskia/include/effects/SkMergeImageFilter.h
-thirdparty/libskia/include/effects/SkMorphologyImageFilter.h
-thirdparty/libskia/include/effects/SkOffsetImageFilter.h
-thirdparty/libskia/include/effects/SkPaintFlagsDrawFilter.h
-thirdparty/libskia/include/effects/SkPerlinNoiseShader.h
-thirdparty/libskia/include/effects/SkPictureImageFilter.h
-thirdparty/libskia/include/effects/SkPixelXorXfermode.h
-thirdparty/libskia/include/effects/SkPorterDuff.h
-thirdparty/libskia/include/effects/SkRectShaderImageFilter.h
-thirdparty/libskia/include/effects/SkStippleMaskFilter.h
-thirdparty/libskia/include/effects/SkTableColorFilter.h
-thirdparty/libskia/include/effects/SkTableMaskFilter.h
-thirdparty/libskia/include/effects/SkTestImageFilters.h
-thirdparty/libskia/include/effects/SkTileImageFilter.h
-thirdparty/libskia/include/effects/SkTransparentShader.h
-thirdparty/libskia/include/effects/SkXfermodeImageFilter.h
-thirdparty/libskia/include/gpu/gl/GrGLConfig.h
-thirdparty/libskia/include/gpu/gl/GrGLConfig_chrome.h
-thirdparty/libskia/include/gpu/gl/GrGLExtensions.h
-thirdparty/libskia/include/gpu/gl/GrGLFunctions.h
-thirdparty/libskia/include/gpu/gl/GrGLInterface.h
-thirdparty/libskia/include/gpu/gl/SkANGLEGLContext.h
-thirdparty/libskia/include/gpu/gl/SkDebugGLContext.h
-thirdparty/libskia/include/gpu/gl/SkGLContextHelper.h
-thirdparty/libskia/include/gpu/gl/SkMesaGLContext.h
-thirdparty/libskia/include/gpu/gl/SkNativeGLContext.h
-thirdparty/libskia/include/gpu/gl/SkNullGLContext.h
-thirdparty/libskia/include/gpu/GrBackendEffectFactory.h
-thirdparty/libskia/include/gpu/GrBitmapTextContext.h
-thirdparty/libskia/include/gpu/GrClipData.h
-thirdparty/libskia/include/gpu/GrColor.h
-thirdparty/libskia/include/gpu/GrConfig.h
-thirdparty/libskia/include/gpu/GrContext.h
-thirdparty/libskia/include/gpu/GrContextFactory.h
-thirdparty/libskia/include/gpu/GrCoordTransform.h
-thirdparty/libskia/include/gpu/GrDistanceFieldTextContext.h
-thirdparty/libskia/include/gpu/GrDrawEffect.h
-thirdparty/libskia/include/gpu/GrEffect.h
-thirdparty/libskia/include/gpu/GrEffectStage.h
-thirdparty/libskia/include/gpu/GrEffectUnitTest.h
-thirdparty/libskia/include/gpu/GrFontScaler.h
-thirdparty/libskia/include/gpu/GrGlyph.h
-thirdparty/libskia/include/gpu/GrKey.h
-thirdparty/libskia/include/gpu/GrPaint.h
-thirdparty/libskia/include/gpu/GrPathRendererChain.h
-thirdparty/libskia/include/gpu/GrPoint.h
-thirdparty/libskia/include/gpu/GrRect.h
-thirdparty/libskia/include/gpu/GrRenderTarget.h
-thirdparty/libskia/include/gpu/GrResource.h
-thirdparty/libskia/include/gpu/GrSurface.h
-thirdparty/libskia/include/gpu/GrTBackendEffectFactory.h
-thirdparty/libskia/include/gpu/GrTextContext.h
-thirdparty/libskia/include/gpu/GrTexture.h
-thirdparty/libskia/include/gpu/GrTextureAccess.h
-thirdparty/libskia/include/gpu/GrTypes.h
-thirdparty/libskia/include/gpu/GrTypesPriv.h
-thirdparty/libskia/include/gpu/GrUserConfig.h
-thirdparty/libskia/include/gpu/SkGpuDevice.h
-thirdparty/libskia/include/gpu/SkGr.h
-thirdparty/libskia/include/gpu/SkGrPixelRef.h
-thirdparty/libskia/include/gpu/SkGrTexturePixelRef.h
-thirdparty/libskia/include/images/SkForceLinking.h
-thirdparty/libskia/include/images/SkImageRef.h
-thirdparty/libskia/include/images/SkImageRef_GlobalPool.h
-thirdparty/libskia/include/images/SkImages.h
-thirdparty/libskia/include/images/SkMovie.h
-thirdparty/libskia/include/images/SkPageFlipper.h
-thirdparty/libskia/include/pathops/SkPathOps.h
-thirdparty/libskia/include/pdf/SkPDFDevice.h
-thirdparty/libskia/include/pdf/SkPDFDocument.h
-thirdparty/libskia/include/pipe/SkGPipe.h
-thirdparty/libskia/include/ports/SkFontConfigInterface.h
-thirdparty/libskia/include/ports/SkFontMgr.h
-thirdparty/libskia/include/ports/SkFontStyle.h
-thirdparty/libskia/include/ports/SkHarfBuzzFont.h
-thirdparty/libskia/include/ports/SkTypeface_android.h
-thirdparty/libskia/include/ports/SkTypeface_mac.h
-thirdparty/libskia/include/ports/SkTypeface_win.h
-thirdparty/libskia/include/svg/SkSVGAttribute.h
-thirdparty/libskia/include/svg/SkSVGBase.h
-thirdparty/libskia/include/svg/SkSVGPaintState.h
-thirdparty/libskia/include/svg/SkSVGParser.h
-thirdparty/libskia/include/svg/SkSVGTypes.h
-thirdparty/libskia/include/text/SkTextLayout.h
-thirdparty/libskia/include/utils/ios/SkStream_NSData.h
-thirdparty/libskia/include/utils/mac/SkCGUtils.h
-thirdparty/libskia/include/utils/win/SkAutoCoInitialize.h
-thirdparty/libskia/include/utils/win/SkHRESULT.h
-thirdparty/libskia/include/utils/win/SkIStream.h
-thirdparty/libskia/include/utils/win/SkTScopedComPtr.h
-thirdparty/libskia/include/utils/SkBoundaryPatch.h
-thirdparty/libskia/include/utils/SkCamera.h
-thirdparty/libskia/include/utils/SkCanvasStateUtils.h
-thirdparty/libskia/include/utils/SkCondVar.h
-thirdparty/libskia/include/utils/SkCountdown.h
-thirdparty/libskia/include/utils/SkCubicInterval.h
-thirdparty/libskia/include/utils/SkCullPoints.h
-thirdparty/libskia/include/utils/SkDebugUtils.h
-thirdparty/libskia/include/utils/SkDeferredCanvas.h
-thirdparty/libskia/include/utils/SkDumpCanvas.h
-thirdparty/libskia/include/utils/SkFrontBufferedStream.h
-thirdparty/libskia/include/utils/SkInterpolator.h
-thirdparty/libskia/include/utils/SkJSON.h
-thirdparty/libskia/include/utils/SkJSONCPP.h
-thirdparty/libskia/include/utils/SkLayer.h
-thirdparty/libskia/include/utils/SkLua.h
-thirdparty/libskia/include/utils/SkLuaCanvas.h
-thirdparty/libskia/include/utils/SkMatrix44.h
-thirdparty/libskia/include/utils/SkMeshUtils.h
-thirdparty/libskia/include/utils/SkNinePatch.h
-thirdparty/libskia/include/utils/SkNullCanvas.h
-thirdparty/libskia/include/utils/SkNWayCanvas.h
-thirdparty/libskia/include/utils/SkParse.h
-thirdparty/libskia/include/utils/SkParsePaint.h
-thirdparty/libskia/include/utils/SkParsePath.h
-thirdparty/libskia/include/utils/SkPathUtils.h
-thirdparty/libskia/include/utils/SkPictureUtils.h
-thirdparty/libskia/include/utils/SkProxyCanvas.h
-thirdparty/libskia/include/utils/SkRandom.h
-thirdparty/libskia/include/utils/SkRTConf.h
-thirdparty/libskia/include/utils/SkRunnable.h
-thirdparty/libskia/include/utils/SkThreadPool.h
-thirdparty/libskia/include/utils/SkUnitMappers.h
-thirdparty/libskia/include/utils/SkWGL.h
-thirdparty/libskia/src/core/ARGB32_Clamp_Bilinear_BitmapShader.h
-thirdparty/libskia/src/core/Sk64.cpp
-thirdparty/libskia/src/core/SkAAClip.cpp
-thirdparty/libskia/src/core/SkAAClip.h
-thirdparty/libskia/src/core/SkAdvancedTypefaceMetrics.cpp
-thirdparty/libskia/src/core/SkAlphaRuns.cpp
-thirdparty/libskia/src/core/SkAnnotation.cpp
-thirdparty/libskia/src/core/SkAntiRun.h
-thirdparty/libskia/src/core/SkAutoKern.h
-thirdparty/libskia/src/core/SkBBoxHierarchy.h
-thirdparty/libskia/src/core/SkBBoxHierarchyRecord.cpp
-thirdparty/libskia/src/core/SkBBoxHierarchyRecord.h
-thirdparty/libskia/src/core/SkBBoxRecord.cpp
-thirdparty/libskia/src/core/SkBBoxRecord.h
-thirdparty/libskia/src/core/SkBitmap.cpp
-thirdparty/libskia/src/core/SkBitmap_scroll.cpp
-thirdparty/libskia/src/core/SkBitmapDevice.cpp
-thirdparty/libskia/src/core/SkBitmapFilter.cpp
-thirdparty/libskia/src/core/SkBitmapFilter.h
-thirdparty/libskia/src/core/SkBitmapHeap.cpp
-thirdparty/libskia/src/core/SkBitmapHeap.h
-thirdparty/libskia/src/core/SkBitmapProcShader.cpp
-thirdparty/libskia/src/core/SkBitmapProcShader.h
-thirdparty/libskia/src/core/SkBitmapProcState.cpp
-thirdparty/libskia/src/core/SkBitmapProcState.h
-thirdparty/libskia/src/core/SkBitmapProcState_filter.h
-thirdparty/libskia/src/core/SkBitmapProcState_matrix.h
-thirdparty/libskia/src/core/SkBitmapProcState_matrixProcs.cpp
-thirdparty/libskia/src/core/SkBitmapProcState_procs.h
-thirdparty/libskia/src/core/SkBitmapProcState_sample.h
-thirdparty/libskia/src/core/SkBitmapProcState_shaderproc.h
-thirdparty/libskia/src/core/SkBitmapProcState_utils.h
-thirdparty/libskia/src/core/SkBitmapScaler.cpp
-thirdparty/libskia/src/core/SkBitmapScaler.h
-thirdparty/libskia/src/core/SkBitmapShader16BilerpTemplate.h
-thirdparty/libskia/src/core/SkBitmapShaderTemplate.h
-thirdparty/libskia/src/core/SkBlitBWMaskTemplate.h
-thirdparty/libskia/src/core/SkBlitMask.h
-thirdparty/libskia/src/core/SkBlitMask_D32.cpp
-thirdparty/libskia/src/core/SkBlitRow_D16.cpp
-thirdparty/libskia/src/core/SkBlitRow_D32.cpp
-thirdparty/libskia/src/core/SkBlitter.cpp
-thirdparty/libskia/src/core/SkBlitter.h
-thirdparty/libskia/src/core/SkBlitter_A8.cpp
-thirdparty/libskia/src/core/SkBlitter_ARGB32.cpp
-thirdparty/libskia/src/core/SkBlitter_RGB16.cpp
-thirdparty/libskia/src/core/SkBlitter_Sprite.cpp
-thirdparty/libskia/src/core/SkBuffer.cpp
-thirdparty/libskia/src/core/SkBuffer.h
-thirdparty/libskia/src/core/SkCanvas.cpp
-thirdparty/libskia/src/core/SkChunkAlloc.cpp
-thirdparty/libskia/src/core/SkClipStack.cpp
-thirdparty/libskia/src/core/SkColor.cpp
-thirdparty/libskia/src/core/SkColorFilter.cpp
-thirdparty/libskia/src/core/SkColorTable.cpp
-thirdparty/libskia/src/core/SkComposeShader.cpp
-thirdparty/libskia/src/core/SkConfig8888.cpp
-thirdparty/libskia/src/core/SkConfig8888.h
-thirdparty/libskia/src/core/SkConvolver.cpp
-thirdparty/libskia/src/core/SkConvolver.h
-thirdparty/libskia/src/core/SkCordic.cpp
-thirdparty/libskia/src/core/SkCordic.h
-thirdparty/libskia/src/core/SkCoreBlitters.h
-thirdparty/libskia/src/core/SkCubicClipper.cpp
-thirdparty/libskia/src/core/SkCubicClipper.h
-thirdparty/libskia/src/core/SkData.cpp
-thirdparty/libskia/src/core/SkDataTable.cpp
-thirdparty/libskia/src/core/SkDebug.cpp
-thirdparty/libskia/src/core/SkDeque.cpp
-thirdparty/libskia/src/core/SkDescriptor.h
-thirdparty/libskia/src/core/SkDevice.cpp
-thirdparty/libskia/src/core/SkDeviceImageFilterProxy.h
-thirdparty/libskia/src/core/SkDeviceLooper.cpp
-thirdparty/libskia/src/core/SkDeviceLooper.h
-thirdparty/libskia/src/core/SkDeviceProfile.cpp
-thirdparty/libskia/src/core/SkDeviceProfile.h
-thirdparty/libskia/src/core/SkDiscardableMemory.h
-thirdparty/libskia/src/core/SkDither.cpp
-thirdparty/libskia/src/core/SkDraw.cpp
-thirdparty/libskia/src/core/SkDrawLooper.cpp
-thirdparty/libskia/src/core/SkDrawProcs.h
-thirdparty/libskia/src/core/SkEdge.cpp
-thirdparty/libskia/src/core/SkEdge.h
-thirdparty/libskia/src/core/SkEdgeBuilder.cpp
-thirdparty/libskia/src/core/SkEdgeBuilder.h
-thirdparty/libskia/src/core/SkEdgeClipper.cpp
-thirdparty/libskia/src/core/SkEdgeClipper.h
-thirdparty/libskia/src/core/SkError.cpp
-thirdparty/libskia/src/core/SkErrorInternals.h
-thirdparty/libskia/src/core/SkFDot6.h
-thirdparty/libskia/src/core/SkFilterProc.cpp
-thirdparty/libskia/src/core/SkFilterProc.h
-thirdparty/libskia/src/core/SkFilterShader.cpp
-thirdparty/libskia/src/core/SkFilterShader.h
-thirdparty/libskia/src/core/SkFlate.cpp
-thirdparty/libskia/src/core/SkFlattenable.cpp
-thirdparty/libskia/src/core/SkFlattenableBuffers.cpp
-thirdparty/libskia/src/core/SkFlattenableSerialization.cpp
-thirdparty/libskia/src/core/SkFloat.cpp
-thirdparty/libskia/src/core/SkFloat.h
-thirdparty/libskia/src/core/SkFloatBits.cpp
-thirdparty/libskia/src/core/SkFontDescriptor.cpp
-thirdparty/libskia/src/core/SkFontDescriptor.h
-thirdparty/libskia/src/core/SkFontHost.cpp
-thirdparty/libskia/src/core/SkFontStream.cpp
-thirdparty/libskia/src/core/SkFontStream.h
-thirdparty/libskia/src/core/SkFP.h
-thirdparty/libskia/src/core/SkGeometry.cpp
-thirdparty/libskia/src/core/SkGlyph.h
-thirdparty/libskia/src/core/SkGlyphCache.cpp
-thirdparty/libskia/src/core/SkGlyphCache.h
-thirdparty/libskia/src/core/SkGlyphCache_Globals.h
-thirdparty/libskia/src/core/SkGraphics.cpp
-thirdparty/libskia/src/core/SkImageFilter.cpp
-thirdparty/libskia/src/core/SkImageFilterUtils.cpp
-thirdparty/libskia/src/core/SkImageInfo.cpp
-thirdparty/libskia/src/core/SkInstCnt.cpp
-thirdparty/libskia/src/core/SkLineClipper.cpp
-thirdparty/libskia/src/core/SkMallocPixelRef.cpp
-thirdparty/libskia/src/core/SkMask.cpp
-thirdparty/libskia/src/core/SkMaskFilter.cpp
-thirdparty/libskia/src/core/SkMaskGamma.cpp
-thirdparty/libskia/src/core/SkMaskGamma.h
-thirdparty/libskia/src/core/SkMath.cpp
-thirdparty/libskia/src/core/SkMathPriv.h
-thirdparty/libskia/src/core/SkMatrix.cpp
-thirdparty/libskia/src/core/SkMatrixUtils.h
-thirdparty/libskia/src/core/SkMessageBus.h
-thirdparty/libskia/src/core/SkMetaData.cpp
-thirdparty/libskia/src/core/SkMipMap.cpp
-thirdparty/libskia/src/core/SkMipMap.h
-thirdparty/libskia/src/core/SkOnce.h
-thirdparty/libskia/src/core/SkOrderedReadBuffer.cpp
-thirdparty/libskia/src/core/SkOrderedReadBuffer.h
-thirdparty/libskia/src/core/SkOrderedWriteBuffer.cpp
-thirdparty/libskia/src/core/SkOrderedWriteBuffer.h
-thirdparty/libskia/src/core/SkPackBits.cpp
-thirdparty/libskia/src/core/SkPaint.cpp
-thirdparty/libskia/src/core/SkPaintDefaults.h
-thirdparty/libskia/src/core/SkPaintOptionsAndroid.cpp
-thirdparty/libskia/src/core/SkPaintPriv.cpp
-thirdparty/libskia/src/core/SkPaintPriv.h
-thirdparty/libskia/src/core/SkPath.cpp
-thirdparty/libskia/src/core/SkPathEffect.cpp
-thirdparty/libskia/src/core/SkPathHeap.cpp
-thirdparty/libskia/src/core/SkPathHeap.h
-thirdparty/libskia/src/core/SkPathMeasure.cpp
-thirdparty/libskia/src/core/SkPathRef.cpp
-thirdparty/libskia/src/core/SkPerspIter.h
-thirdparty/libskia/src/core/SkPicture.cpp
-thirdparty/libskia/src/core/SkPictureFlat.cpp
-thirdparty/libskia/src/core/SkPictureFlat.h
-thirdparty/libskia/src/core/SkPicturePlayback.cpp
-thirdparty/libskia/src/core/SkPicturePlayback.h
-thirdparty/libskia/src/core/SkPictureRecord.cpp
-thirdparty/libskia/src/core/SkPictureRecord.h
-thirdparty/libskia/src/core/SkPictureStateTree.cpp
-thirdparty/libskia/src/core/SkPictureStateTree.h
-thirdparty/libskia/src/core/SkPixelRef.cpp
-thirdparty/libskia/src/core/SkPoint.cpp
-thirdparty/libskia/src/core/SkProcSpriteBlitter.cpp
-thirdparty/libskia/src/core/SkPtrRecorder.cpp
-thirdparty/libskia/src/core/SkPtrRecorder.h
-thirdparty/libskia/src/core/SkQuadClipper.cpp
-thirdparty/libskia/src/core/SkQuadClipper.h
-thirdparty/libskia/src/core/SkRasterClip.cpp
-thirdparty/libskia/src/core/SkRasterClip.h
-thirdparty/libskia/src/core/SkRasterizer.cpp
-thirdparty/libskia/src/core/SkRect.cpp
-thirdparty/libskia/src/core/SkRefDict.cpp
-thirdparty/libskia/src/core/SkRefDict.h
-thirdparty/libskia/src/core/SkRegion.cpp
-thirdparty/libskia/src/core/SkRegion_path.cpp
-thirdparty/libskia/src/core/SkRegion_rects.cpp
-thirdparty/libskia/src/core/SkRegionPriv.h
-thirdparty/libskia/src/core/SkRRect.cpp
-thirdparty/libskia/src/core/SkRTree.cpp
-thirdparty/libskia/src/core/SkRTree.h
-thirdparty/libskia/src/core/SkScalar.cpp
-thirdparty/libskia/src/core/SkScaledImageCache.cpp
-thirdparty/libskia/src/core/SkScaledImageCache.h
-thirdparty/libskia/src/core/SkScalerContext.cpp
-thirdparty/libskia/src/core/SkScalerContext.h
-thirdparty/libskia/src/core/SkScan.cpp
-thirdparty/libskia/src/core/SkScan.h
-thirdparty/libskia/src/core/SkScan_Antihair.cpp
-thirdparty/libskia/src/core/SkScan_AntiPath.cpp
-thirdparty/libskia/src/core/SkScan_Hairline.cpp
-thirdparty/libskia/src/core/SkScan_Path.cpp
-thirdparty/libskia/src/core/SkScanPriv.h
-thirdparty/libskia/src/core/SkShader.cpp
-thirdparty/libskia/src/core/SkSinTable.h
-thirdparty/libskia/src/core/SkSpriteBlitter.h
-thirdparty/libskia/src/core/SkSpriteBlitter_ARGB32.cpp
-thirdparty/libskia/src/core/SkSpriteBlitter_RGB16.cpp
-thirdparty/libskia/src/core/SkSpriteBlitterTemplate.h
-thirdparty/libskia/src/core/SkStream.cpp
-thirdparty/libskia/src/core/SkString.cpp
-thirdparty/libskia/src/core/SkStringUtils.cpp
-thirdparty/libskia/src/core/SkStroke.cpp
-thirdparty/libskia/src/core/SkStroke.h
-thirdparty/libskia/src/core/SkStrokeRec.cpp
-thirdparty/libskia/src/core/SkStrokerPriv.cpp
-thirdparty/libskia/src/core/SkStrokerPriv.h
-thirdparty/libskia/src/core/SkTDynamicHash.h
-thirdparty/libskia/src/core/SkTemplatesPriv.h
-thirdparty/libskia/src/core/SkTextFormatParams.h
-thirdparty/libskia/src/core/SkTextToPathIter.h
-thirdparty/libskia/src/core/SkTileGrid.cpp
-thirdparty/libskia/src/core/SkTileGrid.h
-thirdparty/libskia/src/core/SkTileGridPicture.cpp
-thirdparty/libskia/src/core/SkTLList.h
-thirdparty/libskia/src/core/SkTLS.cpp
-thirdparty/libskia/src/core/SkTLS.h
-thirdparty/libskia/src/core/SkTRefArray.h
-thirdparty/libskia/src/core/SkTSearch.cpp
-thirdparty/libskia/src/core/SkTSort.h
-thirdparty/libskia/src/core/SkTypeface.cpp
-thirdparty/libskia/src/core/SkTypefaceCache.cpp
-thirdparty/libskia/src/core/SkTypefaceCache.h
-thirdparty/libskia/src/core/SkTypefacePriv.h
-thirdparty/libskia/src/core/SkUnPreMultiply.cpp
-thirdparty/libskia/src/core/SkUtils.cpp
-thirdparty/libskia/src/core/SkUtilsArm.cpp
-thirdparty/libskia/src/core/SkUtilsArm.h
-thirdparty/libskia/src/core/SkValidatingReadBuffer.cpp
-thirdparty/libskia/src/core/SkValidatingReadBuffer.h
-thirdparty/libskia/src/core/SkValidationUtils.h
-thirdparty/libskia/src/core/SkWriter32.cpp
-thirdparty/libskia/src/core/SkXfermode.cpp
-thirdparty/libskia/src/core/SkXfermode_proccoeff.h
-thirdparty/libskia/src/device/xps/SkXPSDevice.cpp
-thirdparty/libskia/src/effects/gradients/SkBitmapCache.cpp
-thirdparty/libskia/src/effects/gradients/SkBitmapCache.h
-thirdparty/libskia/src/effects/gradients/SkClampRange.cpp
-thirdparty/libskia/src/effects/gradients/SkClampRange.h
-thirdparty/libskia/src/effects/gradients/SkGradientShader.cpp
-thirdparty/libskia/src/effects/gradients/SkGradientShaderPriv.h
-thirdparty/libskia/src/effects/gradients/SkLinearGradient.cpp
-thirdparty/libskia/src/effects/gradients/SkLinearGradient.h
-thirdparty/libskia/src/effects/gradients/SkRadialGradient.cpp
-thirdparty/libskia/src/effects/gradients/SkRadialGradient.h
-thirdparty/libskia/src/effects/gradients/SkRadialGradient_Table.h
-thirdparty/libskia/src/effects/gradients/SkSweepGradient.cpp
-thirdparty/libskia/src/effects/gradients/SkSweepGradient.h
-thirdparty/libskia/src/effects/gradients/SkTwoPointConicalGradient.cpp
-thirdparty/libskia/src/effects/gradients/SkTwoPointConicalGradient.h
-thirdparty/libskia/src/effects/gradients/SkTwoPointRadialGradient.cpp
-thirdparty/libskia/src/effects/gradients/SkTwoPointRadialGradient.h
-thirdparty/libskia/src/effects/Sk1DPathEffect.cpp
-thirdparty/libskia/src/effects/Sk2DPathEffect.cpp
-thirdparty/libskia/src/effects/SkArithmeticMode.cpp
-thirdparty/libskia/src/effects/SkAvoidXfermode.cpp
-thirdparty/libskia/src/effects/SkBicubicImageFilter.cpp
-thirdparty/libskia/src/effects/SkBitmapSource.cpp
-thirdparty/libskia/src/effects/SkBlurDrawLooper.cpp
-thirdparty/libskia/src/effects/SkBlurImageFilter.cpp
-thirdparty/libskia/src/effects/SkBlurMask.cpp
-thirdparty/libskia/src/effects/SkBlurMask.h
-thirdparty/libskia/src/effects/SkBlurMaskFilter.cpp
-thirdparty/libskia/src/effects/SkColorFilterImageFilter.cpp
-thirdparty/libskia/src/effects/SkColorFilters.cpp
-thirdparty/libskia/src/effects/SkColorMatrix.cpp
-thirdparty/libskia/src/effects/SkColorMatrixFilter.cpp
-thirdparty/libskia/src/effects/SkComposeImageFilter.cpp
-thirdparty/libskia/src/effects/SkCornerPathEffect.cpp
-thirdparty/libskia/src/effects/SkDashPathEffect.cpp
-thirdparty/libskia/src/effects/SkDiscretePathEffect.cpp
-thirdparty/libskia/src/effects/SkDisplacementMapEffect.cpp
-thirdparty/libskia/src/effects/SkDropShadowImageFilter.cpp
-thirdparty/libskia/src/effects/SkEmbossMask.cpp
-thirdparty/libskia/src/effects/SkEmbossMask.h
-thirdparty/libskia/src/effects/SkEmbossMask_Table.h
-thirdparty/libskia/src/effects/SkEmbossMaskFilter.cpp
-thirdparty/libskia/src/effects/SkGpuBlurUtils.cpp
-thirdparty/libskia/src/effects/SkGpuBlurUtils.h
-thirdparty/libskia/src/effects/SkKernel33MaskFilter.cpp
-thirdparty/libskia/src/effects/SkLayerDrawLooper.cpp
-thirdparty/libskia/src/effects/SkLayerRasterizer.cpp
-thirdparty/libskia/src/effects/SkLerpXfermode.cpp
-thirdparty/libskia/src/effects/SkLightingImageFilter.cpp
-thirdparty/libskia/src/effects/SkLumaColorFilter.cpp
-thirdparty/libskia/src/effects/SkMagnifierImageFilter.cpp
-thirdparty/libskia/src/effects/SkMatrixConvolutionImageFilter.cpp
-thirdparty/libskia/src/effects/SkMergeImageFilter.cpp
-thirdparty/libskia/src/effects/SkMorphologyImageFilter.cpp
-thirdparty/libskia/src/effects/SkOffsetImageFilter.cpp
-thirdparty/libskia/src/effects/SkPaintFlagsDrawFilter.cpp
-thirdparty/libskia/src/effects/SkPerlinNoiseShader.cpp
-thirdparty/libskia/src/effects/SkPictureImageFilter.cpp
-thirdparty/libskia/src/effects/SkPixelXorXfermode.cpp
-thirdparty/libskia/src/effects/SkPorterDuff.cpp
-thirdparty/libskia/src/effects/SkRectShaderImageFilter.cpp
-thirdparty/libskia/src/effects/SkStippleMaskFilter.cpp
-thirdparty/libskia/src/effects/SkTableColorFilter.cpp
-thirdparty/libskia/src/effects/SkTableMaskFilter.cpp
-thirdparty/libskia/src/effects/SkTestImageFilters.cpp
-thirdparty/libskia/src/effects/SkTileImageFilter.cpp
-thirdparty/libskia/src/effects/SkTransparentShader.cpp
-thirdparty/libskia/src/effects/SkXfermodeImageFilter.cpp
-thirdparty/libskia/src/fonts/SkFontMgr_fontconfig.cpp
-thirdparty/libskia/src/fonts/SkGScalerContext.cpp
-thirdparty/libskia/src/fonts/SkGScalerContext.h
-thirdparty/libskia/src/gpu/effects/Gr1DKernelEffect.h
-thirdparty/libskia/src/gpu/effects/GrBezierEffect.cpp
-thirdparty/libskia/src/gpu/effects/GrBezierEffect.h
-thirdparty/libskia/src/gpu/effects/GrBicubicEffect.cpp
-thirdparty/libskia/src/gpu/effects/GrBicubicEffect.h
-thirdparty/libskia/src/gpu/effects/GrConfigConversionEffect.cpp
-thirdparty/libskia/src/gpu/effects/GrConfigConversionEffect.h
-thirdparty/libskia/src/gpu/effects/GrConvolutionEffect.cpp
-thirdparty/libskia/src/gpu/effects/GrConvolutionEffect.h
-thirdparty/libskia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp
-thirdparty/libskia/src/gpu/effects/GrCustomCoordsTextureEffect.h
-thirdparty/libskia/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
-thirdparty/libskia/src/gpu/effects/GrDistanceFieldTextureEffect.h
-thirdparty/libskia/src/gpu/effects/GrSimpleTextureEffect.cpp
-thirdparty/libskia/src/gpu/effects/GrSimpleTextureEffect.h
-thirdparty/libskia/src/gpu/effects/GrSingleTextureEffect.cpp
-thirdparty/libskia/src/gpu/effects/GrSingleTextureEffect.h
-thirdparty/libskia/src/gpu/effects/GrTextureDomain.cpp
-thirdparty/libskia/src/gpu/effects/GrTextureDomain.h
-thirdparty/libskia/src/gpu/effects/GrTextureStripAtlas.cpp
-thirdparty/libskia/src/gpu/effects/GrTextureStripAtlas.h
-thirdparty/libskia/src/gpu/effects/GrVertexEffect.h
-thirdparty/libskia/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp
-thirdparty/libskia/src/gpu/gl/android/SkNativeGLContext_android.cpp
-thirdparty/libskia/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp
-thirdparty/libskia/src/gpu/gl/angle/SkANGLEGLContext.cpp
-thirdparty/libskia/src/gpu/gl/debug/GrBufferObj.cpp
-thirdparty/libskia/src/gpu/gl/debug/GrBufferObj.h
-thirdparty/libskia/src/gpu/gl/debug/GrDebugGL.cpp
-thirdparty/libskia/src/gpu/gl/debug/GrDebugGL.h
-thirdparty/libskia/src/gpu/gl/debug/GrFakeRefObj.h
-thirdparty/libskia/src/gpu/gl/debug/GrFBBindableObj.h
-thirdparty/libskia/src/gpu/gl/debug/GrFrameBufferObj.cpp
-thirdparty/libskia/src/gpu/gl/debug/GrFrameBufferObj.h
-thirdparty/libskia/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp
-thirdparty/libskia/src/gpu/gl/debug/GrProgramObj.cpp
-thirdparty/libskia/src/gpu/gl/debug/GrProgramObj.h
-thirdparty/libskia/src/gpu/gl/debug/GrRenderBufferObj.h
-thirdparty/libskia/src/gpu/gl/debug/GrShaderObj.cpp
-thirdparty/libskia/src/gpu/gl/debug/GrShaderObj.h
-thirdparty/libskia/src/gpu/gl/debug/GrTextureObj.cpp
-thirdparty/libskia/src/gpu/gl/debug/GrTextureObj.h
-thirdparty/libskia/src/gpu/gl/debug/GrTextureUnitObj.cpp
-thirdparty/libskia/src/gpu/gl/debug/GrTextureUnitObj.h
-thirdparty/libskia/src/gpu/gl/debug/GrVertexArrayObj.h
-thirdparty/libskia/src/gpu/gl/debug/SkDebugGLContext.cpp
-thirdparty/libskia/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp
-thirdparty/libskia/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm
-thirdparty/libskia/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
-thirdparty/libskia/src/gpu/gl/mac/SkNativeGLContext_mac.cpp
-thirdparty/libskia/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp
-thirdparty/libskia/src/gpu/gl/mesa/osmesa_wrapper.h
-thirdparty/libskia/src/gpu/gl/mesa/SkMesaGLContext.cpp
-thirdparty/libskia/src/gpu/gl/nacl/SkNativeGLContext_nacl.cpp
-thirdparty/libskia/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp
-thirdparty/libskia/src/gpu/gl/unix/SkNativeGLContext_unix.cpp
-thirdparty/libskia/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp
-thirdparty/libskia/src/gpu/gl/win/SkNativeGLContext_win.cpp
-thirdparty/libskia/src/gpu/gl/GrGLBufferImpl.cpp
-thirdparty/libskia/src/gpu/gl/GrGLBufferImpl.h
-thirdparty/libskia/src/gpu/gl/GrGLCaps.cpp
-thirdparty/libskia/src/gpu/gl/GrGLCaps.h
-thirdparty/libskia/src/gpu/gl/GrGLContext.cpp
-thirdparty/libskia/src/gpu/gl/GrGLContext.h
-thirdparty/libskia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp
-thirdparty/libskia/src/gpu/gl/GrGLCreateNullInterface.cpp
-thirdparty/libskia/src/gpu/gl/GrGLDefaultInterface_native.cpp
-thirdparty/libskia/src/gpu/gl/GrGLDefaultInterface_none.cpp
-thirdparty/libskia/src/gpu/gl/GrGLDefines.h
-thirdparty/libskia/src/gpu/gl/GrGLEffect.h
-thirdparty/libskia/src/gpu/gl/GrGLExtensions.cpp
-thirdparty/libskia/src/gpu/gl/GrGLIndexBuffer.cpp
-thirdparty/libskia/src/gpu/gl/GrGLIndexBuffer.h
-thirdparty/libskia/src/gpu/gl/GrGLInterface.cpp
-thirdparty/libskia/src/gpu/gl/GrGLIRect.h
-thirdparty/libskia/src/gpu/gl/GrGLNoOpInterface.cpp
-thirdparty/libskia/src/gpu/gl/GrGLNoOpInterface.h
-thirdparty/libskia/src/gpu/gl/GrGLPath.cpp
-thirdparty/libskia/src/gpu/gl/GrGLPath.h
-thirdparty/libskia/src/gpu/gl/GrGLProgram.cpp
-thirdparty/libskia/src/gpu/gl/GrGLProgram.h
-thirdparty/libskia/src/gpu/gl/GrGLProgramDesc.cpp
-thirdparty/libskia/src/gpu/gl/GrGLProgramDesc.h
-thirdparty/libskia/src/gpu/gl/GrGLProgramEffects.cpp
-thirdparty/libskia/src/gpu/gl/GrGLProgramEffects.h
-thirdparty/libskia/src/gpu/gl/GrGLRenderTarget.cpp
-thirdparty/libskia/src/gpu/gl/GrGLRenderTarget.h
-thirdparty/libskia/src/gpu/gl/GrGLShaderBuilder.cpp
-thirdparty/libskia/src/gpu/gl/GrGLShaderBuilder.h
-thirdparty/libskia/src/gpu/gl/GrGLShaderVar.h
-thirdparty/libskia/src/gpu/gl/GrGLSL.cpp
-thirdparty/libskia/src/gpu/gl/GrGLSL.h
-thirdparty/libskia/src/gpu/gl/GrGLSL_impl.h
-thirdparty/libskia/src/gpu/gl/GrGLStencilBuffer.cpp
-thirdparty/libskia/src/gpu/gl/GrGLStencilBuffer.h
-thirdparty/libskia/src/gpu/gl/GrGLTexture.cpp
-thirdparty/libskia/src/gpu/gl/GrGLTexture.h
-thirdparty/libskia/src/gpu/gl/GrGLUniformHandle.h
-thirdparty/libskia/src/gpu/gl/GrGLUniformManager.cpp
-thirdparty/libskia/src/gpu/gl/GrGLUniformManager.h
-thirdparty/libskia/src/gpu/gl/GrGLUtil.cpp
-thirdparty/libskia/src/gpu/gl/GrGLUtil.h
-thirdparty/libskia/src/gpu/gl/GrGLVertexArray.cpp
-thirdparty/libskia/src/gpu/gl/GrGLVertexArray.h
-thirdparty/libskia/src/gpu/gl/GrGLVertexBuffer.cpp
-thirdparty/libskia/src/gpu/gl/GrGLVertexBuffer.h
-thirdparty/libskia/src/gpu/gl/GrGLVertexEffect.h
-thirdparty/libskia/src/gpu/gl/GrGpuGL.cpp
-thirdparty/libskia/src/gpu/gl/GrGpuGL.h
-thirdparty/libskia/src/gpu/gl/GrGpuGL_program.cpp
-thirdparty/libskia/src/gpu/gl/SkGLContextHelper.cpp
-thirdparty/libskia/src/gpu/gl/SkNullGLContext.cpp
-thirdparty/libskia/src/gpu/FlingState.cpp
-thirdparty/libskia/src/gpu/GrAAConvexPathRenderer.cpp
-thirdparty/libskia/src/gpu/GrAAConvexPathRenderer.h
-thirdparty/libskia/src/gpu/GrAAHairLinePathRenderer.cpp
-thirdparty/libskia/src/gpu/GrAAHairLinePathRenderer.h
-thirdparty/libskia/src/gpu/GrAARectRenderer.cpp
-thirdparty/libskia/src/gpu/GrAARectRenderer.h
-thirdparty/libskia/src/gpu/GrAddPathRenderers_default.cpp
-thirdparty/libskia/src/gpu/GrAddPathRenderers_none.cpp
-thirdparty/libskia/src/gpu/GrAllocator.h
-thirdparty/libskia/src/gpu/GrAllocPool.cpp
-thirdparty/libskia/src/gpu/GrAllocPool.h
-thirdparty/libskia/src/gpu/GrAtlas.cpp
-thirdparty/libskia/src/gpu/GrAtlas.h
-thirdparty/libskia/src/gpu/GrBinHashKey.h
-thirdparty/libskia/src/gpu/GrBitmapTextContext.cpp
-thirdparty/libskia/src/gpu/GrBlend.cpp
-thirdparty/libskia/src/gpu/GrBlend.h
-thirdparty/libskia/src/gpu/GrBufferAllocPool.cpp
-thirdparty/libskia/src/gpu/GrBufferAllocPool.h
-thirdparty/libskia/src/gpu/GrCacheID.cpp
-thirdparty/libskia/src/gpu/GrClipData.cpp
-thirdparty/libskia/src/gpu/GrClipMaskCache.cpp
-thirdparty/libskia/src/gpu/GrClipMaskCache.h
-thirdparty/libskia/src/gpu/GrClipMaskManager.cpp
-thirdparty/libskia/src/gpu/GrClipMaskManager.h
-thirdparty/libskia/src/gpu/GrContext.cpp
-thirdparty/libskia/src/gpu/GrDefaultPathRenderer.cpp
-thirdparty/libskia/src/gpu/GrDefaultPathRenderer.h
-thirdparty/libskia/src/gpu/GrDistanceFieldTextContext.cpp
-thirdparty/libskia/src/gpu/GrDrawState.cpp
-thirdparty/libskia/src/gpu/GrDrawState.h
-thirdparty/libskia/src/gpu/GrDrawTarget.cpp
-thirdparty/libskia/src/gpu/GrDrawTarget.h
-thirdparty/libskia/src/gpu/GrDrawTargetCaps.h
-thirdparty/libskia/src/gpu/GrEffect.cpp
-thirdparty/libskia/src/gpu/GrGeometryBuffer.h
-thirdparty/libskia/src/gpu/GrGpu.cpp
-thirdparty/libskia/src/gpu/GrGpu.h
-thirdparty/libskia/src/gpu/GrGpuFactory.cpp
-thirdparty/libskia/src/gpu/GrIndexBuffer.h
-thirdparty/libskia/src/gpu/GrInOrderDrawBuffer.cpp
-thirdparty/libskia/src/gpu/GrInOrderDrawBuffer.h
-thirdparty/libskia/src/gpu/GrMemory.cpp
-thirdparty/libskia/src/gpu/GrMemoryPool.cpp
-thirdparty/libskia/src/gpu/GrMemoryPool.h
-thirdparty/libskia/src/gpu/GrOvalRenderer.cpp
-thirdparty/libskia/src/gpu/GrOvalRenderer.h
-thirdparty/libskia/src/gpu/GrPaint.cpp
-thirdparty/libskia/src/gpu/GrPath.cpp
-thirdparty/libskia/src/gpu/GrPath.h
-thirdparty/libskia/src/gpu/GrPathRenderer.cpp
-thirdparty/libskia/src/gpu/GrPathRenderer.h
-thirdparty/libskia/src/gpu/GrPathRendererChain.cpp
-thirdparty/libskia/src/gpu/GrPathUtils.cpp
-thirdparty/libskia/src/gpu/GrPathUtils.h
-thirdparty/libskia/src/gpu/GrPlotMgr.h
-thirdparty/libskia/src/gpu/GrRectanizer.cpp
-thirdparty/libskia/src/gpu/GrRectanizer.h
-thirdparty/libskia/src/gpu/GrRectanizer_fifo.cpp
-thirdparty/libskia/src/gpu/GrRectanizer_skyline.cpp
-thirdparty/libskia/src/gpu/GrRedBlackTree.h
-thirdparty/libskia/src/gpu/GrReducedClip.cpp
-thirdparty/libskia/src/gpu/GrReducedClip.h
-thirdparty/libskia/src/gpu/GrRenderTarget.cpp
-thirdparty/libskia/src/gpu/GrResource.cpp
-thirdparty/libskia/src/gpu/GrResourceCache.cpp
-thirdparty/libskia/src/gpu/GrResourceCache.h
-thirdparty/libskia/src/gpu/GrSoftwarePathRenderer.cpp
-thirdparty/libskia/src/gpu/GrSoftwarePathRenderer.h
-thirdparty/libskia/src/gpu/GrStencil.cpp
-thirdparty/libskia/src/gpu/GrStencil.h
-thirdparty/libskia/src/gpu/GrStencilAndCoverPathRenderer.cpp
-thirdparty/libskia/src/gpu/GrStencilAndCoverPathRenderer.h
-thirdparty/libskia/src/gpu/GrStencilBuffer.cpp
-thirdparty/libskia/src/gpu/GrStencilBuffer.h
-thirdparty/libskia/src/gpu/GrSurface.cpp
-thirdparty/libskia/src/gpu/GrSWMaskHelper.cpp
-thirdparty/libskia/src/gpu/GrSWMaskHelper.h
-thirdparty/libskia/src/gpu/GrTBSearch.h
-thirdparty/libskia/src/gpu/GrTemplates.h
-thirdparty/libskia/src/gpu/GrTest.cpp
-thirdparty/libskia/src/gpu/GrTest.h
-thirdparty/libskia/src/gpu/GrTextContext.cpp
-thirdparty/libskia/src/gpu/GrTextStrike.cpp
-thirdparty/libskia/src/gpu/GrTextStrike.h
-thirdparty/libskia/src/gpu/GrTextStrike_impl.h
-thirdparty/libskia/src/gpu/GrTexture.cpp
-thirdparty/libskia/src/gpu/GrTextureAccess.cpp
-thirdparty/libskia/src/gpu/GrTHashTable.h
-thirdparty/libskia/src/gpu/GrVertexBuffer.h
-thirdparty/libskia/src/gpu/SkGpuDevice.cpp
-thirdparty/libskia/src/gpu/SkGr.cpp
-thirdparty/libskia/src/gpu/SkGrFontScaler.cpp
-thirdparty/libskia/src/gpu/SkGrPixelRef.cpp
-thirdparty/libskia/src/gpu/SkGrTexturePixelRef.cpp
-thirdparty/libskia/src/image/SkImage.cpp
-thirdparty/libskia/src/image/SkImage_Base.h
-thirdparty/libskia/src/image/SkImage_Codec.cpp
-thirdparty/libskia/src/image/SkImage_Gpu.cpp
-thirdparty/libskia/src/image/SkImage_Picture.cpp
-thirdparty/libskia/src/image/SkImage_Raster.cpp
-thirdparty/libskia/src/image/SkImagePriv.cpp
-thirdparty/libskia/src/image/SkImagePriv.h
-thirdparty/libskia/src/image/SkSurface.cpp
-thirdparty/libskia/src/image/SkSurface_Base.h
-thirdparty/libskia/src/image/SkSurface_Gpu.cpp
-thirdparty/libskia/src/image/SkSurface_Picture.cpp
-thirdparty/libskia/src/image/SkSurface_Raster.cpp
-thirdparty/libskia/src/images/bmpdecoderhelper.cpp
-thirdparty/libskia/src/images/bmpdecoderhelper.h
-thirdparty/libskia/src/images/SkDecodingImageGenerator.cpp
-thirdparty/libskia/src/images/SkDecodingImageGenerator.h
-thirdparty/libskia/src/images/SkForceLinking.cpp
-thirdparty/libskia/src/images/SkImageDecoder.cpp
-thirdparty/libskia/src/images/SkImageDecoder_FactoryDefault.cpp
-thirdparty/libskia/src/images/SkImageDecoder_FactoryRegistrar.cpp
-thirdparty/libskia/src/images/SkImageDecoder_libbmp.cpp
-thirdparty/libskia/src/images/SkImageDecoder_libgif.cpp
-thirdparty/libskia/src/images/SkImageDecoder_libico.cpp
-thirdparty/libskia/src/images/SkImageDecoder_libjpeg.cpp
-thirdparty/libskia/src/images/SkImageDecoder_libpng.cpp
-thirdparty/libskia/src/images/SkImageDecoder_libwebp.cpp
-thirdparty/libskia/src/images/SkImageDecoder_wbmp.cpp
-thirdparty/libskia/src/images/SkImageEncoder.cpp
-thirdparty/libskia/src/images/SkImageEncoder_argb.cpp
-thirdparty/libskia/src/images/SkImageEncoder_Factory.cpp
-thirdparty/libskia/src/images/SkImageRef.cpp
-thirdparty/libskia/src/images/SkImageRef_ashmem.cpp
-thirdparty/libskia/src/images/SkImageRef_ashmem.h
-thirdparty/libskia/src/images/SkImageRef_GlobalPool.cpp
-thirdparty/libskia/src/images/SkImageRefPool.cpp
-thirdparty/libskia/src/images/SkImageRefPool.h
-thirdparty/libskia/src/images/SkImages.cpp
-thirdparty/libskia/src/images/SkJpegUtility.cpp
-thirdparty/libskia/src/images/SkJpegUtility.h
-thirdparty/libskia/src/images/SkMovie.cpp
-thirdparty/libskia/src/images/SkMovie_gif.cpp
-thirdparty/libskia/src/images/SkPageFlipper.cpp
-thirdparty/libskia/src/images/SkScaledBitmapSampler.cpp
-thirdparty/libskia/src/images/SkScaledBitmapSampler.h
-thirdparty/libskia/src/images/SkStreamHelpers.cpp
-thirdparty/libskia/src/images/SkStreamHelpers.h
-thirdparty/libskia/src/images/transform_scanline.h
-thirdparty/libskia/src/opts/morphology_opts_check_mac.cpp
-thirdparty/libskia/src/opts/opts_check_arm.cpp
-thirdparty/libskia/src/opts/opts_check_mac.cpp
-thirdparty/libskia/src/opts/opts_check_SSE2.cpp
-thirdparty/libskia/src/opts/SkBitmapFilter_opts_SSE2.cpp
-thirdparty/libskia/src/opts/SkBitmapFilter_opts_SSE2.h
-thirdparty/libskia/src/opts/SkBitmapProcState_arm_neon.cpp
-thirdparty/libskia/src/opts/SkBitmapProcState_filter_neon.h
-thirdparty/libskia/src/opts/SkBitmapProcState_matrix_clamp_neon.h
-thirdparty/libskia/src/opts/SkBitmapProcState_matrix_repeat_neon.h
-thirdparty/libskia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp
-thirdparty/libskia/src/opts/SkBitmapProcState_opts_arm.cpp
-thirdparty/libskia/src/opts/SkBitmapProcState_opts_none.cpp
-thirdparty/libskia/src/opts/SkBitmapProcState_opts_SSE2.cpp
-thirdparty/libskia/src/opts/SkBitmapProcState_opts_SSE2.h
-thirdparty/libskia/src/opts/SkBitmapProcState_opts_SSSE3.cpp
-thirdparty/libskia/src/opts/SkBitmapProcState_opts_SSSE3.h
-thirdparty/libskia/src/opts/SkBlitMask_opts_arm.cpp
-thirdparty/libskia/src/opts/SkBlitMask_opts_arm_neon.cpp
-thirdparty/libskia/src/opts/SkBlitMask_opts_arm_neon.h
-thirdparty/libskia/src/opts/SkBlitMask_opts_none.cpp
-thirdparty/libskia/src/opts/SkBlitRect_opts_SSE2.cpp
-thirdparty/libskia/src/opts/SkBlitRect_opts_SSE2.h
-thirdparty/libskia/src/opts/SkBlitRow_opts_arm.cpp
-thirdparty/libskia/src/opts/SkBlitRow_opts_arm_neon.cpp
-thirdparty/libskia/src/opts/SkBlitRow_opts_arm_neon.h
-thirdparty/libskia/src/opts/SkBlitRow_opts_none.cpp
-thirdparty/libskia/src/opts/SkBlitRow_opts_SSE2.cpp
-thirdparty/libskia/src/opts/SkBlitRow_opts_SSE2.h
-thirdparty/libskia/src/opts/SkBlurImage_opts.h
-thirdparty/libskia/src/opts/SkBlurImage_opts_neon.cpp
-thirdparty/libskia/src/opts/SkBlurImage_opts_neon.h
-thirdparty/libskia/src/opts/SkBlurImage_opts_none.cpp
-thirdparty/libskia/src/opts/SkBlurImage_opts_SSE2.cpp
-thirdparty/libskia/src/opts/SkBlurImage_opts_SSE2.h
-thirdparty/libskia/src/opts/SkCachePreload_arm.h
-thirdparty/libskia/src/opts/SkColor_opts_neon.h
-thirdparty/libskia/src/opts/SkMorphology_opts.h
-thirdparty/libskia/src/opts/SkMorphology_opts_neon.cpp
-thirdparty/libskia/src/opts/SkMorphology_opts_neon.h
-thirdparty/libskia/src/opts/SkMorphology_opts_none.cpp
-thirdparty/libskia/src/opts/SkMorphology_opts_SSE2.cpp
-thirdparty/libskia/src/opts/SkMorphology_opts_SSE2.h
-thirdparty/libskia/src/opts/SkUtils_opts_none.cpp
-thirdparty/libskia/src/opts/SkUtils_opts_SSE2.cpp
-thirdparty/libskia/src/opts/SkUtils_opts_SSE2.h
-thirdparty/libskia/src/opts/SkXfermode_opts_arm.cpp
-thirdparty/libskia/src/opts/SkXfermode_opts_arm_neon.cpp
-thirdparty/libskia/src/opts/SkXfermode_opts_arm_neon.h
-thirdparty/libskia/src/opts/SkXfermode_opts_none.cpp
-thirdparty/libskia/src/pathops/main.cpp
-thirdparty/libskia/src/pathops/SkAddIntersections.cpp
-thirdparty/libskia/src/pathops/SkAddIntersections.h
-thirdparty/libskia/src/pathops/SkDCubicIntersection.cpp
-thirdparty/libskia/src/pathops/SkDCubicLineIntersection.cpp
-thirdparty/libskia/src/pathops/SkDCubicToQuads.cpp
-thirdparty/libskia/src/pathops/SkDLineIntersection.cpp
-thirdparty/libskia/src/pathops/SkDQuadImplicit.cpp
-thirdparty/libskia/src/pathops/SkDQuadImplicit.h
-thirdparty/libskia/src/pathops/SkDQuadIntersection.cpp
-thirdparty/libskia/src/pathops/SkDQuadLineIntersection.cpp
-thirdparty/libskia/src/pathops/SkIntersectionHelper.h
-thirdparty/libskia/src/pathops/SkIntersections.cpp
-thirdparty/libskia/src/pathops/SkIntersections.h
-thirdparty/libskia/src/pathops/SkLineParameters.h
-thirdparty/libskia/src/pathops/SkOpAngle.cpp
-thirdparty/libskia/src/pathops/SkOpAngle.h
-thirdparty/libskia/src/pathops/SkOpContour.cpp
-thirdparty/libskia/src/pathops/SkOpContour.h
-thirdparty/libskia/src/pathops/SkOpEdgeBuilder.cpp
-thirdparty/libskia/src/pathops/SkOpEdgeBuilder.h
-thirdparty/libskia/src/pathops/SkOpSegment.cpp
-thirdparty/libskia/src/pathops/SkOpSegment.h
-thirdparty/libskia/src/pathops/SkOpSpan.h
-thirdparty/libskia/src/pathops/SkPathOpsBounds.cpp
-thirdparty/libskia/src/pathops/SkPathOpsBounds.h
-thirdparty/libskia/src/pathops/SkPathOpsCommon.cpp
-thirdparty/libskia/src/pathops/SkPathOpsCommon.h
-thirdparty/libskia/src/pathops/SkPathOpsCubic.cpp
-thirdparty/libskia/src/pathops/SkPathOpsCubic.h
-thirdparty/libskia/src/pathops/SkPathOpsCurve.h
-thirdparty/libskia/src/pathops/SkPathOpsDebug.cpp
-thirdparty/libskia/src/pathops/SkPathOpsDebug.h
-thirdparty/libskia/src/pathops/SkPathOpsLine.cpp
-thirdparty/libskia/src/pathops/SkPathOpsLine.h
-thirdparty/libskia/src/pathops/SkPathOpsOp.cpp
-thirdparty/libskia/src/pathops/SkPathOpsPoint.cpp
-thirdparty/libskia/src/pathops/SkPathOpsPoint.h
-thirdparty/libskia/src/pathops/SkPathOpsQuad.cpp
-thirdparty/libskia/src/pathops/SkPathOpsQuad.h
-thirdparty/libskia/src/pathops/SkPathOpsRect.cpp
-thirdparty/libskia/src/pathops/SkPathOpsRect.h
-thirdparty/libskia/src/pathops/SkPathOpsSimplify.cpp
-thirdparty/libskia/src/pathops/SkPathOpsTriangle.cpp
-thirdparty/libskia/src/pathops/SkPathOpsTriangle.h
-thirdparty/libskia/src/pathops/SkPathOpsTypes.cpp
-thirdparty/libskia/src/pathops/SkPathOpsTypes.h
-thirdparty/libskia/src/pathops/SkPathWriter.cpp
-thirdparty/libskia/src/pathops/SkPathWriter.h
-thirdparty/libskia/src/pathops/SkQuarticRoot.cpp
-thirdparty/libskia/src/pathops/SkQuarticRoot.h
-thirdparty/libskia/src/pathops/SkReduceOrder.cpp
-thirdparty/libskia/src/pathops/SkReduceOrder.h
-thirdparty/libskia/src/pdf/SkPDFCatalog.cpp
-thirdparty/libskia/src/pdf/SkPDFCatalog.h
-thirdparty/libskia/src/pdf/SkPDFDevice.cpp
-thirdparty/libskia/src/pdf/SkPDFDeviceFlattener.cpp
-thirdparty/libskia/src/pdf/SkPDFDeviceFlattener.h
-thirdparty/libskia/src/pdf/SkPDFDocument.cpp
-thirdparty/libskia/src/pdf/SkPDFFont.cpp
-thirdparty/libskia/src/pdf/SkPDFFont.h
-thirdparty/libskia/src/pdf/SkPDFFontImpl.h
-thirdparty/libskia/src/pdf/SkPDFFormXObject.cpp
-thirdparty/libskia/src/pdf/SkPDFFormXObject.h
-thirdparty/libskia/src/pdf/SkPDFGraphicState.cpp
-thirdparty/libskia/src/pdf/SkPDFGraphicState.h
-thirdparty/libskia/src/pdf/SkPDFImage.cpp
-thirdparty/libskia/src/pdf/SkPDFImage.h
-thirdparty/libskia/src/pdf/SkPDFPage.cpp
-thirdparty/libskia/src/pdf/SkPDFPage.h
-thirdparty/libskia/src/pdf/SkPDFResourceDict.cpp
-thirdparty/libskia/src/pdf/SkPDFResourceDict.h
-thirdparty/libskia/src/pdf/SkPDFShader.cpp
-thirdparty/libskia/src/pdf/SkPDFShader.h
-thirdparty/libskia/src/pdf/SkPDFStream.cpp
-thirdparty/libskia/src/pdf/SkPDFStream.h
-thirdparty/libskia/src/pdf/SkPDFTypes.cpp
-thirdparty/libskia/src/pdf/SkPDFTypes.h
-thirdparty/libskia/src/pdf/SkPDFUtils.cpp
-thirdparty/libskia/src/pdf/SkPDFUtils.h
-thirdparty/libskia/src/pdf/SkTSet.h
-thirdparty/libskia/src/pipe/utils/SamplePipeControllers.cpp
-thirdparty/libskia/src/pipe/utils/SamplePipeControllers.h
-thirdparty/libskia/src/pipe/SkGPipePriv.h
-thirdparty/libskia/src/pipe/SkGPipeRead.cpp
-thirdparty/libskia/src/pipe/SkGPipeWrite.cpp
-thirdparty/libskia/src/ports/SkAtomics_android.h
-thirdparty/libskia/src/ports/SkAtomics_none.h
-thirdparty/libskia/src/ports/SkAtomics_sync.h
-thirdparty/libskia/src/ports/SkAtomics_win.h
-thirdparty/libskia/src/ports/SkDebug_android.cpp
-thirdparty/libskia/src/ports/SkDebug_nacl.cpp
-thirdparty/libskia/src/ports/SkDebug_stdio.cpp
-thirdparty/libskia/src/ports/SkDebug_win.cpp
-thirdparty/libskia/src/ports/SkDiscardableMemory_ashmem.cpp
-thirdparty/libskia/src/ports/SkDiscardableMemory_none.cpp
-thirdparty/libskia/src/ports/SkFontConfigInterface_android.cpp
-thirdparty/libskia/src/ports/SkFontConfigInterface_direct.cpp
-thirdparty/libskia/src/ports/SkFontConfigParser_android.cpp
-thirdparty/libskia/src/ports/SkFontConfigParser_android.h
-thirdparty/libskia/src/ports/SkFontConfigTypeface.h
-thirdparty/libskia/src/ports/SkFontHost_android.cpp
-thirdparty/libskia/src/ports/SkFontHost_fontconfig.cpp
-thirdparty/libskia/src/ports/SkFontHost_FreeType.cpp
-thirdparty/libskia/src/ports/SkFontHost_FreeType_common.cpp
-thirdparty/libskia/src/ports/SkFontHost_FreeType_common.h
-thirdparty/libskia/src/ports/SkFontHost_linux.cpp
-thirdparty/libskia/src/ports/SkFontHost_mac.cpp
-thirdparty/libskia/src/ports/SkFontHost_none.cpp
-thirdparty/libskia/src/ports/SkFontHost_win.cpp
-thirdparty/libskia/src/ports/SkFontHost_win_dw.cpp
-thirdparty/libskia/src/ports/SkFontMgr_default_dw.cpp
-thirdparty/libskia/src/ports/SkFontMgr_default_gdi.cpp
-thirdparty/libskia/src/ports/SkGlobalInitialization_chromium.cpp
-thirdparty/libskia/src/ports/SkGlobalInitialization_default.cpp
-thirdparty/libskia/src/ports/SkHarfBuzzFont.cpp
-thirdparty/libskia/src/ports/SkImageDecoder_CG.cpp
-thirdparty/libskia/src/ports/SkImageDecoder_empty.cpp
-thirdparty/libskia/src/ports/SkImageDecoder_WIC.cpp
-thirdparty/libskia/src/ports/SkMemory_malloc.cpp
-thirdparty/libskia/src/ports/SkMemory_mozalloc.cpp
-thirdparty/libskia/src/ports/SkMutex_none.h
-thirdparty/libskia/src/ports/SkMutex_pthread.h
-thirdparty/libskia/src/ports/SkMutex_win.h
-thirdparty/libskia/src/ports/SkOSFile_none.cpp
-thirdparty/libskia/src/ports/SkOSFile_posix.cpp
-thirdparty/libskia/src/ports/SkOSFile_stdio.cpp
-thirdparty/libskia/src/ports/SkOSFile_win.cpp
-thirdparty/libskia/src/ports/SkPurgeableMemoryBlock_android.cpp
-thirdparty/libskia/src/ports/SkPurgeableMemoryBlock_mac.cpp
-thirdparty/libskia/src/ports/SkPurgeableMemoryBlock_none.cpp
-thirdparty/libskia/src/ports/SkTime_Unix.cpp
-thirdparty/libskia/src/ports/SkTime_win.cpp
-thirdparty/libskia/src/ports/SkTLS_none.cpp
-thirdparty/libskia/src/ports/SkTLS_pthread.cpp
-thirdparty/libskia/src/ports/SkTLS_win.cpp
-thirdparty/libskia/src/ports/SkXMLParser_empty.cpp
-thirdparty/libskia/src/ports/SkXMLParser_expat.cpp
-thirdparty/libskia/src/ports/SkXMLParser_tinyxml.cpp
-thirdparty/libskia/src/ports/SkXMLPullParser_expat.cpp
-thirdparty/libskia/src/sfnt/SkIBMFamilyClass.h
-thirdparty/libskia/src/sfnt/SkOTTable_glyf.h
-thirdparty/libskia/src/sfnt/SkOTTable_head.h
-thirdparty/libskia/src/sfnt/SkOTTable_hhea.h
-thirdparty/libskia/src/sfnt/SkOTTable_loca.h
-thirdparty/libskia/src/sfnt/SkOTTable_maxp.h
-thirdparty/libskia/src/sfnt/SkOTTable_maxp_CFF.h
-thirdparty/libskia/src/sfnt/SkOTTable_maxp_TT.h
-thirdparty/libskia/src/sfnt/SkOTTable_name.cpp
-thirdparty/libskia/src/sfnt/SkOTTable_name.h
-thirdparty/libskia/src/sfnt/SkOTTable_OS_2.h
-thirdparty/libskia/src/sfnt/SkOTTable_OS_2_V0.h
-thirdparty/libskia/src/sfnt/SkOTTable_OS_2_V1.h
-thirdparty/libskia/src/sfnt/SkOTTable_OS_2_V2.h
-thirdparty/libskia/src/sfnt/SkOTTable_OS_2_V3.h
-thirdparty/libskia/src/sfnt/SkOTTable_OS_2_V4.h
-thirdparty/libskia/src/sfnt/SkOTTable_OS_2_VA.h
-thirdparty/libskia/src/sfnt/SkOTTable_post.h
-thirdparty/libskia/src/sfnt/SkOTTableTypes.h
-thirdparty/libskia/src/sfnt/SkOTUtils.cpp
-thirdparty/libskia/src/sfnt/SkOTUtils.h
-thirdparty/libskia/src/sfnt/SkPanose.h
-thirdparty/libskia/src/sfnt/SkPreprocessorSeq.h
-thirdparty/libskia/src/sfnt/SkSFNTHeader.h
-thirdparty/libskia/src/sfnt/SkTTCFHeader.h
-thirdparty/libskia/src/sfnt/SkTypedEnum.h
-thirdparty/libskia/src/svg/SkSVG.cpp
-thirdparty/libskia/src/svg/SkSVGCircle.cpp
-thirdparty/libskia/src/svg/SkSVGCircle.h
-thirdparty/libskia/src/svg/SkSVGClipPath.cpp
-thirdparty/libskia/src/svg/SkSVGClipPath.h
-thirdparty/libskia/src/svg/SkSVGDefs.cpp
-thirdparty/libskia/src/svg/SkSVGDefs.h
-thirdparty/libskia/src/svg/SkSVGElements.cpp
-thirdparty/libskia/src/svg/SkSVGElements.h
-thirdparty/libskia/src/svg/SkSVGEllipse.cpp
-thirdparty/libskia/src/svg/SkSVGEllipse.h
-thirdparty/libskia/src/svg/SkSVGFeColorMatrix.cpp
-thirdparty/libskia/src/svg/SkSVGFeColorMatrix.h
-thirdparty/libskia/src/svg/SkSVGFilter.cpp
-thirdparty/libskia/src/svg/SkSVGFilter.h
-thirdparty/libskia/src/svg/SkSVGG.cpp
-thirdparty/libskia/src/svg/SkSVGG.h
-thirdparty/libskia/src/svg/SkSVGGradient.cpp
-thirdparty/libskia/src/svg/SkSVGGradient.h
-thirdparty/libskia/src/svg/SkSVGGroup.cpp
-thirdparty/libskia/src/svg/SkSVGGroup.h
-thirdparty/libskia/src/svg/SkSVGImage.cpp
-thirdparty/libskia/src/svg/SkSVGImage.h
-thirdparty/libskia/src/svg/SkSVGLine.cpp
-thirdparty/libskia/src/svg/SkSVGLine.h
-thirdparty/libskia/src/svg/SkSVGLinearGradient.cpp
-thirdparty/libskia/src/svg/SkSVGLinearGradient.h
-thirdparty/libskia/src/svg/SkSVGMask.cpp
-thirdparty/libskia/src/svg/SkSVGMask.h
-thirdparty/libskia/src/svg/SkSVGMetadata.cpp
-thirdparty/libskia/src/svg/SkSVGMetadata.h
-thirdparty/libskia/src/svg/SkSVGPaintState.cpp
-thirdparty/libskia/src/svg/SkSVGParser.cpp
-thirdparty/libskia/src/svg/SkSVGPath.cpp
-thirdparty/libskia/src/svg/SkSVGPath.h
-thirdparty/libskia/src/svg/SkSVGPolygon.cpp
-thirdparty/libskia/src/svg/SkSVGPolygon.h
-thirdparty/libskia/src/svg/SkSVGPolyline.cpp
-thirdparty/libskia/src/svg/SkSVGPolyline.h
-thirdparty/libskia/src/svg/SkSVGRadialGradient.cpp
-thirdparty/libskia/src/svg/SkSVGRadialGradient.h
-thirdparty/libskia/src/svg/SkSVGRect.cpp
-thirdparty/libskia/src/svg/SkSVGRect.h
-thirdparty/libskia/src/svg/SkSVGStop.cpp
-thirdparty/libskia/src/svg/SkSVGStop.h
-thirdparty/libskia/src/svg/SkSVGSVG.cpp
-thirdparty/libskia/src/svg/SkSVGSVG.h
-thirdparty/libskia/src/svg/SkSVGSymbol.cpp
-thirdparty/libskia/src/svg/SkSVGSymbol.h
-thirdparty/libskia/src/svg/SkSVGText.cpp
-thirdparty/libskia/src/svg/SkSVGText.h
-thirdparty/libskia/src/svg/SkSVGUse.cpp
-thirdparty/libskia/src/svg/SkSVGUse.h
-thirdparty/libskia/src/text/SkTextLayout.cpp
-thirdparty/libskia/src/utils/android/ashmem.cpp
-thirdparty/libskia/src/utils/android/ashmem.h
-thirdparty/libskia/src/utils/debugger/SkDebugCanvas.cpp
-thirdparty/libskia/src/utils/debugger/SkDebugCanvas.h
-thirdparty/libskia/src/utils/debugger/SkDrawCommand.cpp
-thirdparty/libskia/src/utils/debugger/SkDrawCommand.h
-thirdparty/libskia/src/utils/debugger/SkObjectParser.cpp
-thirdparty/libskia/src/utils/debugger/SkObjectParser.h
-thirdparty/libskia/src/utils/ios/SkFontHost_iOS.mm
-thirdparty/libskia/src/utils/ios/SkImageDecoder_iOS.mm
-thirdparty/libskia/src/utils/ios/SkOSFile_iOS.mm
-thirdparty/libskia/src/utils/ios/SkStream_NSData.mm
-thirdparty/libskia/src/utils/mac/SkCreateCGImageRef.cpp
-thirdparty/libskia/src/utils/mac/SkStream_mac.cpp
-thirdparty/libskia/src/utils/win/SkAutoCoInitialize.cpp
-thirdparty/libskia/src/utils/win/SkDWriteFontFileStream.cpp
-thirdparty/libskia/src/utils/win/SkDWriteFontFileStream.h
-thirdparty/libskia/src/utils/win/SkDWriteGeometrySink.cpp
-thirdparty/libskia/src/utils/win/SkDWriteGeometrySink.h
-thirdparty/libskia/src/utils/win/SkHRESULT.cpp
-thirdparty/libskia/src/utils/win/SkIStream.cpp
-thirdparty/libskia/src/utils/win/SkWGL_win.cpp
-thirdparty/libskia/src/utils/SkBase64.cpp
-thirdparty/libskia/src/utils/SkBase64.h
-thirdparty/libskia/src/utils/SkBitmapHasher.cpp
-thirdparty/libskia/src/utils/SkBitmapHasher.h
-thirdparty/libskia/src/utils/SkBitSet.cpp
-thirdparty/libskia/src/utils/SkBitSet.h
-thirdparty/libskia/src/utils/SkBoundaryPatch.cpp
-thirdparty/libskia/src/utils/SkCamera.cpp
-thirdparty/libskia/src/utils/SkCanvasStack.cpp
-thirdparty/libskia/src/utils/SkCanvasStack.h
-thirdparty/libskia/src/utils/SkCanvasStateUtils.cpp
-thirdparty/libskia/src/utils/SkCondVar.cpp
-thirdparty/libskia/src/utils/SkCountdown.cpp
-thirdparty/libskia/src/utils/SkCubicInterval.cpp
-thirdparty/libskia/src/utils/SkCullPoints.cpp
-thirdparty/libskia/src/utils/SkDebugTrace.h
-thirdparty/libskia/src/utils/SkDeferredCanvas.cpp
-thirdparty/libskia/src/utils/SkDumpCanvas.cpp
-thirdparty/libskia/src/utils/SkFloatUtils.h
-thirdparty/libskia/src/utils/SkFrontBufferedStream.cpp
-thirdparty/libskia/src/utils/SkInterpolator.cpp
-thirdparty/libskia/src/utils/SkJSON.cpp
-thirdparty/libskia/src/utils/SkLayer.cpp
-thirdparty/libskia/src/utils/SkLua.cpp
-thirdparty/libskia/src/utils/SkLuaCanvas.cpp
-thirdparty/libskia/src/utils/SkMatrix44.cpp
-thirdparty/libskia/src/utils/SkMD5.cpp
-thirdparty/libskia/src/utils/SkMD5.h
-thirdparty/libskia/src/utils/SkMeshUtils.cpp
-thirdparty/libskia/src/utils/SkNinePatch.cpp
-thirdparty/libskia/src/utils/SkNullCanvas.cpp
-thirdparty/libskia/src/utils/SkNWayCanvas.cpp
-thirdparty/libskia/src/utils/SkOSFile.cpp
-thirdparty/libskia/src/utils/SkParse.cpp
-thirdparty/libskia/src/utils/SkParseColor.cpp
-thirdparty/libskia/src/utils/SkParsePath.cpp
-thirdparty/libskia/src/utils/SkPathUtils.cpp
-thirdparty/libskia/src/utils/SkPDFRasterizer.cpp
-thirdparty/libskia/src/utils/SkPDFRasterizer.h
-thirdparty/libskia/src/utils/SkPictureUtils.cpp
-thirdparty/libskia/src/utils/SkProxyCanvas.cpp
-thirdparty/libskia/src/utils/SkRTConf.cpp
-thirdparty/libskia/src/utils/SkSHA1.cpp
-thirdparty/libskia/src/utils/SkSHA1.h
-thirdparty/libskia/src/utils/SkTFitsIn.h
-thirdparty/libskia/src/utils/SkThreadPool.cpp
-thirdparty/libskia/src/utils/SkThreadUtils.h
-thirdparty/libskia/src/utils/SkThreadUtils_pthread.cpp
-thirdparty/libskia/src/utils/SkThreadUtils_pthread.h
-thirdparty/libskia/src/utils/SkThreadUtils_pthread_linux.cpp
-thirdparty/libskia/src/utils/SkThreadUtils_pthread_mach.cpp
-thirdparty/libskia/src/utils/SkThreadUtils_pthread_other.cpp
-thirdparty/libskia/src/utils/SkThreadUtils_win.cpp
-thirdparty/libskia/src/utils/SkThreadUtils_win.h
-thirdparty/libskia/src/utils/SkTLogic.h
-thirdparty/libskia/src/utils/SkUnitMappers.cpp
-thirdparty/libskia/libskia.gyp
-thirdparty/libsqlite/include/sqlitedataset/dataset.h
-thirdparty/libsqlite/include/sqlitedataset/qry_dat.h
-thirdparty/libsqlite/include/sqlitedataset/sqlitedataset.h
-thirdparty/libsqlite/include/sqlite3.h
-thirdparty/libsqlite/include/sqlite3ext.h
-thirdparty/libsqlite/include/sqlitedecode.h
-thirdparty/libsqlite/src/dataset.cpp
-thirdparty/libsqlite/src/gethostuuid.c
-thirdparty/libsqlite/src/qry_dat.cpp
-thirdparty/libsqlite/src/sqlite3.c
-thirdparty/libsqlite/src/sqlitedataset.cpp
-thirdparty/libsqlite/src/sqlitedecode.cpp
-thirdparty/libsqlite/libsqlite.gyp
-thirdparty/libsqlite/score.txt
-thirdparty/libxml/include/libxml/c14n.h
-thirdparty/libxml/include/libxml/catalog.h
-thirdparty/libxml/include/libxml/chvalid.h
-thirdparty/libxml/include/libxml/debugXML.h
-thirdparty/libxml/include/libxml/dict.h
-thirdparty/libxml/include/libxml/DOCBparser.h
-thirdparty/libxml/include/libxml/encoding.h
-thirdparty/libxml/include/libxml/entities.h
-thirdparty/libxml/include/libxml/globals.h
-thirdparty/libxml/include/libxml/hash.h
-thirdparty/libxml/include/libxml/HTMLparser.h
-thirdparty/libxml/include/libxml/HTMLtree.h
-thirdparty/libxml/include/libxml/list.h
-thirdparty/libxml/include/libxml/nanoftp.h
-thirdparty/libxml/include/libxml/nanohttp.h
-thirdparty/libxml/include/libxml/parser.h
-thirdparty/libxml/include/libxml/parserInternals.h
-thirdparty/libxml/include/libxml/pattern.h
-thirdparty/libxml/include/libxml/relaxng.h
-thirdparty/libxml/include/libxml/SAX.h
-thirdparty/libxml/include/libxml/SAX2.h
-thirdparty/libxml/include/libxml/schemasInternals.h
-thirdparty/libxml/include/libxml/schematron.h
-thirdparty/libxml/include/libxml/threads.h
-thirdparty/libxml/include/libxml/tree.h
-thirdparty/libxml/include/libxml/uri.h
-thirdparty/libxml/include/libxml/valid.h
-thirdparty/libxml/include/libxml/xinclude.h
-thirdparty/libxml/include/libxml/xlink.h
-thirdparty/libxml/include/libxml/xmlautomata.h
-thirdparty/libxml/include/libxml/xmlerror.h
-thirdparty/libxml/include/libxml/xmlexports.h
-thirdparty/libxml/include/libxml/xmlIO.h
-thirdparty/libxml/include/libxml/xmlmemory.h
-thirdparty/libxml/include/libxml/xmlmodule.h
-thirdparty/libxml/include/libxml/xmlreader.h
-thirdparty/libxml/include/libxml/xmlregexp.h
-thirdparty/libxml/include/libxml/xmlsave.h
-thirdparty/libxml/include/libxml/xmlschemas.h
-thirdparty/libxml/include/libxml/xmlschemastypes.h
-thirdparty/libxml/include/libxml/xmlstring.h
-thirdparty/libxml/include/libxml/xmlunicode.h
-thirdparty/libxml/include/libxml/xmlversion.h
-thirdparty/libxml/include/libxml/xmlwriter.h
-thirdparty/libxml/include/libxml/xpath.h
-thirdparty/libxml/include/libxml/xpathInternals.h
-thirdparty/libxml/include/libxml/xpointer.h
-thirdparty/libxml/src/acconfig.h
-thirdparty/libxml/src/buf.c
-thirdparty/libxml/src/buf.h
-thirdparty/libxml/src/c14n.c
-thirdparty/libxml/src/catalog.c
-thirdparty/libxml/src/chvalid.c
-thirdparty/libxml/src/config.h
-thirdparty/libxml/src/debugXML.c
-thirdparty/libxml/src/dict.c
-thirdparty/libxml/src/DOCBparser.c
-thirdparty/libxml/src/elfgcchack.h
-thirdparty/libxml/src/enc.h
-thirdparty/libxml/src/encoding.c
-thirdparty/libxml/src/entities.c
-thirdparty/libxml/src/error.c
-thirdparty/libxml/src/globals.c
-thirdparty/libxml/src/hash.c
-thirdparty/libxml/src/HTMLparser.c
-thirdparty/libxml/src/HTMLtree.c
-thirdparty/libxml/src/legacy.c
-thirdparty/libxml/src/libxml.h
-thirdparty/libxml/src/list.c
-thirdparty/libxml/src/nanoftp.c
-thirdparty/libxml/src/nanohttp.c
-thirdparty/libxml/src/parser.c
-thirdparty/libxml/src/parserInternals.c
-thirdparty/libxml/src/pattern.c
-thirdparty/libxml/src/relaxng.c
-thirdparty/libxml/src/runsuite.c
-thirdparty/libxml/src/runtest.c
-thirdparty/libxml/src/save.h
-thirdparty/libxml/src/SAX.c
-thirdparty/libxml/src/SAX2.c
-thirdparty/libxml/src/schematron.c
-thirdparty/libxml/src/testapi.c
-thirdparty/libxml/src/testAutomata.c
-thirdparty/libxml/src/testC14N.c
-thirdparty/libxml/src/testdso.c
-thirdparty/libxml/src/testHTML.c
-thirdparty/libxml/src/testModule.c
-thirdparty/libxml/src/testReader.c
-thirdparty/libxml/src/testRegexp.c
-thirdparty/libxml/src/testRelax.c
-thirdparty/libxml/src/testSAX.c
-thirdparty/libxml/src/testSchemas.c
-thirdparty/libxml/src/testThreads.c
-thirdparty/libxml/src/testThreadsWin32.c
-thirdparty/libxml/src/testURI.c
-thirdparty/libxml/src/testXPath.c
-thirdparty/libxml/src/threads.c
-thirdparty/libxml/src/timsort.h
-thirdparty/libxml/src/tree.c
-thirdparty/libxml/src/trio.c
-thirdparty/libxml/src/trio.h
-thirdparty/libxml/src/triodef.h
-thirdparty/libxml/src/trionan.c
-thirdparty/libxml/src/trionan.h
-thirdparty/libxml/src/triop.h
-thirdparty/libxml/src/triostr.c
-thirdparty/libxml/src/triostr.h
-thirdparty/libxml/src/uri.c
-thirdparty/libxml/src/valid.c
-thirdparty/libxml/src/win32config.h
-thirdparty/libxml/src/wsockcompat.h
-thirdparty/libxml/src/xinclude.c
-thirdparty/libxml/src/xlink.c
-thirdparty/libxml/src/xmlcatalog.c
-thirdparty/libxml/src/xmlIO.c
-thirdparty/libxml/src/xmllint.c
-thirdparty/libxml/src/xmlmemory.c
-thirdparty/libxml/src/xmlmodule.c
-thirdparty/libxml/src/xmlreader.c
-thirdparty/libxml/src/xmlregexp.c
-thirdparty/libxml/src/xmlsave.c
-thirdparty/libxml/src/xmlschemas.c
-thirdparty/libxml/src/xmlschemastypes.c
-thirdparty/libxml/src/xmlstring.c
-thirdparty/libxml/src/xmlunicode.c
-thirdparty/libxml/src/xmlwriter.c
-thirdparty/libxml/src/xpath.c
-thirdparty/libxml/src/xpointer.c
-thirdparty/libxml/libxml.gyp
-thirdparty/libxml/score.txt
-thirdparty/libxslt/doc/tutorial/libxslt_tutorial.c
-thirdparty/libxslt/doc/tutorial2/libxslt_pipes.c
-thirdparty/libxslt/doc/Makefile.am
-thirdparty/libxslt/examples/xsltICUSort.c
-thirdparty/libxslt/include/libxslt/attributes.h
-thirdparty/libxslt/include/libxslt/config.h
-thirdparty/libxslt/include/libxslt/documents.h
-thirdparty/libxslt/include/libxslt/extensions.h
-thirdparty/libxslt/include/libxslt/extra.h
-thirdparty/libxslt/include/libxslt/functions.h
-thirdparty/libxslt/include/libxslt/imports.h
-thirdparty/libxslt/include/libxslt/keys.h
-thirdparty/libxslt/include/libxslt/libxslt.h
-thirdparty/libxslt/include/libxslt/namespaces.h
-thirdparty/libxslt/include/libxslt/numbersInternals.h
-thirdparty/libxslt/include/libxslt/pattern.h
-thirdparty/libxslt/include/libxslt/preproc.h
-thirdparty/libxslt/include/libxslt/security.h
-thirdparty/libxslt/include/libxslt/templates.h
-thirdparty/libxslt/include/libxslt/transform.h
-thirdparty/libxslt/include/libxslt/trio.h
-thirdparty/libxslt/include/libxslt/triodef.h
-thirdparty/libxslt/include/libxslt/variables.h
-thirdparty/libxslt/include/libxslt/win32config.h
-thirdparty/libxslt/include/libxslt/xslt.h
-thirdparty/libxslt/include/libxslt/xsltconfig.h
-thirdparty/libxslt/include/libxslt/xsltexports.h
-thirdparty/libxslt/include/libxslt/xsltInternals.h
-thirdparty/libxslt/include/libxslt/xsltlocale.h
-thirdparty/libxslt/include/libxslt/xsltutils.h
-thirdparty/libxslt/include/libxslt/xsltwin32config.h
-thirdparty/libxslt/libexslt/common.c
-thirdparty/libxslt/libexslt/crypto.c
-thirdparty/libxslt/libexslt/date.c
-thirdparty/libxslt/libexslt/dynamic.c
-thirdparty/libxslt/libexslt/exslt.c
-thirdparty/libxslt/libexslt/exslt.h
-thirdparty/libxslt/libexslt/exsltexports.h
-thirdparty/libxslt/libexslt/functions.c
-thirdparty/libxslt/libexslt/libexslt.h
-thirdparty/libxslt/libexslt/Makefile.am
-thirdparty/libxslt/libexslt/math.c
-thirdparty/libxslt/libexslt/saxon.c
-thirdparty/libxslt/libexslt/sets.c
-thirdparty/libxslt/libexslt/strings.c
-thirdparty/libxslt/python/tests/Makefile.am
-thirdparty/libxslt/python/libxml_wrap.h
-thirdparty/libxslt/python/libxslt.c
-thirdparty/libxslt/python/libxslt_wrap.h
-thirdparty/libxslt/python/Makefile.am
-thirdparty/libxslt/python/types.c
-thirdparty/libxslt/src/attributes.c
-thirdparty/libxslt/src/attrvt.c
-thirdparty/libxslt/src/documents.c
-thirdparty/libxslt/src/extensions.c
-thirdparty/libxslt/src/extra.c
-thirdparty/libxslt/src/functions.c
-thirdparty/libxslt/src/imports.c
-thirdparty/libxslt/src/keys.c
-thirdparty/libxslt/src/namespaces.c
-thirdparty/libxslt/src/numbers.c
-thirdparty/libxslt/src/pattern.c
-thirdparty/libxslt/src/preproc.c
-thirdparty/libxslt/src/security.c
-thirdparty/libxslt/src/templates.c
-thirdparty/libxslt/src/transform.c
-thirdparty/libxslt/src/variables.c
-thirdparty/libxslt/src/xslt.c
-thirdparty/libxslt/src/xsltlocale.c
-thirdparty/libxslt/src/xsltutils.c
-thirdparty/libxslt/win32/Makefile.mingw
-thirdparty/libxslt/win32/Makefile.msvc
-thirdparty/libxslt/xsltproc/Makefile.am
-thirdparty/libxslt/xsltproc/testThreads.c
-thirdparty/libxslt/xsltproc/xsltproc.c
-thirdparty/libxslt/libxslt.gyp
-thirdparty/libxslt/Makefile.am
-thirdparty/libz/include/zconf.h
-thirdparty/libz/include/zlib.h
-thirdparty/libz/src/adler32.c
-thirdparty/libz/src/compress.c
-thirdparty/libz/src/crc32.c
-thirdparty/libz/src/crc32.h
-thirdparty/libz/src/deflate.c
-thirdparty/libz/src/deflate.h
-thirdparty/libz/src/gzio.c
-thirdparty/libz/src/infback.c
-thirdparty/libz/src/inffast.c
-thirdparty/libz/src/inffast.h
-thirdparty/libz/src/inffixed.h
-thirdparty/libz/src/inflate.c
-thirdparty/libz/src/inflate.h
-thirdparty/libz/src/inftrees.c
-thirdparty/libz/src/inftrees.h
-thirdparty/libz/src/trees.c
-thirdparty/libz/src/trees.h
-thirdparty/libz/src/uncompr.c
-thirdparty/libz/src/zutil.c
-thirdparty/libz/src/zutil.h
-thirdparty/libz/libz.gyp
-thirdparty/libz/score.txt
-thirdparty/libzip/include/zip.h
-thirdparty/libzip/src/make_zip_err_str.sh
-thirdparty/libzip/src/mkstemp.c
-thirdparty/libzip/src/w32support.cpp
-thirdparty/libzip/src/zip_add.c
-thirdparty/libzip/src/zip_close.c
-thirdparty/libzip/src/zip_delete.c
-thirdparty/libzip/src/zip_dirent.c
-thirdparty/libzip/src/zip_entry_free.c
-thirdparty/libzip/src/zip_entry_new.c
-thirdparty/libzip/src/zip_err_str.c
-thirdparty/libzip/src/zip_error.c
-thirdparty/libzip/src/zip_error_get.c
-thirdparty/libzip/src/zip_error_get_sys_type.c
-thirdparty/libzip/src/zip_error_strerror.c
-thirdparty/libzip/src/zip_error_to_str.c
-thirdparty/libzip/src/zip_fclose.c
-thirdparty/libzip/src/zip_file_error_get.c
-thirdparty/libzip/src/zip_file_get_offset.c
-thirdparty/libzip/src/zip_file_strerror.c
-thirdparty/libzip/src/zip_fopen.c
-thirdparty/libzip/src/zip_fopen_index.c
-thirdparty/libzip/src/zip_fread.c
-thirdparty/libzip/src/zip_free.c
-thirdparty/libzip/src/zip_get_attributes.c
-thirdparty/libzip/src/zip_get_name.c
-thirdparty/libzip/src/zip_get_num_files.c
-thirdparty/libzip/src/zip_get_path.c
-thirdparty/libzip/src/zip_name_locate.c
-thirdparty/libzip/src/zip_new.c
-thirdparty/libzip/src/zip_open.c
-thirdparty/libzip/src/zip_recompress.c
-thirdparty/libzip/src/zip_rename.c
-thirdparty/libzip/src/zip_replace.c
-thirdparty/libzip/src/zip_set_attributes.c
-thirdparty/libzip/src/zip_set_name.c
-thirdparty/libzip/src/zip_set_progress_callback.c
-thirdparty/libzip/src/zip_source_buffer.c
-thirdparty/libzip/src/zip_source_file.c
-thirdparty/libzip/src/zip_source_filename.c
-thirdparty/libzip/src/zip_source_filep.c
-thirdparty/libzip/src/zip_source_free.c
-thirdparty/libzip/src/zip_source_function.c
-thirdparty/libzip/src/zip_source_zip.c
-thirdparty/libzip/src/zip_stat.c
-thirdparty/libzip/src/zip_stat_index.c
-thirdparty/libzip/src/zip_strerror.c
-thirdparty/libzip/src/zip_unchange.c
-thirdparty/libzip/src/zip_unchange_all.c
-thirdparty/libzip/src/zip_unchange_data.c
-thirdparty/libzip/src/zipint.h
-thirdparty/libzip/src/zipintw32.h
-thirdparty/libzip/libzip.gyp
-thirdparty/libzip/score.txt
-thirdparty/tools/perfect.c
-tools/build-android.osx
-tools/build-extension-android.sh
-tools/build-extension-ios.sh
-tools/build-ios.osx
-tools/extract-debug-symbols.sh
-tools/javac_wrapper.sh
-tools/pathify.sh
-tools/setup_xcode_sdks.sh
-util/perfect/perfect.c
-util/perfect/perfect.gyp
-common.gypi
-config.sh
-livecode.gyp
-Makefile
-version
diff --git a/Livecode.includes b/Livecode.includes
deleted file mode 100644
index 5cb45fd7fe1..00000000000
--- a/Livecode.includes
+++ /dev/null
@@ -1,106 +0,0 @@
-engine/include
-engine/src
-lcidlc/src
-libexternal/include/revolution
-libexternalv1/include
-libfoundation/include
-libfoundation/src
-libgraphics/include
-libgraphics/src
-revbrowser/src
-revdb/src
-revfont/src
-revmobile/src
-revpdfprinter/src
-revspeech/src
-revvideograbber/src
-revxml/src
-thirdparty/headers/linux/include
-thirdparty/headers/linux/include/atk
-thirdparty/headers/linux/include/cairo
-thirdparty/headers/linux/include/freetype
-thirdparty/headers/linux/include/freetype/cache
-thirdparty/headers/linux/include/freetype/config
-thirdparty/headers/linux/include/freetype/internal
-thirdparty/headers/linux/include/gdk
-thirdparty/headers/linux/include/gdk-pixbuf
-thirdparty/headers/linux/include/gdk-pixbuf-xlib
-thirdparty/headers/linux/include/glib
-thirdparty/headers/linux/include/gobject
-thirdparty/headers/linux/include/gtk
-thirdparty/headers/linux/include/libgnome
-thirdparty/headers/linux/include/libgnomevfs
-thirdparty/headers/linux/include/pango
-thirdparty/headers/linux/include/Xft
-thirdparty/libcairo
-thirdparty/libcairo/src
-thirdparty/libcurl/include/curl
-thirdparty/libfreetype/include
-thirdparty/libfreetype/include/freetype
-thirdparty/libfreetype/include/freetype/config
-thirdparty/libfreetype/include/freetype/internal
-thirdparty/libfreetype/include/freetype/internal/services
-thirdparty/libfreetype/src/autofit
-thirdparty/libfreetype/src/base
-thirdparty/libfreetype/src/bdf
-thirdparty/libfreetype/src/cache
-thirdparty/libfreetype/src/cff
-thirdparty/libfreetype/src/cid
-thirdparty/libfreetype/src/gxvalid
-thirdparty/libfreetype/src/gzip
-thirdparty/libfreetype/src/lzw
-thirdparty/libfreetype/src/otvalid
-thirdparty/libfreetype/src/pcf
-thirdparty/libfreetype/src/pfr
-thirdparty/libfreetype/src/psaux
-thirdparty/libfreetype/src/pshinter
-thirdparty/libfreetype/src/psnames
-thirdparty/libfreetype/src/raster
-thirdparty/libfreetype/src/sfnt
-thirdparty/libfreetype/src/smooth
-thirdparty/libfreetype/src/truetype
-thirdparty/libfreetype/src/type1
-thirdparty/libfreetype/src/type42
-thirdparty/libfreetype/src/winfonts
-thirdparty/libgif/include
-thirdparty/libgif/src
-thirdparty/libiodbc/include
-thirdparty/libiodbc/src
-thirdparty/libiodbc/src/inst
-thirdparty/libiodbc/src/trace
-thirdparty/libjpeg/include
-thirdparty/libjpeg/src
-thirdparty/libmysql/include
-thirdparty/libmysql/src
-thirdparty/libopenssl/include/openssl
-thirdparty/libpcre/include
-thirdparty/libpcre/src
-thirdparty/libpng/include
-thirdparty/libpq/include
-thirdparty/libpq/src
-thirdparty/libpq/src/access
-thirdparty/libpq/src/libpq
-thirdparty/libpq/src/mb
-thirdparty/libpq/src/nodes
-thirdparty/libpq/src/port
-thirdparty/libpq/src/port/win32
-thirdparty/libpq/src/port/win32/arpa
-thirdparty/libpq/src/port/win32/netinet
-thirdparty/libpq/src/port/win32/sys
-thirdparty/libpq/src/utils
-thirdparty/libskia/include/config
-thirdparty/libskia/include/core
-thirdparty/libskia/include/effects
-thirdparty/libskia/include/ports
-thirdparty/libskia/src/core
-thirdparty/libskia/src/effects
-thirdparty/libskia/src/opts
-thirdparty/libskia/src/ports
-thirdparty/libsqlite/include
-thirdparty/libsqlite/include/sqlitedataset
-thirdparty/libxml/include/libxml
-thirdparty/libxml/src
-thirdparty/libz/include
-thirdparty/libz/src
-thirdparty/libzip/include
-thirdparty/libzip/src
diff --git a/Makefile b/Makefile
index ec27b5080c9..9f6db69266d 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,11 @@ EMMAKE ?= emmake
# Some magic to control which versions of iOS we try to build. N.b. you may
# also need to modify the buildbot configuration
-IPHONEOS_VERSIONS ?= 9.2 10.0
-IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.0
+IPHONEOS_VERSIONS ?= 11.2 12.1 13.2 14.4 14.5
+IPHONESIMULATOR_VERSIONS ?= 11.2 12.1 13.2 14.4 14.5
+SKIP_IPHONEOS_VERSIONS ?= 9.2 10.2
+SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.2
+
IOS_SDKS ?= \
$(addprefix iphoneos,$(IPHONEOS_VERSIONS)) \
@@ -45,12 +48,7 @@ else
endif
# Prettifying output for CI builds
-ifeq ($(TRAVIS),true)
- XCODEBUILD := set -o pipefail && $(XCODEBUILD)
- XCODEBUILD_FILTER := | xcpretty
-else
- XCODEBUILD_FILTER :=
-endif
+XCODEBUILD_FILTER ?=
include Makefile.common
@@ -61,25 +59,71 @@ include Makefile.common
all: all-$(guess_platform)
check: check-$(guess_platform)
+# [[ MDW-2017-05-09 ]] feature_clean_target
+clean-linux:
+ rm -rf linux-*-bin
+ rm -rf build-linux-*
+ rm -rf prebuilt/fetched
+ rm -rf prebuilt/include
+ rm -rf prebuilt/lib
+ find . -name \*.lcb | xargs touch
+
check-common-%:
+ifneq ($(TRAVIS),undefined)
+ @echo "travis_fold:start:testengine"
+ @echo "TEST Engine"
+endif
$(MAKE) -C tests bin_dir=../$*-bin
+ifneq ($(TRAVIS),undefined)
+ @echo "travis_fold:end:testengine"
+ @echo "travis_fold:start:testide"
+ @echo "TEST IDE"
+endif
$(MAKE) -C ide/tests bin_dir=../../$*-bin
+ifneq ($(TRAVIS),undefined)
+ @echo "travis_fold:end:testide"
+ @echo "travis_fold:start:testextensions"
+ @echo "TEST Extensions"
+endif
$(MAKE) -C extensions bin_dir=../$*-bin
-
+ifneq ($(TRAVIS),undefined)
+ @echo "travis_fold:end:testextensions"
+endif
################################################################
# Linux rules
################################################################
-LINUX_ARCHS = x86_64 x86
+LINUX_ARCHS = x86_64 x86 armv6hf armv7
config-linux-%:
+ifneq ($(TRAVIS),undefined)
+ @echo "travis_fold:start:config"
+ @echo "CONFIGURE"
+endif
./config.sh --platform linux-$*
-
+ifneq ($(TRAVIS),undefined)
+ @echo "travis_fold:end:config"
+endif
+
compile-linux-%:
+ifneq ($(TRAVIS),undefined)
+ @echo "travis_fold:start:compile"
+ @echo "COMPILE"
+endif
$(MAKE) -C build-linux-$*/livecode default
-
+ifneq ($(TRAVIS),undefined)
+ @echo "travis_fold:end:compile"
+endif
+
check-linux-%:
+ifneq ($(TRAVIS),undefined)
+ @echo "travis_fold:start:testcpp"
+ @echo "TEST C++"
+endif
$(MAKE) -C build-linux-$*/livecode check
+ifneq ($(TRAVIS),undefined)
+ @echo "travis_fold:end:testcpp"
+endif
$(MAKE) check-common-linux-$*
all-linux-%:
@@ -92,7 +136,7 @@ $(addsuffix -linux,all config compile check): %: %-$(guess_linux_arch)
# Android rules
################################################################
-ANDROID_ARCHS = armv6
+ANDROID_ARCHS = armv6 armv7 arm64 x86 x86_64
config-android-%:
./config.sh --platform android-$*
@@ -114,15 +158,36 @@ $(addsuffix -android,all config compile check): %: %-armv6
################################################################
config-mac:
+ifneq ($(TRAVIS),undefined)
+ @echo "travis_fold:start:config"
+ @echo "CONFIGURE"
+endif
./config.sh --platform mac
-
+ifneq ($(TRAVIS),undefined)
+ @echo "travis_fold:end:config"
+endif
+
compile-mac:
+ifneq ($(TRAVIS),undefined)
+ @echo "travis_fold:start:compile"
+ @echo "COMPILE"
+endif
$(XCODEBUILD) -project "build-mac$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE) -target default \
$(XCODEBUILD_FILTER)
-
+ifneq ($(TRAVIS),undefined)
+ @echo "travis_fold:end:compile"
+endif
+
check-mac:
+ifneq ($(TRAVIS),undefined)
+ @echo "travis_fold:start:testcpp"
+ @echo "TEST C++"
+endif
$(XCODEBUILD) -project "build-mac$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE) -target check \
$(XCODEBUILD_FILTER)
+ifneq ($(TRAVIS),undefined)
+ @echo "travis_fold:end:testcpp"
+endif
$(MAKE) check-common-mac
@@ -147,13 +212,20 @@ compile-ios-%:
check-ios-%:
$(XCODEBUILD) -project "build-ios-$*$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE) -target check
-# Dummy targets to prevent our build system from building iOS 5.1 simulator
-config-ios-iphonesimulator5.1:
- @echo "Skipping iOS simulator 5.1 (no longer supported)"
-compile-ios-iphonesimulator5.1:
- @echo "Skipping iOS simulator 5.1 (no longer supported)"
-check-ios-iphonesimulator5.1:
- @echo "Skipping iOS simulator 5.1 (no longer supported)"
+# Dummy targets to prevent our build system from building old iOS simulators+devices
+$(addprefix config-ios-iphonesimulator,$(SKIP_IPHONESIMULATOR_VERSIONS)):
+ @echo "Skipping $@ (no longer supported)"
+$(addprefix compile-ios-iphonesimulator,$(SKIP_IPHONESIMULATOR_VERSIONS)):
+ @echo "Skipping $@ (no longer supported)"
+$(addprefix check-ios-iphonesimulator,$(SKIP_IPHONESIMULATOR_VERSIONS)):
+ @echo "Skipping $@ (no longer supported)"
+
+$(addprefix config-ios-iphonesimulator,$(SKIP_IPHONEOS_VERSIONS)):
+ @echo "Skipping $@ (no longer supported)"
+$(addprefix compile-ios-iphonesimulator,$(SKIP_IPHONEOS_VERSIONS)):
+ @echo "Skipping $@ (no longer supported)"
+$(addprefix check-ios-iphonesimulator,$(SKIP_IPHONEOS_VERSIONS)):
+ @echo "Skipping $@ (no longer supported)"
# Provide some synonyms for "latest iOS SDK"
$(addsuffix -ios-iphoneos,all config compile check): %: %$(lastword $(IPHONEOS_VERSIONS))
@@ -190,6 +262,16 @@ all-win-%:
$(addsuffix -win,all config compile): %: %-x86
+# Dummy rules for Windows x86-64 builds
+# TODO Replace with real rules
+config-win-x86_64:
+ mkdir -p build-win-x86_64
+compile-win-x86_64:
+ mkdir -p win-x86_64-bin
+all-win-x86_64:
+ $(MAKE) config-win-x86_64
+ $(MAKE) compile-win-x86_64
+
################################################################
# Emscripten rules
################################################################
diff --git a/Makefile.common b/Makefile.common
index 81939644dfa..864c64bb688 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -43,6 +43,10 @@ guess_linux_arch_script := \
case `uname -p` in \
x86_64) echo x86_64 ;; \
x86|i*86) echo x86 ;; \
+ unknown) case `uname -m` in \
+ x86_64) echo x86_64 ;; \
+ x86|i*86) echo x86 ;; \
+ esac ;; \
esac
guess_linux_arch := $(shell $(guess_linux_arch_script))
diff --git a/README.md b/README.md
index f0f58ccb57e..806f235fede 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

-Copyright © 2003-2016 LiveCode Ltd., Edinburgh, UK
+Copyright © 2003-2019 LiveCode Ltd., Edinburgh, UK
## Introduction
@@ -40,7 +40,7 @@ This repository contains a number of subprojects, each of which has its own subd
* `revspeech/` — Text-to-speech support
- * `revvideograbber/` — Video capture
+ * `revvideograbber/` — Video capture (Windows only)
* `revxml/` — XML parsing and generation
@@ -75,13 +75,13 @@ On Linux or Mac, you can quickly build LiveCode by installing basic development
Please see the following table, which shows which target platforms are supported by which host platforms. The documentation for compiling for each target platform is linked.
-| Target platform | Host platforms |
-| ------------------------------------------- | ----------------- |
-| [mac, ios](INSTALL-mac.md) | mac |
-| [win](INSTALL-win.md) | win, linux (Wine) |
-| [linux](INSTALL-linux.md) | linux |
-| [android](INSTALL-android.md) | mac, linux |
-| [emscripten (html5)](INSTALL-emscripten.md) | linux |
+| Target platform | Host platforms |
+| ---------------------------------------------------------- | ----------------- |
+| [mac, ios](docs/development/build-mac.md) | mac |
+| [win](docs/development/build-win.md) | win, linux (Wine) |
+| [linux](docs/development/build-linux.md) | linux |
+| [android](docs/development/build-android.md) | mac, linux |
+| [emscripten (html5)](docs/development/build-emscripten.md) | linux |
## Getting help
@@ -105,4 +105,4 @@ LiveCode Community is freely distributable under the GNU Public License (GPL), w
The LiveCode Community engine, libraries, and associated files are, unless otherwise noted:
-Copyright © 2003-2015 LiveCode Ltd.
+Copyright © 2003-2019 LiveCode Ltd.
diff --git a/Server.config b/Server.config
deleted file mode 100644
index 2afe0010aa9..00000000000
--- a/Server.config
+++ /dev/null
@@ -1,19 +0,0 @@
-// ADD PREDEFINED MACROS HERE!
-
-#define TARGET_PLATFORM_POSIX
-#define _LINUX
-#define __LINUX__
-#define _SERVER
-#define _LINUX_SERVER
-#define __LITTLE_ENDIAN__
-#define HAVE___THREAD
-#define MCSSL
-#define PLATFORM_STRING "Linux"
-#define _HAS_VSNPRINTF
-#define _DEBUG
-#undef LEGACY_SYSTEM
-
-// libpcre definitions
-#define SUPPORT_PCRE16
-#define SUPPORT_UCP
-#define SUPPORT_UTF
diff --git a/Server.files b/Server.files
deleted file mode 100644
index 50855fcc657..00000000000
--- a/Server.files
+++ /dev/null
@@ -1,473 +0,0 @@
-engine/src/aclip.cpp
-engine/src/block.cpp
-engine/src/button.cpp
-engine/src/buttondraw.cpp
-engine/src/card.cpp
-engine/src/cardlst.cpp
-engine/src/cdata.cpp
-engine/src/chunk.cpp
-engine/src/cmds.cpp
-engine/src/cmdsc.cpp
-engine/src/cmdse.cpp
-engine/src/cmdsf.cpp
-engine/src/cmdsm.cpp
-engine/src/cmdsp.cpp
-engine/src/cmdss.cpp
-engine/src/constant.cpp
-engine/src/control.cpp
-engine/src/cpalette.cpp
-engine/src/date.cpp
-engine/src/debug.cpp
-engine/src/dispatch.cpp
-engine/src/dllst.cpp
-engine/src/dsklnx.cpp
-engine/src/exec-array.cpp
-engine/src/exec-datetime.cpp
-engine/src/exec-engine.cpp
-engine/src/exec-files.cpp
-engine/src/exec-filters.cpp
-engine/src/exec-interface.cpp
-engine/src/exec-logic
-engine/src/exec-math.cpp
-engine/src/exec-multimedia.cpp
-engine/src/exec-network.cpp
-engine/src/exec-pasteboard.cpp
-engine/src/exec-scripting
-engine/src/exec-strings.cpp
-engine/src/exec-strings-chunk.cpp
-engine/src/exec-text.cpp
-engine/src/exec-graphics.cpp
-engine/src/exec-security.cpp
-engine/src/exec-printing.cpp
-engine/src/exec-debugging.cpp
-engine/src/exec-ide.cpp
-engine/src/exec-server.cpp
-engine/src/exec-interface2.cpp
-engine/src/exec.cpp
-engine/src/exec-interface-aclip.cpp
-engine/src/exec-interface-button.cpp
-engine/src/exec-interface-card.cpp
-engine/src/exec-interface-control.cpp
-engine/src/exec-interface-field.cpp
-engine/src/exec-interface-graphic.cpp
-engine/src/exec-interface-group.cpp
-engine/src/exec-interface-image.cpp
-engine/src/exec-interface-object.cpp
-engine/src/exec-interface-field-chunk.cpp
-engine/src/exec-interface-player.cpp
-engine/src/exec-interface-scrollbar.cpp
-engine/src/exec-interface-stack.cpp
-engine/src/exec-interface-vclip.cpp
-engine/src/exec-keywords.cpp
-engine/src/exec-legacy.cpp
-engine/src/exec-dialog.cpp
-engine/src/exec-strings-chunk.cpp
-engine/src/express.cpp
-engine/src/field.cpp
-engine/src/fieldf.cpp
-engine/src/fieldh.cpp
-engine/src/fields.cpp
-engine/src/font.cpp
-engine/src/funcs.cpp
-engine/src/funcsm.cpp
-engine/src/globals.cpp
-engine/src/graphic.cpp
-engine/src/group.cpp
-engine/src/handler.cpp
-engine/src/hc.cpp
-engine/src/hndlrlst.cpp
-engine/src/ibmp.cpp
-engine/src/idraw.cpp
-engine/src/ifile.cpp
-engine/src/igif.cpp
-engine/src/iimport.cpp
-engine/src/ijpg.cpp
-engine/src/image.cpp
-engine/src/imagelist.cpp
-engine/src/image_rep.cpp
-engine/src/image_rep_encoded.cpp
-engine/src/image_rep_mutable.cpp
-engine/src/image_rep_densitymapped.cpp
-engine/src/image_rep_resampled.cpp
-engine/src/imagebitmap.cpp
-engine/src/ipng.cpp
-engine/src/iquantization.cpp
-engine/src/iquantize_new.cpp
-engine/src/irle.cpp
-engine/src/iutil.cpp
-engine/src/itransform.cpp
-engine/src/keywords.cpp
-engine/src/legacy_spec.cpp
-engine/src/line.cpp
-engine/src/literal.cpp
-engine/src/magnify.cpp
-engine/src/mcerror.cpp
-engine/src/mcio.cpp
-engine/src/mcstring.cpp
-engine/src/mctheme.cpp
-engine/src/newobj.cpp
-engine/src/object.cpp
-engine/src/objptr.cpp
-engine/src/operator.cpp
-engine/src/paragraf.cpp
-engine/src/param.cpp
-engine/src/property.cpp
-engine/src/pickle.cpp
-engine/src/regex.cpp
-engine/src/resolution.cpp
-engine/src/scriptpt.cpp
-engine/src/scrolbar.cpp
-engine/src/scrollbardraw.cpp
-engine/src/sellst.cpp
-engine/src/stack.cpp
-engine/src/stack2.cpp
-engine/src/stack3.cpp
-engine/src/stackcache.cpp
-engine/src/stacklst.cpp
-engine/src/stackview.cpp
-engine/src/stacksecurity.cpp
-engine/src/statemnt.cpp
-engine/src/styledtext.cpp
-engine/src/tooltip.cpp
-engine/src/transfer.cpp
-engine/src/uidc.cpp
-engine/src/gradient.cpp
-engine/src/edittool.cpp
-engine/src/undolst.cpp
-engine/src/util.cpp
-engine/src/variable.cpp
-engine/src/vclip.cpp
-engine/src/visual.cpp
-engine/src/eps.cpp
-engine/src/mcssl.cpp
-engine/src/answer.cpp
-engine/src/ask.cpp
-engine/src/external.cpp
-engine/src/player.cpp
-engine/src/surface.cpp
-engine/src/combiners.cpp
-engine/src/path.cpp
-engine/src/metacontext.cpp
-engine/src/printer.cpp
-engine/src/unicode.cpp
-engine/src/rtf.cpp
-engine/src/rtfsupport.cpp
-engine/src/text.cpp
-engine/src/pathgray.cpp
-engine/src/pathprocess.cpp
-engine/src/objectstream.cpp
-engine/src/menuparse.cpp
-engine/src/parentscript.cpp
-engine/src/securemode.cpp
-engine/src/bitmapeffect.cpp
-engine/src/bitmapeffectblur.cpp
-engine/src/md5.cpp
-engine/src/sha1.cpp
-engine/src/capsule.cpp
-engine/src/externalv0.cpp
-engine/src/externalv1.cpp
-engine/src/lextable.cpp
-engine/src/uuid.cpp
-engine/src/objectprops.cpp
-engine/src/objectpropsets.cpp
-engine/src/mcutility.cpp
-engine/src/notify.cpp
-engine/src/customprinter.cpp
-engine/src/sysspec.cpp
-engine/src/mode_server.cpp
-engine/src/sysunxdate.cpp
-engine/src/sysunxnetwork.cpp
-engine/src/sysunxrandom.cpp
-engine/src/srvmain.cpp
-engine/src/srvspec.cpp
-engine/src/srvsession.cpp
-engine/src/srvstack.cpp
-engine/src/srvposix.cpp
-engine/src/srvdebug.cpp
-engine/src/srvscript.cpp
-engine/src/srvcgi.cpp
-engine/src/srvoutput.cpp
-engine/src/srvmultipart.cpp
-engine/src/srvtheme.cpp
-engine/src/syntax.cpp
-engine/src/eventqueue.cpp
-engine/src/encodederrors.cpp
-engine/src/redraw.cpp
-engine/src/sysregion.cpp
-engine/src/tilecache.cpp
-engine/src/tilecachesw.cpp
-engine/src/fonttable.cpp
-engine/src/fieldrtf.cpp
-engine/src/fieldhtml.cpp
-engine/src/fieldstyledtext.cpp
-engine/src/paragrafattr.cpp
-engine/src/graphicscontext.cpp
-engine/src/lnxflst.cpp
-engine/src/lnxflstold.cpp
-engine/src/stacksecurity.cpp
-engine/src/lnxelevate.cpp
-engine/src/opensslsocket.cpp
-engine/src/foundation-legacy.cpp
-
-engine/src/aclip.h
-engine/src/ans.h
-engine/src/answer.h
-engine/src/ask.h
-engine/src/bitmapeffectblur.h
-engine/src/bitmapeffect.h
-engine/src/bsdiff.h
-engine/src/button.h
-engine/src/capsule.h
-engine/src/card.h
-engine/src/cardlst.h
-engine/src/cdata.h
-engine/src/chunk.h
-engine/src/cmds.h
-engine/src/constant.h
-engine/src/context.h
-engine/src/control.h
-engine/src/cpalette.h
-engine/src/datastructures.h
-engine/src/date.h
-engine/src/debug.h
-engine/src/deploy.h
-engine/src/deploysecurity.h
-engine/src/dispatch.h
-engine/src/dllst.h
-engine/src/edittool.h
-engine/src/eps.h
-engine/src/eventqueue.h
-engine/src/exec-context.h
-engine/src/exec.h
-engine/src/exec-interface.h
-engine/src/exec-keywords.h
-engine/src/exec-strings.h
-engine/src/executionerrors.h
-engine/src/express.h
-engine/src/external.h
-engine/src/fiber.h
-engine/src/field.h
-engine/src/filedefs.h
-engine/src/flst.h
-engine/src/font.h
-engine/src/foundation-legacy.h
-engine/src/funcs.h
-engine/src/globals.h
-engine/src/globdefs.h
-engine/src/gradient.h
-engine/src/graphic.h
-engine/src/graphicscontext.h
-engine/src/graphics_util.h
-engine/src/group.h
-engine/src/handler.h
-engine/src/hc.h
-engine/src/hndlrlst.h
-engine/src/ide.h
-engine/src/imagebitmap.h
-engine/src/image.h
-engine/src/imagelist.h
-engine/src/image_rep.h
-engine/src/internal.h
-engine/src/iquantization.h
-engine/src/keywords.h
-engine/src/license.h
-engine/src/line.h
-engine/src/literal.h
-engine/src/lnxans.h
-engine/src/lnxaudio.h
-engine/src/lnxcontext.h
-engine/src/lnxdc.h
-engine/src/lnxdnd.h
-engine/src/lnxflst.h
-engine/src/lnxgtkthemedrawing.h
-engine/src/lnximagecache.h
-engine/src/lnxmplayer.h
-engine/src/lnxpasteboard.h
-engine/src/lnxprefix.h
-engine/src/lnxpsprinter.h
-engine/src/lnxtheme.h
-engine/src/lnxtransfer.h
-engine/src/lnxtxt.cpp
-engine/src/magnify.h
-engine/src/mblad.h
-engine/src/mblandroidcontrol.h
-engine/src/mblandroid.h
-engine/src/mblandroidjava.h
-engine/src/mblandroidtypeface.h
-engine/src/mblandroidutil.h
-engine/src/mblcalendar.h
-engine/src/mblcontact.h
-engine/src/mblcontrol.h
-engine/src/mbldc.h
-engine/src/mblevent.h
-engine/src/mblflst.h
-engine/src/mbliphoneapp.h
-engine/src/mbliphonecontrol.h
-engine/src/mbliphone.h
-engine/src/mbliphoneview.h
-engine/src/mblnotification.h
-engine/src/mblsensor.h
-engine/src/mblstore.h
-engine/src/mblsyntax.h
-engine/src/MCBlock.h
-engine/src/mcerror.h
-engine/src/mcio.h
-engine/src/mcssl.h
-engine/src/mcstring.h
-engine/src/mctheme.h
-engine/src/mcutility.h
-engine/src/md5.h
-engine/src/menuparse.h
-engine/src/metacontext.h
-engine/src/meta.h
-engine/src/minizip.h
-engine/src/mode.h
-engine/src/name.h
-engine/src/newobj.h
-engine/src/notify.h
-engine/src/objdefs.h
-engine/src/object.h
-engine/src/objectpropsets.h
-engine/src/objectstream.h
-engine/src/objptr.h
-engine/src/operator.h
-engine/src/osspec.h
-engine/src/osxcontext.h
-engine/src/osxdc.h
-engine/src/osxflst.h
-engine/src/osxprefix.h
-engine/src/osxprinter.h
-engine/src/osxtheme.h
-engine/src/packed.h
-engine/src/paint.h
-engine/src/paragraf.h
-engine/src/paragraph.h
-engine/src/param.h
-engine/src/parentscript.h
-engine/src/parsedef.h
-engine/src/parseerrors.h
-engine/src/path.h
-engine/src/pathprivate.h
-engine/src/player.h
-engine/src/prefix.h
-engine/src/printer.h
-engine/src/property.h
-engine/src/rawarray.h
-engine/src/redraw.h
-engine/src/regex.h
-engine/src/region.h
-engine/src/resolution.h
-engine/src/resource.h
-engine/src/rtf.h
-engine/src/scriptenvironment.h
-engine/src/scriptpt.h
-engine/src/scrolbar.h
-engine/src/securemode.h
-engine/src/segment.h
-engine/src/sellst.h
-engine/src/sha1.h
-engine/src/socket.h
-engine/src/srvcgi.h
-engine/src/srvdebug.h
-engine/src/srvmain.h
-engine/src/srvmultipart.h
-engine/src/srvscript.h
-engine/src/srvsession.h
-engine/src/stack.h
-engine/src/stacklst.h
-engine/src/stacksecurity.h
-engine/src/statemnt.h
-engine/src/styledtext.h
-engine/src/syntax.h
-engine/src/sysdefs.h
-engine/src/system.h
-engine/src/textbuffer.h
-engine/src/text.h
-engine/src/textlayout.h
-engine/src/tilecache.h
-engine/src/tooltip.h
-engine/src/transfer.h
-engine/src/typedefs.h
-engine/src/uidc.h
-engine/src/undolst.h
-engine/src/unicode.h
-engine/src/util.h
-engine/src/uuid.h
-engine/src/variable.h
-engine/src/variable_impl.h
-engine/src/vclip.h
-engine/src/visualeffect.h
-engine/src/visual.h
-engine/src/w32context.h
-engine/src/w32dc.h
-engine/src/w32defs.h
-engine/src/w32dnd.h
-engine/src/w32dsk-legacy.h
-engine/src/w32flst.h
-engine/src/w32prefix.h
-engine/src/w32printer.h
-engine/src/w32text.h
-engine/src/w32theme.h
-engine/src/w32transfer.h
-
-libfoundation/include/foundation-auto.h
-libfoundation/include/foundation-inline.h
-libfoundation/include/foundation-locale.h
-libfoundation/include/foundation-stdlib.h
-libfoundation/include/foundation-unicode.h
-libfoundation/include/foundation.h
-libfoundation/src/foundation-array.cpp
-libfoundation/src/foundation-core.cpp
-libfoundation/src/foundation-data.cpp
-libfoundation/src/foundation-debug.cpp
-libfoundation/src/foundation-error.cpp
-libfoundation/src/foundation-list.cpp
-libfoundation/src/foundation-locale.cpp
-libfoundation/src/foundation-name.cpp
-libfoundation/src/foundation-nativechars.cpp
-libfoundation/src/foundation-number.cpp
-libfoundation/src/foundation-private.h
-libfoundation/src/foundation-set.cpp
-libfoundation/src/foundation-stream.cpp
-libfoundation/src/foundation-string-cf.cpp
-libfoundation/src/foundation-string.cpp
-libfoundation/src/foundation-unicodechars.cpp
-libfoundation/src/foundation-unicode.cpp
-libfoundation/src/foundation-unicode-private.h
-libfoundation/src/foundation-value.cpp
-
-libgraphics/include/graphics.h
-libgraphics/src/blur.cpp
-libgraphics/src/cachetable.cpp
-libgraphics/src/context.cpp
-libgraphics/src/graphics-internal.h
-libgraphics/src/image.cpp
-libgraphics/src/legacyblendmodes.cpp
-libgraphics/src/legacygradients.cpp
-libgraphics/src/lnxtext.cpp
-libgraphics/src/mblandroidtext.cpp
-libgraphics/src/mbliphonetext.mm
-libgraphics/src/osxtext.cpp
-libgraphics/src/path.cpp
-libgraphics/src/spread.cpp
-libgraphics/src/utils.cpp
-libgraphics/src/w32text.cpp
-
-Makefile
-engine/Makefile.standalone
-engine/Makefile.server
-engine/Makefile.kernel-standalone
-engine/Makefile.kernel-server
-engine/Makefile.kernel-development
-engine/Makefile.kernel-common
-engine/Makefile.kernel
-engine/Makefile.installer
-engine/Makefile.development
-engine/Makefile.common
-engine/Makefile
-rules/library.linux.makefile
-rules/environment.linux.makefile
-rules/common.linux.makefile
-rules/archive.linux.makefile
-rules/application.linux.makefile
-libfoundation/Makefile
diff --git a/Server.includes b/Server.includes
deleted file mode 100644
index 979d9e77431..00000000000
--- a/Server.includes
+++ /dev/null
@@ -1,107 +0,0 @@
-engine/include
-engine/src
-lcidlc/src
-libexternal/include/revolution
-libexternalv1/include
-libfoundation/include
-libfoundation/src
-libgraphics/include
-libexternal/include
-libexternalv1/include
-revbrowser/src
-revdb/src
-revfont/src
-revmobile/src
-revpdfprinter/src
-revspeech/src
-revvideograbber/src
-revxml/src
-thirdparty/headers/linux/include
-thirdparty/headers/linux/include/atk
-thirdparty/headers/linux/include/cairo
-thirdparty/headers/linux/include/freetype
-thirdparty/headers/linux/include/freetype/cache
-thirdparty/headers/linux/include/freetype/config
-thirdparty/headers/linux/include/freetype/internal
-thirdparty/headers/linux/include/gdk
-thirdparty/headers/linux/include/gdk-pixbuf
-thirdparty/headers/linux/include/gdk-pixbuf-xlib
-thirdparty/headers/linux/include/glib
-thirdparty/headers/linux/include/gobject
-thirdparty/headers/linux/include/gtk
-thirdparty/headers/linux/include/libgnome
-thirdparty/headers/linux/include/libgnomevfs
-thirdparty/headers/linux/include/pango
-thirdparty/headers/linux/include/Xft
-thirdparty/libcairo
-thirdparty/libcairo/src
-thirdparty/libcurl/include/curl
-thirdparty/libfreetype/include
-thirdparty/libfreetype/include/freetype
-thirdparty/libfreetype/include/freetype/config
-thirdparty/libfreetype/include/freetype/internal
-thirdparty/libfreetype/include/freetype/internal/services
-thirdparty/libfreetype/src/autofit
-thirdparty/libfreetype/src/base
-thirdparty/libfreetype/src/bdf
-thirdparty/libfreetype/src/cache
-thirdparty/libfreetype/src/cff
-thirdparty/libfreetype/src/cid
-thirdparty/libfreetype/src/gxvalid
-thirdparty/libfreetype/src/gzip
-thirdparty/libfreetype/src/lzw
-thirdparty/libfreetype/src/otvalid
-thirdparty/libfreetype/src/pcf
-thirdparty/libfreetype/src/pfr
-thirdparty/libfreetype/src/psaux
-thirdparty/libfreetype/src/pshinter
-thirdparty/libfreetype/src/psnames
-thirdparty/libfreetype/src/raster
-thirdparty/libfreetype/src/sfnt
-thirdparty/libfreetype/src/smooth
-thirdparty/libfreetype/src/truetype
-thirdparty/libfreetype/src/type1
-thirdparty/libfreetype/src/type42
-thirdparty/libfreetype/src/winfonts
-thirdparty/libgif/include
-thirdparty/libgif/src
-thirdparty/libiodbc/include
-thirdparty/libiodbc/src
-thirdparty/libiodbc/src/inst
-thirdparty/libiodbc/src/trace
-thirdparty/libjpeg/include
-thirdparty/libjpeg/src
-thirdparty/libmysql/include
-thirdparty/libmysql/src
-thirdparty/libopenssl/include/openssl
-thirdparty/libpcre/include
-thirdparty/libpcre/src
-thirdparty/libpng/include
-thirdparty/libpq/include
-thirdparty/libpq/src
-thirdparty/libpq/src/access
-thirdparty/libpq/src/libpq
-thirdparty/libpq/src/mb
-thirdparty/libpq/src/nodes
-thirdparty/libpq/src/port
-thirdparty/libpq/src/port/win32
-thirdparty/libpq/src/port/win32/arpa
-thirdparty/libpq/src/port/win32/netinet
-thirdparty/libpq/src/port/win32/sys
-thirdparty/libpq/src/utils
-thirdparty/libskia/include/config
-thirdparty/libskia/include/core
-thirdparty/libskia/include/effects
-thirdparty/libskia/include/ports
-thirdparty/libskia/src/core
-thirdparty/libskia/src/effects
-thirdparty/libskia/src/opts
-thirdparty/libskia/src/ports
-thirdparty/libsqlite/include
-thirdparty/libsqlite/include/sqlitedataset
-thirdparty/libxml/include/libxml
-thirdparty/libxml/src
-thirdparty/libz/include
-thirdparty/libz/src
-thirdparty/libzip/include
-thirdparty/libzip/src
diff --git a/benchmarks/_benchmarkrunner.livecodescript b/benchmarks/_benchmarkrunner.livecodescript
index ae19f34e5da..fe521daf54b 100644
--- a/benchmarks/_benchmarkrunner.livecodescript
+++ b/benchmarks/_benchmarkrunner.livecodescript
@@ -237,9 +237,11 @@ private command runSingleCommand pInfo, pScriptFile, pCommand
-- Check the exit status and process for logging.
if tBenchmarkExitStatus is not empty then
write tab & "failed" & return to stdout
- write tBenchmarkTimes & return to stderr
+ write tBenchmarkTimes & return to stdout
return tBenchmarkName & tab & "failed" & return
end if
+
+ filter tBenchmarkTimes without "*TIS/TSM*"
local tLog
set the itemDelimiter to tab
diff --git a/benchmarks/lcs/control/array.livecodescript b/benchmarks/lcs/control/array.livecodescript
new file mode 100644
index 00000000000..8d6f31c3a72
--- /dev/null
+++ b/benchmarks/lcs/control/array.livecodescript
@@ -0,0 +1,208 @@
+script "ControlArray"
+/*
+Copyright (C) 2017 LiveCode Ltd.
+
+This file is part of LiveCode.
+
+LiveCode is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License v3 as published by the Free
+Software Foundation.
+
+LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with LiveCode. If not see . */
+
+on BenchmarkArrayBug17434
+ local tMax
+ put 100 into tMax
+
+ local sA
+ BenchmarkStartTiming "Bug 17434 - 3-dim matrix"
+ repeat with i = 1 to tMax
+ repeat with j = 1 to tMax
+ repeat with k = 1 to tMax
+ put "bob,carol,ted,alice" into sA[i][j][k]
+ end repeat
+ end repeat
+ end repeat
+ BenchmarkStopTiming
+end BenchmarkArrayBug17434
+
+on BenchmarkArrayWordCount
+ /* Generate 10Mb of text from a public domain book */
+ local tContent
+ BenchmarkLoadNativeTextFile "the_adventures_of_sherlock_holmes.txt"
+ repeat while (the number of chars in tContent) < 10 * 1024 * 1024
+ put the result after tContent
+ end repeat
+
+ local tWordCount, tKeyWords, tResult
+ BenchmarkStartTiming "WordCount - iterate"
+ repeat for each word tWord in tContent
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tWordCount
+ BenchmarkStartTiming "WordCount - count"
+ repeat for each word tWord in tContent
+ add 1 to tWordCount[tWord]
+ end repeat
+ BenchmarkStopTiming
+
+ BenchmarkStartTiming "WordCount - keys then sort then combine"
+ put the keys of tWordCount into tKeyWords
+ sort tKeyWords
+ repeat for each line tWord in tKeyWords
+ put tWord & tab & tWordCount[tWord] & return after tResult
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tResult
+ BenchmarkStartTiming "WordCount - combine then sort"
+ repeat for each line tWord in tKeyWords
+ put tWord & tab & tWordCount[tWord] & return after tResult
+ end repeat
+ set the itemDelimiter to tab
+ sort tResult by item 1 of each
+ BenchmarkStopTiming
+end BenchmarkArrayWordCount
+
+on BenchmarkArrayFilterRecords
+ local tRecords, tFilteredRecords
+ put _BenchmarkArrayFilterGetRecords() into tRecords
+
+ local tWantedColumns
+ put "First name,Test1,Grade" into tWantedColumns
+
+ BenchmarkStartTiming "FilterRecords - stringlist"
+ repeat 100000 times
+ get _BenchmarkArrayFilterRecords(tRecords, tWantedColumns)
+ end repeat
+ BenchmarkStopTiming
+
+ split tWantedColumns by comma as set
+ BenchmarkStartTiming "FilterRecords - set"
+ repeat 100000 times
+ get _BenchmarkArrayFilterRecordsSet(tRecords, tWantedColumns)
+ end repeat
+ BenchmarkStopTiming
+end BenchmarkArrayFilterRecords
+
+private function _BenchmarkArrayFilterRecords pRecords, pColumnNames
+ local tFilteredRecords, tFilteredRecord
+ repeat for each element tRecord in pRecords
+ repeat for each item tColumnName in pColumnNames
+ put tRecord[tColumnName] into tFilteredRecord[tColumnName]
+ end repeat
+ put tFilteredRecord into \
+ tFilteredRecords[the number of elements in tFilteredRecords + 1]
+ end repeat
+ return tFilteredRecords
+end _BenchmarkArrayFilterRecords
+
+private function _BenchmarkArrayFilterRecordsSet pRecords, pColumnNameSet
+ local tFilteredRecords, tFilteredRecord
+ repeat for each element tRecord in pRecords
+ repeat for each key tColumnName in pColumnNameSet
+ put tRecord[tColumnName] into tFilteredRecord[tColumnName]
+ end repeat
+ put tFilteredRecord into \
+ tFilteredRecords[the number of elements in tFilteredRecords + 1]
+ end repeat
+ return tFilteredRecords
+end _BenchmarkArrayFilterRecordsSet
+
+private function _BenchmarkArrayFilterGetRecords
+ local tData
+ BenchmarkLoadNativeTextFile "example_tsv_records.txt"
+ put the result into tData
+
+ local tColumnNames
+ put line 1 of tData into tColumnNames
+ split tColumnNames by tab
+
+ local tRecords, tRecordIndex
+ put 1 into tRecordIndex
+ repeat for each line tRow in line 2 to -1 of tData
+ split tRow by tab
+ repeat with tColumnIndex = 1 to the number of elements in tRow
+ put tRow[tColumnIndex] into \
+ tRecords[tRecordIndex][tColumnNames[tColumnIndex]]
+ end repeat
+ add 1 to tRecordIndex
+ end repeat
+ return tRecords
+end _BenchmarkArrayFilterGetRecords
+
+on BenchmarkCKSqrtLoop
+ BenchmarkStartTiming "CK Sqrt Loop"
+ local n
+ repeat with i = 1 to 1000000
+ add sqrt(i) to n
+ end repeat
+ BenchmarkStopTiming
+end BenchmarkCKSqrtLoop
+
+on BenchmarkCKAppendFromArray
+ BenchmarkStartTiming "CK Big List (prepare)"
+ local tList, tCount
+ put 9 into tCount
+ put "apple,banana,carrot,dairy,egg," into tList
+ repeat tCount - 1 times
+ put tList after tList
+ end repeat
+ BenchmarkStopTiming
+
+ local tMod
+ put the number of items in tList into tMod
+
+ local tOutput
+ BenchmarkStartTiming "CK Big List (non-array)"
+ repeat with i=0 to 500000-1
+ put item i*7 mod tMod + 1 of tList & space after tOutput
+ end repeat
+ BenchmarkStopTiming
+
+ BenchmarkStartTiming "CK Big List (split)"
+ split tList by comma
+ BenchmarkStopTiming
+
+ BenchmarkStartTiming "CK Big List (array)"
+ repeat with i=0 to 500000-1
+ put tList[i*7 mod tMod + 1] & space after tOutput
+ end repeat
+ BenchmarkStopTiming
+end BenchmarkCKAppendFromArray
+
+on BenchmarkCKLargeText
+ local x, y, n, i
+ BenchmarkStartTiming "CK Large Text - 3 (non-cs prepare)"
+ set the caseSensitive to false
+ put "fab" into x
+ put "fzb" into y
+ put "abcdefghij " into n
+ repeat with i = 1 to 24
+ put n & codeunit i mod 10 + 1 of n after n
+ end repeat
+ BenchmarkStopTiming
+ BenchmarkStartTiming "CK Large Text - 3 (non-cs run)"
+ replace x with y in n
+ BenchmarkStopTiming
+
+ BenchmarkStartTiming "CK Large Text - 3 (cs prepare)"
+ set the caseSensitive to true
+ put "fab" into x
+ put "fzb" into y
+ put "abcdefghij " into n
+ repeat with i = 1 to 24
+ put n & codeunit i mod 10 + 1 of n after n
+ end repeat
+ BenchmarkStopTiming
+ BenchmarkStartTiming "CK Large Text - 3 (cs run)"
+ replace x with y in n
+ BenchmarkStopTiming
+end BenchmarkCKLargeText
diff --git a/benchmarks/lcs/control/example_tsv_records.txt b/benchmarks/lcs/control/example_tsv_records.txt
new file mode 100644
index 00000000000..20fb3fa4a20
--- /dev/null
+++ b/benchmarks/lcs/control/example_tsv_records.txt
@@ -0,0 +1,17 @@
+Last name First name SSN Test1 Test2 Test3 Test4 Final Grade
+Alfalfa Aloysius 123-45-6789 40.0 90.0 100.0 83.0 49.0 D-
+Alfred University 123-12-1234 41.0 97.0 96.0 97.0 48.0 D+
+Gerty Gramma 567-89-0123 41.0 80.0 60.0 40.0 44.0 C
+Android Electric 087-65-4321 42.0 23.0 36.0 45.0 47.0 B-
+Bumpkin Fred 456-78-9012 43.0 78.0 88.0 77.0 45.0 A-
+Rubble Betty 234-56-7890 44.0 90.0 80.0 90.0 46.0 C-
+Noshow Cecil 345-67-8901 45.0 11.0 -1.0 4.0 43.0 F
+Buff Bif 632-79-9939 46.0 20.0 30.0 40.0 50.0 B+
+Airpump Andrew 223-45-6789 49.0 1.0 90.0 100.0 83.0 A
+Backus Jim 143-12-1234 48.0 1.0 97.0 96.0 97.0 A+
+Carnivore Art 565-89-0123 44.0 1.0 80.0 60.0 40.0 D+
+Dandy Jim 087-75-4321 47.0 1.0 23.0 36.0 45.0 C+
+Elephant Ima 456-71-9012 45.0 1.0 78.0 88.0 77.0 B-
+Franklin Benny 234-56-2890 50.0 1.0 90.0 80.0 90.0 B-
+George Boy 345-67-3901 40.0 1.0 11.0 -1.0 4.0 B
+Heffalump Harvey 632-79-9439 30.0 1.0 20.0 30.0 40.0 C
diff --git a/benchmarks/lcs/control/the_adventures_of_sherlock_holmes.txt b/benchmarks/lcs/control/the_adventures_of_sherlock_holmes.txt
new file mode 100644
index 00000000000..a02bd85cfec
--- /dev/null
+++ b/benchmarks/lcs/control/the_adventures_of_sherlock_holmes.txt
@@ -0,0 +1,13052 @@
+Project Gutenberg's The Adventures of Sherlock Holmes, by Arthur Conan Doyle
+
+This eBook is for the use of anyone anywhere at no cost and with
+almost no restrictions whatsoever. You may copy it, give it away or
+re-use it under the terms of the Project Gutenberg License included
+with this eBook or online at www.gutenberg.net
+
+
+Title: The Adventures of Sherlock Holmes
+
+Author: Arthur Conan Doyle
+
+Posting Date: April 18, 2011 [EBook #1661]
+First Posted: November 29, 2002
+
+Language: English
+
+
+*** START OF THIS PROJECT GUTENBERG EBOOK THE ADVENTURES OF SHERLOCK HOLMES ***
+
+
+
+
+Produced by an anonymous Project Gutenberg volunteer and Jose Menendez
+
+
+
+
+
+
+
+
+
+THE ADVENTURES OF SHERLOCK HOLMES
+
+by
+
+SIR ARTHUR CONAN DOYLE
+
+
+
+ I. A Scandal in Bohemia
+ II. The Red-headed League
+ III. A Case of Identity
+ IV. The Boscombe Valley Mystery
+ V. The Five Orange Pips
+ VI. The Man with the Twisted Lip
+ VII. The Adventure of the Blue Carbuncle
+VIII. The Adventure of the Speckled Band
+ IX. The Adventure of the Engineer's Thumb
+ X. The Adventure of the Noble Bachelor
+ XI. The Adventure of the Beryl Coronet
+ XII. The Adventure of the Copper Beeches
+
+
+
+
+ADVENTURE I. A SCANDAL IN BOHEMIA
+
+I.
+
+To Sherlock Holmes she is always THE woman. I have seldom heard
+him mention her under any other name. In his eyes she eclipses
+and predominates the whole of her sex. It was not that he felt
+any emotion akin to love for Irene Adler. All emotions, and that
+one particularly, were abhorrent to his cold, precise but
+admirably balanced mind. He was, I take it, the most perfect
+reasoning and observing machine that the world has seen, but as a
+lover he would have placed himself in a false position. He never
+spoke of the softer passions, save with a gibe and a sneer. They
+were admirable things for the observer--excellent for drawing the
+veil from men's motives and actions. But for the trained reasoner
+to admit such intrusions into his own delicate and finely
+adjusted temperament was to introduce a distracting factor which
+might throw a doubt upon all his mental results. Grit in a
+sensitive instrument, or a crack in one of his own high-power
+lenses, would not be more disturbing than a strong emotion in a
+nature such as his. And yet there was but one woman to him, and
+that woman was the late Irene Adler, of dubious and questionable
+memory.
+
+I had seen little of Holmes lately. My marriage had drifted us
+away from each other. My own complete happiness, and the
+home-centred interests which rise up around the man who first
+finds himself master of his own establishment, were sufficient to
+absorb all my attention, while Holmes, who loathed every form of
+society with his whole Bohemian soul, remained in our lodgings in
+Baker Street, buried among his old books, and alternating from
+week to week between cocaine and ambition, the drowsiness of the
+drug, and the fierce energy of his own keen nature. He was still,
+as ever, deeply attracted by the study of crime, and occupied his
+immense faculties and extraordinary powers of observation in
+following out those clues, and clearing up those mysteries which
+had been abandoned as hopeless by the official police. From time
+to time I heard some vague account of his doings: of his summons
+to Odessa in the case of the Trepoff murder, of his clearing up
+of the singular tragedy of the Atkinson brothers at Trincomalee,
+and finally of the mission which he had accomplished so
+delicately and successfully for the reigning family of Holland.
+Beyond these signs of his activity, however, which I merely
+shared with all the readers of the daily press, I knew little of
+my former friend and companion.
+
+One night--it was on the twentieth of March, 1888--I was
+returning from a journey to a patient (for I had now returned to
+civil practice), when my way led me through Baker Street. As I
+passed the well-remembered door, which must always be associated
+in my mind with my wooing, and with the dark incidents of the
+Study in Scarlet, I was seized with a keen desire to see Holmes
+again, and to know how he was employing his extraordinary powers.
+His rooms were brilliantly lit, and, even as I looked up, I saw
+his tall, spare figure pass twice in a dark silhouette against
+the blind. He was pacing the room swiftly, eagerly, with his head
+sunk upon his chest and his hands clasped behind him. To me, who
+knew his every mood and habit, his attitude and manner told their
+own story. He was at work again. He had risen out of his
+drug-created dreams and was hot upon the scent of some new
+problem. I rang the bell and was shown up to the chamber which
+had formerly been in part my own.
+
+His manner was not effusive. It seldom was; but he was glad, I
+think, to see me. With hardly a word spoken, but with a kindly
+eye, he waved me to an armchair, threw across his case of cigars,
+and indicated a spirit case and a gasogene in the corner. Then he
+stood before the fire and looked me over in his singular
+introspective fashion.
+
+"Wedlock suits you," he remarked. "I think, Watson, that you have
+put on seven and a half pounds since I saw you."
+
+"Seven!" I answered.
+
+"Indeed, I should have thought a little more. Just a trifle more,
+I fancy, Watson. And in practice again, I observe. You did not
+tell me that you intended to go into harness."
+
+"Then, how do you know?"
+
+"I see it, I deduce it. How do I know that you have been getting
+yourself very wet lately, and that you have a most clumsy and
+careless servant girl?"
+
+"My dear Holmes," said I, "this is too much. You would certainly
+have been burned, had you lived a few centuries ago. It is true
+that I had a country walk on Thursday and came home in a dreadful
+mess, but as I have changed my clothes I can't imagine how you
+deduce it. As to Mary Jane, she is incorrigible, and my wife has
+given her notice, but there, again, I fail to see how you work it
+out."
+
+He chuckled to himself and rubbed his long, nervous hands
+together.
+
+"It is simplicity itself," said he; "my eyes tell me that on the
+inside of your left shoe, just where the firelight strikes it,
+the leather is scored by six almost parallel cuts. Obviously they
+have been caused by someone who has very carelessly scraped round
+the edges of the sole in order to remove crusted mud from it.
+Hence, you see, my double deduction that you had been out in vile
+weather, and that you had a particularly malignant boot-slitting
+specimen of the London slavey. As to your practice, if a
+gentleman walks into my rooms smelling of iodoform, with a black
+mark of nitrate of silver upon his right forefinger, and a bulge
+on the right side of his top-hat to show where he has secreted
+his stethoscope, I must be dull, indeed, if I do not pronounce
+him to be an active member of the medical profession."
+
+I could not help laughing at the ease with which he explained his
+process of deduction. "When I hear you give your reasons," I
+remarked, "the thing always appears to me to be so ridiculously
+simple that I could easily do it myself, though at each
+successive instance of your reasoning I am baffled until you
+explain your process. And yet I believe that my eyes are as good
+as yours."
+
+"Quite so," he answered, lighting a cigarette, and throwing
+himself down into an armchair. "You see, but you do not observe.
+The distinction is clear. For example, you have frequently seen
+the steps which lead up from the hall to this room."
+
+"Frequently."
+
+"How often?"
+
+"Well, some hundreds of times."
+
+"Then how many are there?"
+
+"How many? I don't know."
+
+"Quite so! You have not observed. And yet you have seen. That is
+just my point. Now, I know that there are seventeen steps,
+because I have both seen and observed. By-the-way, since you are
+interested in these little problems, and since you are good
+enough to chronicle one or two of my trifling experiences, you
+may be interested in this." He threw over a sheet of thick,
+pink-tinted note-paper which had been lying open upon the table.
+"It came by the last post," said he. "Read it aloud."
+
+The note was undated, and without either signature or address.
+
+"There will call upon you to-night, at a quarter to eight
+o'clock," it said, "a gentleman who desires to consult you upon a
+matter of the very deepest moment. Your recent services to one of
+the royal houses of Europe have shown that you are one who may
+safely be trusted with matters which are of an importance which
+can hardly be exaggerated. This account of you we have from all
+quarters received. Be in your chamber then at that hour, and do
+not take it amiss if your visitor wear a mask."
+
+"This is indeed a mystery," I remarked. "What do you imagine that
+it means?"
+
+"I have no data yet. It is a capital mistake to theorize before
+one has data. Insensibly one begins to twist facts to suit
+theories, instead of theories to suit facts. But the note itself.
+What do you deduce from it?"
+
+I carefully examined the writing, and the paper upon which it was
+written.
+
+"The man who wrote it was presumably well to do," I remarked,
+endeavouring to imitate my companion's processes. "Such paper
+could not be bought under half a crown a packet. It is peculiarly
+strong and stiff."
+
+"Peculiar--that is the very word," said Holmes. "It is not an
+English paper at all. Hold it up to the light."
+
+I did so, and saw a large "E" with a small "g," a "P," and a
+large "G" with a small "t" woven into the texture of the paper.
+
+"What do you make of that?" asked Holmes.
+
+"The name of the maker, no doubt; or his monogram, rather."
+
+"Not at all. The 'G' with the small 't' stands for
+'Gesellschaft,' which is the German for 'Company.' It is a
+customary contraction like our 'Co.' 'P,' of course, stands for
+'Papier.' Now for the 'Eg.' Let us glance at our Continental
+Gazetteer." He took down a heavy brown volume from his shelves.
+"Eglow, Eglonitz--here we are, Egria. It is in a German-speaking
+country--in Bohemia, not far from Carlsbad. 'Remarkable as being
+the scene of the death of Wallenstein, and for its numerous
+glass-factories and paper-mills.' Ha, ha, my boy, what do you
+make of that?" His eyes sparkled, and he sent up a great blue
+triumphant cloud from his cigarette.
+
+"The paper was made in Bohemia," I said.
+
+"Precisely. And the man who wrote the note is a German. Do you
+note the peculiar construction of the sentence--'This account of
+you we have from all quarters received.' A Frenchman or Russian
+could not have written that. It is the German who is so
+uncourteous to his verbs. It only remains, therefore, to discover
+what is wanted by this German who writes upon Bohemian paper and
+prefers wearing a mask to showing his face. And here he comes, if
+I am not mistaken, to resolve all our doubts."
+
+As he spoke there was the sharp sound of horses' hoofs and
+grating wheels against the curb, followed by a sharp pull at the
+bell. Holmes whistled.
+
+"A pair, by the sound," said he. "Yes," he continued, glancing
+out of the window. "A nice little brougham and a pair of
+beauties. A hundred and fifty guineas apiece. There's money in
+this case, Watson, if there is nothing else."
+
+"I think that I had better go, Holmes."
+
+"Not a bit, Doctor. Stay where you are. I am lost without my
+Boswell. And this promises to be interesting. It would be a pity
+to miss it."
+
+"But your client--"
+
+"Never mind him. I may want your help, and so may he. Here he
+comes. Sit down in that armchair, Doctor, and give us your best
+attention."
+
+A slow and heavy step, which had been heard upon the stairs and
+in the passage, paused immediately outside the door. Then there
+was a loud and authoritative tap.
+
+"Come in!" said Holmes.
+
+A man entered who could hardly have been less than six feet six
+inches in height, with the chest and limbs of a Hercules. His
+dress was rich with a richness which would, in England, be looked
+upon as akin to bad taste. Heavy bands of astrakhan were slashed
+across the sleeves and fronts of his double-breasted coat, while
+the deep blue cloak which was thrown over his shoulders was lined
+with flame-coloured silk and secured at the neck with a brooch
+which consisted of a single flaming beryl. Boots which extended
+halfway up his calves, and which were trimmed at the tops with
+rich brown fur, completed the impression of barbaric opulence
+which was suggested by his whole appearance. He carried a
+broad-brimmed hat in his hand, while he wore across the upper
+part of his face, extending down past the cheekbones, a black
+vizard mask, which he had apparently adjusted that very moment,
+for his hand was still raised to it as he entered. From the lower
+part of the face he appeared to be a man of strong character,
+with a thick, hanging lip, and a long, straight chin suggestive
+of resolution pushed to the length of obstinacy.
+
+"You had my note?" he asked with a deep harsh voice and a
+strongly marked German accent. "I told you that I would call." He
+looked from one to the other of us, as if uncertain which to
+address.
+
+"Pray take a seat," said Holmes. "This is my friend and
+colleague, Dr. Watson, who is occasionally good enough to help me
+in my cases. Whom have I the honour to address?"
+
+"You may address me as the Count Von Kramm, a Bohemian nobleman.
+I understand that this gentleman, your friend, is a man of honour
+and discretion, whom I may trust with a matter of the most
+extreme importance. If not, I should much prefer to communicate
+with you alone."
+
+I rose to go, but Holmes caught me by the wrist and pushed me
+back into my chair. "It is both, or none," said he. "You may say
+before this gentleman anything which you may say to me."
+
+The Count shrugged his broad shoulders. "Then I must begin," said
+he, "by binding you both to absolute secrecy for two years; at
+the end of that time the matter will be of no importance. At
+present it is not too much to say that it is of such weight it
+may have an influence upon European history."
+
+"I promise," said Holmes.
+
+"And I."
+
+"You will excuse this mask," continued our strange visitor. "The
+august person who employs me wishes his agent to be unknown to
+you, and I may confess at once that the title by which I have
+just called myself is not exactly my own."
+
+"I was aware of it," said Holmes dryly.
+
+"The circumstances are of great delicacy, and every precaution
+has to be taken to quench what might grow to be an immense
+scandal and seriously compromise one of the reigning families of
+Europe. To speak plainly, the matter implicates the great House
+of Ormstein, hereditary kings of Bohemia."
+
+"I was also aware of that," murmured Holmes, settling himself
+down in his armchair and closing his eyes.
+
+Our visitor glanced with some apparent surprise at the languid,
+lounging figure of the man who had been no doubt depicted to him
+as the most incisive reasoner and most energetic agent in Europe.
+Holmes slowly reopened his eyes and looked impatiently at his
+gigantic client.
+
+"If your Majesty would condescend to state your case," he
+remarked, "I should be better able to advise you."
+
+The man sprang from his chair and paced up and down the room in
+uncontrollable agitation. Then, with a gesture of desperation, he
+tore the mask from his face and hurled it upon the ground. "You
+are right," he cried; "I am the King. Why should I attempt to
+conceal it?"
+
+"Why, indeed?" murmured Holmes. "Your Majesty had not spoken
+before I was aware that I was addressing Wilhelm Gottsreich
+Sigismond von Ormstein, Grand Duke of Cassel-Felstein, and
+hereditary King of Bohemia."
+
+"But you can understand," said our strange visitor, sitting down
+once more and passing his hand over his high white forehead, "you
+can understand that I am not accustomed to doing such business in
+my own person. Yet the matter was so delicate that I could not
+confide it to an agent without putting myself in his power. I
+have come incognito from Prague for the purpose of consulting
+you."
+
+"Then, pray consult," said Holmes, shutting his eyes once more.
+
+"The facts are briefly these: Some five years ago, during a
+lengthy visit to Warsaw, I made the acquaintance of the well-known
+adventuress, Irene Adler. The name is no doubt familiar to you."
+
+"Kindly look her up in my index, Doctor," murmured Holmes without
+opening his eyes. For many years he had adopted a system of
+docketing all paragraphs concerning men and things, so that it
+was difficult to name a subject or a person on which he could not
+at once furnish information. In this case I found her biography
+sandwiched in between that of a Hebrew rabbi and that of a
+staff-commander who had written a monograph upon the deep-sea
+fishes.
+
+"Let me see!" said Holmes. "Hum! Born in New Jersey in the year
+1858. Contralto--hum! La Scala, hum! Prima donna Imperial Opera
+of Warsaw--yes! Retired from operatic stage--ha! Living in
+London--quite so! Your Majesty, as I understand, became entangled
+with this young person, wrote her some compromising letters, and
+is now desirous of getting those letters back."
+
+"Precisely so. But how--"
+
+"Was there a secret marriage?"
+
+"None."
+
+"No legal papers or certificates?"
+
+"None."
+
+"Then I fail to follow your Majesty. If this young person should
+produce her letters for blackmailing or other purposes, how is
+she to prove their authenticity?"
+
+"There is the writing."
+
+"Pooh, pooh! Forgery."
+
+"My private note-paper."
+
+"Stolen."
+
+"My own seal."
+
+"Imitated."
+
+"My photograph."
+
+"Bought."
+
+"We were both in the photograph."
+
+"Oh, dear! That is very bad! Your Majesty has indeed committed an
+indiscretion."
+
+"I was mad--insane."
+
+"You have compromised yourself seriously."
+
+"I was only Crown Prince then. I was young. I am but thirty now."
+
+"It must be recovered."
+
+"We have tried and failed."
+
+"Your Majesty must pay. It must be bought."
+
+"She will not sell."
+
+"Stolen, then."
+
+"Five attempts have been made. Twice burglars in my pay ransacked
+her house. Once we diverted her luggage when she travelled. Twice
+she has been waylaid. There has been no result."
+
+"No sign of it?"
+
+"Absolutely none."
+
+Holmes laughed. "It is quite a pretty little problem," said he.
+
+"But a very serious one to me," returned the King reproachfully.
+
+"Very, indeed. And what does she propose to do with the
+photograph?"
+
+"To ruin me."
+
+"But how?"
+
+"I am about to be married."
+
+"So I have heard."
+
+"To Clotilde Lothman von Saxe-Meningen, second daughter of the
+King of Scandinavia. You may know the strict principles of her
+family. She is herself the very soul of delicacy. A shadow of a
+doubt as to my conduct would bring the matter to an end."
+
+"And Irene Adler?"
+
+"Threatens to send them the photograph. And she will do it. I
+know that she will do it. You do not know her, but she has a soul
+of steel. She has the face of the most beautiful of women, and
+the mind of the most resolute of men. Rather than I should marry
+another woman, there are no lengths to which she would not
+go--none."
+
+"You are sure that she has not sent it yet?"
+
+"I am sure."
+
+"And why?"
+
+"Because she has said that she would send it on the day when the
+betrothal was publicly proclaimed. That will be next Monday."
+
+"Oh, then we have three days yet," said Holmes with a yawn. "That
+is very fortunate, as I have one or two matters of importance to
+look into just at present. Your Majesty will, of course, stay in
+London for the present?"
+
+"Certainly. You will find me at the Langham under the name of the
+Count Von Kramm."
+
+"Then I shall drop you a line to let you know how we progress."
+
+"Pray do so. I shall be all anxiety."
+
+"Then, as to money?"
+
+"You have carte blanche."
+
+"Absolutely?"
+
+"I tell you that I would give one of the provinces of my kingdom
+to have that photograph."
+
+"And for present expenses?"
+
+The King took a heavy chamois leather bag from under his cloak
+and laid it on the table.
+
+"There are three hundred pounds in gold and seven hundred in
+notes," he said.
+
+Holmes scribbled a receipt upon a sheet of his note-book and
+handed it to him.
+
+"And Mademoiselle's address?" he asked.
+
+"Is Briony Lodge, Serpentine Avenue, St. John's Wood."
+
+Holmes took a note of it. "One other question," said he. "Was the
+photograph a cabinet?"
+
+"It was."
+
+"Then, good-night, your Majesty, and I trust that we shall soon
+have some good news for you. And good-night, Watson," he added,
+as the wheels of the royal brougham rolled down the street. "If
+you will be good enough to call to-morrow afternoon at three
+o'clock I should like to chat this little matter over with you."
+
+
+II.
+
+At three o'clock precisely I was at Baker Street, but Holmes had
+not yet returned. The landlady informed me that he had left the
+house shortly after eight o'clock in the morning. I sat down
+beside the fire, however, with the intention of awaiting him,
+however long he might be. I was already deeply interested in his
+inquiry, for, though it was surrounded by none of the grim and
+strange features which were associated with the two crimes which
+I have already recorded, still, the nature of the case and the
+exalted station of his client gave it a character of its own.
+Indeed, apart from the nature of the investigation which my
+friend had on hand, there was something in his masterly grasp of
+a situation, and his keen, incisive reasoning, which made it a
+pleasure to me to study his system of work, and to follow the
+quick, subtle methods by which he disentangled the most
+inextricable mysteries. So accustomed was I to his invariable
+success that the very possibility of his failing had ceased to
+enter into my head.
+
+It was close upon four before the door opened, and a
+drunken-looking groom, ill-kempt and side-whiskered, with an
+inflamed face and disreputable clothes, walked into the room.
+Accustomed as I was to my friend's amazing powers in the use of
+disguises, I had to look three times before I was certain that it
+was indeed he. With a nod he vanished into the bedroom, whence he
+emerged in five minutes tweed-suited and respectable, as of old.
+Putting his hands into his pockets, he stretched out his legs in
+front of the fire and laughed heartily for some minutes.
+
+"Well, really!" he cried, and then he choked and laughed again
+until he was obliged to lie back, limp and helpless, in the
+chair.
+
+"What is it?"
+
+"It's quite too funny. I am sure you could never guess how I
+employed my morning, or what I ended by doing."
+
+"I can't imagine. I suppose that you have been watching the
+habits, and perhaps the house, of Miss Irene Adler."
+
+"Quite so; but the sequel was rather unusual. I will tell you,
+however. I left the house a little after eight o'clock this
+morning in the character of a groom out of work. There is a
+wonderful sympathy and freemasonry among horsey men. Be one of
+them, and you will know all that there is to know. I soon found
+Briony Lodge. It is a bijou villa, with a garden at the back, but
+built out in front right up to the road, two stories. Chubb lock
+to the door. Large sitting-room on the right side, well
+furnished, with long windows almost to the floor, and those
+preposterous English window fasteners which a child could open.
+Behind there was nothing remarkable, save that the passage window
+could be reached from the top of the coach-house. I walked round
+it and examined it closely from every point of view, but without
+noting anything else of interest.
+
+"I then lounged down the street and found, as I expected, that
+there was a mews in a lane which runs down by one wall of the
+garden. I lent the ostlers a hand in rubbing down their horses,
+and received in exchange twopence, a glass of half and half, two
+fills of shag tobacco, and as much information as I could desire
+about Miss Adler, to say nothing of half a dozen other people in
+the neighbourhood in whom I was not in the least interested, but
+whose biographies I was compelled to listen to."
+
+"And what of Irene Adler?" I asked.
+
+"Oh, she has turned all the men's heads down in that part. She is
+the daintiest thing under a bonnet on this planet. So say the
+Serpentine-mews, to a man. She lives quietly, sings at concerts,
+drives out at five every day, and returns at seven sharp for
+dinner. Seldom goes out at other times, except when she sings.
+Has only one male visitor, but a good deal of him. He is dark,
+handsome, and dashing, never calls less than once a day, and
+often twice. He is a Mr. Godfrey Norton, of the Inner Temple. See
+the advantages of a cabman as a confidant. They had driven him
+home a dozen times from Serpentine-mews, and knew all about him.
+When I had listened to all they had to tell, I began to walk up
+and down near Briony Lodge once more, and to think over my plan
+of campaign.
+
+"This Godfrey Norton was evidently an important factor in the
+matter. He was a lawyer. That sounded ominous. What was the
+relation between them, and what the object of his repeated
+visits? Was she his client, his friend, or his mistress? If the
+former, she had probably transferred the photograph to his
+keeping. If the latter, it was less likely. On the issue of this
+question depended whether I should continue my work at Briony
+Lodge, or turn my attention to the gentleman's chambers in the
+Temple. It was a delicate point, and it widened the field of my
+inquiry. I fear that I bore you with these details, but I have to
+let you see my little difficulties, if you are to understand the
+situation."
+
+"I am following you closely," I answered.
+
+"I was still balancing the matter in my mind when a hansom cab
+drove up to Briony Lodge, and a gentleman sprang out. He was a
+remarkably handsome man, dark, aquiline, and moustached--evidently
+the man of whom I had heard. He appeared to be in a
+great hurry, shouted to the cabman to wait, and brushed past the
+maid who opened the door with the air of a man who was thoroughly
+at home.
+
+"He was in the house about half an hour, and I could catch
+glimpses of him in the windows of the sitting-room, pacing up and
+down, talking excitedly, and waving his arms. Of her I could see
+nothing. Presently he emerged, looking even more flurried than
+before. As he stepped up to the cab, he pulled a gold watch from
+his pocket and looked at it earnestly, 'Drive like the devil,' he
+shouted, 'first to Gross & Hankey's in Regent Street, and then to
+the Church of St. Monica in the Edgeware Road. Half a guinea if
+you do it in twenty minutes!'
+
+"Away they went, and I was just wondering whether I should not do
+well to follow them when up the lane came a neat little landau,
+the coachman with his coat only half-buttoned, and his tie under
+his ear, while all the tags of his harness were sticking out of
+the buckles. It hadn't pulled up before she shot out of the hall
+door and into it. I only caught a glimpse of her at the moment,
+but she was a lovely woman, with a face that a man might die for.
+
+"'The Church of St. Monica, John,' she cried, 'and half a
+sovereign if you reach it in twenty minutes.'
+
+"This was quite too good to lose, Watson. I was just balancing
+whether I should run for it, or whether I should perch behind her
+landau when a cab came through the street. The driver looked
+twice at such a shabby fare, but I jumped in before he could
+object. 'The Church of St. Monica,' said I, 'and half a sovereign
+if you reach it in twenty minutes.' It was twenty-five minutes to
+twelve, and of course it was clear enough what was in the wind.
+
+"My cabby drove fast. I don't think I ever drove faster, but the
+others were there before us. The cab and the landau with their
+steaming horses were in front of the door when I arrived. I paid
+the man and hurried into the church. There was not a soul there
+save the two whom I had followed and a surpliced clergyman, who
+seemed to be expostulating with them. They were all three
+standing in a knot in front of the altar. I lounged up the side
+aisle like any other idler who has dropped into a church.
+Suddenly, to my surprise, the three at the altar faced round to
+me, and Godfrey Norton came running as hard as he could towards
+me.
+
+"'Thank God,' he cried. 'You'll do. Come! Come!'
+
+"'What then?' I asked.
+
+"'Come, man, come, only three minutes, or it won't be legal.'
+
+"I was half-dragged up to the altar, and before I knew where I was
+I found myself mumbling responses which were whispered in my ear,
+and vouching for things of which I knew nothing, and generally
+assisting in the secure tying up of Irene Adler, spinster, to
+Godfrey Norton, bachelor. It was all done in an instant, and
+there was the gentleman thanking me on the one side and the lady
+on the other, while the clergyman beamed on me in front. It was
+the most preposterous position in which I ever found myself in my
+life, and it was the thought of it that started me laughing just
+now. It seems that there had been some informality about their
+license, that the clergyman absolutely refused to marry them
+without a witness of some sort, and that my lucky appearance
+saved the bridegroom from having to sally out into the streets in
+search of a best man. The bride gave me a sovereign, and I mean
+to wear it on my watch-chain in memory of the occasion."
+
+"This is a very unexpected turn of affairs," said I; "and what
+then?"
+
+"Well, I found my plans very seriously menaced. It looked as if
+the pair might take an immediate departure, and so necessitate
+very prompt and energetic measures on my part. At the church
+door, however, they separated, he driving back to the Temple, and
+she to her own house. 'I shall drive out in the park at five as
+usual,' she said as she left him. I heard no more. They drove
+away in different directions, and I went off to make my own
+arrangements."
+
+"Which are?"
+
+"Some cold beef and a glass of beer," he answered, ringing the
+bell. "I have been too busy to think of food, and I am likely to
+be busier still this evening. By the way, Doctor, I shall want
+your co-operation."
+
+"I shall be delighted."
+
+"You don't mind breaking the law?"
+
+"Not in the least."
+
+"Nor running a chance of arrest?"
+
+"Not in a good cause."
+
+"Oh, the cause is excellent!"
+
+"Then I am your man."
+
+"I was sure that I might rely on you."
+
+"But what is it you wish?"
+
+"When Mrs. Turner has brought in the tray I will make it clear to
+you. Now," he said as he turned hungrily on the simple fare that
+our landlady had provided, "I must discuss it while I eat, for I
+have not much time. It is nearly five now. In two hours we must
+be on the scene of action. Miss Irene, or Madame, rather, returns
+from her drive at seven. We must be at Briony Lodge to meet her."
+
+"And what then?"
+
+"You must leave that to me. I have already arranged what is to
+occur. There is only one point on which I must insist. You must
+not interfere, come what may. You understand?"
+
+"I am to be neutral?"
+
+"To do nothing whatever. There will probably be some small
+unpleasantness. Do not join in it. It will end in my being
+conveyed into the house. Four or five minutes afterwards the
+sitting-room window will open. You are to station yourself close
+to that open window."
+
+"Yes."
+
+"You are to watch me, for I will be visible to you."
+
+"Yes."
+
+"And when I raise my hand--so--you will throw into the room what
+I give you to throw, and will, at the same time, raise the cry of
+fire. You quite follow me?"
+
+"Entirely."
+
+"It is nothing very formidable," he said, taking a long cigar-shaped
+roll from his pocket. "It is an ordinary plumber's smoke-rocket,
+fitted with a cap at either end to make it self-lighting.
+Your task is confined to that. When you raise your cry of fire,
+it will be taken up by quite a number of people. You may then
+walk to the end of the street, and I will rejoin you in ten
+minutes. I hope that I have made myself clear?"
+
+"I am to remain neutral, to get near the window, to watch you,
+and at the signal to throw in this object, then to raise the cry
+of fire, and to wait you at the corner of the street."
+
+"Precisely."
+
+"Then you may entirely rely on me."
+
+"That is excellent. I think, perhaps, it is almost time that I
+prepare for the new role I have to play."
+
+He disappeared into his bedroom and returned in a few minutes in
+the character of an amiable and simple-minded Nonconformist
+clergyman. His broad black hat, his baggy trousers, his white
+tie, his sympathetic smile, and general look of peering and
+benevolent curiosity were such as Mr. John Hare alone could have
+equalled. It was not merely that Holmes changed his costume. His
+expression, his manner, his very soul seemed to vary with every
+fresh part that he assumed. The stage lost a fine actor, even as
+science lost an acute reasoner, when he became a specialist in
+crime.
+
+It was a quarter past six when we left Baker Street, and it still
+wanted ten minutes to the hour when we found ourselves in
+Serpentine Avenue. It was already dusk, and the lamps were just
+being lighted as we paced up and down in front of Briony Lodge,
+waiting for the coming of its occupant. The house was just such
+as I had pictured it from Sherlock Holmes' succinct description,
+but the locality appeared to be less private than I expected. On
+the contrary, for a small street in a quiet neighbourhood, it was
+remarkably animated. There was a group of shabbily dressed men
+smoking and laughing in a corner, a scissors-grinder with his
+wheel, two guardsmen who were flirting with a nurse-girl, and
+several well-dressed young men who were lounging up and down with
+cigars in their mouths.
+
+"You see," remarked Holmes, as we paced to and fro in front of
+the house, "this marriage rather simplifies matters. The
+photograph becomes a double-edged weapon now. The chances are
+that she would be as averse to its being seen by Mr. Godfrey
+Norton, as our client is to its coming to the eyes of his
+princess. Now the question is, Where are we to find the
+photograph?"
+
+"Where, indeed?"
+
+"It is most unlikely that she carries it about with her. It is
+cabinet size. Too large for easy concealment about a woman's
+dress. She knows that the King is capable of having her waylaid
+and searched. Two attempts of the sort have already been made. We
+may take it, then, that she does not carry it about with her."
+
+"Where, then?"
+
+"Her banker or her lawyer. There is that double possibility. But
+I am inclined to think neither. Women are naturally secretive,
+and they like to do their own secreting. Why should she hand it
+over to anyone else? She could trust her own guardianship, but
+she could not tell what indirect or political influence might be
+brought to bear upon a business man. Besides, remember that she
+had resolved to use it within a few days. It must be where she
+can lay her hands upon it. It must be in her own house."
+
+"But it has twice been burgled."
+
+"Pshaw! They did not know how to look."
+
+"But how will you look?"
+
+"I will not look."
+
+"What then?"
+
+"I will get her to show me."
+
+"But she will refuse."
+
+"She will not be able to. But I hear the rumble of wheels. It is
+her carriage. Now carry out my orders to the letter."
+
+As he spoke the gleam of the side-lights of a carriage came round
+the curve of the avenue. It was a smart little landau which
+rattled up to the door of Briony Lodge. As it pulled up, one of
+the loafing men at the corner dashed forward to open the door in
+the hope of earning a copper, but was elbowed away by another
+loafer, who had rushed up with the same intention. A fierce
+quarrel broke out, which was increased by the two guardsmen, who
+took sides with one of the loungers, and by the scissors-grinder,
+who was equally hot upon the other side. A blow was struck, and
+in an instant the lady, who had stepped from her carriage, was
+the centre of a little knot of flushed and struggling men, who
+struck savagely at each other with their fists and sticks. Holmes
+dashed into the crowd to protect the lady; but just as he reached
+her he gave a cry and dropped to the ground, with the blood
+running freely down his face. At his fall the guardsmen took to
+their heels in one direction and the loungers in the other, while
+a number of better-dressed people, who had watched the scuffle
+without taking part in it, crowded in to help the lady and to
+attend to the injured man. Irene Adler, as I will still call her,
+had hurried up the steps; but she stood at the top with her
+superb figure outlined against the lights of the hall, looking
+back into the street.
+
+"Is the poor gentleman much hurt?" she asked.
+
+"He is dead," cried several voices.
+
+"No, no, there's life in him!" shouted another. "But he'll be
+gone before you can get him to hospital."
+
+"He's a brave fellow," said a woman. "They would have had the
+lady's purse and watch if it hadn't been for him. They were a
+gang, and a rough one, too. Ah, he's breathing now."
+
+"He can't lie in the street. May we bring him in, marm?"
+
+"Surely. Bring him into the sitting-room. There is a comfortable
+sofa. This way, please!"
+
+Slowly and solemnly he was borne into Briony Lodge and laid out
+in the principal room, while I still observed the proceedings
+from my post by the window. The lamps had been lit, but the
+blinds had not been drawn, so that I could see Holmes as he lay
+upon the couch. I do not know whether he was seized with
+compunction at that moment for the part he was playing, but I
+know that I never felt more heartily ashamed of myself in my life
+than when I saw the beautiful creature against whom I was
+conspiring, or the grace and kindliness with which she waited
+upon the injured man. And yet it would be the blackest treachery
+to Holmes to draw back now from the part which he had intrusted
+to me. I hardened my heart, and took the smoke-rocket from under
+my ulster. After all, I thought, we are not injuring her. We are
+but preventing her from injuring another.
+
+Holmes had sat up upon the couch, and I saw him motion like a man
+who is in need of air. A maid rushed across and threw open the
+window. At the same instant I saw him raise his hand and at the
+signal I tossed my rocket into the room with a cry of "Fire!" The
+word was no sooner out of my mouth than the whole crowd of
+spectators, well dressed and ill--gentlemen, ostlers, and
+servant-maids--joined in a general shriek of "Fire!" Thick clouds
+of smoke curled through the room and out at the open window. I
+caught a glimpse of rushing figures, and a moment later the voice
+of Holmes from within assuring them that it was a false alarm.
+Slipping through the shouting crowd I made my way to the corner
+of the street, and in ten minutes was rejoiced to find my
+friend's arm in mine, and to get away from the scene of uproar.
+He walked swiftly and in silence for some few minutes until we
+had turned down one of the quiet streets which lead towards the
+Edgeware Road.
+
+"You did it very nicely, Doctor," he remarked. "Nothing could
+have been better. It is all right."
+
+"You have the photograph?"
+
+"I know where it is."
+
+"And how did you find out?"
+
+"She showed me, as I told you she would."
+
+"I am still in the dark."
+
+"I do not wish to make a mystery," said he, laughing. "The matter
+was perfectly simple. You, of course, saw that everyone in the
+street was an accomplice. They were all engaged for the evening."
+
+"I guessed as much."
+
+"Then, when the row broke out, I had a little moist red paint in
+the palm of my hand. I rushed forward, fell down, clapped my hand
+to my face, and became a piteous spectacle. It is an old trick."
+
+"That also I could fathom."
+
+"Then they carried me in. She was bound to have me in. What else
+could she do? And into her sitting-room, which was the very room
+which I suspected. It lay between that and her bedroom, and I was
+determined to see which. They laid me on a couch, I motioned for
+air, they were compelled to open the window, and you had your
+chance."
+
+"How did that help you?"
+
+"It was all-important. When a woman thinks that her house is on
+fire, her instinct is at once to rush to the thing which she
+values most. It is a perfectly overpowering impulse, and I have
+more than once taken advantage of it. In the case of the
+Darlington substitution scandal it was of use to me, and also in
+the Arnsworth Castle business. A married woman grabs at her baby;
+an unmarried one reaches for her jewel-box. Now it was clear to
+me that our lady of to-day had nothing in the house more precious
+to her than what we are in quest of. She would rush to secure it.
+The alarm of fire was admirably done. The smoke and shouting were
+enough to shake nerves of steel. She responded beautifully. The
+photograph is in a recess behind a sliding panel just above the
+right bell-pull. She was there in an instant, and I caught a
+glimpse of it as she half-drew it out. When I cried out that it
+was a false alarm, she replaced it, glanced at the rocket, rushed
+from the room, and I have not seen her since. I rose, and, making
+my excuses, escaped from the house. I hesitated whether to
+attempt to secure the photograph at once; but the coachman had
+come in, and as he was watching me narrowly it seemed safer to
+wait. A little over-precipitance may ruin all."
+
+"And now?" I asked.
+
+"Our quest is practically finished. I shall call with the King
+to-morrow, and with you, if you care to come with us. We will be
+shown into the sitting-room to wait for the lady, but it is
+probable that when she comes she may find neither us nor the
+photograph. It might be a satisfaction to his Majesty to regain
+it with his own hands."
+
+"And when will you call?"
+
+"At eight in the morning. She will not be up, so that we shall
+have a clear field. Besides, we must be prompt, for this marriage
+may mean a complete change in her life and habits. I must wire to
+the King without delay."
+
+We had reached Baker Street and had stopped at the door. He was
+searching his pockets for the key when someone passing said:
+
+"Good-night, Mister Sherlock Holmes."
+
+There were several people on the pavement at the time, but the
+greeting appeared to come from a slim youth in an ulster who had
+hurried by.
+
+"I've heard that voice before," said Holmes, staring down the
+dimly lit street. "Now, I wonder who the deuce that could have
+been."
+
+
+III.
+
+I slept at Baker Street that night, and we were engaged upon our
+toast and coffee in the morning when the King of Bohemia rushed
+into the room.
+
+"You have really got it!" he cried, grasping Sherlock Holmes by
+either shoulder and looking eagerly into his face.
+
+"Not yet."
+
+"But you have hopes?"
+
+"I have hopes."
+
+"Then, come. I am all impatience to be gone."
+
+"We must have a cab."
+
+"No, my brougham is waiting."
+
+"Then that will simplify matters." We descended and started off
+once more for Briony Lodge.
+
+"Irene Adler is married," remarked Holmes.
+
+"Married! When?"
+
+"Yesterday."
+
+"But to whom?"
+
+"To an English lawyer named Norton."
+
+"But she could not love him."
+
+"I am in hopes that she does."
+
+"And why in hopes?"
+
+"Because it would spare your Majesty all fear of future
+annoyance. If the lady loves her husband, she does not love your
+Majesty. If she does not love your Majesty, there is no reason
+why she should interfere with your Majesty's plan."
+
+"It is true. And yet--Well! I wish she had been of my own
+station! What a queen she would have made!" He relapsed into a
+moody silence, which was not broken until we drew up in
+Serpentine Avenue.
+
+The door of Briony Lodge was open, and an elderly woman stood
+upon the steps. She watched us with a sardonic eye as we stepped
+from the brougham.
+
+"Mr. Sherlock Holmes, I believe?" said she.
+
+"I am Mr. Holmes," answered my companion, looking at her with a
+questioning and rather startled gaze.
+
+"Indeed! My mistress told me that you were likely to call. She
+left this morning with her husband by the 5:15 train from Charing
+Cross for the Continent."
+
+"What!" Sherlock Holmes staggered back, white with chagrin and
+surprise. "Do you mean that she has left England?"
+
+"Never to return."
+
+"And the papers?" asked the King hoarsely. "All is lost."
+
+"We shall see." He pushed past the servant and rushed into the
+drawing-room, followed by the King and myself. The furniture was
+scattered about in every direction, with dismantled shelves and
+open drawers, as if the lady had hurriedly ransacked them before
+her flight. Holmes rushed at the bell-pull, tore back a small
+sliding shutter, and, plunging in his hand, pulled out a
+photograph and a letter. The photograph was of Irene Adler
+herself in evening dress, the letter was superscribed to
+"Sherlock Holmes, Esq. To be left till called for." My friend
+tore it open and we all three read it together. It was dated at
+midnight of the preceding night and ran in this way:
+
+"MY DEAR MR. SHERLOCK HOLMES,--You really did it very well. You
+took me in completely. Until after the alarm of fire, I had not a
+suspicion. But then, when I found how I had betrayed myself, I
+began to think. I had been warned against you months ago. I had
+been told that if the King employed an agent it would certainly
+be you. And your address had been given me. Yet, with all this,
+you made me reveal what you wanted to know. Even after I became
+suspicious, I found it hard to think evil of such a dear, kind
+old clergyman. But, you know, I have been trained as an actress
+myself. Male costume is nothing new to me. I often take advantage
+of the freedom which it gives. I sent John, the coachman, to
+watch you, ran up stairs, got into my walking-clothes, as I call
+them, and came down just as you departed.
+
+"Well, I followed you to your door, and so made sure that I was
+really an object of interest to the celebrated Mr. Sherlock
+Holmes. Then I, rather imprudently, wished you good-night, and
+started for the Temple to see my husband.
+
+"We both thought the best resource was flight, when pursued by
+so formidable an antagonist; so you will find the nest empty when
+you call to-morrow. As to the photograph, your client may rest in
+peace. I love and am loved by a better man than he. The King may
+do what he will without hindrance from one whom he has cruelly
+wronged. I keep it only to safeguard myself, and to preserve a
+weapon which will always secure me from any steps which he might
+take in the future. I leave a photograph which he might care to
+possess; and I remain, dear Mr. Sherlock Holmes,
+
+ "Very truly yours,
+ "IRENE NORTON, née ADLER."
+
+"What a woman--oh, what a woman!" cried the King of Bohemia, when
+we had all three read this epistle. "Did I not tell you how quick
+and resolute she was? Would she not have made an admirable queen?
+Is it not a pity that she was not on my level?"
+
+"From what I have seen of the lady she seems indeed to be on a
+very different level to your Majesty," said Holmes coldly. "I am
+sorry that I have not been able to bring your Majesty's business
+to a more successful conclusion."
+
+"On the contrary, my dear sir," cried the King; "nothing could be
+more successful. I know that her word is inviolate. The
+photograph is now as safe as if it were in the fire."
+
+"I am glad to hear your Majesty say so."
+
+"I am immensely indebted to you. Pray tell me in what way I can
+reward you. This ring--" He slipped an emerald snake ring from
+his finger and held it out upon the palm of his hand.
+
+"Your Majesty has something which I should value even more
+highly," said Holmes.
+
+"You have but to name it."
+
+"This photograph!"
+
+The King stared at him in amazement.
+
+"Irene's photograph!" he cried. "Certainly, if you wish it."
+
+"I thank your Majesty. Then there is no more to be done in the
+matter. I have the honour to wish you a very good-morning." He
+bowed, and, turning away without observing the hand which the
+King had stretched out to him, he set off in my company for his
+chambers.
+
+And that was how a great scandal threatened to affect the kingdom
+of Bohemia, and how the best plans of Mr. Sherlock Holmes were
+beaten by a woman's wit. He used to make merry over the
+cleverness of women, but I have not heard him do it of late. And
+when he speaks of Irene Adler, or when he refers to her
+photograph, it is always under the honourable title of the woman.
+
+
+
+ADVENTURE II. THE RED-HEADED LEAGUE
+
+I had called upon my friend, Mr. Sherlock Holmes, one day in the
+autumn of last year and found him in deep conversation with a
+very stout, florid-faced, elderly gentleman with fiery red hair.
+With an apology for my intrusion, I was about to withdraw when
+Holmes pulled me abruptly into the room and closed the door
+behind me.
+
+"You could not possibly have come at a better time, my dear
+Watson," he said cordially.
+
+"I was afraid that you were engaged."
+
+"So I am. Very much so."
+
+"Then I can wait in the next room."
+
+"Not at all. This gentleman, Mr. Wilson, has been my partner and
+helper in many of my most successful cases, and I have no
+doubt that he will be of the utmost use to me in yours also."
+
+The stout gentleman half rose from his chair and gave a bob of
+greeting, with a quick little questioning glance from his small
+fat-encircled eyes.
+
+"Try the settee," said Holmes, relapsing into his armchair and
+putting his fingertips together, as was his custom when in
+judicial moods. "I know, my dear Watson, that you share my love
+of all that is bizarre and outside the conventions and humdrum
+routine of everyday life. You have shown your relish for it by
+the enthusiasm which has prompted you to chronicle, and, if you
+will excuse my saying so, somewhat to embellish so many of my own
+little adventures."
+
+"Your cases have indeed been of the greatest interest to me," I
+observed.
+
+"You will remember that I remarked the other day, just before we
+went into the very simple problem presented by Miss Mary
+Sutherland, that for strange effects and extraordinary
+combinations we must go to life itself, which is always far more
+daring than any effort of the imagination."
+
+"A proposition which I took the liberty of doubting."
+
+"You did, Doctor, but none the less you must come round to my
+view, for otherwise I shall keep on piling fact upon fact on you
+until your reason breaks down under them and acknowledges me to
+be right. Now, Mr. Jabez Wilson here has been good enough to call
+upon me this morning, and to begin a narrative which promises to
+be one of the most singular which I have listened to for some
+time. You have heard me remark that the strangest and most unique
+things are very often connected not with the larger but with the
+smaller crimes, and occasionally, indeed, where there is room for
+doubt whether any positive crime has been committed. As far as I
+have heard it is impossible for me to say whether the present
+case is an instance of crime or not, but the course of events is
+certainly among the most singular that I have ever listened to.
+Perhaps, Mr. Wilson, you would have the great kindness to
+recommence your narrative. I ask you not merely because my friend
+Dr. Watson has not heard the opening part but also because the
+peculiar nature of the story makes me anxious to have every
+possible detail from your lips. As a rule, when I have heard some
+slight indication of the course of events, I am able to guide
+myself by the thousands of other similar cases which occur to my
+memory. In the present instance I am forced to admit that the
+facts are, to the best of my belief, unique."
+
+The portly client puffed out his chest with an appearance of some
+little pride and pulled a dirty and wrinkled newspaper from the
+inside pocket of his greatcoat. As he glanced down the
+advertisement column, with his head thrust forward and the paper
+flattened out upon his knee, I took a good look at the man and
+endeavoured, after the fashion of my companion, to read the
+indications which might be presented by his dress or appearance.
+
+I did not gain very much, however, by my inspection. Our visitor
+bore every mark of being an average commonplace British
+tradesman, obese, pompous, and slow. He wore rather baggy grey
+shepherd's check trousers, a not over-clean black frock-coat,
+unbuttoned in the front, and a drab waistcoat with a heavy brassy
+Albert chain, and a square pierced bit of metal dangling down as
+an ornament. A frayed top-hat and a faded brown overcoat with a
+wrinkled velvet collar lay upon a chair beside him. Altogether,
+look as I would, there was nothing remarkable about the man save
+his blazing red head, and the expression of extreme chagrin and
+discontent upon his features.
+
+Sherlock Holmes' quick eye took in my occupation, and he shook
+his head with a smile as he noticed my questioning glances.
+"Beyond the obvious facts that he has at some time done manual
+labour, that he takes snuff, that he is a Freemason, that he has
+been in China, and that he has done a considerable amount of
+writing lately, I can deduce nothing else."
+
+Mr. Jabez Wilson started up in his chair, with his forefinger
+upon the paper, but his eyes upon my companion.
+
+"How, in the name of good-fortune, did you know all that, Mr.
+Holmes?" he asked. "How did you know, for example, that I did
+manual labour. It's as true as gospel, for I began as a ship's
+carpenter."
+
+"Your hands, my dear sir. Your right hand is quite a size larger
+than your left. You have worked with it, and the muscles are more
+developed."
+
+"Well, the snuff, then, and the Freemasonry?"
+
+"I won't insult your intelligence by telling you how I read that,
+especially as, rather against the strict rules of your order, you
+use an arc-and-compass breastpin."
+
+"Ah, of course, I forgot that. But the writing?"
+
+"What else can be indicated by that right cuff so very shiny for
+five inches, and the left one with the smooth patch near the
+elbow where you rest it upon the desk?"
+
+"Well, but China?"
+
+"The fish that you have tattooed immediately above your right
+wrist could only have been done in China. I have made a small
+study of tattoo marks and have even contributed to the literature
+of the subject. That trick of staining the fishes' scales of a
+delicate pink is quite peculiar to China. When, in addition, I
+see a Chinese coin hanging from your watch-chain, the matter
+becomes even more simple."
+
+Mr. Jabez Wilson laughed heavily. "Well, I never!" said he. "I
+thought at first that you had done something clever, but I see
+that there was nothing in it, after all."
+
+"I begin to think, Watson," said Holmes, "that I make a mistake
+in explaining. 'Omne ignotum pro magnifico,' you know, and my
+poor little reputation, such as it is, will suffer shipwreck if I
+am so candid. Can you not find the advertisement, Mr. Wilson?"
+
+"Yes, I have got it now," he answered with his thick red finger
+planted halfway down the column. "Here it is. This is what began
+it all. You just read it for yourself, sir."
+
+I took the paper from him and read as follows:
+
+"TO THE RED-HEADED LEAGUE: On account of the bequest of the late
+Ezekiah Hopkins, of Lebanon, Pennsylvania, U. S. A., there is now
+another vacancy open which entitles a member of the League to a
+salary of 4 pounds a week for purely nominal services. All
+red-headed men who are sound in body and mind and above the age
+of twenty-one years, are eligible. Apply in person on Monday, at
+eleven o'clock, to Duncan Ross, at the offices of the League, 7
+Pope's Court, Fleet Street."
+
+"What on earth does this mean?" I ejaculated after I had twice
+read over the extraordinary announcement.
+
+Holmes chuckled and wriggled in his chair, as was his habit when
+in high spirits. "It is a little off the beaten track, isn't it?"
+said he. "And now, Mr. Wilson, off you go at scratch and tell us
+all about yourself, your household, and the effect which this
+advertisement had upon your fortunes. You will first make a note,
+Doctor, of the paper and the date."
+
+"It is The Morning Chronicle of April 27, 1890. Just two months
+ago."
+
+"Very good. Now, Mr. Wilson?"
+
+"Well, it is just as I have been telling you, Mr. Sherlock
+Holmes," said Jabez Wilson, mopping his forehead; "I have a small
+pawnbroker's business at Coburg Square, near the City. It's not a
+very large affair, and of late years it has not done more than
+just give me a living. I used to be able to keep two assistants,
+but now I only keep one; and I would have a job to pay him but
+that he is willing to come for half wages so as to learn the
+business."
+
+"What is the name of this obliging youth?" asked Sherlock Holmes.
+
+"His name is Vincent Spaulding, and he's not such a youth,
+either. It's hard to say his age. I should not wish a smarter
+assistant, Mr. Holmes; and I know very well that he could better
+himself and earn twice what I am able to give him. But, after
+all, if he is satisfied, why should I put ideas in his head?"
+
+"Why, indeed? You seem most fortunate in having an employé who
+comes under the full market price. It is not a common experience
+among employers in this age. I don't know that your assistant is
+not as remarkable as your advertisement."
+
+"Oh, he has his faults, too," said Mr. Wilson. "Never was such a
+fellow for photography. Snapping away with a camera when he ought
+to be improving his mind, and then diving down into the cellar
+like a rabbit into its hole to develop his pictures. That is his
+main fault, but on the whole he's a good worker. There's no vice
+in him."
+
+"He is still with you, I presume?"
+
+"Yes, sir. He and a girl of fourteen, who does a bit of simple
+cooking and keeps the place clean--that's all I have in the
+house, for I am a widower and never had any family. We live very
+quietly, sir, the three of us; and we keep a roof over our heads
+and pay our debts, if we do nothing more.
+
+"The first thing that put us out was that advertisement.
+Spaulding, he came down into the office just this day eight
+weeks, with this very paper in his hand, and he says:
+
+"'I wish to the Lord, Mr. Wilson, that I was a red-headed man.'
+
+"'Why that?' I asks.
+
+"'Why,' says he, 'here's another vacancy on the League of the
+Red-headed Men. It's worth quite a little fortune to any man who
+gets it, and I understand that there are more vacancies than
+there are men, so that the trustees are at their wits' end what
+to do with the money. If my hair would only change colour, here's
+a nice little crib all ready for me to step into.'
+
+"'Why, what is it, then?' I asked. You see, Mr. Holmes, I am a
+very stay-at-home man, and as my business came to me instead of
+my having to go to it, I was often weeks on end without putting
+my foot over the door-mat. In that way I didn't know much of what
+was going on outside, and I was always glad of a bit of news.
+
+"'Have you never heard of the League of the Red-headed Men?' he
+asked with his eyes open.
+
+"'Never.'
+
+"'Why, I wonder at that, for you are eligible yourself for one
+of the vacancies.'
+
+"'And what are they worth?' I asked.
+
+"'Oh, merely a couple of hundred a year, but the work is slight,
+and it need not interfere very much with one's other
+occupations.'
+
+"Well, you can easily think that that made me prick up my ears,
+for the business has not been over-good for some years, and an
+extra couple of hundred would have been very handy.
+
+"'Tell me all about it,' said I.
+
+"'Well,' said he, showing me the advertisement, 'you can see for
+yourself that the League has a vacancy, and there is the address
+where you should apply for particulars. As far as I can make out,
+the League was founded by an American millionaire, Ezekiah
+Hopkins, who was very peculiar in his ways. He was himself
+red-headed, and he had a great sympathy for all red-headed men;
+so when he died it was found that he had left his enormous
+fortune in the hands of trustees, with instructions to apply the
+interest to the providing of easy berths to men whose hair is of
+that colour. From all I hear it is splendid pay and very little to
+do.'
+
+"'But,' said I, 'there would be millions of red-headed men who
+would apply.'
+
+"'Not so many as you might think,' he answered. 'You see it is
+really confined to Londoners, and to grown men. This American had
+started from London when he was young, and he wanted to do the
+old town a good turn. Then, again, I have heard it is no use your
+applying if your hair is light red, or dark red, or anything but
+real bright, blazing, fiery red. Now, if you cared to apply, Mr.
+Wilson, you would just walk in; but perhaps it would hardly be
+worth your while to put yourself out of the way for the sake of a
+few hundred pounds.'
+
+"Now, it is a fact, gentlemen, as you may see for yourselves,
+that my hair is of a very full and rich tint, so that it seemed
+to me that if there was to be any competition in the matter I
+stood as good a chance as any man that I had ever met. Vincent
+Spaulding seemed to know so much about it that I thought he might
+prove useful, so I just ordered him to put up the shutters for
+the day and to come right away with me. He was very willing to
+have a holiday, so we shut the business up and started off for
+the address that was given us in the advertisement.
+
+"I never hope to see such a sight as that again, Mr. Holmes. From
+north, south, east, and west every man who had a shade of red in
+his hair had tramped into the city to answer the advertisement.
+Fleet Street was choked with red-headed folk, and Pope's Court
+looked like a coster's orange barrow. I should not have thought
+there were so many in the whole country as were brought together
+by that single advertisement. Every shade of colour they
+were--straw, lemon, orange, brick, Irish-setter, liver, clay;
+but, as Spaulding said, there were not many who had the real
+vivid flame-coloured tint. When I saw how many were waiting, I
+would have given it up in despair; but Spaulding would not hear
+of it. How he did it I could not imagine, but he pushed and
+pulled and butted until he got me through the crowd, and right up
+to the steps which led to the office. There was a double stream
+upon the stair, some going up in hope, and some coming back
+dejected; but we wedged in as well as we could and soon found
+ourselves in the office."
+
+"Your experience has been a most entertaining one," remarked
+Holmes as his client paused and refreshed his memory with a huge
+pinch of snuff. "Pray continue your very interesting statement."
+
+"There was nothing in the office but a couple of wooden chairs
+and a deal table, behind which sat a small man with a head that
+was even redder than mine. He said a few words to each candidate
+as he came up, and then he always managed to find some fault in
+them which would disqualify them. Getting a vacancy did not seem
+to be such a very easy matter, after all. However, when our turn
+came the little man was much more favourable to me than to any of
+the others, and he closed the door as we entered, so that he
+might have a private word with us.
+
+"'This is Mr. Jabez Wilson,' said my assistant, 'and he is
+willing to fill a vacancy in the League.'
+
+"'And he is admirably suited for it,' the other answered. 'He has
+every requirement. I cannot recall when I have seen anything so
+fine.' He took a step backward, cocked his head on one side, and
+gazed at my hair until I felt quite bashful. Then suddenly he
+plunged forward, wrung my hand, and congratulated me warmly on my
+success.
+
+"'It would be injustice to hesitate,' said he. 'You will,
+however, I am sure, excuse me for taking an obvious precaution.'
+With that he seized my hair in both his hands, and tugged until I
+yelled with the pain. 'There is water in your eyes,' said he as
+he released me. 'I perceive that all is as it should be. But we
+have to be careful, for we have twice been deceived by wigs and
+once by paint. I could tell you tales of cobbler's wax which
+would disgust you with human nature.' He stepped over to the
+window and shouted through it at the top of his voice that the
+vacancy was filled. A groan of disappointment came up from below,
+and the folk all trooped away in different directions until there
+was not a red-head to be seen except my own and that of the
+manager.
+
+"'My name,' said he, 'is Mr. Duncan Ross, and I am myself one of
+the pensioners upon the fund left by our noble benefactor. Are
+you a married man, Mr. Wilson? Have you a family?'
+
+"I answered that I had not.
+
+"His face fell immediately.
+
+"'Dear me!' he said gravely, 'that is very serious indeed! I am
+sorry to hear you say that. The fund was, of course, for the
+propagation and spread of the red-heads as well as for their
+maintenance. It is exceedingly unfortunate that you should be a
+bachelor.'
+
+"My face lengthened at this, Mr. Holmes, for I thought that I was
+not to have the vacancy after all; but after thinking it over for
+a few minutes he said that it would be all right.
+
+"'In the case of another,' said he, 'the objection might be
+fatal, but we must stretch a point in favour of a man with such a
+head of hair as yours. When shall you be able to enter upon your
+new duties?'
+
+"'Well, it is a little awkward, for I have a business already,'
+said I.
+
+"'Oh, never mind about that, Mr. Wilson!' said Vincent Spaulding.
+'I should be able to look after that for you.'
+
+"'What would be the hours?' I asked.
+
+"'Ten to two.'
+
+"Now a pawnbroker's business is mostly done of an evening, Mr.
+Holmes, especially Thursday and Friday evening, which is just
+before pay-day; so it would suit me very well to earn a little in
+the mornings. Besides, I knew that my assistant was a good man,
+and that he would see to anything that turned up.
+
+"'That would suit me very well,' said I. 'And the pay?'
+
+"'Is 4 pounds a week.'
+
+"'And the work?'
+
+"'Is purely nominal.'
+
+"'What do you call purely nominal?'
+
+"'Well, you have to be in the office, or at least in the
+building, the whole time. If you leave, you forfeit your whole
+position forever. The will is very clear upon that point. You
+don't comply with the conditions if you budge from the office
+during that time.'
+
+"'It's only four hours a day, and I should not think of leaving,'
+said I.
+
+"'No excuse will avail,' said Mr. Duncan Ross; 'neither sickness
+nor business nor anything else. There you must stay, or you lose
+your billet.'
+
+"'And the work?'
+
+"'Is to copy out the "Encyclopaedia Britannica." There is the first
+volume of it in that press. You must find your own ink, pens, and
+blotting-paper, but we provide this table and chair. Will you be
+ready to-morrow?'
+
+"'Certainly,' I answered.
+
+"'Then, good-bye, Mr. Jabez Wilson, and let me congratulate you
+once more on the important position which you have been fortunate
+enough to gain.' He bowed me out of the room and I went home with
+my assistant, hardly knowing what to say or do, I was so pleased
+at my own good fortune.
+
+"Well, I thought over the matter all day, and by evening I was in
+low spirits again; for I had quite persuaded myself that the
+whole affair must be some great hoax or fraud, though what its
+object might be I could not imagine. It seemed altogether past
+belief that anyone could make such a will, or that they would pay
+such a sum for doing anything so simple as copying out the
+'Encyclopaedia Britannica.' Vincent Spaulding did what he could to
+cheer me up, but by bedtime I had reasoned myself out of the
+whole thing. However, in the morning I determined to have a look
+at it anyhow, so I bought a penny bottle of ink, and with a
+quill-pen, and seven sheets of foolscap paper, I started off for
+Pope's Court.
+
+"Well, to my surprise and delight, everything was as right as
+possible. The table was set out ready for me, and Mr. Duncan Ross
+was there to see that I got fairly to work. He started me off
+upon the letter A, and then he left me; but he would drop in from
+time to time to see that all was right with me. At two o'clock he
+bade me good-day, complimented me upon the amount that I had
+written, and locked the door of the office after me.
+
+"This went on day after day, Mr. Holmes, and on Saturday the
+manager came in and planked down four golden sovereigns for my
+week's work. It was the same next week, and the same the week
+after. Every morning I was there at ten, and every afternoon I
+left at two. By degrees Mr. Duncan Ross took to coming in only
+once of a morning, and then, after a time, he did not come in at
+all. Still, of course, I never dared to leave the room for an
+instant, for I was not sure when he might come, and the billet
+was such a good one, and suited me so well, that I would not risk
+the loss of it.
+
+"Eight weeks passed away like this, and I had written about
+Abbots and Archery and Armour and Architecture and Attica, and
+hoped with diligence that I might get on to the B's before very
+long. It cost me something in foolscap, and I had pretty nearly
+filled a shelf with my writings. And then suddenly the whole
+business came to an end."
+
+"To an end?"
+
+"Yes, sir. And no later than this morning. I went to my work as
+usual at ten o'clock, but the door was shut and locked, with a
+little square of cardboard hammered on to the middle of the
+panel with a tack. Here it is, and you can read for yourself."
+
+He held up a piece of white cardboard about the size of a sheet
+of note-paper. It read in this fashion:
+
+ THE RED-HEADED LEAGUE
+
+ IS
+
+ DISSOLVED.
+
+ October 9, 1890.
+
+Sherlock Holmes and I surveyed this curt announcement and the
+rueful face behind it, until the comical side of the affair so
+completely overtopped every other consideration that we both
+burst out into a roar of laughter.
+
+"I cannot see that there is anything very funny," cried our
+client, flushing up to the roots of his flaming head. "If you can
+do nothing better than laugh at me, I can go elsewhere."
+
+"No, no," cried Holmes, shoving him back into the chair from
+which he had half risen. "I really wouldn't miss your case for
+the world. It is most refreshingly unusual. But there is, if you
+will excuse my saying so, something just a little funny about it.
+Pray what steps did you take when you found the card upon the
+door?"
+
+"I was staggered, sir. I did not know what to do. Then I called
+at the offices round, but none of them seemed to know anything
+about it. Finally, I went to the landlord, who is an accountant
+living on the ground-floor, and I asked him if he could tell me
+what had become of the Red-headed League. He said that he had
+never heard of any such body. Then I asked him who Mr. Duncan
+Ross was. He answered that the name was new to him.
+
+"'Well,' said I, 'the gentleman at No. 4.'
+
+"'What, the red-headed man?'
+
+"'Yes.'
+
+"'Oh,' said he, 'his name was William Morris. He was a solicitor
+and was using my room as a temporary convenience until his new
+premises were ready. He moved out yesterday.'
+
+"'Where could I find him?'
+
+"'Oh, at his new offices. He did tell me the address. Yes, 17
+King Edward Street, near St. Paul's.'
+
+"I started off, Mr. Holmes, but when I got to that address it was
+a manufactory of artificial knee-caps, and no one in it had ever
+heard of either Mr. William Morris or Mr. Duncan Ross."
+
+"And what did you do then?" asked Holmes.
+
+"I went home to Saxe-Coburg Square, and I took the advice of my
+assistant. But he could not help me in any way. He could only say
+that if I waited I should hear by post. But that was not quite
+good enough, Mr. Holmes. I did not wish to lose such a place
+without a struggle, so, as I had heard that you were good enough
+to give advice to poor folk who were in need of it, I came right
+away to you."
+
+"And you did very wisely," said Holmes. "Your case is an
+exceedingly remarkable one, and I shall be happy to look into it.
+From what you have told me I think that it is possible that
+graver issues hang from it than might at first sight appear."
+
+"Grave enough!" said Mr. Jabez Wilson. "Why, I have lost four
+pound a week."
+
+"As far as you are personally concerned," remarked Holmes, "I do
+not see that you have any grievance against this extraordinary
+league. On the contrary, you are, as I understand, richer by some
+30 pounds, to say nothing of the minute knowledge which you have
+gained on every subject which comes under the letter A. You have
+lost nothing by them."
+
+"No, sir. But I want to find out about them, and who they are,
+and what their object was in playing this prank--if it was a
+prank--upon me. It was a pretty expensive joke for them, for it
+cost them two and thirty pounds."
+
+"We shall endeavour to clear up these points for you. And, first,
+one or two questions, Mr. Wilson. This assistant of yours who
+first called your attention to the advertisement--how long had he
+been with you?"
+
+"About a month then."
+
+"How did he come?"
+
+"In answer to an advertisement."
+
+"Was he the only applicant?"
+
+"No, I had a dozen."
+
+"Why did you pick him?"
+
+"Because he was handy and would come cheap."
+
+"At half-wages, in fact."
+
+"Yes."
+
+"What is he like, this Vincent Spaulding?"
+
+"Small, stout-built, very quick in his ways, no hair on his face,
+though he's not short of thirty. Has a white splash of acid upon
+his forehead."
+
+Holmes sat up in his chair in considerable excitement. "I thought
+as much," said he. "Have you ever observed that his ears are
+pierced for earrings?"
+
+"Yes, sir. He told me that a gipsy had done it for him when he
+was a lad."
+
+"Hum!" said Holmes, sinking back in deep thought. "He is still
+with you?"
+
+"Oh, yes, sir; I have only just left him."
+
+"And has your business been attended to in your absence?"
+
+"Nothing to complain of, sir. There's never very much to do of a
+morning."
+
+"That will do, Mr. Wilson. I shall be happy to give you an
+opinion upon the subject in the course of a day or two. To-day is
+Saturday, and I hope that by Monday we may come to a conclusion."
+
+"Well, Watson," said Holmes when our visitor had left us, "what
+do you make of it all?"
+
+"I make nothing of it," I answered frankly. "It is a most
+mysterious business."
+
+"As a rule," said Holmes, "the more bizarre a thing is the less
+mysterious it proves to be. It is your commonplace, featureless
+crimes which are really puzzling, just as a commonplace face is
+the most difficult to identify. But I must be prompt over this
+matter."
+
+"What are you going to do, then?" I asked.
+
+"To smoke," he answered. "It is quite a three pipe problem, and I
+beg that you won't speak to me for fifty minutes." He curled
+himself up in his chair, with his thin knees drawn up to his
+hawk-like nose, and there he sat with his eyes closed and his
+black clay pipe thrusting out like the bill of some strange bird.
+I had come to the conclusion that he had dropped asleep, and
+indeed was nodding myself, when he suddenly sprang out of his
+chair with the gesture of a man who has made up his mind and put
+his pipe down upon the mantelpiece.
+
+"Sarasate plays at the St. James's Hall this afternoon," he
+remarked. "What do you think, Watson? Could your patients spare
+you for a few hours?"
+
+"I have nothing to do to-day. My practice is never very
+absorbing."
+
+"Then put on your hat and come. I am going through the City
+first, and we can have some lunch on the way. I observe that
+there is a good deal of German music on the programme, which is
+rather more to my taste than Italian or French. It is
+introspective, and I want to introspect. Come along!"
+
+We travelled by the Underground as far as Aldersgate; and a short
+walk took us to Saxe-Coburg Square, the scene of the singular
+story which we had listened to in the morning. It was a poky,
+little, shabby-genteel place, where four lines of dingy
+two-storied brick houses looked out into a small railed-in
+enclosure, where a lawn of weedy grass and a few clumps of faded
+laurel-bushes made a hard fight against a smoke-laden and
+uncongenial atmosphere. Three gilt balls and a brown board with
+"JABEZ WILSON" in white letters, upon a corner house, announced
+the place where our red-headed client carried on his business.
+Sherlock Holmes stopped in front of it with his head on one side
+and looked it all over, with his eyes shining brightly between
+puckered lids. Then he walked slowly up the street, and then down
+again to the corner, still looking keenly at the houses. Finally
+he returned to the pawnbroker's, and, having thumped vigorously
+upon the pavement with his stick two or three times, he went up
+to the door and knocked. It was instantly opened by a
+bright-looking, clean-shaven young fellow, who asked him to step
+in.
+
+"Thank you," said Holmes, "I only wished to ask you how you would
+go from here to the Strand."
+
+"Third right, fourth left," answered the assistant promptly,
+closing the door.
+
+"Smart fellow, that," observed Holmes as we walked away. "He is,
+in my judgment, the fourth smartest man in London, and for daring
+I am not sure that he has not a claim to be third. I have known
+something of him before."
+
+"Evidently," said I, "Mr. Wilson's assistant counts for a good
+deal in this mystery of the Red-headed League. I am sure that you
+inquired your way merely in order that you might see him."
+
+"Not him."
+
+"What then?"
+
+"The knees of his trousers."
+
+"And what did you see?"
+
+"What I expected to see."
+
+"Why did you beat the pavement?"
+
+"My dear doctor, this is a time for observation, not for talk. We
+are spies in an enemy's country. We know something of Saxe-Coburg
+Square. Let us now explore the parts which lie behind it."
+
+The road in which we found ourselves as we turned round the
+corner from the retired Saxe-Coburg Square presented as great a
+contrast to it as the front of a picture does to the back. It was
+one of the main arteries which conveyed the traffic of the City
+to the north and west. The roadway was blocked with the immense
+stream of commerce flowing in a double tide inward and outward,
+while the footpaths were black with the hurrying swarm of
+pedestrians. It was difficult to realise as we looked at the line
+of fine shops and stately business premises that they really
+abutted on the other side upon the faded and stagnant square
+which we had just quitted.
+
+"Let me see," said Holmes, standing at the corner and glancing
+along the line, "I should like just to remember the order of the
+houses here. It is a hobby of mine to have an exact knowledge of
+London. There is Mortimer's, the tobacconist, the little
+newspaper shop, the Coburg branch of the City and Suburban Bank,
+the Vegetarian Restaurant, and McFarlane's carriage-building
+depot. That carries us right on to the other block. And now,
+Doctor, we've done our work, so it's time we had some play. A
+sandwich and a cup of coffee, and then off to violin-land, where
+all is sweetness and delicacy and harmony, and there are no
+red-headed clients to vex us with their conundrums."
+
+My friend was an enthusiastic musician, being himself not only a
+very capable performer but a composer of no ordinary merit. All
+the afternoon he sat in the stalls wrapped in the most perfect
+happiness, gently waving his long, thin fingers in time to the
+music, while his gently smiling face and his languid, dreamy eyes
+were as unlike those of Holmes the sleuth-hound, Holmes the
+relentless, keen-witted, ready-handed criminal agent, as it was
+possible to conceive. In his singular character the dual nature
+alternately asserted itself, and his extreme exactness and
+astuteness represented, as I have often thought, the reaction
+against the poetic and contemplative mood which occasionally
+predominated in him. The swing of his nature took him from
+extreme languor to devouring energy; and, as I knew well, he was
+never so truly formidable as when, for days on end, he had been
+lounging in his armchair amid his improvisations and his
+black-letter editions. Then it was that the lust of the chase
+would suddenly come upon him, and that his brilliant reasoning
+power would rise to the level of intuition, until those who were
+unacquainted with his methods would look askance at him as on a
+man whose knowledge was not that of other mortals. When I saw him
+that afternoon so enwrapped in the music at St. James's Hall I
+felt that an evil time might be coming upon those whom he had set
+himself to hunt down.
+
+"You want to go home, no doubt, Doctor," he remarked as we
+emerged.
+
+"Yes, it would be as well."
+
+"And I have some business to do which will take some hours. This
+business at Coburg Square is serious."
+
+"Why serious?"
+
+"A considerable crime is in contemplation. I have every reason to
+believe that we shall be in time to stop it. But to-day being
+Saturday rather complicates matters. I shall want your help
+to-night."
+
+"At what time?"
+
+"Ten will be early enough."
+
+"I shall be at Baker Street at ten."
+
+"Very well. And, I say, Doctor, there may be some little danger,
+so kindly put your army revolver in your pocket." He waved his
+hand, turned on his heel, and disappeared in an instant among the
+crowd.
+
+I trust that I am not more dense than my neighbours, but I was
+always oppressed with a sense of my own stupidity in my dealings
+with Sherlock Holmes. Here I had heard what he had heard, I had
+seen what he had seen, and yet from his words it was evident that
+he saw clearly not only what had happened but what was about to
+happen, while to me the whole business was still confused and
+grotesque. As I drove home to my house in Kensington I thought
+over it all, from the extraordinary story of the red-headed
+copier of the "Encyclopaedia" down to the visit to Saxe-Coburg
+Square, and the ominous words with which he had parted from me.
+What was this nocturnal expedition, and why should I go armed?
+Where were we going, and what were we to do? I had the hint from
+Holmes that this smooth-faced pawnbroker's assistant was a
+formidable man--a man who might play a deep game. I tried to
+puzzle it out, but gave it up in despair and set the matter aside
+until night should bring an explanation.
+
+It was a quarter-past nine when I started from home and made my
+way across the Park, and so through Oxford Street to Baker
+Street. Two hansoms were standing at the door, and as I entered
+the passage I heard the sound of voices from above. On entering
+his room I found Holmes in animated conversation with two men,
+one of whom I recognised as Peter Jones, the official police
+agent, while the other was a long, thin, sad-faced man, with a
+very shiny hat and oppressively respectable frock-coat.
+
+"Ha! Our party is complete," said Holmes, buttoning up his
+pea-jacket and taking his heavy hunting crop from the rack.
+"Watson, I think you know Mr. Jones, of Scotland Yard? Let me
+introduce you to Mr. Merryweather, who is to be our companion in
+to-night's adventure."
+
+"We're hunting in couples again, Doctor, you see," said Jones in
+his consequential way. "Our friend here is a wonderful man for
+starting a chase. All he wants is an old dog to help him to do
+the running down."
+
+"I hope a wild goose may not prove to be the end of our chase,"
+observed Mr. Merryweather gloomily.
+
+"You may place considerable confidence in Mr. Holmes, sir," said
+the police agent loftily. "He has his own little methods, which
+are, if he won't mind my saying so, just a little too theoretical
+and fantastic, but he has the makings of a detective in him. It
+is not too much to say that once or twice, as in that business of
+the Sholto murder and the Agra treasure, he has been more nearly
+correct than the official force."
+
+"Oh, if you say so, Mr. Jones, it is all right," said the
+stranger with deference. "Still, I confess that I miss my rubber.
+It is the first Saturday night for seven-and-twenty years that I
+have not had my rubber."
+
+"I think you will find," said Sherlock Holmes, "that you will
+play for a higher stake to-night than you have ever done yet, and
+that the play will be more exciting. For you, Mr. Merryweather,
+the stake will be some 30,000 pounds; and for you, Jones, it will
+be the man upon whom you wish to lay your hands."
+
+"John Clay, the murderer, thief, smasher, and forger. He's a
+young man, Mr. Merryweather, but he is at the head of his
+profession, and I would rather have my bracelets on him than on
+any criminal in London. He's a remarkable man, is young John
+Clay. His grandfather was a royal duke, and he himself has been
+to Eton and Oxford. His brain is as cunning as his fingers, and
+though we meet signs of him at every turn, we never know where to
+find the man himself. He'll crack a crib in Scotland one week,
+and be raising money to build an orphanage in Cornwall the next.
+I've been on his track for years and have never set eyes on him
+yet."
+
+"I hope that I may have the pleasure of introducing you to-night.
+I've had one or two little turns also with Mr. John Clay, and I
+agree with you that he is at the head of his profession. It is
+past ten, however, and quite time that we started. If you two
+will take the first hansom, Watson and I will follow in the
+second."
+
+Sherlock Holmes was not very communicative during the long drive
+and lay back in the cab humming the tunes which he had heard in
+the afternoon. We rattled through an endless labyrinth of gas-lit
+streets until we emerged into Farrington Street.
+
+"We are close there now," my friend remarked. "This fellow
+Merryweather is a bank director, and personally interested in the
+matter. I thought it as well to have Jones with us also. He is
+not a bad fellow, though an absolute imbecile in his profession.
+He has one positive virtue. He is as brave as a bulldog and as
+tenacious as a lobster if he gets his claws upon anyone. Here we
+are, and they are waiting for us."
+
+We had reached the same crowded thoroughfare in which we had
+found ourselves in the morning. Our cabs were dismissed, and,
+following the guidance of Mr. Merryweather, we passed down a
+narrow passage and through a side door, which he opened for us.
+Within there was a small corridor, which ended in a very massive
+iron gate. This also was opened, and led down a flight of winding
+stone steps, which terminated at another formidable gate. Mr.
+Merryweather stopped to light a lantern, and then conducted us
+down a dark, earth-smelling passage, and so, after opening a
+third door, into a huge vault or cellar, which was piled all
+round with crates and massive boxes.
+
+"You are not very vulnerable from above," Holmes remarked as he
+held up the lantern and gazed about him.
+
+"Nor from below," said Mr. Merryweather, striking his stick upon
+the flags which lined the floor. "Why, dear me, it sounds quite
+hollow!" he remarked, looking up in surprise.
+
+"I must really ask you to be a little more quiet!" said Holmes
+severely. "You have already imperilled the whole success of our
+expedition. Might I beg that you would have the goodness to sit
+down upon one of those boxes, and not to interfere?"
+
+The solemn Mr. Merryweather perched himself upon a crate, with a
+very injured expression upon his face, while Holmes fell upon his
+knees upon the floor and, with the lantern and a magnifying lens,
+began to examine minutely the cracks between the stones. A few
+seconds sufficed to satisfy him, for he sprang to his feet again
+and put his glass in his pocket.
+
+"We have at least an hour before us," he remarked, "for they can
+hardly take any steps until the good pawnbroker is safely in bed.
+Then they will not lose a minute, for the sooner they do their
+work the longer time they will have for their escape. We are at
+present, Doctor--as no doubt you have divined--in the cellar of
+the City branch of one of the principal London banks. Mr.
+Merryweather is the chairman of directors, and he will explain to
+you that there are reasons why the more daring criminals of
+London should take a considerable interest in this cellar at
+present."
+
+"It is our French gold," whispered the director. "We have had
+several warnings that an attempt might be made upon it."
+
+"Your French gold?"
+
+"Yes. We had occasion some months ago to strengthen our resources
+and borrowed for that purpose 30,000 napoleons from the Bank of
+France. It has become known that we have never had occasion to
+unpack the money, and that it is still lying in our cellar. The
+crate upon which I sit contains 2,000 napoleons packed between
+layers of lead foil. Our reserve of bullion is much larger at
+present than is usually kept in a single branch office, and the
+directors have had misgivings upon the subject."
+
+"Which were very well justified," observed Holmes. "And now it is
+time that we arranged our little plans. I expect that within an
+hour matters will come to a head. In the meantime Mr.
+Merryweather, we must put the screen over that dark lantern."
+
+"And sit in the dark?"
+
+"I am afraid so. I had brought a pack of cards in my pocket, and
+I thought that, as we were a partie carrée, you might have your
+rubber after all. But I see that the enemy's preparations have
+gone so far that we cannot risk the presence of a light. And,
+first of all, we must choose our positions. These are daring men,
+and though we shall take them at a disadvantage, they may do us
+some harm unless we are careful. I shall stand behind this crate,
+and do you conceal yourselves behind those. Then, when I flash a
+light upon them, close in swiftly. If they fire, Watson, have no
+compunction about shooting them down."
+
+I placed my revolver, cocked, upon the top of the wooden case
+behind which I crouched. Holmes shot the slide across the front
+of his lantern and left us in pitch darkness--such an absolute
+darkness as I have never before experienced. The smell of hot
+metal remained to assure us that the light was still there, ready
+to flash out at a moment's notice. To me, with my nerves worked
+up to a pitch of expectancy, there was something depressing and
+subduing in the sudden gloom, and in the cold dank air of the
+vault.
+
+"They have but one retreat," whispered Holmes. "That is back
+through the house into Saxe-Coburg Square. I hope that you have
+done what I asked you, Jones?"
+
+"I have an inspector and two officers waiting at the front door."
+
+"Then we have stopped all the holes. And now we must be silent
+and wait."
+
+What a time it seemed! From comparing notes afterwards it was but
+an hour and a quarter, yet it appeared to me that the night must
+have almost gone and the dawn be breaking above us. My limbs
+were weary and stiff, for I feared to change my position; yet my
+nerves were worked up to the highest pitch of tension, and my
+hearing was so acute that I could not only hear the gentle
+breathing of my companions, but I could distinguish the deeper,
+heavier in-breath of the bulky Jones from the thin, sighing note
+of the bank director. From my position I could look over the case
+in the direction of the floor. Suddenly my eyes caught the glint
+of a light.
+
+At first it was but a lurid spark upon the stone pavement. Then
+it lengthened out until it became a yellow line, and then,
+without any warning or sound, a gash seemed to open and a hand
+appeared, a white, almost womanly hand, which felt about in the
+centre of the little area of light. For a minute or more the
+hand, with its writhing fingers, protruded out of the floor. Then
+it was withdrawn as suddenly as it appeared, and all was dark
+again save the single lurid spark which marked a chink between
+the stones.
+
+Its disappearance, however, was but momentary. With a rending,
+tearing sound, one of the broad, white stones turned over upon
+its side and left a square, gaping hole, through which streamed
+the light of a lantern. Over the edge there peeped a clean-cut,
+boyish face, which looked keenly about it, and then, with a hand
+on either side of the aperture, drew itself shoulder-high and
+waist-high, until one knee rested upon the edge. In another
+instant he stood at the side of the hole and was hauling after
+him a companion, lithe and small like himself, with a pale face
+and a shock of very red hair.
+
+"It's all clear," he whispered. "Have you the chisel and the
+bags? Great Scott! Jump, Archie, jump, and I'll swing for it!"
+
+Sherlock Holmes had sprung out and seized the intruder by the
+collar. The other dived down the hole, and I heard the sound of
+rending cloth as Jones clutched at his skirts. The light flashed
+upon the barrel of a revolver, but Holmes' hunting crop came
+down on the man's wrist, and the pistol clinked upon the stone
+floor.
+
+"It's no use, John Clay," said Holmes blandly. "You have no
+chance at all."
+
+"So I see," the other answered with the utmost coolness. "I fancy
+that my pal is all right, though I see you have got his
+coat-tails."
+
+"There are three men waiting for him at the door," said Holmes.
+
+"Oh, indeed! You seem to have done the thing very completely. I
+must compliment you."
+
+"And I you," Holmes answered. "Your red-headed idea was very new
+and effective."
+
+"You'll see your pal again presently," said Jones. "He's quicker
+at climbing down holes than I am. Just hold out while I fix the
+derbies."
+
+"I beg that you will not touch me with your filthy hands,"
+remarked our prisoner as the handcuffs clattered upon his wrists.
+"You may not be aware that I have royal blood in my veins. Have
+the goodness, also, when you address me always to say 'sir' and
+'please.'"
+
+"All right," said Jones with a stare and a snigger. "Well, would
+you please, sir, march upstairs, where we can get a cab to carry
+your Highness to the police-station?"
+
+"That is better," said John Clay serenely. He made a sweeping bow
+to the three of us and walked quietly off in the custody of the
+detective.
+
+"Really, Mr. Holmes," said Mr. Merryweather as we followed them
+from the cellar, "I do not know how the bank can thank you or
+repay you. There is no doubt that you have detected and defeated
+in the most complete manner one of the most determined attempts
+at bank robbery that have ever come within my experience."
+
+"I have had one or two little scores of my own to settle with Mr.
+John Clay," said Holmes. "I have been at some small expense over
+this matter, which I shall expect the bank to refund, but beyond
+that I am amply repaid by having had an experience which is in
+many ways unique, and by hearing the very remarkable narrative of
+the Red-headed League."
+
+
+"You see, Watson," he explained in the early hours of the morning
+as we sat over a glass of whisky and soda in Baker Street, "it
+was perfectly obvious from the first that the only possible
+object of this rather fantastic business of the advertisement of
+the League, and the copying of the 'Encyclopaedia,' must be to get
+this not over-bright pawnbroker out of the way for a number of
+hours every day. It was a curious way of managing it, but,
+really, it would be difficult to suggest a better. The method was
+no doubt suggested to Clay's ingenious mind by the colour of his
+accomplice's hair. The 4 pounds a week was a lure which must draw
+him, and what was it to them, who were playing for thousands?
+They put in the advertisement, one rogue has the temporary
+office, the other rogue incites the man to apply for it, and
+together they manage to secure his absence every morning in the
+week. From the time that I heard of the assistant having come for
+half wages, it was obvious to me that he had some strong motive
+for securing the situation."
+
+"But how could you guess what the motive was?"
+
+"Had there been women in the house, I should have suspected a
+mere vulgar intrigue. That, however, was out of the question. The
+man's business was a small one, and there was nothing in his
+house which could account for such elaborate preparations, and
+such an expenditure as they were at. It must, then, be something
+out of the house. What could it be? I thought of the assistant's
+fondness for photography, and his trick of vanishing into the
+cellar. The cellar! There was the end of this tangled clue. Then
+I made inquiries as to this mysterious assistant and found that I
+had to deal with one of the coolest and most daring criminals in
+London. He was doing something in the cellar--something which
+took many hours a day for months on end. What could it be, once
+more? I could think of nothing save that he was running a tunnel
+to some other building.
+
+"So far I had got when we went to visit the scene of action. I
+surprised you by beating upon the pavement with my stick. I was
+ascertaining whether the cellar stretched out in front or behind.
+It was not in front. Then I rang the bell, and, as I hoped, the
+assistant answered it. We have had some skirmishes, but we had
+never set eyes upon each other before. I hardly looked at his
+face. His knees were what I wished to see. You must yourself have
+remarked how worn, wrinkled, and stained they were. They spoke of
+those hours of burrowing. The only remaining point was what they
+were burrowing for. I walked round the corner, saw the City and
+Suburban Bank abutted on our friend's premises, and felt that I
+had solved my problem. When you drove home after the concert I
+called upon Scotland Yard and upon the chairman of the bank
+directors, with the result that you have seen."
+
+"And how could you tell that they would make their attempt
+to-night?" I asked.
+
+"Well, when they closed their League offices that was a sign that
+they cared no longer about Mr. Jabez Wilson's presence--in other
+words, that they had completed their tunnel. But it was essential
+that they should use it soon, as it might be discovered, or the
+bullion might be removed. Saturday would suit them better than
+any other day, as it would give them two days for their escape.
+For all these reasons I expected them to come to-night."
+
+"You reasoned it out beautifully," I exclaimed in unfeigned
+admiration. "It is so long a chain, and yet every link rings
+true."
+
+"It saved me from ennui," he answered, yawning. "Alas! I already
+feel it closing in upon me. My life is spent in one long effort
+to escape from the commonplaces of existence. These little
+problems help me to do so."
+
+"And you are a benefactor of the race," said I.
+
+He shrugged his shoulders. "Well, perhaps, after all, it is of
+some little use," he remarked. "'L'homme c'est rien--l'oeuvre
+c'est tout,' as Gustave Flaubert wrote to George Sand."
+
+
+
+ADVENTURE III. A CASE OF IDENTITY
+
+"My dear fellow," said Sherlock Holmes as we sat on either side
+of the fire in his lodgings at Baker Street, "life is infinitely
+stranger than anything which the mind of man could invent. We
+would not dare to conceive the things which are really mere
+commonplaces of existence. If we could fly out of that window
+hand in hand, hover over this great city, gently remove the
+roofs, and peep in at the queer things which are going on, the
+strange coincidences, the plannings, the cross-purposes, the
+wonderful chains of events, working through generations, and
+leading to the most outré results, it would make all fiction with
+its conventionalities and foreseen conclusions most stale and
+unprofitable."
+
+"And yet I am not convinced of it," I answered. "The cases which
+come to light in the papers are, as a rule, bald enough, and
+vulgar enough. We have in our police reports realism pushed to
+its extreme limits, and yet the result is, it must be confessed,
+neither fascinating nor artistic."
+
+"A certain selection and discretion must be used in producing a
+realistic effect," remarked Holmes. "This is wanting in the
+police report, where more stress is laid, perhaps, upon the
+platitudes of the magistrate than upon the details, which to an
+observer contain the vital essence of the whole matter. Depend
+upon it, there is nothing so unnatural as the commonplace."
+
+I smiled and shook my head. "I can quite understand your thinking
+so," I said. "Of course, in your position of unofficial adviser
+and helper to everybody who is absolutely puzzled, throughout
+three continents, you are brought in contact with all that is
+strange and bizarre. But here"--I picked up the morning paper
+from the ground--"let us put it to a practical test. Here is the
+first heading upon which I come. 'A husband's cruelty to his
+wife.' There is half a column of print, but I know without
+reading it that it is all perfectly familiar to me. There is, of
+course, the other woman, the drink, the push, the blow, the
+bruise, the sympathetic sister or landlady. The crudest of
+writers could invent nothing more crude."
+
+"Indeed, your example is an unfortunate one for your argument,"
+said Holmes, taking the paper and glancing his eye down it. "This
+is the Dundas separation case, and, as it happens, I was engaged
+in clearing up some small points in connection with it. The
+husband was a teetotaler, there was no other woman, and the
+conduct complained of was that he had drifted into the habit of
+winding up every meal by taking out his false teeth and hurling
+them at his wife, which, you will allow, is not an action likely
+to occur to the imagination of the average story-teller. Take a
+pinch of snuff, Doctor, and acknowledge that I have scored over
+you in your example."
+
+He held out his snuffbox of old gold, with a great amethyst in
+the centre of the lid. Its splendour was in such contrast to his
+homely ways and simple life that I could not help commenting upon
+it.
+
+"Ah," said he, "I forgot that I had not seen you for some weeks.
+It is a little souvenir from the King of Bohemia in return for my
+assistance in the case of the Irene Adler papers."
+
+"And the ring?" I asked, glancing at a remarkable brilliant which
+sparkled upon his finger.
+
+"It was from the reigning family of Holland, though the matter in
+which I served them was of such delicacy that I cannot confide it
+even to you, who have been good enough to chronicle one or two of
+my little problems."
+
+"And have you any on hand just now?" I asked with interest.
+
+"Some ten or twelve, but none which present any feature of
+interest. They are important, you understand, without being
+interesting. Indeed, I have found that it is usually in
+unimportant matters that there is a field for the observation,
+and for the quick analysis of cause and effect which gives the
+charm to an investigation. The larger crimes are apt to be the
+simpler, for the bigger the crime the more obvious, as a rule, is
+the motive. In these cases, save for one rather intricate matter
+which has been referred to me from Marseilles, there is nothing
+which presents any features of interest. It is possible, however,
+that I may have something better before very many minutes are
+over, for this is one of my clients, or I am much mistaken."
+
+He had risen from his chair and was standing between the parted
+blinds gazing down into the dull neutral-tinted London street.
+Looking over his shoulder, I saw that on the pavement opposite
+there stood a large woman with a heavy fur boa round her neck,
+and a large curling red feather in a broad-brimmed hat which was
+tilted in a coquettish Duchess of Devonshire fashion over her
+ear. From under this great panoply she peeped up in a nervous,
+hesitating fashion at our windows, while her body oscillated
+backward and forward, and her fingers fidgeted with her glove
+buttons. Suddenly, with a plunge, as of the swimmer who leaves
+the bank, she hurried across the road, and we heard the sharp
+clang of the bell.
+
+"I have seen those symptoms before," said Holmes, throwing his
+cigarette into the fire. "Oscillation upon the pavement always
+means an affaire de coeur. She would like advice, but is not sure
+that the matter is not too delicate for communication. And yet
+even here we may discriminate. When a woman has been seriously
+wronged by a man she no longer oscillates, and the usual symptom
+is a broken bell wire. Here we may take it that there is a love
+matter, but that the maiden is not so much angry as perplexed, or
+grieved. But here she comes in person to resolve our doubts."
+
+As he spoke there was a tap at the door, and the boy in buttons
+entered to announce Miss Mary Sutherland, while the lady herself
+loomed behind his small black figure like a full-sailed
+merchant-man behind a tiny pilot boat. Sherlock Holmes welcomed
+her with the easy courtesy for which he was remarkable, and,
+having closed the door and bowed her into an armchair, he looked
+her over in the minute and yet abstracted fashion which was
+peculiar to him.
+
+"Do you not find," he said, "that with your short sight it is a
+little trying to do so much typewriting?"
+
+"I did at first," she answered, "but now I know where the letters
+are without looking." Then, suddenly realising the full purport
+of his words, she gave a violent start and looked up, with fear
+and astonishment upon her broad, good-humoured face. "You've
+heard about me, Mr. Holmes," she cried, "else how could you know
+all that?"
+
+"Never mind," said Holmes, laughing; "it is my business to know
+things. Perhaps I have trained myself to see what others
+overlook. If not, why should you come to consult me?"
+
+"I came to you, sir, because I heard of you from Mrs. Etherege,
+whose husband you found so easy when the police and everyone had
+given him up for dead. Oh, Mr. Holmes, I wish you would do as
+much for me. I'm not rich, but still I have a hundred a year in
+my own right, besides the little that I make by the machine, and
+I would give it all to know what has become of Mr. Hosmer Angel."
+
+"Why did you come away to consult me in such a hurry?" asked
+Sherlock Holmes, with his finger-tips together and his eyes to
+the ceiling.
+
+Again a startled look came over the somewhat vacuous face of Miss
+Mary Sutherland. "Yes, I did bang out of the house," she said,
+"for it made me angry to see the easy way in which Mr.
+Windibank--that is, my father--took it all. He would not go to
+the police, and he would not go to you, and so at last, as he
+would do nothing and kept on saying that there was no harm done,
+it made me mad, and I just on with my things and came right away
+to you."
+
+"Your father," said Holmes, "your stepfather, surely, since the
+name is different."
+
+"Yes, my stepfather. I call him father, though it sounds funny,
+too, for he is only five years and two months older than myself."
+
+"And your mother is alive?"
+
+"Oh, yes, mother is alive and well. I wasn't best pleased, Mr.
+Holmes, when she married again so soon after father's death, and
+a man who was nearly fifteen years younger than herself. Father
+was a plumber in the Tottenham Court Road, and he left a tidy
+business behind him, which mother carried on with Mr. Hardy, the
+foreman; but when Mr. Windibank came he made her sell the
+business, for he was very superior, being a traveller in wines.
+They got 4700 pounds for the goodwill and interest, which wasn't
+near as much as father could have got if he had been alive."
+
+I had expected to see Sherlock Holmes impatient under this
+rambling and inconsequential narrative, but, on the contrary, he
+had listened with the greatest concentration of attention.
+
+"Your own little income," he asked, "does it come out of the
+business?"
+
+"Oh, no, sir. It is quite separate and was left me by my uncle
+Ned in Auckland. It is in New Zealand stock, paying 4 1/2 per
+cent. Two thousand five hundred pounds was the amount, but I can
+only touch the interest."
+
+"You interest me extremely," said Holmes. "And since you draw so
+large a sum as a hundred a year, with what you earn into the
+bargain, you no doubt travel a little and indulge yourself in
+every way. I believe that a single lady can get on very nicely
+upon an income of about 60 pounds."
+
+"I could do with much less than that, Mr. Holmes, but you
+understand that as long as I live at home I don't wish to be a
+burden to them, and so they have the use of the money just while
+I am staying with them. Of course, that is only just for the
+time. Mr. Windibank draws my interest every quarter and pays it
+over to mother, and I find that I can do pretty well with what I
+earn at typewriting. It brings me twopence a sheet, and I can
+often do from fifteen to twenty sheets in a day."
+
+"You have made your position very clear to me," said Holmes.
+"This is my friend, Dr. Watson, before whom you can speak as
+freely as before myself. Kindly tell us now all about your
+connection with Mr. Hosmer Angel."
+
+A flush stole over Miss Sutherland's face, and she picked
+nervously at the fringe of her jacket. "I met him first at the
+gasfitters' ball," she said. "They used to send father tickets
+when he was alive, and then afterwards they remembered us, and
+sent them to mother. Mr. Windibank did not wish us to go. He
+never did wish us to go anywhere. He would get quite mad if I
+wanted so much as to join a Sunday-school treat. But this time I
+was set on going, and I would go; for what right had he to
+prevent? He said the folk were not fit for us to know, when all
+father's friends were to be there. And he said that I had nothing
+fit to wear, when I had my purple plush that I had never so much
+as taken out of the drawer. At last, when nothing else would do,
+he went off to France upon the business of the firm, but we went,
+mother and I, with Mr. Hardy, who used to be our foreman, and it
+was there I met Mr. Hosmer Angel."
+
+"I suppose," said Holmes, "that when Mr. Windibank came back from
+France he was very annoyed at your having gone to the ball."
+
+"Oh, well, he was very good about it. He laughed, I remember, and
+shrugged his shoulders, and said there was no use denying
+anything to a woman, for she would have her way."
+
+"I see. Then at the gasfitters' ball you met, as I understand, a
+gentleman called Mr. Hosmer Angel."
+
+"Yes, sir. I met him that night, and he called next day to ask if
+we had got home all safe, and after that we met him--that is to
+say, Mr. Holmes, I met him twice for walks, but after that father
+came back again, and Mr. Hosmer Angel could not come to the house
+any more."
+
+"No?"
+
+"Well, you know father didn't like anything of the sort. He
+wouldn't have any visitors if he could help it, and he used to
+say that a woman should be happy in her own family circle. But
+then, as I used to say to mother, a woman wants her own circle to
+begin with, and I had not got mine yet."
+
+"But how about Mr. Hosmer Angel? Did he make no attempt to see
+you?"
+
+"Well, father was going off to France again in a week, and Hosmer
+wrote and said that it would be safer and better not to see each
+other until he had gone. We could write in the meantime, and he
+used to write every day. I took the letters in in the morning, so
+there was no need for father to know."
+
+"Were you engaged to the gentleman at this time?"
+
+"Oh, yes, Mr. Holmes. We were engaged after the first walk that
+we took. Hosmer--Mr. Angel--was a cashier in an office in
+Leadenhall Street--and--"
+
+"What office?"
+
+"That's the worst of it, Mr. Holmes, I don't know."
+
+"Where did he live, then?"
+
+"He slept on the premises."
+
+"And you don't know his address?"
+
+"No--except that it was Leadenhall Street."
+
+"Where did you address your letters, then?"
+
+"To the Leadenhall Street Post Office, to be left till called
+for. He said that if they were sent to the office he would be
+chaffed by all the other clerks about having letters from a lady,
+so I offered to typewrite them, like he did his, but he wouldn't
+have that, for he said that when I wrote them they seemed to come
+from me, but when they were typewritten he always felt that the
+machine had come between us. That will just show you how fond he
+was of me, Mr. Holmes, and the little things that he would think
+of."
+
+"It was most suggestive," said Holmes. "It has long been an axiom
+of mine that the little things are infinitely the most important.
+Can you remember any other little things about Mr. Hosmer Angel?"
+
+"He was a very shy man, Mr. Holmes. He would rather walk with me
+in the evening than in the daylight, for he said that he hated to
+be conspicuous. Very retiring and gentlemanly he was. Even his
+voice was gentle. He'd had the quinsy and swollen glands when he
+was young, he told me, and it had left him with a weak throat,
+and a hesitating, whispering fashion of speech. He was always
+well dressed, very neat and plain, but his eyes were weak, just
+as mine are, and he wore tinted glasses against the glare."
+
+"Well, and what happened when Mr. Windibank, your stepfather,
+returned to France?"
+
+"Mr. Hosmer Angel came to the house again and proposed that we
+should marry before father came back. He was in dreadful earnest
+and made me swear, with my hands on the Testament, that whatever
+happened I would always be true to him. Mother said he was quite
+right to make me swear, and that it was a sign of his passion.
+Mother was all in his favour from the first and was even fonder
+of him than I was. Then, when they talked of marrying within the
+week, I began to ask about father; but they both said never to
+mind about father, but just to tell him afterwards, and mother
+said she would make it all right with him. I didn't quite like
+that, Mr. Holmes. It seemed funny that I should ask his leave, as
+he was only a few years older than me; but I didn't want to do
+anything on the sly, so I wrote to father at Bordeaux, where the
+company has its French offices, but the letter came back to me on
+the very morning of the wedding."
+
+"It missed him, then?"
+
+"Yes, sir; for he had started to England just before it arrived."
+
+"Ha! that was unfortunate. Your wedding was arranged, then, for
+the Friday. Was it to be in church?"
+
+"Yes, sir, but very quietly. It was to be at St. Saviour's, near
+King's Cross, and we were to have breakfast afterwards at the St.
+Pancras Hotel. Hosmer came for us in a hansom, but as there were
+two of us he put us both into it and stepped himself into a
+four-wheeler, which happened to be the only other cab in the
+street. We got to the church first, and when the four-wheeler
+drove up we waited for him to step out, but he never did, and
+when the cabman got down from the box and looked there was no one
+there! The cabman said that he could not imagine what had become
+of him, for he had seen him get in with his own eyes. That was
+last Friday, Mr. Holmes, and I have never seen or heard anything
+since then to throw any light upon what became of him."
+
+"It seems to me that you have been very shamefully treated," said
+Holmes.
+
+"Oh, no, sir! He was too good and kind to leave me so. Why, all
+the morning he was saying to me that, whatever happened, I was to
+be true; and that even if something quite unforeseen occurred to
+separate us, I was always to remember that I was pledged to him,
+and that he would claim his pledge sooner or later. It seemed
+strange talk for a wedding-morning, but what has happened since
+gives a meaning to it."
+
+"Most certainly it does. Your own opinion is, then, that some
+unforeseen catastrophe has occurred to him?"
+
+"Yes, sir. I believe that he foresaw some danger, or else he
+would not have talked so. And then I think that what he foresaw
+happened."
+
+"But you have no notion as to what it could have been?"
+
+"None."
+
+"One more question. How did your mother take the matter?"
+
+"She was angry, and said that I was never to speak of the matter
+again."
+
+"And your father? Did you tell him?"
+
+"Yes; and he seemed to think, with me, that something had
+happened, and that I should hear of Hosmer again. As he said,
+what interest could anyone have in bringing me to the doors of
+the church, and then leaving me? Now, if he had borrowed my
+money, or if he had married me and got my money settled on him,
+there might be some reason, but Hosmer was very independent about
+money and never would look at a shilling of mine. And yet, what
+could have happened? And why could he not write? Oh, it drives me
+half-mad to think of it, and I can't sleep a wink at night." She
+pulled a little handkerchief out of her muff and began to sob
+heavily into it.
+
+"I shall glance into the case for you," said Holmes, rising, "and
+I have no doubt that we shall reach some definite result. Let the
+weight of the matter rest upon me now, and do not let your mind
+dwell upon it further. Above all, try to let Mr. Hosmer Angel
+vanish from your memory, as he has done from your life."
+
+"Then you don't think I'll see him again?"
+
+"I fear not."
+
+"Then what has happened to him?"
+
+"You will leave that question in my hands. I should like an
+accurate description of him and any letters of his which you can
+spare."
+
+"I advertised for him in last Saturday's Chronicle," said she.
+"Here is the slip and here are four letters from him."
+
+"Thank you. And your address?"
+
+"No. 31 Lyon Place, Camberwell."
+
+"Mr. Angel's address you never had, I understand. Where is your
+father's place of business?"
+
+"He travels for Westhouse & Marbank, the great claret importers
+of Fenchurch Street."
+
+"Thank you. You have made your statement very clearly. You will
+leave the papers here, and remember the advice which I have given
+you. Let the whole incident be a sealed book, and do not allow it
+to affect your life."
+
+"You are very kind, Mr. Holmes, but I cannot do that. I shall be
+true to Hosmer. He shall find me ready when he comes back."
+
+For all the preposterous hat and the vacuous face, there was
+something noble in the simple faith of our visitor which
+compelled our respect. She laid her little bundle of papers upon
+the table and went her way, with a promise to come again whenever
+she might be summoned.
+
+Sherlock Holmes sat silent for a few minutes with his fingertips
+still pressed together, his legs stretched out in front of him,
+and his gaze directed upward to the ceiling. Then he took down
+from the rack the old and oily clay pipe, which was to him as a
+counsellor, and, having lit it, he leaned back in his chair, with
+the thick blue cloud-wreaths spinning up from him, and a look of
+infinite languor in his face.
+
+"Quite an interesting study, that maiden," he observed. "I found
+her more interesting than her little problem, which, by the way,
+is rather a trite one. You will find parallel cases, if you
+consult my index, in Andover in '77, and there was something of
+the sort at The Hague last year. Old as is the idea, however,
+there were one or two details which were new to me. But the
+maiden herself was most instructive."
+
+"You appeared to read a good deal upon her which was quite
+invisible to me," I remarked.
+
+"Not invisible but unnoticed, Watson. You did not know where to
+look, and so you missed all that was important. I can never bring
+you to realise the importance of sleeves, the suggestiveness of
+thumb-nails, or the great issues that may hang from a boot-lace.
+Now, what did you gather from that woman's appearance? Describe
+it."
+
+"Well, she had a slate-coloured, broad-brimmed straw hat, with a
+feather of a brickish red. Her jacket was black, with black beads
+sewn upon it, and a fringe of little black jet ornaments. Her
+dress was brown, rather darker than coffee colour, with a little
+purple plush at the neck and sleeves. Her gloves were greyish and
+were worn through at the right forefinger. Her boots I didn't
+observe. She had small round, hanging gold earrings, and a
+general air of being fairly well-to-do in a vulgar, comfortable,
+easy-going way."
+
+Sherlock Holmes clapped his hands softly together and chuckled.
+
+"'Pon my word, Watson, you are coming along wonderfully. You have
+really done very well indeed. It is true that you have missed
+everything of importance, but you have hit upon the method, and
+you have a quick eye for colour. Never trust to general
+impressions, my boy, but concentrate yourself upon details. My
+first glance is always at a woman's sleeve. In a man it is
+perhaps better first to take the knee of the trouser. As you
+observe, this woman had plush upon her sleeves, which is a most
+useful material for showing traces. The double line a little
+above the wrist, where the typewritist presses against the table,
+was beautifully defined. The sewing-machine, of the hand type,
+leaves a similar mark, but only on the left arm, and on the side
+of it farthest from the thumb, instead of being right across the
+broadest part, as this was. I then glanced at her face, and,
+observing the dint of a pince-nez at either side of her nose, I
+ventured a remark upon short sight and typewriting, which seemed
+to surprise her."
+
+"It surprised me."
+
+"But, surely, it was obvious. I was then much surprised and
+interested on glancing down to observe that, though the boots
+which she was wearing were not unlike each other, they were
+really odd ones; the one having a slightly decorated toe-cap, and
+the other a plain one. One was buttoned only in the two lower
+buttons out of five, and the other at the first, third, and
+fifth. Now, when you see that a young lady, otherwise neatly
+dressed, has come away from home with odd boots, half-buttoned,
+it is no great deduction to say that she came away in a hurry."
+
+"And what else?" I asked, keenly interested, as I always was, by
+my friend's incisive reasoning.
+
+"I noted, in passing, that she had written a note before leaving
+home but after being fully dressed. You observed that her right
+glove was torn at the forefinger, but you did not apparently see
+that both glove and finger were stained with violet ink. She had
+written in a hurry and dipped her pen too deep. It must have been
+this morning, or the mark would not remain clear upon the finger.
+All this is amusing, though rather elementary, but I must go back
+to business, Watson. Would you mind reading me the advertised
+description of Mr. Hosmer Angel?"
+
+I held the little printed slip to the light.
+
+"Missing," it said, "on the morning of the fourteenth, a gentleman
+named Hosmer Angel. About five ft. seven in. in height;
+strongly built, sallow complexion, black hair, a little bald in
+the centre, bushy, black side-whiskers and moustache; tinted
+glasses, slight infirmity of speech. Was dressed, when last seen,
+in black frock-coat faced with silk, black waistcoat, gold Albert
+chain, and grey Harris tweed trousers, with brown gaiters over
+elastic-sided boots. Known to have been employed in an office in
+Leadenhall Street. Anybody bringing--"
+
+"That will do," said Holmes. "As to the letters," he continued,
+glancing over them, "they are very commonplace. Absolutely no
+clue in them to Mr. Angel, save that he quotes Balzac once. There
+is one remarkable point, however, which will no doubt strike
+you."
+
+"They are typewritten," I remarked.
+
+"Not only that, but the signature is typewritten. Look at the
+neat little 'Hosmer Angel' at the bottom. There is a date, you
+see, but no superscription except Leadenhall Street, which is
+rather vague. The point about the signature is very suggestive--in
+fact, we may call it conclusive."
+
+"Of what?"
+
+"My dear fellow, is it possible you do not see how strongly it
+bears upon the case?"
+
+"I cannot say that I do unless it were that he wished to be able
+to deny his signature if an action for breach of promise were
+instituted."
+
+"No, that was not the point. However, I shall write two letters,
+which should settle the matter. One is to a firm in the City, the
+other is to the young lady's stepfather, Mr. Windibank, asking
+him whether he could meet us here at six o'clock tomorrow
+evening. It is just as well that we should do business with the
+male relatives. And now, Doctor, we can do nothing until the
+answers to those letters come, so we may put our little problem
+upon the shelf for the interim."
+
+I had had so many reasons to believe in my friend's subtle powers
+of reasoning and extraordinary energy in action that I felt that
+he must have some solid grounds for the assured and easy
+demeanour with which he treated the singular mystery which he had
+been called upon to fathom. Once only had I known him to fail, in
+the case of the King of Bohemia and of the Irene Adler
+photograph; but when I looked back to the weird business of the
+Sign of Four, and the extraordinary circumstances connected with
+the Study in Scarlet, I felt that it would be a strange tangle
+indeed which he could not unravel.
+
+I left him then, still puffing at his black clay pipe, with the
+conviction that when I came again on the next evening I would
+find that he held in his hands all the clues which would lead up
+to the identity of the disappearing bridegroom of Miss Mary
+Sutherland.
+
+A professional case of great gravity was engaging my own
+attention at the time, and the whole of next day I was busy at
+the bedside of the sufferer. It was not until close upon six
+o'clock that I found myself free and was able to spring into a
+hansom and drive to Baker Street, half afraid that I might be too
+late to assist at the dénouement of the little mystery. I found
+Sherlock Holmes alone, however, half asleep, with his long, thin
+form curled up in the recesses of his armchair. A formidable
+array of bottles and test-tubes, with the pungent cleanly smell
+of hydrochloric acid, told me that he had spent his day in the
+chemical work which was so dear to him.
+
+"Well, have you solved it?" I asked as I entered.
+
+"Yes. It was the bisulphate of baryta."
+
+"No, no, the mystery!" I cried.
+
+"Oh, that! I thought of the salt that I have been working upon.
+There was never any mystery in the matter, though, as I said
+yesterday, some of the details are of interest. The only drawback
+is that there is no law, I fear, that can touch the scoundrel."
+
+"Who was he, then, and what was his object in deserting Miss
+Sutherland?"
+
+The question was hardly out of my mouth, and Holmes had not yet
+opened his lips to reply, when we heard a heavy footfall in the
+passage and a tap at the door.
+
+"This is the girl's stepfather, Mr. James Windibank," said
+Holmes. "He has written to me to say that he would be here at
+six. Come in!"
+
+The man who entered was a sturdy, middle-sized fellow, some
+thirty years of age, clean-shaven, and sallow-skinned, with a
+bland, insinuating manner, and a pair of wonderfully sharp and
+penetrating grey eyes. He shot a questioning glance at each of
+us, placed his shiny top-hat upon the sideboard, and with a
+slight bow sidled down into the nearest chair.
+
+"Good-evening, Mr. James Windibank," said Holmes. "I think that
+this typewritten letter is from you, in which you made an
+appointment with me for six o'clock?"
+
+"Yes, sir. I am afraid that I am a little late, but I am not
+quite my own master, you know. I am sorry that Miss Sutherland
+has troubled you about this little matter, for I think it is far
+better not to wash linen of the sort in public. It was quite
+against my wishes that she came, but she is a very excitable,
+impulsive girl, as you may have noticed, and she is not easily
+controlled when she has made up her mind on a point. Of course, I
+did not mind you so much, as you are not connected with the
+official police, but it is not pleasant to have a family
+misfortune like this noised abroad. Besides, it is a useless
+expense, for how could you possibly find this Hosmer Angel?"
+
+"On the contrary," said Holmes quietly; "I have every reason to
+believe that I will succeed in discovering Mr. Hosmer Angel."
+
+Mr. Windibank gave a violent start and dropped his gloves. "I am
+delighted to hear it," he said.
+
+"It is a curious thing," remarked Holmes, "that a typewriter has
+really quite as much individuality as a man's handwriting. Unless
+they are quite new, no two of them write exactly alike. Some
+letters get more worn than others, and some wear only on one
+side. Now, you remark in this note of yours, Mr. Windibank, that
+in every case there is some little slurring over of the 'e,' and
+a slight defect in the tail of the 'r.' There are fourteen other
+characteristics, but those are the more obvious."
+
+"We do all our correspondence with this machine at the office,
+and no doubt it is a little worn," our visitor answered, glancing
+keenly at Holmes with his bright little eyes.
+
+"And now I will show you what is really a very interesting study,
+Mr. Windibank," Holmes continued. "I think of writing another
+little monograph some of these days on the typewriter and its
+relation to crime. It is a subject to which I have devoted some
+little attention. I have here four letters which purport to come
+from the missing man. They are all typewritten. In each case, not
+only are the 'e's' slurred and the 'r's' tailless, but you will
+observe, if you care to use my magnifying lens, that the fourteen
+other characteristics to which I have alluded are there as well."
+
+Mr. Windibank sprang out of his chair and picked up his hat. "I
+cannot waste time over this sort of fantastic talk, Mr. Holmes,"
+he said. "If you can catch the man, catch him, and let me know
+when you have done it."
+
+"Certainly," said Holmes, stepping over and turning the key in
+the door. "I let you know, then, that I have caught him!"
+
+"What! where?" shouted Mr. Windibank, turning white to his lips
+and glancing about him like a rat in a trap.
+
+"Oh, it won't do--really it won't," said Holmes suavely. "There
+is no possible getting out of it, Mr. Windibank. It is quite too
+transparent, and it was a very bad compliment when you said that
+it was impossible for me to solve so simple a question. That's
+right! Sit down and let us talk it over."
+
+Our visitor collapsed into a chair, with a ghastly face and a
+glitter of moisture on his brow. "It--it's not actionable," he
+stammered.
+
+"I am very much afraid that it is not. But between ourselves,
+Windibank, it was as cruel and selfish and heartless a trick in a
+petty way as ever came before me. Now, let me just run over the
+course of events, and you will contradict me if I go wrong."
+
+The man sat huddled up in his chair, with his head sunk upon his
+breast, like one who is utterly crushed. Holmes stuck his feet up
+on the corner of the mantelpiece and, leaning back with his hands
+in his pockets, began talking, rather to himself, as it seemed,
+than to us.
+
+"The man married a woman very much older than himself for her
+money," said he, "and he enjoyed the use of the money of the
+daughter as long as she lived with them. It was a considerable
+sum, for people in their position, and the loss of it would have
+made a serious difference. It was worth an effort to preserve it.
+The daughter was of a good, amiable disposition, but affectionate
+and warm-hearted in her ways, so that it was evident that with
+her fair personal advantages, and her little income, she would
+not be allowed to remain single long. Now her marriage would
+mean, of course, the loss of a hundred a year, so what does her
+stepfather do to prevent it? He takes the obvious course of
+keeping her at home and forbidding her to seek the company of
+people of her own age. But soon he found that that would not
+answer forever. She became restive, insisted upon her rights, and
+finally announced her positive intention of going to a certain
+ball. What does her clever stepfather do then? He conceives an
+idea more creditable to his head than to his heart. With the
+connivance and assistance of his wife he disguised himself,
+covered those keen eyes with tinted glasses, masked the face with
+a moustache and a pair of bushy whiskers, sunk that clear voice
+into an insinuating whisper, and doubly secure on account of the
+girl's short sight, he appears as Mr. Hosmer Angel, and keeps off
+other lovers by making love himself."
+
+"It was only a joke at first," groaned our visitor. "We never
+thought that she would have been so carried away."
+
+"Very likely not. However that may be, the young lady was very
+decidedly carried away, and, having quite made up her mind that
+her stepfather was in France, the suspicion of treachery never
+for an instant entered her mind. She was flattered by the
+gentleman's attentions, and the effect was increased by the
+loudly expressed admiration of her mother. Then Mr. Angel began
+to call, for it was obvious that the matter should be pushed as
+far as it would go if a real effect were to be produced. There
+were meetings, and an engagement, which would finally secure the
+girl's affections from turning towards anyone else. But the
+deception could not be kept up forever. These pretended journeys
+to France were rather cumbrous. The thing to do was clearly to
+bring the business to an end in such a dramatic manner that it
+would leave a permanent impression upon the young lady's mind and
+prevent her from looking upon any other suitor for some time to
+come. Hence those vows of fidelity exacted upon a Testament, and
+hence also the allusions to a possibility of something happening
+on the very morning of the wedding. James Windibank wished Miss
+Sutherland to be so bound to Hosmer Angel, and so uncertain as to
+his fate, that for ten years to come, at any rate, she would not
+listen to another man. As far as the church door he brought her,
+and then, as he could go no farther, he conveniently vanished
+away by the old trick of stepping in at one door of a
+four-wheeler and out at the other. I think that was the chain of
+events, Mr. Windibank!"
+
+Our visitor had recovered something of his assurance while Holmes
+had been talking, and he rose from his chair now with a cold
+sneer upon his pale face.
+
+"It may be so, or it may not, Mr. Holmes," said he, "but if you
+are so very sharp you ought to be sharp enough to know that it is
+you who are breaking the law now, and not me. I have done nothing
+actionable from the first, but as long as you keep that door
+locked you lay yourself open to an action for assault and illegal
+constraint."
+
+"The law cannot, as you say, touch you," said Holmes, unlocking
+and throwing open the door, "yet there never was a man who
+deserved punishment more. If the young lady has a brother or a
+friend, he ought to lay a whip across your shoulders. By Jove!"
+he continued, flushing up at the sight of the bitter sneer upon
+the man's face, "it is not part of my duties to my client, but
+here's a hunting crop handy, and I think I shall just treat
+myself to--" He took two swift steps to the whip, but before he
+could grasp it there was a wild clatter of steps upon the stairs,
+the heavy hall door banged, and from the window we could see Mr.
+James Windibank running at the top of his speed down the road.
+
+"There's a cold-blooded scoundrel!" said Holmes, laughing, as he
+threw himself down into his chair once more. "That fellow will
+rise from crime to crime until he does something very bad, and
+ends on a gallows. The case has, in some respects, been not
+entirely devoid of interest."
+
+"I cannot now entirely see all the steps of your reasoning," I
+remarked.
+
+"Well, of course it was obvious from the first that this Mr.
+Hosmer Angel must have some strong object for his curious
+conduct, and it was equally clear that the only man who really
+profited by the incident, as far as we could see, was the
+stepfather. Then the fact that the two men were never together,
+but that the one always appeared when the other was away, was
+suggestive. So were the tinted spectacles and the curious voice,
+which both hinted at a disguise, as did the bushy whiskers. My
+suspicions were all confirmed by his peculiar action in
+typewriting his signature, which, of course, inferred that his
+handwriting was so familiar to her that she would recognise even
+the smallest sample of it. You see all these isolated facts,
+together with many minor ones, all pointed in the same
+direction."
+
+"And how did you verify them?"
+
+"Having once spotted my man, it was easy to get corroboration. I
+knew the firm for which this man worked. Having taken the printed
+description. I eliminated everything from it which could be the
+result of a disguise--the whiskers, the glasses, the voice, and I
+sent it to the firm, with a request that they would inform me
+whether it answered to the description of any of their
+travellers. I had already noticed the peculiarities of the
+typewriter, and I wrote to the man himself at his business
+address asking him if he would come here. As I expected, his
+reply was typewritten and revealed the same trivial but
+characteristic defects. The same post brought me a letter from
+Westhouse & Marbank, of Fenchurch Street, to say that the
+description tallied in every respect with that of their employé,
+James Windibank. Voilà tout!"
+
+"And Miss Sutherland?"
+
+"If I tell her she will not believe me. You may remember the old
+Persian saying, 'There is danger for him who taketh the tiger
+cub, and danger also for whoso snatches a delusion from a woman.'
+There is as much sense in Hafiz as in Horace, and as much
+knowledge of the world."
+
+
+
+ADVENTURE IV. THE BOSCOMBE VALLEY MYSTERY
+
+We were seated at breakfast one morning, my wife and I, when the
+maid brought in a telegram. It was from Sherlock Holmes and ran
+in this way:
+
+"Have you a couple of days to spare? Have just been wired for from
+the west of England in connection with Boscombe Valley tragedy.
+Shall be glad if you will come with me. Air and scenery perfect.
+Leave Paddington by the 11:15."
+
+"What do you say, dear?" said my wife, looking across at me.
+"Will you go?"
+
+"I really don't know what to say. I have a fairly long list at
+present."
+
+"Oh, Anstruther would do your work for you. You have been looking
+a little pale lately. I think that the change would do you good,
+and you are always so interested in Mr. Sherlock Holmes' cases."
+
+"I should be ungrateful if I were not, seeing what I gained
+through one of them," I answered. "But if I am to go, I must pack
+at once, for I have only half an hour."
+
+My experience of camp life in Afghanistan had at least had the
+effect of making me a prompt and ready traveller. My wants were
+few and simple, so that in less than the time stated I was in a
+cab with my valise, rattling away to Paddington Station. Sherlock
+Holmes was pacing up and down the platform, his tall, gaunt
+figure made even gaunter and taller by his long grey
+travelling-cloak and close-fitting cloth cap.
+
+"It is really very good of you to come, Watson," said he. "It
+makes a considerable difference to me, having someone with me on
+whom I can thoroughly rely. Local aid is always either worthless
+or else biassed. If you will keep the two corner seats I shall
+get the tickets."
+
+We had the carriage to ourselves save for an immense litter of
+papers which Holmes had brought with him. Among these he rummaged
+and read, with intervals of note-taking and of meditation, until
+we were past Reading. Then he suddenly rolled them all into a
+gigantic ball and tossed them up onto the rack.
+
+"Have you heard anything of the case?" he asked.
+
+"Not a word. I have not seen a paper for some days."
+
+"The London press has not had very full accounts. I have just
+been looking through all the recent papers in order to master the
+particulars. It seems, from what I gather, to be one of those
+simple cases which are so extremely difficult."
+
+"That sounds a little paradoxical."
+
+"But it is profoundly true. Singularity is almost invariably a
+clue. The more featureless and commonplace a crime is, the more
+difficult it is to bring it home. In this case, however, they
+have established a very serious case against the son of the
+murdered man."
+
+"It is a murder, then?"
+
+"Well, it is conjectured to be so. I shall take nothing for
+granted until I have the opportunity of looking personally into
+it. I will explain the state of things to you, as far as I have
+been able to understand it, in a very few words.
+
+"Boscombe Valley is a country district not very far from Ross, in
+Herefordshire. The largest landed proprietor in that part is a
+Mr. John Turner, who made his money in Australia and returned
+some years ago to the old country. One of the farms which he
+held, that of Hatherley, was let to Mr. Charles McCarthy, who was
+also an ex-Australian. The men had known each other in the
+colonies, so that it was not unnatural that when they came to
+settle down they should do so as near each other as possible.
+Turner was apparently the richer man, so McCarthy became his
+tenant but still remained, it seems, upon terms of perfect
+equality, as they were frequently together. McCarthy had one son,
+a lad of eighteen, and Turner had an only daughter of the same
+age, but neither of them had wives living. They appear to have
+avoided the society of the neighbouring English families and to
+have led retired lives, though both the McCarthys were fond of
+sport and were frequently seen at the race-meetings of the
+neighbourhood. McCarthy kept two servants--a man and a girl.
+Turner had a considerable household, some half-dozen at the
+least. That is as much as I have been able to gather about the
+families. Now for the facts.
+
+"On June 3rd, that is, on Monday last, McCarthy left his house at
+Hatherley about three in the afternoon and walked down to the
+Boscombe Pool, which is a small lake formed by the spreading out
+of the stream which runs down the Boscombe Valley. He had been
+out with his serving-man in the morning at Ross, and he had told
+the man that he must hurry, as he had an appointment of
+importance to keep at three. From that appointment he never came
+back alive.
+
+"From Hatherley Farm-house to the Boscombe Pool is a quarter of a
+mile, and two people saw him as he passed over this ground. One
+was an old woman, whose name is not mentioned, and the other was
+William Crowder, a game-keeper in the employ of Mr. Turner. Both
+these witnesses depose that Mr. McCarthy was walking alone. The
+game-keeper adds that within a few minutes of his seeing Mr.
+McCarthy pass he had seen his son, Mr. James McCarthy, going the
+same way with a gun under his arm. To the best of his belief, the
+father was actually in sight at the time, and the son was
+following him. He thought no more of the matter until he heard in
+the evening of the tragedy that had occurred.
+
+"The two McCarthys were seen after the time when William Crowder,
+the game-keeper, lost sight of them. The Boscombe Pool is thickly
+wooded round, with just a fringe of grass and of reeds round the
+edge. A girl of fourteen, Patience Moran, who is the daughter of
+the lodge-keeper of the Boscombe Valley estate, was in one of the
+woods picking flowers. She states that while she was there she
+saw, at the border of the wood and close by the lake, Mr.
+McCarthy and his son, and that they appeared to be having a
+violent quarrel. She heard Mr. McCarthy the elder using very
+strong language to his son, and she saw the latter raise up his
+hand as if to strike his father. She was so frightened by their
+violence that she ran away and told her mother when she reached
+home that she had left the two McCarthys quarrelling near
+Boscombe Pool, and that she was afraid that they were going to
+fight. She had hardly said the words when young Mr. McCarthy came
+running up to the lodge to say that he had found his father dead
+in the wood, and to ask for the help of the lodge-keeper. He was
+much excited, without either his gun or his hat, and his right
+hand and sleeve were observed to be stained with fresh blood. On
+following him they found the dead body stretched out upon the
+grass beside the pool. The head had been beaten in by repeated
+blows of some heavy and blunt weapon. The injuries were such as
+might very well have been inflicted by the butt-end of his son's
+gun, which was found lying on the grass within a few paces of the
+body. Under these circumstances the young man was instantly
+arrested, and a verdict of 'wilful murder' having been returned
+at the inquest on Tuesday, he was on Wednesday brought before the
+magistrates at Ross, who have referred the case to the next
+Assizes. Those are the main facts of the case as they came out
+before the coroner and the police-court."
+
+"I could hardly imagine a more damning case," I remarked. "If
+ever circumstantial evidence pointed to a criminal it does so
+here."
+
+"Circumstantial evidence is a very tricky thing," answered Holmes
+thoughtfully. "It may seem to point very straight to one thing,
+but if you shift your own point of view a little, you may find it
+pointing in an equally uncompromising manner to something
+entirely different. It must be confessed, however, that the case
+looks exceedingly grave against the young man, and it is very
+possible that he is indeed the culprit. There are several people
+in the neighbourhood, however, and among them Miss Turner, the
+daughter of the neighbouring landowner, who believe in his
+innocence, and who have retained Lestrade, whom you may recollect
+in connection with the Study in Scarlet, to work out the case in
+his interest. Lestrade, being rather puzzled, has referred the
+case to me, and hence it is that two middle-aged gentlemen are
+flying westward at fifty miles an hour instead of quietly
+digesting their breakfasts at home."
+
+"I am afraid," said I, "that the facts are so obvious that you
+will find little credit to be gained out of this case."
+
+"There is nothing more deceptive than an obvious fact," he
+answered, laughing. "Besides, we may chance to hit upon some
+other obvious facts which may have been by no means obvious to
+Mr. Lestrade. You know me too well to think that I am boasting
+when I say that I shall either confirm or destroy his theory by
+means which he is quite incapable of employing, or even of
+understanding. To take the first example to hand, I very clearly
+perceive that in your bedroom the window is upon the right-hand
+side, and yet I question whether Mr. Lestrade would have noted
+even so self-evident a thing as that."
+
+"How on earth--"
+
+"My dear fellow, I know you well. I know the military neatness
+which characterises you. You shave every morning, and in this
+season you shave by the sunlight; but since your shaving is less
+and less complete as we get farther back on the left side, until
+it becomes positively slovenly as we get round the angle of the
+jaw, it is surely very clear that that side is less illuminated
+than the other. I could not imagine a man of your habits looking
+at himself in an equal light and being satisfied with such a
+result. I only quote this as a trivial example of observation and
+inference. Therein lies my métier, and it is just possible that
+it may be of some service in the investigation which lies before
+us. There are one or two minor points which were brought out in
+the inquest, and which are worth considering."
+
+"What are they?"
+
+"It appears that his arrest did not take place at once, but after
+the return to Hatherley Farm. On the inspector of constabulary
+informing him that he was a prisoner, he remarked that he was not
+surprised to hear it, and that it was no more than his deserts.
+This observation of his had the natural effect of removing any
+traces of doubt which might have remained in the minds of the
+coroner's jury."
+
+"It was a confession," I ejaculated.
+
+"No, for it was followed by a protestation of innocence."
+
+"Coming on the top of such a damning series of events, it was at
+least a most suspicious remark."
+
+"On the contrary," said Holmes, "it is the brightest rift which I
+can at present see in the clouds. However innocent he might be,
+he could not be such an absolute imbecile as not to see that the
+circumstances were very black against him. Had he appeared
+surprised at his own arrest, or feigned indignation at it, I
+should have looked upon it as highly suspicious, because such
+surprise or anger would not be natural under the circumstances,
+and yet might appear to be the best policy to a scheming man. His
+frank acceptance of the situation marks him as either an innocent
+man, or else as a man of considerable self-restraint and
+firmness. As to his remark about his deserts, it was also not
+unnatural if you consider that he stood beside the dead body of
+his father, and that there is no doubt that he had that very day
+so far forgotten his filial duty as to bandy words with him, and
+even, according to the little girl whose evidence is so
+important, to raise his hand as if to strike him. The
+self-reproach and contrition which are displayed in his remark
+appear to me to be the signs of a healthy mind rather than of a
+guilty one."
+
+I shook my head. "Many men have been hanged on far slighter
+evidence," I remarked.
+
+"So they have. And many men have been wrongfully hanged."
+
+"What is the young man's own account of the matter?"
+
+"It is, I am afraid, not very encouraging to his supporters,
+though there are one or two points in it which are suggestive.
+You will find it here, and may read it for yourself."
+
+He picked out from his bundle a copy of the local Herefordshire
+paper, and having turned down the sheet he pointed out the
+paragraph in which the unfortunate young man had given his own
+statement of what had occurred. I settled myself down in the
+corner of the carriage and read it very carefully. It ran in this
+way:
+
+"Mr. James McCarthy, the only son of the deceased, was then called
+and gave evidence as follows: 'I had been away from home for
+three days at Bristol, and had only just returned upon the
+morning of last Monday, the 3rd. My father was absent from home at
+the time of my arrival, and I was informed by the maid that he
+had driven over to Ross with John Cobb, the groom. Shortly after
+my return I heard the wheels of his trap in the yard, and,
+looking out of my window, I saw him get out and walk rapidly out
+of the yard, though I was not aware in which direction he was
+going. I then took my gun and strolled out in the direction of
+the Boscombe Pool, with the intention of visiting the rabbit
+warren which is upon the other side. On my way I saw William
+Crowder, the game-keeper, as he had stated in his evidence; but
+he is mistaken in thinking that I was following my father. I had
+no idea that he was in front of me. When about a hundred yards
+from the pool I heard a cry of "Cooee!" which was a usual signal
+between my father and myself. I then hurried forward, and found
+him standing by the pool. He appeared to be much surprised at
+seeing me and asked me rather roughly what I was doing there. A
+conversation ensued which led to high words and almost to blows,
+for my father was a man of a very violent temper. Seeing that his
+passion was becoming ungovernable, I left him and returned
+towards Hatherley Farm. I had not gone more than 150 yards,
+however, when I heard a hideous outcry behind me, which caused me
+to run back again. I found my father expiring upon the ground,
+with his head terribly injured. I dropped my gun and held him in
+my arms, but he almost instantly expired. I knelt beside him for
+some minutes, and then made my way to Mr. Turner's lodge-keeper,
+his house being the nearest, to ask for assistance. I saw no one
+near my father when I returned, and I have no idea how he came by
+his injuries. He was not a popular man, being somewhat cold and
+forbidding in his manners, but he had, as far as I know, no
+active enemies. I know nothing further of the matter.'
+
+"The Coroner: Did your father make any statement to you before
+he died?
+
+"Witness: He mumbled a few words, but I could only catch some
+allusion to a rat.
+
+"The Coroner: What did you understand by that?
+
+"Witness: It conveyed no meaning to me. I thought that he was
+delirious.
+
+"The Coroner: What was the point upon which you and your father
+had this final quarrel?
+
+"Witness: I should prefer not to answer.
+
+"The Coroner: I am afraid that I must press it.
+
+"Witness: It is really impossible for me to tell you. I can
+assure you that it has nothing to do with the sad tragedy which
+followed.
+
+"The Coroner: That is for the court to decide. I need not point
+out to you that your refusal to answer will prejudice your case
+considerably in any future proceedings which may arise.
+
+"Witness: I must still refuse.
+
+"The Coroner: I understand that the cry of 'Cooee' was a common
+signal between you and your father?
+
+"Witness: It was.
+
+"The Coroner: How was it, then, that he uttered it before he saw
+you, and before he even knew that you had returned from Bristol?
+
+"Witness (with considerable confusion): I do not know.
+
+"A Juryman: Did you see nothing which aroused your suspicions
+when you returned on hearing the cry and found your father
+fatally injured?
+
+"Witness: Nothing definite.
+
+"The Coroner: What do you mean?
+
+"Witness: I was so disturbed and excited as I rushed out into
+the open, that I could think of nothing except of my father. Yet
+I have a vague impression that as I ran forward something lay
+upon the ground to the left of me. It seemed to me to be
+something grey in colour, a coat of some sort, or a plaid perhaps.
+When I rose from my father I looked round for it, but it was
+gone.
+
+"'Do you mean that it disappeared before you went for help?'
+
+"'Yes, it was gone.'
+
+"'You cannot say what it was?'
+
+"'No, I had a feeling something was there.'
+
+"'How far from the body?'
+
+"'A dozen yards or so.'
+
+"'And how far from the edge of the wood?'
+
+"'About the same.'
+
+"'Then if it was removed it was while you were within a dozen
+yards of it?'
+
+"'Yes, but with my back towards it.'
+
+"This concluded the examination of the witness."
+
+"I see," said I as I glanced down the column, "that the coroner
+in his concluding remarks was rather severe upon young McCarthy.
+He calls attention, and with reason, to the discrepancy about his
+father having signalled to him before seeing him, also to his
+refusal to give details of his conversation with his father, and
+his singular account of his father's dying words. They are all,
+as he remarks, very much against the son."
+
+Holmes laughed softly to himself and stretched himself out upon
+the cushioned seat. "Both you and the coroner have been at some
+pains," said he, "to single out the very strongest points in the
+young man's favour. Don't you see that you alternately give him
+credit for having too much imagination and too little? Too
+little, if he could not invent a cause of quarrel which would
+give him the sympathy of the jury; too much, if he evolved from
+his own inner consciousness anything so outré as a dying
+reference to a rat, and the incident of the vanishing cloth. No,
+sir, I shall approach this case from the point of view that what
+this young man says is true, and we shall see whither that
+hypothesis will lead us. And now here is my pocket Petrarch, and
+not another word shall I say of this case until we are on the
+scene of action. We lunch at Swindon, and I see that we shall be
+there in twenty minutes."
+
+It was nearly four o'clock when we at last, after passing through
+the beautiful Stroud Valley, and over the broad gleaming Severn,
+found ourselves at the pretty little country-town of Ross. A
+lean, ferret-like man, furtive and sly-looking, was waiting for
+us upon the platform. In spite of the light brown dustcoat and
+leather-leggings which he wore in deference to his rustic
+surroundings, I had no difficulty in recognising Lestrade, of
+Scotland Yard. With him we drove to the Hereford Arms where a
+room had already been engaged for us.
+
+"I have ordered a carriage," said Lestrade as we sat over a cup
+of tea. "I knew your energetic nature, and that you would not be
+happy until you had been on the scene of the crime."
+
+"It was very nice and complimentary of you," Holmes answered. "It
+is entirely a question of barometric pressure."
+
+Lestrade looked startled. "I do not quite follow," he said.
+
+"How is the glass? Twenty-nine, I see. No wind, and not a cloud
+in the sky. I have a caseful of cigarettes here which need
+smoking, and the sofa is very much superior to the usual country
+hotel abomination. I do not think that it is probable that I
+shall use the carriage to-night."
+
+Lestrade laughed indulgently. "You have, no doubt, already formed
+your conclusions from the newspapers," he said. "The case is as
+plain as a pikestaff, and the more one goes into it the plainer
+it becomes. Still, of course, one can't refuse a lady, and such a
+very positive one, too. She has heard of you, and would have your
+opinion, though I repeatedly told her that there was nothing
+which you could do which I had not already done. Why, bless my
+soul! here is her carriage at the door."
+
+He had hardly spoken before there rushed into the room one of the
+most lovely young women that I have ever seen in my life. Her
+violet eyes shining, her lips parted, a pink flush upon her
+cheeks, all thought of her natural reserve lost in her
+overpowering excitement and concern.
+
+"Oh, Mr. Sherlock Holmes!" she cried, glancing from one to the
+other of us, and finally, with a woman's quick intuition,
+fastening upon my companion, "I am so glad that you have come. I
+have driven down to tell you so. I know that James didn't do it.
+I know it, and I want you to start upon your work knowing it,
+too. Never let yourself doubt upon that point. We have known each
+other since we were little children, and I know his faults as no
+one else does; but he is too tender-hearted to hurt a fly. Such a
+charge is absurd to anyone who really knows him."
+
+"I hope we may clear him, Miss Turner," said Sherlock Holmes.
+"You may rely upon my doing all that I can."
+
+"But you have read the evidence. You have formed some conclusion?
+Do you not see some loophole, some flaw? Do you not yourself
+think that he is innocent?"
+
+"I think that it is very probable."
+
+"There, now!" she cried, throwing back her head and looking
+defiantly at Lestrade. "You hear! He gives me hopes."
+
+Lestrade shrugged his shoulders. "I am afraid that my colleague
+has been a little quick in forming his conclusions," he said.
+
+"But he is right. Oh! I know that he is right. James never did
+it. And about his quarrel with his father, I am sure that the
+reason why he would not speak about it to the coroner was because
+I was concerned in it."
+
+"In what way?" asked Holmes.
+
+"It is no time for me to hide anything. James and his father had
+many disagreements about me. Mr. McCarthy was very anxious that
+there should be a marriage between us. James and I have always
+loved each other as brother and sister; but of course he is young
+and has seen very little of life yet, and--and--well, he
+naturally did not wish to do anything like that yet. So there
+were quarrels, and this, I am sure, was one of them."
+
+"And your father?" asked Holmes. "Was he in favour of such a
+union?"
+
+"No, he was averse to it also. No one but Mr. McCarthy was in
+favour of it." A quick blush passed over her fresh young face as
+Holmes shot one of his keen, questioning glances at her.
+
+"Thank you for this information," said he. "May I see your father
+if I call to-morrow?"
+
+"I am afraid the doctor won't allow it."
+
+"The doctor?"
+
+"Yes, have you not heard? Poor father has never been strong for
+years back, but this has broken him down completely. He has taken
+to his bed, and Dr. Willows says that he is a wreck and that his
+nervous system is shattered. Mr. McCarthy was the only man alive
+who had known dad in the old days in Victoria."
+
+"Ha! In Victoria! That is important."
+
+"Yes, at the mines."
+
+"Quite so; at the gold-mines, where, as I understand, Mr. Turner
+made his money."
+
+"Yes, certainly."
+
+"Thank you, Miss Turner. You have been of material assistance to
+me."
+
+"You will tell me if you have any news to-morrow. No doubt you
+will go to the prison to see James. Oh, if you do, Mr. Holmes, do
+tell him that I know him to be innocent."
+
+"I will, Miss Turner."
+
+"I must go home now, for dad is very ill, and he misses me so if
+I leave him. Good-bye, and God help you in your undertaking." She
+hurried from the room as impulsively as she had entered, and we
+heard the wheels of her carriage rattle off down the street.
+
+"I am ashamed of you, Holmes," said Lestrade with dignity after a
+few minutes' silence. "Why should you raise up hopes which you
+are bound to disappoint? I am not over-tender of heart, but I
+call it cruel."
+
+"I think that I see my way to clearing James McCarthy," said
+Holmes. "Have you an order to see him in prison?"
+
+"Yes, but only for you and me."
+
+"Then I shall reconsider my resolution about going out. We have
+still time to take a train to Hereford and see him to-night?"
+
+"Ample."
+
+"Then let us do so. Watson, I fear that you will find it very
+slow, but I shall only be away a couple of hours."
+
+I walked down to the station with them, and then wandered through
+the streets of the little town, finally returning to the hotel,
+where I lay upon the sofa and tried to interest myself in a
+yellow-backed novel. The puny plot of the story was so thin,
+however, when compared to the deep mystery through which we were
+groping, and I found my attention wander so continually from the
+action to the fact, that I at last flung it across the room and
+gave myself up entirely to a consideration of the events of the
+day. Supposing that this unhappy young man's story were
+absolutely true, then what hellish thing, what absolutely
+unforeseen and extraordinary calamity could have occurred between
+the time when he parted from his father, and the moment when,
+drawn back by his screams, he rushed into the glade? It was
+something terrible and deadly. What could it be? Might not the
+nature of the injuries reveal something to my medical instincts?
+I rang the bell and called for the weekly county paper, which
+contained a verbatim account of the inquest. In the surgeon's
+deposition it was stated that the posterior third of the left
+parietal bone and the left half of the occipital bone had been
+shattered by a heavy blow from a blunt weapon. I marked the spot
+upon my own head. Clearly such a blow must have been struck from
+behind. That was to some extent in favour of the accused, as when
+seen quarrelling he was face to face with his father. Still, it
+did not go for very much, for the older man might have turned his
+back before the blow fell. Still, it might be worth while to call
+Holmes' attention to it. Then there was the peculiar dying
+reference to a rat. What could that mean? It could not be
+delirium. A man dying from a sudden blow does not commonly become
+delirious. No, it was more likely to be an attempt to explain how
+he met his fate. But what could it indicate? I cudgelled my
+brains to find some possible explanation. And then the incident
+of the grey cloth seen by young McCarthy. If that were true the
+murderer must have dropped some part of his dress, presumably his
+overcoat, in his flight, and must have had the hardihood to
+return and to carry it away at the instant when the son was
+kneeling with his back turned not a dozen paces off. What a
+tissue of mysteries and improbabilities the whole thing was! I
+did not wonder at Lestrade's opinion, and yet I had so much faith
+in Sherlock Holmes' insight that I could not lose hope as long
+as every fresh fact seemed to strengthen his conviction of young
+McCarthy's innocence.
+
+It was late before Sherlock Holmes returned. He came back alone,
+for Lestrade was staying in lodgings in the town.
+
+"The glass still keeps very high," he remarked as he sat down.
+"It is of importance that it should not rain before we are able
+to go over the ground. On the other hand, a man should be at his
+very best and keenest for such nice work as that, and I did not
+wish to do it when fagged by a long journey. I have seen young
+McCarthy."
+
+"And what did you learn from him?"
+
+"Nothing."
+
+"Could he throw no light?"
+
+"None at all. I was inclined to think at one time that he knew
+who had done it and was screening him or her, but I am convinced
+now that he is as puzzled as everyone else. He is not a very
+quick-witted youth, though comely to look at and, I should think,
+sound at heart."
+
+"I cannot admire his taste," I remarked, "if it is indeed a fact
+that he was averse to a marriage with so charming a young lady as
+this Miss Turner."
+
+"Ah, thereby hangs a rather painful tale. This fellow is madly,
+insanely, in love with her, but some two years ago, when he was
+only a lad, and before he really knew her, for she had been away
+five years at a boarding-school, what does the idiot do but get
+into the clutches of a barmaid in Bristol and marry her at a
+registry office? No one knows a word of the matter, but you can
+imagine how maddening it must be to him to be upbraided for not
+doing what he would give his very eyes to do, but what he knows
+to be absolutely impossible. It was sheer frenzy of this sort
+which made him throw his hands up into the air when his father,
+at their last interview, was goading him on to propose to Miss
+Turner. On the other hand, he had no means of supporting himself,
+and his father, who was by all accounts a very hard man, would
+have thrown him over utterly had he known the truth. It was with
+his barmaid wife that he had spent the last three days in
+Bristol, and his father did not know where he was. Mark that
+point. It is of importance. Good has come out of evil, however,
+for the barmaid, finding from the papers that he is in serious
+trouble and likely to be hanged, has thrown him over utterly and
+has written to him to say that she has a husband already in the
+Bermuda Dockyard, so that there is really no tie between them. I
+think that that bit of news has consoled young McCarthy for all
+that he has suffered."
+
+"But if he is innocent, who has done it?"
+
+"Ah! who? I would call your attention very particularly to two
+points. One is that the murdered man had an appointment with
+someone at the pool, and that the someone could not have been his
+son, for his son was away, and he did not know when he would
+return. The second is that the murdered man was heard to cry
+'Cooee!' before he knew that his son had returned. Those are the
+crucial points upon which the case depends. And now let us talk
+about George Meredith, if you please, and we shall leave all
+minor matters until to-morrow."
+
+There was no rain, as Holmes had foretold, and the morning broke
+bright and cloudless. At nine o'clock Lestrade called for us with
+the carriage, and we set off for Hatherley Farm and the Boscombe
+Pool.
+
+"There is serious news this morning," Lestrade observed. "It is
+said that Mr. Turner, of the Hall, is so ill that his life is
+despaired of."
+
+"An elderly man, I presume?" said Holmes.
+
+"About sixty; but his constitution has been shattered by his life
+abroad, and he has been in failing health for some time. This
+business has had a very bad effect upon him. He was an old friend
+of McCarthy's, and, I may add, a great benefactor to him, for I
+have learned that he gave him Hatherley Farm rent free."
+
+"Indeed! That is interesting," said Holmes.
+
+"Oh, yes! In a hundred other ways he has helped him. Everybody
+about here speaks of his kindness to him."
+
+"Really! Does it not strike you as a little singular that this
+McCarthy, who appears to have had little of his own, and to have
+been under such obligations to Turner, should still talk of
+marrying his son to Turner's daughter, who is, presumably,
+heiress to the estate, and that in such a very cocksure manner,
+as if it were merely a case of a proposal and all else would
+follow? It is the more strange, since we know that Turner himself
+was averse to the idea. The daughter told us as much. Do you not
+deduce something from that?"
+
+"We have got to the deductions and the inferences," said
+Lestrade, winking at me. "I find it hard enough to tackle facts,
+Holmes, without flying away after theories and fancies."
+
+"You are right," said Holmes demurely; "you do find it very hard
+to tackle the facts."
+
+"Anyhow, I have grasped one fact which you seem to find it
+difficult to get hold of," replied Lestrade with some warmth.
+
+"And that is--"
+
+"That McCarthy senior met his death from McCarthy junior and that
+all theories to the contrary are the merest moonshine."
+
+"Well, moonshine is a brighter thing than fog," said Holmes,
+laughing. "But I am very much mistaken if this is not Hatherley
+Farm upon the left."
+
+"Yes, that is it." It was a widespread, comfortable-looking
+building, two-storied, slate-roofed, with great yellow blotches
+of lichen upon the grey walls. The drawn blinds and the smokeless
+chimneys, however, gave it a stricken look, as though the weight
+of this horror still lay heavy upon it. We called at the door,
+when the maid, at Holmes' request, showed us the boots which her
+master wore at the time of his death, and also a pair of the
+son's, though not the pair which he had then had. Having measured
+these very carefully from seven or eight different points, Holmes
+desired to be led to the court-yard, from which we all followed
+the winding track which led to Boscombe Pool.
+
+Sherlock Holmes was transformed when he was hot upon such a scent
+as this. Men who had only known the quiet thinker and logician of
+Baker Street would have failed to recognise him. His face flushed
+and darkened. His brows were drawn into two hard black lines,
+while his eyes shone out from beneath them with a steely glitter.
+His face was bent downward, his shoulders bowed, his lips
+compressed, and the veins stood out like whipcord in his long,
+sinewy neck. His nostrils seemed to dilate with a purely animal
+lust for the chase, and his mind was so absolutely concentrated
+upon the matter before him that a question or remark fell
+unheeded upon his ears, or, at the most, only provoked a quick,
+impatient snarl in reply. Swiftly and silently he made his way
+along the track which ran through the meadows, and so by way of
+the woods to the Boscombe Pool. It was damp, marshy ground, as is
+all that district, and there were marks of many feet, both upon
+the path and amid the short grass which bounded it on either
+side. Sometimes Holmes would hurry on, sometimes stop dead, and
+once he made quite a little detour into the meadow. Lestrade and
+I walked behind him, the detective indifferent and contemptuous,
+while I watched my friend with the interest which sprang from the
+conviction that every one of his actions was directed towards a
+definite end.
+
+The Boscombe Pool, which is a little reed-girt sheet of water
+some fifty yards across, is situated at the boundary between the
+Hatherley Farm and the private park of the wealthy Mr. Turner.
+Above the woods which lined it upon the farther side we could see
+the red, jutting pinnacles which marked the site of the rich
+landowner's dwelling. On the Hatherley side of the pool the woods
+grew very thick, and there was a narrow belt of sodden grass
+twenty paces across between the edge of the trees and the reeds
+which lined the lake. Lestrade showed us the exact spot at which
+the body had been found, and, indeed, so moist was the ground,
+that I could plainly see the traces which had been left by the
+fall of the stricken man. To Holmes, as I could see by his eager
+face and peering eyes, very many other things were to be read
+upon the trampled grass. He ran round, like a dog who is picking
+up a scent, and then turned upon my companion.
+
+"What did you go into the pool for?" he asked.
+
+"I fished about with a rake. I thought there might be some weapon
+or other trace. But how on earth--"
+
+"Oh, tut, tut! I have no time! That left foot of yours with its
+inward twist is all over the place. A mole could trace it, and
+there it vanishes among the reeds. Oh, how simple it would all
+have been had I been here before they came like a herd of buffalo
+and wallowed all over it. Here is where the party with the
+lodge-keeper came, and they have covered all tracks for six or
+eight feet round the body. But here are three separate tracks of
+the same feet." He drew out a lens and lay down upon his
+waterproof to have a better view, talking all the time rather to
+himself than to us. "These are young McCarthy's feet. Twice he
+was walking, and once he ran swiftly, so that the soles are
+deeply marked and the heels hardly visible. That bears out his
+story. He ran when he saw his father on the ground. Then here are
+the father's feet as he paced up and down. What is this, then? It
+is the butt-end of the gun as the son stood listening. And this?
+Ha, ha! What have we here? Tiptoes! tiptoes! Square, too, quite
+unusual boots! They come, they go, they come again--of course
+that was for the cloak. Now where did they come from?" He ran up
+and down, sometimes losing, sometimes finding the track until we
+were well within the edge of the wood and under the shadow of a
+great beech, the largest tree in the neighbourhood. Holmes traced
+his way to the farther side of this and lay down once more upon
+his face with a little cry of satisfaction. For a long time he
+remained there, turning over the leaves and dried sticks,
+gathering up what seemed to me to be dust into an envelope and
+examining with his lens not only the ground but even the bark of
+the tree as far as he could reach. A jagged stone was lying among
+the moss, and this also he carefully examined and retained. Then
+he followed a pathway through the wood until he came to the
+highroad, where all traces were lost.
+
+"It has been a case of considerable interest," he remarked,
+returning to his natural manner. "I fancy that this grey house on
+the right must be the lodge. I think that I will go in and have a
+word with Moran, and perhaps write a little note. Having done
+that, we may drive back to our luncheon. You may walk to the cab,
+and I shall be with you presently."
+
+It was about ten minutes before we regained our cab and drove
+back into Ross, Holmes still carrying with him the stone which he
+had picked up in the wood.
+
+"This may interest you, Lestrade," he remarked, holding it out.
+"The murder was done with it."
+
+"I see no marks."
+
+"There are none."
+
+"How do you know, then?"
+
+"The grass was growing under it. It had only lain there a few
+days. There was no sign of a place whence it had been taken. It
+corresponds with the injuries. There is no sign of any other
+weapon."
+
+"And the murderer?"
+
+"Is a tall man, left-handed, limps with the right leg, wears
+thick-soled shooting-boots and a grey cloak, smokes Indian
+cigars, uses a cigar-holder, and carries a blunt pen-knife in his
+pocket. There are several other indications, but these may be
+enough to aid us in our search."
+
+Lestrade laughed. "I am afraid that I am still a sceptic," he
+said. "Theories are all very well, but we have to deal with a
+hard-headed British jury."
+
+"Nous verrons," answered Holmes calmly. "You work your own
+method, and I shall work mine. I shall be busy this afternoon,
+and shall probably return to London by the evening train."
+
+"And leave your case unfinished?"
+
+"No, finished."
+
+"But the mystery?"
+
+"It is solved."
+
+"Who was the criminal, then?"
+
+"The gentleman I describe."
+
+"But who is he?"
+
+"Surely it would not be difficult to find out. This is not such a
+populous neighbourhood."
+
+Lestrade shrugged his shoulders. "I am a practical man," he said,
+"and I really cannot undertake to go about the country looking
+for a left-handed gentleman with a game leg. I should become the
+laughing-stock of Scotland Yard."
+
+"All right," said Holmes quietly. "I have given you the chance.
+Here are your lodgings. Good-bye. I shall drop you a line before
+I leave."
+
+Having left Lestrade at his rooms, we drove to our hotel, where
+we found lunch upon the table. Holmes was silent and buried in
+thought with a pained expression upon his face, as one who finds
+himself in a perplexing position.
+
+"Look here, Watson," he said when the cloth was cleared "just sit
+down in this chair and let me preach to you for a little. I don't
+know quite what to do, and I should value your advice. Light a
+cigar and let me expound."
+
+ "Pray do so."
+
+"Well, now, in considering this case there are two points about
+young McCarthy's narrative which struck us both instantly,
+although they impressed me in his favour and you against him. One
+was the fact that his father should, according to his account,
+cry 'Cooee!' before seeing him. The other was his singular dying
+reference to a rat. He mumbled several words, you understand, but
+that was all that caught the son's ear. Now from this double
+point our research must commence, and we will begin it by
+presuming that what the lad says is absolutely true."
+
+"What of this 'Cooee!' then?"
+
+"Well, obviously it could not have been meant for the son. The
+son, as far as he knew, was in Bristol. It was mere chance that
+he was within earshot. The 'Cooee!' was meant to attract the
+attention of whoever it was that he had the appointment with. But
+'Cooee' is a distinctly Australian cry, and one which is used
+between Australians. There is a strong presumption that the
+person whom McCarthy expected to meet him at Boscombe Pool was
+someone who had been in Australia."
+
+"What of the rat, then?"
+
+Sherlock Holmes took a folded paper from his pocket and flattened
+it out on the table. "This is a map of the Colony of Victoria,"
+he said. "I wired to Bristol for it last night." He put his hand
+over part of the map. "What do you read?"
+
+"ARAT," I read.
+
+"And now?" He raised his hand.
+
+"BALLARAT."
+
+"Quite so. That was the word the man uttered, and of which his
+son only caught the last two syllables. He was trying to utter
+the name of his murderer. So and so, of Ballarat."
+
+"It is wonderful!" I exclaimed.
+
+"It is obvious. And now, you see, I had narrowed the field down
+considerably. The possession of a grey garment was a third point
+which, granting the son's statement to be correct, was a
+certainty. We have come now out of mere vagueness to the definite
+conception of an Australian from Ballarat with a grey cloak."
+
+"Certainly."
+
+"And one who was at home in the district, for the pool can only
+be approached by the farm or by the estate, where strangers could
+hardly wander."
+
+"Quite so."
+
+"Then comes our expedition of to-day. By an examination of the
+ground I gained the trifling details which I gave to that
+imbecile Lestrade, as to the personality of the criminal."
+
+"But how did you gain them?"
+
+"You know my method. It is founded upon the observation of
+trifles."
+
+"His height I know that you might roughly judge from the length
+of his stride. His boots, too, might be told from their traces."
+
+"Yes, they were peculiar boots."
+
+"But his lameness?"
+
+"The impression of his right foot was always less distinct than
+his left. He put less weight upon it. Why? Because he limped--he
+was lame."
+
+"But his left-handedness."
+
+"You were yourself struck by the nature of the injury as recorded
+by the surgeon at the inquest. The blow was struck from
+immediately behind, and yet was upon the left side. Now, how can
+that be unless it were by a left-handed man? He had stood behind
+that tree during the interview between the father and son. He had
+even smoked there. I found the ash of a cigar, which my special
+knowledge of tobacco ashes enables me to pronounce as an Indian
+cigar. I have, as you know, devoted some attention to this, and
+written a little monograph on the ashes of 140 different
+varieties of pipe, cigar, and cigarette tobacco. Having found the
+ash, I then looked round and discovered the stump among the moss
+where he had tossed it. It was an Indian cigar, of the variety
+which are rolled in Rotterdam."
+
+"And the cigar-holder?"
+
+"I could see that the end had not been in his mouth. Therefore he
+used a holder. The tip had been cut off, not bitten off, but the
+cut was not a clean one, so I deduced a blunt pen-knife."
+
+"Holmes," I said, "you have drawn a net round this man from which
+he cannot escape, and you have saved an innocent human life as
+truly as if you had cut the cord which was hanging him. I see the
+direction in which all this points. The culprit is--"
+
+"Mr. John Turner," cried the hotel waiter, opening the door of
+our sitting-room, and ushering in a visitor.
+
+The man who entered was a strange and impressive figure. His
+slow, limping step and bowed shoulders gave the appearance of
+decrepitude, and yet his hard, deep-lined, craggy features, and
+his enormous limbs showed that he was possessed of unusual
+strength of body and of character. His tangled beard, grizzled
+hair, and outstanding, drooping eyebrows combined to give an air
+of dignity and power to his appearance, but his face was of an
+ashen white, while his lips and the corners of his nostrils were
+tinged with a shade of blue. It was clear to me at a glance that
+he was in the grip of some deadly and chronic disease.
+
+"Pray sit down on the sofa," said Holmes gently. "You had my
+note?"
+
+"Yes, the lodge-keeper brought it up. You said that you wished to
+see me here to avoid scandal."
+
+"I thought people would talk if I went to the Hall."
+
+"And why did you wish to see me?" He looked across at my
+companion with despair in his weary eyes, as though his question
+was already answered.
+
+"Yes," said Holmes, answering the look rather than the words. "It
+is so. I know all about McCarthy."
+
+The old man sank his face in his hands. "God help me!" he cried.
+"But I would not have let the young man come to harm. I give you
+my word that I would have spoken out if it went against him at
+the Assizes."
+
+"I am glad to hear you say so," said Holmes gravely.
+
+"I would have spoken now had it not been for my dear girl. It
+would break her heart--it will break her heart when she hears
+that I am arrested."
+
+"It may not come to that," said Holmes.
+
+"What?"
+
+"I am no official agent. I understand that it was your daughter
+who required my presence here, and I am acting in her interests.
+Young McCarthy must be got off, however."
+
+"I am a dying man," said old Turner. "I have had diabetes for
+years. My doctor says it is a question whether I shall live a
+month. Yet I would rather die under my own roof than in a gaol."
+
+Holmes rose and sat down at the table with his pen in his hand
+and a bundle of paper before him. "Just tell us the truth," he
+said. "I shall jot down the facts. You will sign it, and Watson
+here can witness it. Then I could produce your confession at the
+last extremity to save young McCarthy. I promise you that I shall
+not use it unless it is absolutely needed."
+
+"It's as well," said the old man; "it's a question whether I
+shall live to the Assizes, so it matters little to me, but I
+should wish to spare Alice the shock. And now I will make the
+thing clear to you; it has been a long time in the acting, but
+will not take me long to tell.
+
+"You didn't know this dead man, McCarthy. He was a devil
+incarnate. I tell you that. God keep you out of the clutches of
+such a man as he. His grip has been upon me these twenty years,
+and he has blasted my life. I'll tell you first how I came to be
+in his power.
+
+"It was in the early '60's at the diggings. I was a young chap
+then, hot-blooded and reckless, ready to turn my hand at
+anything; I got among bad companions, took to drink, had no luck
+with my claim, took to the bush, and in a word became what you
+would call over here a highway robber. There were six of us, and
+we had a wild, free life of it, sticking up a station from time
+to time, or stopping the wagons on the road to the diggings.
+Black Jack of Ballarat was the name I went under, and our party
+is still remembered in the colony as the Ballarat Gang.
+
+"One day a gold convoy came down from Ballarat to Melbourne, and
+we lay in wait for it and attacked it. There were six troopers
+and six of us, so it was a close thing, but we emptied four of
+their saddles at the first volley. Three of our boys were killed,
+however, before we got the swag. I put my pistol to the head of
+the wagon-driver, who was this very man McCarthy. I wish to the
+Lord that I had shot him then, but I spared him, though I saw his
+wicked little eyes fixed on my face, as though to remember every
+feature. We got away with the gold, became wealthy men, and made
+our way over to England without being suspected. There I parted
+from my old pals and determined to settle down to a quiet and
+respectable life. I bought this estate, which chanced to be in
+the market, and I set myself to do a little good with my money,
+to make up for the way in which I had earned it. I married, too,
+and though my wife died young she left me my dear little Alice.
+Even when she was just a baby her wee hand seemed to lead me down
+the right path as nothing else had ever done. In a word, I turned
+over a new leaf and did my best to make up for the past. All was
+going well when McCarthy laid his grip upon me.
+
+"I had gone up to town about an investment, and I met him in
+Regent Street with hardly a coat to his back or a boot to his
+foot.
+
+"'Here we are, Jack,' says he, touching me on the arm; 'we'll be
+as good as a family to you. There's two of us, me and my son, and
+you can have the keeping of us. If you don't--it's a fine,
+law-abiding country is England, and there's always a policeman
+within hail.'
+
+"Well, down they came to the west country, there was no shaking
+them off, and there they have lived rent free on my best land
+ever since. There was no rest for me, no peace, no forgetfulness;
+turn where I would, there was his cunning, grinning face at my
+elbow. It grew worse as Alice grew up, for he soon saw I was more
+afraid of her knowing my past than of the police. Whatever he
+wanted he must have, and whatever it was I gave him without
+question, land, money, houses, until at last he asked a thing
+which I could not give. He asked for Alice.
+
+"His son, you see, had grown up, and so had my girl, and as I was
+known to be in weak health, it seemed a fine stroke to him that
+his lad should step into the whole property. But there I was
+firm. I would not have his cursed stock mixed with mine; not that
+I had any dislike to the lad, but his blood was in him, and that
+was enough. I stood firm. McCarthy threatened. I braved him to do
+his worst. We were to meet at the pool midway between our houses
+to talk it over.
+
+"When I went down there I found him talking with his son, so I
+smoked a cigar and waited behind a tree until he should be alone.
+But as I listened to his talk all that was black and bitter in
+me seemed to come uppermost. He was urging his son to marry my
+daughter with as little regard for what she might think as if she
+were a slut from off the streets. It drove me mad to think that I
+and all that I held most dear should be in the power of such a
+man as this. Could I not snap the bond? I was already a dying and
+a desperate man. Though clear of mind and fairly strong of limb,
+I knew that my own fate was sealed. But my memory and my girl!
+Both could be saved if I could but silence that foul tongue. I
+did it, Mr. Holmes. I would do it again. Deeply as I have sinned,
+I have led a life of martyrdom to atone for it. But that my girl
+should be entangled in the same meshes which held me was more
+than I could suffer. I struck him down with no more compunction
+than if he had been some foul and venomous beast. His cry brought
+back his son; but I had gained the cover of the wood, though I
+was forced to go back to fetch the cloak which I had dropped in
+my flight. That is the true story, gentlemen, of all that
+occurred."
+
+"Well, it is not for me to judge you," said Holmes as the old man
+signed the statement which had been drawn out. "I pray that we
+may never be exposed to such a temptation."
+
+"I pray not, sir. And what do you intend to do?"
+
+"In view of your health, nothing. You are yourself aware that you
+will soon have to answer for your deed at a higher court than the
+Assizes. I will keep your confession, and if McCarthy is
+condemned I shall be forced to use it. If not, it shall never be
+seen by mortal eye; and your secret, whether you be alive or
+dead, shall be safe with us."
+
+"Farewell, then," said the old man solemnly. "Your own deathbeds,
+when they come, will be the easier for the thought of the peace
+which you have given to mine." Tottering and shaking in all his
+giant frame, he stumbled slowly from the room.
+
+"God help us!" said Holmes after a long silence. "Why does fate
+play such tricks with poor, helpless worms? I never hear of such
+a case as this that I do not think of Baxter's words, and say,
+'There, but for the grace of God, goes Sherlock Holmes.'"
+
+James McCarthy was acquitted at the Assizes on the strength of a
+number of objections which had been drawn out by Holmes and
+submitted to the defending counsel. Old Turner lived for seven
+months after our interview, but he is now dead; and there is
+every prospect that the son and daughter may come to live happily
+together in ignorance of the black cloud which rests upon their
+past.
+
+
+
+ADVENTURE V. THE FIVE ORANGE PIPS
+
+When I glance over my notes and records of the Sherlock Holmes
+cases between the years '82 and '90, I am faced by so many which
+present strange and interesting features that it is no easy
+matter to know which to choose and which to leave. Some, however,
+have already gained publicity through the papers, and others have
+not offered a field for those peculiar qualities which my friend
+possessed in so high a degree, and which it is the object of
+these papers to illustrate. Some, too, have baffled his
+analytical skill, and would be, as narratives, beginnings without
+an ending, while others have been but partially cleared up, and
+have their explanations founded rather upon conjecture and
+surmise than on that absolute logical proof which was so dear to
+him. There is, however, one of these last which was so remarkable
+in its details and so startling in its results that I am tempted
+to give some account of it in spite of the fact that there are
+points in connection with it which never have been, and probably
+never will be, entirely cleared up.
+
+The year '87 furnished us with a long series of cases of greater
+or less interest, of which I retain the records. Among my
+headings under this one twelve months I find an account of the
+adventure of the Paradol Chamber, of the Amateur Mendicant
+Society, who held a luxurious club in the lower vault of a
+furniture warehouse, of the facts connected with the loss of the
+British barque "Sophy Anderson", of the singular adventures of the
+Grice Patersons in the island of Uffa, and finally of the
+Camberwell poisoning case. In the latter, as may be remembered,
+Sherlock Holmes was able, by winding up the dead man's watch, to
+prove that it had been wound up two hours before, and that
+therefore the deceased had gone to bed within that time--a
+deduction which was of the greatest importance in clearing up the
+case. All these I may sketch out at some future date, but none of
+them present such singular features as the strange train of
+circumstances which I have now taken up my pen to describe.
+
+It was in the latter days of September, and the equinoctial gales
+had set in with exceptional violence. All day the wind had
+screamed and the rain had beaten against the windows, so that
+even here in the heart of great, hand-made London we were forced
+to raise our minds for the instant from the routine of life and
+to recognise the presence of those great elemental forces which
+shriek at mankind through the bars of his civilisation, like
+untamed beasts in a cage. As evening drew in, the storm grew
+higher and louder, and the wind cried and sobbed like a child in
+the chimney. Sherlock Holmes sat moodily at one side of the
+fireplace cross-indexing his records of crime, while I at the
+other was deep in one of Clark Russell's fine sea-stories until
+the howl of the gale from without seemed to blend with the text,
+and the splash of the rain to lengthen out into the long swash of
+the sea waves. My wife was on a visit to her mother's, and for a
+few days I was a dweller once more in my old quarters at Baker
+Street.
+
+"Why," said I, glancing up at my companion, "that was surely the
+bell. Who could come to-night? Some friend of yours, perhaps?"
+
+"Except yourself I have none," he answered. "I do not encourage
+visitors."
+
+"A client, then?"
+
+"If so, it is a serious case. Nothing less would bring a man out
+on such a day and at such an hour. But I take it that it is more
+likely to be some crony of the landlady's."
+
+Sherlock Holmes was wrong in his conjecture, however, for there
+came a step in the passage and a tapping at the door. He
+stretched out his long arm to turn the lamp away from himself and
+towards the vacant chair upon which a newcomer must sit.
+
+"Come in!" said he.
+
+The man who entered was young, some two-and-twenty at the
+outside, well-groomed and trimly clad, with something of
+refinement and delicacy in his bearing. The streaming umbrella
+which he held in his hand, and his long shining waterproof told
+of the fierce weather through which he had come. He looked about
+him anxiously in the glare of the lamp, and I could see that his
+face was pale and his eyes heavy, like those of a man who is
+weighed down with some great anxiety.
+
+"I owe you an apology," he said, raising his golden pince-nez to
+his eyes. "I trust that I am not intruding. I fear that I have
+brought some traces of the storm and rain into your snug
+chamber."
+
+"Give me your coat and umbrella," said Holmes. "They may rest
+here on the hook and will be dry presently. You have come up from
+the south-west, I see."
+
+"Yes, from Horsham."
+
+"That clay and chalk mixture which I see upon your toe caps is
+quite distinctive."
+
+"I have come for advice."
+
+"That is easily got."
+
+"And help."
+
+"That is not always so easy."
+
+"I have heard of you, Mr. Holmes. I heard from Major Prendergast
+how you saved him in the Tankerville Club scandal."
+
+"Ah, of course. He was wrongfully accused of cheating at cards."
+
+"He said that you could solve anything."
+
+"He said too much."
+
+"That you are never beaten."
+
+"I have been beaten four times--three times by men, and once by a
+woman."
+
+"But what is that compared with the number of your successes?"
+
+"It is true that I have been generally successful."
+
+"Then you may be so with me."
+
+"I beg that you will draw your chair up to the fire and favour me
+with some details as to your case."
+
+"It is no ordinary one."
+
+"None of those which come to me are. I am the last court of
+appeal."
+
+"And yet I question, sir, whether, in all your experience, you
+have ever listened to a more mysterious and inexplicable chain of
+events than those which have happened in my own family."
+
+"You fill me with interest," said Holmes. "Pray give us the
+essential facts from the commencement, and I can afterwards
+question you as to those details which seem to me to be most
+important."
+
+The young man pulled his chair up and pushed his wet feet out
+towards the blaze.
+
+"My name," said he, "is John Openshaw, but my own affairs have,
+as far as I can understand, little to do with this awful
+business. It is a hereditary matter; so in order to give you an
+idea of the facts, I must go back to the commencement of the
+affair.
+
+"You must know that my grandfather had two sons--my uncle Elias
+and my father Joseph. My father had a small factory at Coventry,
+which he enlarged at the time of the invention of bicycling. He
+was a patentee of the Openshaw unbreakable tire, and his business
+met with such success that he was able to sell it and to retire
+upon a handsome competence.
+
+"My uncle Elias emigrated to America when he was a young man and
+became a planter in Florida, where he was reported to have done
+very well. At the time of the war he fought in Jackson's army,
+and afterwards under Hood, where he rose to be a colonel. When
+Lee laid down his arms my uncle returned to his plantation, where
+he remained for three or four years. About 1869 or 1870 he came
+back to Europe and took a small estate in Sussex, near Horsham.
+He had made a very considerable fortune in the States, and his
+reason for leaving them was his aversion to the negroes, and his
+dislike of the Republican policy in extending the franchise to
+them. He was a singular man, fierce and quick-tempered, very
+foul-mouthed when he was angry, and of a most retiring
+disposition. During all the years that he lived at Horsham, I
+doubt if ever he set foot in the town. He had a garden and two or
+three fields round his house, and there he would take his
+exercise, though very often for weeks on end he would never leave
+his room. He drank a great deal of brandy and smoked very
+heavily, but he would see no society and did not want any
+friends, not even his own brother.
+
+"He didn't mind me; in fact, he took a fancy to me, for at the
+time when he saw me first I was a youngster of twelve or so. This
+would be in the year 1878, after he had been eight or nine years
+in England. He begged my father to let me live with him and he
+was very kind to me in his way. When he was sober he used to be
+fond of playing backgammon and draughts with me, and he would
+make me his representative both with the servants and with the
+tradespeople, so that by the time that I was sixteen I was quite
+master of the house. I kept all the keys and could go where I
+liked and do what I liked, so long as I did not disturb him in
+his privacy. There was one singular exception, however, for he
+had a single room, a lumber-room up among the attics, which was
+invariably locked, and which he would never permit either me or
+anyone else to enter. With a boy's curiosity I have peeped
+through the keyhole, but I was never able to see more than such a
+collection of old trunks and bundles as would be expected in such
+a room.
+
+"One day--it was in March, 1883--a letter with a foreign stamp
+lay upon the table in front of the colonel's plate. It was not a
+common thing for him to receive letters, for his bills were all
+paid in ready money, and he had no friends of any sort. 'From
+India!' said he as he took it up, 'Pondicherry postmark! What can
+this be?' Opening it hurriedly, out there jumped five little
+dried orange pips, which pattered down upon his plate. I began to
+laugh at this, but the laugh was struck from my lips at the sight
+of his face. His lip had fallen, his eyes were protruding, his
+skin the colour of putty, and he glared at the envelope which he
+still held in his trembling hand, 'K. K. K.!' he shrieked, and
+then, 'My God, my God, my sins have overtaken me!'
+
+"'What is it, uncle?' I cried.
+
+"'Death,' said he, and rising from the table he retired to his
+room, leaving me palpitating with horror. I took up the envelope
+and saw scrawled in red ink upon the inner flap, just above the
+gum, the letter K three times repeated. There was nothing else
+save the five dried pips. What could be the reason of his
+overpowering terror? I left the breakfast-table, and as I
+ascended the stair I met him coming down with an old rusty key,
+which must have belonged to the attic, in one hand, and a small
+brass box, like a cashbox, in the other.
+
+"'They may do what they like, but I'll checkmate them still,'
+said he with an oath. 'Tell Mary that I shall want a fire in my
+room to-day, and send down to Fordham, the Horsham lawyer.'
+
+"I did as he ordered, and when the lawyer arrived I was asked to
+step up to the room. The fire was burning brightly, and in the
+grate there was a mass of black, fluffy ashes, as of burned
+paper, while the brass box stood open and empty beside it. As I
+glanced at the box I noticed, with a start, that upon the lid was
+printed the treble K which I had read in the morning upon the
+envelope.
+
+"'I wish you, John,' said my uncle, 'to witness my will. I leave
+my estate, with all its advantages and all its disadvantages, to
+my brother, your father, whence it will, no doubt, descend to
+you. If you can enjoy it in peace, well and good! If you find you
+cannot, take my advice, my boy, and leave it to your deadliest
+enemy. I am sorry to give you such a two-edged thing, but I can't
+say what turn things are going to take. Kindly sign the paper
+where Mr. Fordham shows you.'
+
+"I signed the paper as directed, and the lawyer took it away with
+him. The singular incident made, as you may think, the deepest
+impression upon me, and I pondered over it and turned it every
+way in my mind without being able to make anything of it. Yet I
+could not shake off the vague feeling of dread which it left
+behind, though the sensation grew less keen as the weeks passed
+and nothing happened to disturb the usual routine of our lives. I
+could see a change in my uncle, however. He drank more than ever,
+and he was less inclined for any sort of society. Most of his
+time he would spend in his room, with the door locked upon the
+inside, but sometimes he would emerge in a sort of drunken frenzy
+and would burst out of the house and tear about the garden with a
+revolver in his hand, screaming out that he was afraid of no man,
+and that he was not to be cooped up, like a sheep in a pen, by
+man or devil. When these hot fits were over, however, he would
+rush tumultuously in at the door and lock and bar it behind him,
+like a man who can brazen it out no longer against the terror
+which lies at the roots of his soul. At such times I have seen
+his face, even on a cold day, glisten with moisture, as though it
+were new raised from a basin.
+
+"Well, to come to an end of the matter, Mr. Holmes, and not to
+abuse your patience, there came a night when he made one of those
+drunken sallies from which he never came back. We found him, when
+we went to search for him, face downward in a little
+green-scummed pool, which lay at the foot of the garden. There
+was no sign of any violence, and the water was but two feet deep,
+so that the jury, having regard to his known eccentricity,
+brought in a verdict of 'suicide.' But I, who knew how he winced
+from the very thought of death, had much ado to persuade myself
+that he had gone out of his way to meet it. The matter passed,
+however, and my father entered into possession of the estate, and
+of some 14,000 pounds, which lay to his credit at the bank."
+
+"One moment," Holmes interposed, "your statement is, I foresee,
+one of the most remarkable to which I have ever listened. Let me
+have the date of the reception by your uncle of the letter, and
+the date of his supposed suicide."
+
+"The letter arrived on March 10, 1883. His death was seven weeks
+later, upon the night of May 2nd."
+
+"Thank you. Pray proceed."
+
+"When my father took over the Horsham property, he, at my
+request, made a careful examination of the attic, which had been
+always locked up. We found the brass box there, although its
+contents had been destroyed. On the inside of the cover was a
+paper label, with the initials of K. K. K. repeated upon it, and
+'Letters, memoranda, receipts, and a register' written beneath.
+These, we presume, indicated the nature of the papers which had
+been destroyed by Colonel Openshaw. For the rest, there was
+nothing of much importance in the attic save a great many
+scattered papers and note-books bearing upon my uncle's life in
+America. Some of them were of the war time and showed that he had
+done his duty well and had borne the repute of a brave soldier.
+Others were of a date during the reconstruction of the Southern
+states, and were mostly concerned with politics, for he had
+evidently taken a strong part in opposing the carpet-bag
+politicians who had been sent down from the North.
+
+"Well, it was the beginning of '84 when my father came to live at
+Horsham, and all went as well as possible with us until the
+January of '85. On the fourth day after the new year I heard my
+father give a sharp cry of surprise as we sat together at the
+breakfast-table. There he was, sitting with a newly opened
+envelope in one hand and five dried orange pips in the
+outstretched palm of the other one. He had always laughed at what
+he called my cock-and-bull story about the colonel, but he looked
+very scared and puzzled now that the same thing had come upon
+himself.
+
+"'Why, what on earth does this mean, John?' he stammered.
+
+"My heart had turned to lead. 'It is K. K. K.,' said I.
+
+"He looked inside the envelope. 'So it is,' he cried. 'Here are
+the very letters. But what is this written above them?'
+
+"'Put the papers on the sundial,' I read, peeping over his
+shoulder.
+
+"'What papers? What sundial?' he asked.
+
+"'The sundial in the garden. There is no other,' said I; 'but the
+papers must be those that are destroyed.'
+
+"'Pooh!' said he, gripping hard at his courage. 'We are in a
+civilised land here, and we can't have tomfoolery of this kind.
+Where does the thing come from?'
+
+"'From Dundee,' I answered, glancing at the postmark.
+
+"'Some preposterous practical joke,' said he. 'What have I to do
+with sundials and papers? I shall take no notice of such
+nonsense.'
+
+"'I should certainly speak to the police,' I said.
+
+"'And be laughed at for my pains. Nothing of the sort.'
+
+"'Then let me do so?'
+
+"'No, I forbid you. I won't have a fuss made about such
+nonsense.'
+
+"It was in vain to argue with him, for he was a very obstinate
+man. I went about, however, with a heart which was full of
+forebodings.
+
+"On the third day after the coming of the letter my father went
+from home to visit an old friend of his, Major Freebody, who is
+in command of one of the forts upon Portsdown Hill. I was glad
+that he should go, for it seemed to me that he was farther from
+danger when he was away from home. In that, however, I was in
+error. Upon the second day of his absence I received a telegram
+from the major, imploring me to come at once. My father had
+fallen over one of the deep chalk-pits which abound in the
+neighbourhood, and was lying senseless, with a shattered skull. I
+hurried to him, but he passed away without having ever recovered
+his consciousness. He had, as it appears, been returning from
+Fareham in the twilight, and as the country was unknown to him,
+and the chalk-pit unfenced, the jury had no hesitation in
+bringing in a verdict of 'death from accidental causes.'
+Carefully as I examined every fact connected with his death, I
+was unable to find anything which could suggest the idea of
+murder. There were no signs of violence, no footmarks, no
+robbery, no record of strangers having been seen upon the roads.
+And yet I need not tell you that my mind was far from at ease,
+and that I was well-nigh certain that some foul plot had been
+woven round him.
+
+"In this sinister way I came into my inheritance. You will ask me
+why I did not dispose of it? I answer, because I was well
+convinced that our troubles were in some way dependent upon an
+incident in my uncle's life, and that the danger would be as
+pressing in one house as in another.
+
+"It was in January, '85, that my poor father met his end, and two
+years and eight months have elapsed since then. During that time
+I have lived happily at Horsham, and I had begun to hope that
+this curse had passed away from the family, and that it had ended
+with the last generation. I had begun to take comfort too soon,
+however; yesterday morning the blow fell in the very shape in
+which it had come upon my father."
+
+The young man took from his waistcoat a crumpled envelope, and
+turning to the table he shook out upon it five little dried
+orange pips.
+
+"This is the envelope," he continued. "The postmark is
+London--eastern division. Within are the very words which were
+upon my father's last message: 'K. K. K.'; and then 'Put the
+papers on the sundial.'"
+
+"What have you done?" asked Holmes.
+
+"Nothing."
+
+"Nothing?"
+
+"To tell the truth"--he sank his face into his thin, white
+hands--"I have felt helpless. I have felt like one of those poor
+rabbits when the snake is writhing towards it. I seem to be in
+the grasp of some resistless, inexorable evil, which no foresight
+and no precautions can guard against."
+
+"Tut! tut!" cried Sherlock Holmes. "You must act, man, or you are
+lost. Nothing but energy can save you. This is no time for
+despair."
+
+"I have seen the police."
+
+"Ah!"
+
+"But they listened to my story with a smile. I am convinced that
+the inspector has formed the opinion that the letters are all
+practical jokes, and that the deaths of my relations were really
+accidents, as the jury stated, and were not to be connected with
+the warnings."
+
+Holmes shook his clenched hands in the air. "Incredible
+imbecility!" he cried.
+
+"They have, however, allowed me a policeman, who may remain in
+the house with me."
+
+"Has he come with you to-night?"
+
+"No. His orders were to stay in the house."
+
+Again Holmes raved in the air.
+
+"Why did you come to me," he cried, "and, above all, why did you
+not come at once?"
+
+"I did not know. It was only to-day that I spoke to Major
+Prendergast about my troubles and was advised by him to come to
+you."
+
+"It is really two days since you had the letter. We should have
+acted before this. You have no further evidence, I suppose, than
+that which you have placed before us--no suggestive detail which
+might help us?"
+
+"There is one thing," said John Openshaw. He rummaged in his coat
+pocket, and, drawing out a piece of discoloured, blue-tinted
+paper, he laid it out upon the table. "I have some remembrance,"
+said he, "that on the day when my uncle burned the papers I
+observed that the small, unburned margins which lay amid the
+ashes were of this particular colour. I found this single sheet
+upon the floor of his room, and I am inclined to think that it
+may be one of the papers which has, perhaps, fluttered out from
+among the others, and in that way has escaped destruction. Beyond
+the mention of pips, I do not see that it helps us much. I think
+myself that it is a page from some private diary. The writing is
+undoubtedly my uncle's."
+
+Holmes moved the lamp, and we both bent over the sheet of paper,
+which showed by its ragged edge that it had indeed been torn from
+a book. It was headed, "March, 1869," and beneath were the
+following enigmatical notices:
+
+"4th. Hudson came. Same old platform.
+
+"7th. Set the pips on McCauley, Paramore, and
+ John Swain, of St. Augustine.
+
+"9th. McCauley cleared.
+
+"10th. John Swain cleared.
+
+"12th. Visited Paramore. All well."
+
+"Thank you!" said Holmes, folding up the paper and returning it
+to our visitor. "And now you must on no account lose another
+instant. We cannot spare time even to discuss what you have told
+me. You must get home instantly and act."
+
+"What shall I do?"
+
+"There is but one thing to do. It must be done at once. You must
+put this piece of paper which you have shown us into the brass
+box which you have described. You must also put in a note to say
+that all the other papers were burned by your uncle, and that
+this is the only one which remains. You must assert that in such
+words as will carry conviction with them. Having done this, you
+must at once put the box out upon the sundial, as directed. Do
+you understand?"
+
+"Entirely."
+
+"Do not think of revenge, or anything of the sort, at present. I
+think that we may gain that by means of the law; but we have our
+web to weave, while theirs is already woven. The first
+consideration is to remove the pressing danger which threatens
+you. The second is to clear up the mystery and to punish the
+guilty parties."
+
+"I thank you," said the young man, rising and pulling on his
+overcoat. "You have given me fresh life and hope. I shall
+certainly do as you advise."
+
+"Do not lose an instant. And, above all, take care of yourself in
+the meanwhile, for I do not think that there can be a doubt that
+you are threatened by a very real and imminent danger. How do you
+go back?"
+
+"By train from Waterloo."
+
+"It is not yet nine. The streets will be crowded, so I trust that
+you may be in safety. And yet you cannot guard yourself too
+closely."
+
+"I am armed."
+
+"That is well. To-morrow I shall set to work upon your case."
+
+"I shall see you at Horsham, then?"
+
+"No, your secret lies in London. It is there that I shall seek
+it."
+
+"Then I shall call upon you in a day, or in two days, with news
+as to the box and the papers. I shall take your advice in every
+particular." He shook hands with us and took his leave. Outside
+the wind still screamed and the rain splashed and pattered
+against the windows. This strange, wild story seemed to have come
+to us from amid the mad elements--blown in upon us like a sheet
+of sea-weed in a gale--and now to have been reabsorbed by them
+once more.
+
+Sherlock Holmes sat for some time in silence, with his head sunk
+forward and his eyes bent upon the red glow of the fire. Then he
+lit his pipe, and leaning back in his chair he watched the blue
+smoke-rings as they chased each other up to the ceiling.
+
+"I think, Watson," he remarked at last, "that of all our cases we
+have had none more fantastic than this."
+
+"Save, perhaps, the Sign of Four."
+
+"Well, yes. Save, perhaps, that. And yet this John Openshaw seems
+to me to be walking amid even greater perils than did the
+Sholtos."
+
+"But have you," I asked, "formed any definite conception as to
+what these perils are?"
+
+"There can be no question as to their nature," he answered.
+
+"Then what are they? Who is this K. K. K., and why does he pursue
+this unhappy family?"
+
+Sherlock Holmes closed his eyes and placed his elbows upon the
+arms of his chair, with his finger-tips together. "The ideal
+reasoner," he remarked, "would, when he had once been shown a
+single fact in all its bearings, deduce from it not only all the
+chain of events which led up to it but also all the results which
+would follow from it. As Cuvier could correctly describe a whole
+animal by the contemplation of a single bone, so the observer who
+has thoroughly understood one link in a series of incidents
+should be able to accurately state all the other ones, both
+before and after. We have not yet grasped the results which the
+reason alone can attain to. Problems may be solved in the study
+which have baffled all those who have sought a solution by the
+aid of their senses. To carry the art, however, to its highest
+pitch, it is necessary that the reasoner should be able to
+utilise all the facts which have come to his knowledge; and this
+in itself implies, as you will readily see, a possession of all
+knowledge, which, even in these days of free education and
+encyclopaedias, is a somewhat rare accomplishment. It is not so
+impossible, however, that a man should possess all knowledge
+which is likely to be useful to him in his work, and this I have
+endeavoured in my case to do. If I remember rightly, you on one
+occasion, in the early days of our friendship, defined my limits
+in a very precise fashion."
+
+"Yes," I answered, laughing. "It was a singular document.
+Philosophy, astronomy, and politics were marked at zero, I
+remember. Botany variable, geology profound as regards the
+mud-stains from any region within fifty miles of town, chemistry
+eccentric, anatomy unsystematic, sensational literature and crime
+records unique, violin-player, boxer, swordsman, lawyer, and
+self-poisoner by cocaine and tobacco. Those, I think, were the
+main points of my analysis."
+
+Holmes grinned at the last item. "Well," he said, "I say now, as
+I said then, that a man should keep his little brain-attic
+stocked with all the furniture that he is likely to use, and the
+rest he can put away in the lumber-room of his library, where he
+can get it if he wants it. Now, for such a case as the one which
+has been submitted to us to-night, we need certainly to muster
+all our resources. Kindly hand me down the letter K of the
+'American Encyclopaedia' which stands upon the shelf beside you.
+Thank you. Now let us consider the situation and see what may be
+deduced from it. In the first place, we may start with a strong
+presumption that Colonel Openshaw had some very strong reason for
+leaving America. Men at his time of life do not change all their
+habits and exchange willingly the charming climate of Florida for
+the lonely life of an English provincial town. His extreme love
+of solitude in England suggests the idea that he was in fear of
+someone or something, so we may assume as a working hypothesis
+that it was fear of someone or something which drove him from
+America. As to what it was he feared, we can only deduce that by
+considering the formidable letters which were received by himself
+and his successors. Did you remark the postmarks of those
+letters?"
+
+"The first was from Pondicherry, the second from Dundee, and the
+third from London."
+
+"From East London. What do you deduce from that?"
+
+"They are all seaports. That the writer was on board of a ship."
+
+"Excellent. We have already a clue. There can be no doubt that
+the probability--the strong probability--is that the writer was
+on board of a ship. And now let us consider another point. In the
+case of Pondicherry, seven weeks elapsed between the threat and
+its fulfilment, in Dundee it was only some three or four days.
+Does that suggest anything?"
+
+"A greater distance to travel."
+
+"But the letter had also a greater distance to come."
+
+"Then I do not see the point."
+
+"There is at least a presumption that the vessel in which the man
+or men are is a sailing-ship. It looks as if they always send
+their singular warning or token before them when starting upon
+their mission. You see how quickly the deed followed the sign
+when it came from Dundee. If they had come from Pondicherry in a
+steamer they would have arrived almost as soon as their letter.
+But, as a matter of fact, seven weeks elapsed. I think that those
+seven weeks represented the difference between the mail-boat which
+brought the letter and the sailing vessel which brought the
+writer."
+
+"It is possible."
+
+"More than that. It is probable. And now you see the deadly
+urgency of this new case, and why I urged young Openshaw to
+caution. The blow has always fallen at the end of the time which
+it would take the senders to travel the distance. But this one
+comes from London, and therefore we cannot count upon delay."
+
+"Good God!" I cried. "What can it mean, this relentless
+persecution?"
+
+"The papers which Openshaw carried are obviously of vital
+importance to the person or persons in the sailing-ship. I think
+that it is quite clear that there must be more than one of them.
+A single man could not have carried out two deaths in such a way
+as to deceive a coroner's jury. There must have been several in
+it, and they must have been men of resource and determination.
+Their papers they mean to have, be the holder of them who it may.
+In this way you see K. K. K. ceases to be the initials of an
+individual and becomes the badge of a society."
+
+"But of what society?"
+
+"Have you never--" said Sherlock Holmes, bending forward and
+sinking his voice--"have you never heard of the Ku Klux Klan?"
+
+"I never have."
+
+Holmes turned over the leaves of the book upon his knee. "Here it
+is," said he presently:
+
+"'Ku Klux Klan. A name derived from the fanciful resemblance to
+the sound produced by cocking a rifle. This terrible secret
+society was formed by some ex-Confederate soldiers in the
+Southern states after the Civil War, and it rapidly formed local
+branches in different parts of the country, notably in Tennessee,
+Louisiana, the Carolinas, Georgia, and Florida. Its power was
+used for political purposes, principally for the terrorising of
+the negro voters and the murdering and driving from the country
+of those who were opposed to its views. Its outrages were usually
+preceded by a warning sent to the marked man in some fantastic
+but generally recognised shape--a sprig of oak-leaves in some
+parts, melon seeds or orange pips in others. On receiving this
+the victim might either openly abjure his former ways, or might
+fly from the country. If he braved the matter out, death would
+unfailingly come upon him, and usually in some strange and
+unforeseen manner. So perfect was the organisation of the
+society, and so systematic its methods, that there is hardly a
+case upon record where any man succeeded in braving it with
+impunity, or in which any of its outrages were traced home to the
+perpetrators. For some years the organisation flourished in spite
+of the efforts of the United States government and of the better
+classes of the community in the South. Eventually, in the year
+1869, the movement rather suddenly collapsed, although there have
+been sporadic outbreaks of the same sort since that date.'
+
+"You will observe," said Holmes, laying down the volume, "that
+the sudden breaking up of the society was coincident with the
+disappearance of Openshaw from America with their papers. It may
+well have been cause and effect. It is no wonder that he and his
+family have some of the more implacable spirits upon their track.
+You can understand that this register and diary may implicate
+some of the first men in the South, and that there may be many
+who will not sleep easy at night until it is recovered."
+
+"Then the page we have seen--"
+
+"Is such as we might expect. It ran, if I remember right, 'sent
+the pips to A, B, and C'--that is, sent the society's warning to
+them. Then there are successive entries that A and B cleared, or
+left the country, and finally that C was visited, with, I fear, a
+sinister result for C. Well, I think, Doctor, that we may let
+some light into this dark place, and I believe that the only
+chance young Openshaw has in the meantime is to do what I have
+told him. There is nothing more to be said or to be done
+to-night, so hand me over my violin and let us try to forget for
+half an hour the miserable weather and the still more miserable
+ways of our fellow-men."
+
+
+It had cleared in the morning, and the sun was shining with a
+subdued brightness through the dim veil which hangs over the
+great city. Sherlock Holmes was already at breakfast when I came
+down.
+
+"You will excuse me for not waiting for you," said he; "I have, I
+foresee, a very busy day before me in looking into this case of
+young Openshaw's."
+
+"What steps will you take?" I asked.
+
+"It will very much depend upon the results of my first inquiries.
+I may have to go down to Horsham, after all."
+
+"You will not go there first?"
+
+"No, I shall commence with the City. Just ring the bell and the
+maid will bring up your coffee."
+
+As I waited, I lifted the unopened newspaper from the table and
+glanced my eye over it. It rested upon a heading which sent a
+chill to my heart.
+
+"Holmes," I cried, "you are too late."
+
+"Ah!" said he, laying down his cup, "I feared as much. How was it
+done?" He spoke calmly, but I could see that he was deeply moved.
+
+"My eye caught the name of Openshaw, and the heading 'Tragedy
+Near Waterloo Bridge.' Here is the account:
+
+"Between nine and ten last night Police-Constable Cook, of the H
+Division, on duty near Waterloo Bridge, heard a cry for help and
+a splash in the water. The night, however, was extremely dark and
+stormy, so that, in spite of the help of several passers-by, it
+was quite impossible to effect a rescue. The alarm, however, was
+given, and, by the aid of the water-police, the body was
+eventually recovered. It proved to be that of a young gentleman
+whose name, as it appears from an envelope which was found in his
+pocket, was John Openshaw, and whose residence is near Horsham.
+It is conjectured that he may have been hurrying down to catch
+the last train from Waterloo Station, and that in his haste and
+the extreme darkness he missed his path and walked over the edge
+of one of the small landing-places for river steamboats. The body
+exhibited no traces of violence, and there can be no doubt that
+the deceased had been the victim of an unfortunate accident,
+which should have the effect of calling the attention of the
+authorities to the condition of the riverside landing-stages."
+
+We sat in silence for some minutes, Holmes more depressed and
+shaken than I had ever seen him.
+
+"That hurts my pride, Watson," he said at last. "It is a petty
+feeling, no doubt, but it hurts my pride. It becomes a personal
+matter with me now, and, if God sends me health, I shall set my
+hand upon this gang. That he should come to me for help, and that
+I should send him away to his death--!" He sprang from his chair
+and paced about the room in uncontrollable agitation, with a
+flush upon his sallow cheeks and a nervous clasping and
+unclasping of his long thin hands.
+
+"They must be cunning devils," he exclaimed at last. "How could
+they have decoyed him down there? The Embankment is not on the
+direct line to the station. The bridge, no doubt, was too
+crowded, even on such a night, for their purpose. Well, Watson,
+we shall see who will win in the long run. I am going out now!"
+
+"To the police?"
+
+"No; I shall be my own police. When I have spun the web they may
+take the flies, but not before."
+
+All day I was engaged in my professional work, and it was late in
+the evening before I returned to Baker Street. Sherlock Holmes
+had not come back yet. It was nearly ten o'clock before he
+entered, looking pale and worn. He walked up to the sideboard,
+and tearing a piece from the loaf he devoured it voraciously,
+washing it down with a long draught of water.
+
+"You are hungry," I remarked.
+
+"Starving. It had escaped my memory. I have had nothing since
+breakfast."
+
+"Nothing?"
+
+"Not a bite. I had no time to think of it."
+
+"And how have you succeeded?"
+
+"Well."
+
+"You have a clue?"
+
+"I have them in the hollow of my hand. Young Openshaw shall not
+long remain unavenged. Why, Watson, let us put their own devilish
+trade-mark upon them. It is well thought of!"
+
+"What do you mean?"
+
+He took an orange from the cupboard, and tearing it to pieces he
+squeezed out the pips upon the table. Of these he took five and
+thrust them into an envelope. On the inside of the flap he wrote
+"S. H. for J. O." Then he sealed it and addressed it to "Captain
+James Calhoun, Barque 'Lone Star,' Savannah, Georgia."
+
+"That will await him when he enters port," said he, chuckling.
+"It may give him a sleepless night. He will find it as sure a
+precursor of his fate as Openshaw did before him."
+
+"And who is this Captain Calhoun?"
+
+"The leader of the gang. I shall have the others, but he first."
+
+"How did you trace it, then?"
+
+He took a large sheet of paper from his pocket, all covered with
+dates and names.
+
+"I have spent the whole day," said he, "over Lloyd's registers
+and files of the old papers, following the future career of every
+vessel which touched at Pondicherry in January and February in
+'83. There were thirty-six ships of fair tonnage which were
+reported there during those months. Of these, one, the 'Lone Star,'
+instantly attracted my attention, since, although it was reported
+as having cleared from London, the name is that which is given to
+one of the states of the Union."
+
+"Texas, I think."
+
+"I was not and am not sure which; but I knew that the ship must
+have an American origin."
+
+"What then?"
+
+"I searched the Dundee records, and when I found that the barque
+'Lone Star' was there in January, '85, my suspicion became a
+certainty. I then inquired as to the vessels which lay at present
+in the port of London."
+
+"Yes?"
+
+"The 'Lone Star' had arrived here last week. I went down to the
+Albert Dock and found that she had been taken down the river by
+the early tide this morning, homeward bound to Savannah. I wired
+to Gravesend and learned that she had passed some time ago, and
+as the wind is easterly I have no doubt that she is now past the
+Goodwins and not very far from the Isle of Wight."
+
+"What will you do, then?"
+
+"Oh, I have my hand upon him. He and the two mates, are as I
+learn, the only native-born Americans in the ship. The others are
+Finns and Germans. I know, also, that they were all three away
+from the ship last night. I had it from the stevedore who has
+been loading their cargo. By the time that their sailing-ship
+reaches Savannah the mail-boat will have carried this letter, and
+the cable will have informed the police of Savannah that these
+three gentlemen are badly wanted here upon a charge of murder."
+
+There is ever a flaw, however, in the best laid of human plans,
+and the murderers of John Openshaw were never to receive the
+orange pips which would show them that another, as cunning and as
+resolute as themselves, was upon their track. Very long and very
+severe were the equinoctial gales that year. We waited long for
+news of the "Lone Star" of Savannah, but none ever reached us. We
+did at last hear that somewhere far out in the Atlantic a
+shattered stern-post of a boat was seen swinging in the trough
+of a wave, with the letters "L. S." carved upon it, and that is
+all which we shall ever know of the fate of the "Lone Star."
+
+
+
+ADVENTURE VI. THE MAN WITH THE TWISTED LIP
+
+Isa Whitney, brother of the late Elias Whitney, D.D., Principal
+of the Theological College of St. George's, was much addicted to
+opium. The habit grew upon him, as I understand, from some
+foolish freak when he was at college; for having read De
+Quincey's description of his dreams and sensations, he had
+drenched his tobacco with laudanum in an attempt to produce the
+same effects. He found, as so many more have done, that the
+practice is easier to attain than to get rid of, and for many
+years he continued to be a slave to the drug, an object of
+mingled horror and pity to his friends and relatives. I can see
+him now, with yellow, pasty face, drooping lids, and pin-point
+pupils, all huddled in a chair, the wreck and ruin of a noble
+man.
+
+One night--it was in June, '89--there came a ring to my bell,
+about the hour when a man gives his first yawn and glances at the
+clock. I sat up in my chair, and my wife laid her needle-work
+down in her lap and made a little face of disappointment.
+
+"A patient!" said she. "You'll have to go out."
+
+I groaned, for I was newly come back from a weary day.
+
+We heard the door open, a few hurried words, and then quick steps
+upon the linoleum. Our own door flew open, and a lady, clad in
+some dark-coloured stuff, with a black veil, entered the room.
+
+"You will excuse my calling so late," she began, and then,
+suddenly losing her self-control, she ran forward, threw her arms
+about my wife's neck, and sobbed upon her shoulder. "Oh, I'm in
+such trouble!" she cried; "I do so want a little help."
+
+"Why," said my wife, pulling up her veil, "it is Kate Whitney.
+How you startled me, Kate! I had not an idea who you were when
+you came in."
+
+"I didn't know what to do, so I came straight to you." That was
+always the way. Folk who were in grief came to my wife like birds
+to a light-house.
+
+"It was very sweet of you to come. Now, you must have some wine
+and water, and sit here comfortably and tell us all about it. Or
+should you rather that I sent James off to bed?"
+
+"Oh, no, no! I want the doctor's advice and help, too. It's about
+Isa. He has not been home for two days. I am so frightened about
+him!"
+
+It was not the first time that she had spoken to us of her
+husband's trouble, to me as a doctor, to my wife as an old friend
+and school companion. We soothed and comforted her by such words
+as we could find. Did she know where her husband was? Was it
+possible that we could bring him back to her?
+
+It seems that it was. She had the surest information that of late
+he had, when the fit was on him, made use of an opium den in the
+farthest east of the City. Hitherto his orgies had always been
+confined to one day, and he had come back, twitching and
+shattered, in the evening. But now the spell had been upon him
+eight-and-forty hours, and he lay there, doubtless among the
+dregs of the docks, breathing in the poison or sleeping off the
+effects. There he was to be found, she was sure of it, at the Bar
+of Gold, in Upper Swandam Lane. But what was she to do? How could
+she, a young and timid woman, make her way into such a place and
+pluck her husband out from among the ruffians who surrounded him?
+
+There was the case, and of course there was but one way out of
+it. Might I not escort her to this place? And then, as a second
+thought, why should she come at all? I was Isa Whitney's medical
+adviser, and as such I had influence over him. I could manage it
+better if I were alone. I promised her on my word that I would
+send him home in a cab within two hours if he were indeed at the
+address which she had given me. And so in ten minutes I had left
+my armchair and cheery sitting-room behind me, and was speeding
+eastward in a hansom on a strange errand, as it seemed to me at
+the time, though the future only could show how strange it was to
+be.
+
+But there was no great difficulty in the first stage of my
+adventure. Upper Swandam Lane is a vile alley lurking behind the
+high wharves which line the north side of the river to the east
+of London Bridge. Between a slop-shop and a gin-shop, approached
+by a steep flight of steps leading down to a black gap like the
+mouth of a cave, I found the den of which I was in search.
+Ordering my cab to wait, I passed down the steps, worn hollow in
+the centre by the ceaseless tread of drunken feet; and by the
+light of a flickering oil-lamp above the door I found the latch
+and made my way into a long, low room, thick and heavy with the
+brown opium smoke, and terraced with wooden berths, like the
+forecastle of an emigrant ship.
+
+Through the gloom one could dimly catch a glimpse of bodies lying
+in strange fantastic poses, bowed shoulders, bent knees, heads
+thrown back, and chins pointing upward, with here and there a
+dark, lack-lustre eye turned upon the newcomer. Out of the black
+shadows there glimmered little red circles of light, now bright,
+now faint, as the burning poison waxed or waned in the bowls of
+the metal pipes. The most lay silent, but some muttered to
+themselves, and others talked together in a strange, low,
+monotonous voice, their conversation coming in gushes, and then
+suddenly tailing off into silence, each mumbling out his own
+thoughts and paying little heed to the words of his neighbour. At
+the farther end was a small brazier of burning charcoal, beside
+which on a three-legged wooden stool there sat a tall, thin old
+man, with his jaw resting upon his two fists, and his elbows upon
+his knees, staring into the fire.
+
+As I entered, a sallow Malay attendant had hurried up with a pipe
+for me and a supply of the drug, beckoning me to an empty berth.
+
+"Thank you. I have not come to stay," said I. "There is a friend
+of mine here, Mr. Isa Whitney, and I wish to speak with him."
+
+There was a movement and an exclamation from my right, and
+peering through the gloom, I saw Whitney, pale, haggard, and
+unkempt, staring out at me.
+
+"My God! It's Watson," said he. He was in a pitiable state of
+reaction, with every nerve in a twitter. "I say, Watson, what
+o'clock is it?"
+
+"Nearly eleven."
+
+"Of what day?"
+
+"Of Friday, June 19th."
+
+"Good heavens! I thought it was Wednesday. It is Wednesday. What
+d'you want to frighten a chap for?" He sank his face onto his
+arms and began to sob in a high treble key.
+
+"I tell you that it is Friday, man. Your wife has been waiting
+this two days for you. You should be ashamed of yourself!"
+
+"So I am. But you've got mixed, Watson, for I have only been here
+a few hours, three pipes, four pipes--I forget how many. But I'll
+go home with you. I wouldn't frighten Kate--poor little Kate.
+Give me your hand! Have you a cab?"
+
+"Yes, I have one waiting."
+
+"Then I shall go in it. But I must owe something. Find what I
+owe, Watson. I am all off colour. I can do nothing for myself."
+
+I walked down the narrow passage between the double row of
+sleepers, holding my breath to keep out the vile, stupefying
+fumes of the drug, and looking about for the manager. As I passed
+the tall man who sat by the brazier I felt a sudden pluck at my
+skirt, and a low voice whispered, "Walk past me, and then look
+back at me." The words fell quite distinctly upon my ear. I
+glanced down. They could only have come from the old man at my
+side, and yet he sat now as absorbed as ever, very thin, very
+wrinkled, bent with age, an opium pipe dangling down from between
+his knees, as though it had dropped in sheer lassitude from his
+fingers. I took two steps forward and looked back. It took all my
+self-control to prevent me from breaking out into a cry of
+astonishment. He had turned his back so that none could see him
+but I. His form had filled out, his wrinkles were gone, the dull
+eyes had regained their fire, and there, sitting by the fire and
+grinning at my surprise, was none other than Sherlock Holmes. He
+made a slight motion to me to approach him, and instantly, as he
+turned his face half round to the company once more, subsided
+into a doddering, loose-lipped senility.
+
+"Holmes!" I whispered, "what on earth are you doing in this den?"
+
+"As low as you can," he answered; "I have excellent ears. If you
+would have the great kindness to get rid of that sottish friend
+of yours I should be exceedingly glad to have a little talk with
+you."
+
+"I have a cab outside."
+
+"Then pray send him home in it. You may safely trust him, for he
+appears to be too limp to get into any mischief. I should
+recommend you also to send a note by the cabman to your wife to
+say that you have thrown in your lot with me. If you will wait
+outside, I shall be with you in five minutes."
+
+It was difficult to refuse any of Sherlock Holmes' requests, for
+they were always so exceedingly definite, and put forward with
+such a quiet air of mastery. I felt, however, that when Whitney
+was once confined in the cab my mission was practically
+accomplished; and for the rest, I could not wish anything better
+than to be associated with my friend in one of those singular
+adventures which were the normal condition of his existence. In a
+few minutes I had written my note, paid Whitney's bill, led him
+out to the cab, and seen him driven through the darkness. In a
+very short time a decrepit figure had emerged from the opium den,
+and I was walking down the street with Sherlock Holmes. For two
+streets he shuffled along with a bent back and an uncertain foot.
+Then, glancing quickly round, he straightened himself out and
+burst into a hearty fit of laughter.
+
+"I suppose, Watson," said he, "that you imagine that I have added
+opium-smoking to cocaine injections, and all the other little
+weaknesses on which you have favoured me with your medical
+views."
+
+"I was certainly surprised to find you there."
+
+"But not more so than I to find you."
+
+"I came to find a friend."
+
+"And I to find an enemy."
+
+"An enemy?"
+
+"Yes; one of my natural enemies, or, shall I say, my natural
+prey. Briefly, Watson, I am in the midst of a very remarkable
+inquiry, and I have hoped to find a clue in the incoherent
+ramblings of these sots, as I have done before now. Had I been
+recognised in that den my life would not have been worth an
+hour's purchase; for I have used it before now for my own
+purposes, and the rascally Lascar who runs it has sworn to have
+vengeance upon me. There is a trap-door at the back of that
+building, near the corner of Paul's Wharf, which could tell some
+strange tales of what has passed through it upon the moonless
+nights."
+
+"What! You do not mean bodies?"
+
+"Ay, bodies, Watson. We should be rich men if we had 1000 pounds
+for every poor devil who has been done to death in that den. It
+is the vilest murder-trap on the whole riverside, and I fear that
+Neville St. Clair has entered it never to leave it more. But our
+trap should be here." He put his two forefingers between his
+teeth and whistled shrilly--a signal which was answered by a
+similar whistle from the distance, followed shortly by the rattle
+of wheels and the clink of horses' hoofs.
+
+"Now, Watson," said Holmes, as a tall dog-cart dashed up through
+the gloom, throwing out two golden tunnels of yellow light from
+its side lanterns. "You'll come with me, won't you?"
+
+"If I can be of use."
+
+"Oh, a trusty comrade is always of use; and a chronicler still
+more so. My room at The Cedars is a double-bedded one."
+
+"The Cedars?"
+
+"Yes; that is Mr. St. Clair's house. I am staying there while I
+conduct the inquiry."
+
+"Where is it, then?"
+
+"Near Lee, in Kent. We have a seven-mile drive before us."
+
+"But I am all in the dark."
+
+"Of course you are. You'll know all about it presently. Jump up
+here. All right, John; we shall not need you. Here's half a
+crown. Look out for me to-morrow, about eleven. Give her her
+head. So long, then!"
+
+He flicked the horse with his whip, and we dashed away through
+the endless succession of sombre and deserted streets, which
+widened gradually, until we were flying across a broad
+balustraded bridge, with the murky river flowing sluggishly
+beneath us. Beyond lay another dull wilderness of bricks and
+mortar, its silence broken only by the heavy, regular footfall of
+the policeman, or the songs and shouts of some belated party of
+revellers. A dull wrack was drifting slowly across the sky, and a
+star or two twinkled dimly here and there through the rifts of
+the clouds. Holmes drove in silence, with his head sunk upon his
+breast, and the air of a man who is lost in thought, while I sat
+beside him, curious to learn what this new quest might be which
+seemed to tax his powers so sorely, and yet afraid to break in
+upon the current of his thoughts. We had driven several miles,
+and were beginning to get to the fringe of the belt of suburban
+villas, when he shook himself, shrugged his shoulders, and lit up
+his pipe with the air of a man who has satisfied himself that he
+is acting for the best.
+
+"You have a grand gift of silence, Watson," said he. "It makes
+you quite invaluable as a companion. 'Pon my word, it is a great
+thing for me to have someone to talk to, for my own thoughts are
+not over-pleasant. I was wondering what I should say to this dear
+little woman to-night when she meets me at the door."
+
+"You forget that I know nothing about it."
+
+"I shall just have time to tell you the facts of the case before
+we get to Lee. It seems absurdly simple, and yet, somehow I can
+get nothing to go upon. There's plenty of thread, no doubt, but I
+can't get the end of it into my hand. Now, I'll state the case
+clearly and concisely to you, Watson, and maybe you can see a
+spark where all is dark to me."
+
+"Proceed, then."
+
+"Some years ago--to be definite, in May, 1884--there came to Lee
+a gentleman, Neville St. Clair by name, who appeared to have
+plenty of money. He took a large villa, laid out the grounds very
+nicely, and lived generally in good style. By degrees he made
+friends in the neighbourhood, and in 1887 he married the daughter
+of a local brewer, by whom he now has two children. He had no
+occupation, but was interested in several companies and went into
+town as a rule in the morning, returning by the 5:14 from Cannon
+Street every night. Mr. St. Clair is now thirty-seven years of
+age, is a man of temperate habits, a good husband, a very
+affectionate father, and a man who is popular with all who know
+him. I may add that his whole debts at the present moment, as far
+as we have been able to ascertain, amount to 88 pounds 10s., while
+he has 220 pounds standing to his credit in the Capital and
+Counties Bank. There is no reason, therefore, to think that money
+troubles have been weighing upon his mind.
+
+"Last Monday Mr. Neville St. Clair went into town rather earlier
+than usual, remarking before he started that he had two important
+commissions to perform, and that he would bring his little boy
+home a box of bricks. Now, by the merest chance, his wife
+received a telegram upon this same Monday, very shortly after his
+departure, to the effect that a small parcel of considerable
+value which she had been expecting was waiting for her at the
+offices of the Aberdeen Shipping Company. Now, if you are well up
+in your London, you will know that the office of the company is
+in Fresno Street, which branches out of Upper Swandam Lane, where
+you found me to-night. Mrs. St. Clair had her lunch, started for
+the City, did some shopping, proceeded to the company's office,
+got her packet, and found herself at exactly 4:35 walking through
+Swandam Lane on her way back to the station. Have you followed me
+so far?"
+
+"It is very clear."
+
+"If you remember, Monday was an exceedingly hot day, and Mrs. St.
+Clair walked slowly, glancing about in the hope of seeing a cab,
+as she did not like the neighbourhood in which she found herself.
+While she was walking in this way down Swandam Lane, she suddenly
+heard an ejaculation or cry, and was struck cold to see her
+husband looking down at her and, as it seemed to her, beckoning
+to her from a second-floor window. The window was open, and she
+distinctly saw his face, which she describes as being terribly
+agitated. He waved his hands frantically to her, and then
+vanished from the window so suddenly that it seemed to her that
+he had been plucked back by some irresistible force from behind.
+One singular point which struck her quick feminine eye was that
+although he wore some dark coat, such as he had started to town
+in, he had on neither collar nor necktie.
+
+"Convinced that something was amiss with him, she rushed down the
+steps--for the house was none other than the opium den in which
+you found me to-night--and running through the front room she
+attempted to ascend the stairs which led to the first floor. At
+the foot of the stairs, however, she met this Lascar scoundrel of
+whom I have spoken, who thrust her back and, aided by a Dane, who
+acts as assistant there, pushed her out into the street. Filled
+with the most maddening doubts and fears, she rushed down the
+lane and, by rare good-fortune, met in Fresno Street a number of
+constables with an inspector, all on their way to their beat. The
+inspector and two men accompanied her back, and in spite of the
+continued resistance of the proprietor, they made their way to
+the room in which Mr. St. Clair had last been seen. There was no
+sign of him there. In fact, in the whole of that floor there was
+no one to be found save a crippled wretch of hideous aspect, who,
+it seems, made his home there. Both he and the Lascar stoutly
+swore that no one else had been in the front room during the
+afternoon. So determined was their denial that the inspector was
+staggered, and had almost come to believe that Mrs. St. Clair had
+been deluded when, with a cry, she sprang at a small deal box
+which lay upon the table and tore the lid from it. Out there fell
+a cascade of children's bricks. It was the toy which he had
+promised to bring home.
+
+"This discovery, and the evident confusion which the cripple
+showed, made the inspector realise that the matter was serious.
+The rooms were carefully examined, and results all pointed to an
+abominable crime. The front room was plainly furnished as a
+sitting-room and led into a small bedroom, which looked out upon
+the back of one of the wharves. Between the wharf and the bedroom
+window is a narrow strip, which is dry at low tide but is covered
+at high tide with at least four and a half feet of water. The
+bedroom window was a broad one and opened from below. On
+examination traces of blood were to be seen upon the windowsill,
+and several scattered drops were visible upon the wooden floor of
+the bedroom. Thrust away behind a curtain in the front room were
+all the clothes of Mr. Neville St. Clair, with the exception of
+his coat. His boots, his socks, his hat, and his watch--all were
+there. There were no signs of violence upon any of these
+garments, and there were no other traces of Mr. Neville St.
+Clair. Out of the window he must apparently have gone for no
+other exit could be discovered, and the ominous bloodstains upon
+the sill gave little promise that he could save himself by
+swimming, for the tide was at its very highest at the moment of
+the tragedy.
+
+"And now as to the villains who seemed to be immediately
+implicated in the matter. The Lascar was known to be a man of the
+vilest antecedents, but as, by Mrs. St. Clair's story, he was
+known to have been at the foot of the stair within a very few
+seconds of her husband's appearance at the window, he could
+hardly have been more than an accessory to the crime. His defence
+was one of absolute ignorance, and he protested that he had no
+knowledge as to the doings of Hugh Boone, his lodger, and that he
+could not account in any way for the presence of the missing
+gentleman's clothes.
+
+"So much for the Lascar manager. Now for the sinister cripple who
+lives upon the second floor of the opium den, and who was
+certainly the last human being whose eyes rested upon Neville St.
+Clair. His name is Hugh Boone, and his hideous face is one which
+is familiar to every man who goes much to the City. He is a
+professional beggar, though in order to avoid the police
+regulations he pretends to a small trade in wax vestas. Some
+little distance down Threadneedle Street, upon the left-hand
+side, there is, as you may have remarked, a small angle in the
+wall. Here it is that this creature takes his daily seat,
+cross-legged with his tiny stock of matches on his lap, and as he
+is a piteous spectacle a small rain of charity descends into the
+greasy leather cap which lies upon the pavement beside him. I
+have watched the fellow more than once before ever I thought of
+making his professional acquaintance, and I have been surprised
+at the harvest which he has reaped in a short time. His
+appearance, you see, is so remarkable that no one can pass him
+without observing him. A shock of orange hair, a pale face
+disfigured by a horrible scar, which, by its contraction, has
+turned up the outer edge of his upper lip, a bulldog chin, and a
+pair of very penetrating dark eyes, which present a singular
+contrast to the colour of his hair, all mark him out from amid
+the common crowd of mendicants and so, too, does his wit, for he
+is ever ready with a reply to any piece of chaff which may be
+thrown at him by the passers-by. This is the man whom we now
+learn to have been the lodger at the opium den, and to have been
+the last man to see the gentleman of whom we are in quest."
+
+"But a cripple!" said I. "What could he have done single-handed
+against a man in the prime of life?"
+
+"He is a cripple in the sense that he walks with a limp; but in
+other respects he appears to be a powerful and well-nurtured man.
+Surely your medical experience would tell you, Watson, that
+weakness in one limb is often compensated for by exceptional
+strength in the others."
+
+"Pray continue your narrative."
+
+"Mrs. St. Clair had fainted at the sight of the blood upon the
+window, and she was escorted home in a cab by the police, as her
+presence could be of no help to them in their investigations.
+Inspector Barton, who had charge of the case, made a very careful
+examination of the premises, but without finding anything which
+threw any light upon the matter. One mistake had been made in not
+arresting Boone instantly, as he was allowed some few minutes
+during which he might have communicated with his friend the
+Lascar, but this fault was soon remedied, and he was seized and
+searched, without anything being found which could incriminate
+him. There were, it is true, some blood-stains upon his right
+shirt-sleeve, but he pointed to his ring-finger, which had been
+cut near the nail, and explained that the bleeding came from
+there, adding that he had been to the window not long before, and
+that the stains which had been observed there came doubtless from
+the same source. He denied strenuously having ever seen Mr.
+Neville St. Clair and swore that the presence of the clothes in
+his room was as much a mystery to him as to the police. As to
+Mrs. St. Clair's assertion that she had actually seen her husband
+at the window, he declared that she must have been either mad or
+dreaming. He was removed, loudly protesting, to the
+police-station, while the inspector remained upon the premises in
+the hope that the ebbing tide might afford some fresh clue.
+
+"And it did, though they hardly found upon the mud-bank what they
+had feared to find. It was Neville St. Clair's coat, and not
+Neville St. Clair, which lay uncovered as the tide receded. And
+what do you think they found in the pockets?"
+
+"I cannot imagine."
+
+"No, I don't think you would guess. Every pocket stuffed with
+pennies and half-pennies--421 pennies and 270 half-pennies. It
+was no wonder that it had not been swept away by the tide. But a
+human body is a different matter. There is a fierce eddy between
+the wharf and the house. It seemed likely enough that the
+weighted coat had remained when the stripped body had been sucked
+away into the river."
+
+"But I understand that all the other clothes were found in the
+room. Would the body be dressed in a coat alone?"
+
+"No, sir, but the facts might be met speciously enough. Suppose
+that this man Boone had thrust Neville St. Clair through the
+window, there is no human eye which could have seen the deed.
+What would he do then? It would of course instantly strike him
+that he must get rid of the tell-tale garments. He would seize
+the coat, then, and be in the act of throwing it out, when it
+would occur to him that it would swim and not sink. He has little
+time, for he has heard the scuffle downstairs when the wife tried
+to force her way up, and perhaps he has already heard from his
+Lascar confederate that the police are hurrying up the street.
+There is not an instant to be lost. He rushes to some secret
+hoard, where he has accumulated the fruits of his beggary, and he
+stuffs all the coins upon which he can lay his hands into the
+pockets to make sure of the coat's sinking. He throws it out, and
+would have done the same with the other garments had not he heard
+the rush of steps below, and only just had time to close the
+window when the police appeared."
+
+"It certainly sounds feasible."
+
+"Well, we will take it as a working hypothesis for want of a
+better. Boone, as I have told you, was arrested and taken to the
+station, but it could not be shown that there had ever before
+been anything against him. He had for years been known as a
+professional beggar, but his life appeared to have been a very
+quiet and innocent one. There the matter stands at present, and
+the questions which have to be solved--what Neville St. Clair was
+doing in the opium den, what happened to him when there, where is
+he now, and what Hugh Boone had to do with his disappearance--are
+all as far from a solution as ever. I confess that I cannot
+recall any case within my experience which looked at the first
+glance so simple and yet which presented such difficulties."
+
+While Sherlock Holmes had been detailing this singular series of
+events, we had been whirling through the outskirts of the great
+town until the last straggling houses had been left behind, and
+we rattled along with a country hedge upon either side of us.
+Just as he finished, however, we drove through two scattered
+villages, where a few lights still glimmered in the windows.
+
+"We are on the outskirts of Lee," said my companion. "We have
+touched on three English counties in our short drive, starting in
+Middlesex, passing over an angle of Surrey, and ending in Kent.
+See that light among the trees? That is The Cedars, and beside
+that lamp sits a woman whose anxious ears have already, I have
+little doubt, caught the clink of our horse's feet."
+
+"But why are you not conducting the case from Baker Street?" I
+asked.
+
+"Because there are many inquiries which must be made out here.
+Mrs. St. Clair has most kindly put two rooms at my disposal, and
+you may rest assured that she will have nothing but a welcome for
+my friend and colleague. I hate to meet her, Watson, when I have
+no news of her husband. Here we are. Whoa, there, whoa!"
+
+We had pulled up in front of a large villa which stood within its
+own grounds. A stable-boy had run out to the horse's head, and
+springing down, I followed Holmes up the small, winding
+gravel-drive which led to the house. As we approached, the door
+flew open, and a little blonde woman stood in the opening, clad
+in some sort of light mousseline de soie, with a touch of fluffy
+pink chiffon at her neck and wrists. She stood with her figure
+outlined against the flood of light, one hand upon the door, one
+half-raised in her eagerness, her body slightly bent, her head
+and face protruded, with eager eyes and parted lips, a standing
+question.
+
+"Well?" she cried, "well?" And then, seeing that there were two
+of us, she gave a cry of hope which sank into a groan as she saw
+that my companion shook his head and shrugged his shoulders.
+
+"No good news?"
+
+"None."
+
+"No bad?"
+
+"No."
+
+"Thank God for that. But come in. You must be weary, for you have
+had a long day."
+
+"This is my friend, Dr. Watson. He has been of most vital use to
+me in several of my cases, and a lucky chance has made it
+possible for me to bring him out and associate him with this
+investigation."
+
+"I am delighted to see you," said she, pressing my hand warmly.
+"You will, I am sure, forgive anything that may be wanting in our
+arrangements, when you consider the blow which has come so
+suddenly upon us."
+
+"My dear madam," said I, "I am an old campaigner, and if I were
+not I can very well see that no apology is needed. If I can be of
+any assistance, either to you or to my friend here, I shall be
+indeed happy."
+
+"Now, Mr. Sherlock Holmes," said the lady as we entered a
+well-lit dining-room, upon the table of which a cold supper had
+been laid out, "I should very much like to ask you one or two
+plain questions, to which I beg that you will give a plain
+answer."
+
+"Certainly, madam."
+
+"Do not trouble about my feelings. I am not hysterical, nor given
+to fainting. I simply wish to hear your real, real opinion."
+
+"Upon what point?"
+
+"In your heart of hearts, do you think that Neville is alive?"
+
+Sherlock Holmes seemed to be embarrassed by the question.
+"Frankly, now!" she repeated, standing upon the rug and looking
+keenly down at him as he leaned back in a basket-chair.
+
+"Frankly, then, madam, I do not."
+
+"You think that he is dead?"
+
+"I do."
+
+"Murdered?"
+
+"I don't say that. Perhaps."
+
+"And on what day did he meet his death?"
+
+"On Monday."
+
+"Then perhaps, Mr. Holmes, you will be good enough to explain how
+it is that I have received a letter from him to-day."
+
+Sherlock Holmes sprang out of his chair as if he had been
+galvanised.
+
+"What!" he roared.
+
+"Yes, to-day." She stood smiling, holding up a little slip of
+paper in the air.
+
+"May I see it?"
+
+"Certainly."
+
+He snatched it from her in his eagerness, and smoothing it out
+upon the table he drew over the lamp and examined it intently. I
+had left my chair and was gazing at it over his shoulder. The
+envelope was a very coarse one and was stamped with the Gravesend
+postmark and with the date of that very day, or rather of the day
+before, for it was considerably after midnight.
+
+"Coarse writing," murmured Holmes. "Surely this is not your
+husband's writing, madam."
+
+"No, but the enclosure is."
+
+"I perceive also that whoever addressed the envelope had to go
+and inquire as to the address."
+
+"How can you tell that?"
+
+"The name, you see, is in perfectly black ink, which has dried
+itself. The rest is of the greyish colour, which shows that
+blotting-paper has been used. If it had been written straight
+off, and then blotted, none would be of a deep black shade. This
+man has written the name, and there has then been a pause before
+he wrote the address, which can only mean that he was not
+familiar with it. It is, of course, a trifle, but there is
+nothing so important as trifles. Let us now see the letter. Ha!
+there has been an enclosure here!"
+
+"Yes, there was a ring. His signet-ring."
+
+"And you are sure that this is your husband's hand?"
+
+"One of his hands."
+
+"One?"
+
+"His hand when he wrote hurriedly. It is very unlike his usual
+writing, and yet I know it well."
+
+"'Dearest do not be frightened. All will come well. There is a
+huge error which it may take some little time to rectify.
+Wait in patience.--NEVILLE.' Written in pencil upon the fly-leaf
+of a book, octavo size, no water-mark. Hum! Posted to-day in
+Gravesend by a man with a dirty thumb. Ha! And the flap has been
+gummed, if I am not very much in error, by a person who had been
+chewing tobacco. And you have no doubt that it is your husband's
+hand, madam?"
+
+"None. Neville wrote those words."
+
+"And they were posted to-day at Gravesend. Well, Mrs. St. Clair,
+the clouds lighten, though I should not venture to say that the
+danger is over."
+
+"But he must be alive, Mr. Holmes."
+
+"Unless this is a clever forgery to put us on the wrong scent.
+The ring, after all, proves nothing. It may have been taken from
+him."
+
+"No, no; it is, it is his very own writing!"
+
+"Very well. It may, however, have been written on Monday and only
+posted to-day."
+
+"That is possible."
+
+"If so, much may have happened between."
+
+"Oh, you must not discourage me, Mr. Holmes. I know that all is
+well with him. There is so keen a sympathy between us that I
+should know if evil came upon him. On the very day that I saw him
+last he cut himself in the bedroom, and yet I in the dining-room
+rushed upstairs instantly with the utmost certainty that
+something had happened. Do you think that I would respond to such
+a trifle and yet be ignorant of his death?"
+
+"I have seen too much not to know that the impression of a woman
+may be more valuable than the conclusion of an analytical
+reasoner. And in this letter you certainly have a very strong
+piece of evidence to corroborate your view. But if your husband
+is alive and able to write letters, why should he remain away
+from you?"
+
+"I cannot imagine. It is unthinkable."
+
+"And on Monday he made no remarks before leaving you?"
+
+"No."
+
+"And you were surprised to see him in Swandam Lane?"
+
+"Very much so."
+
+"Was the window open?"
+
+"Yes."
+
+"Then he might have called to you?"
+
+"He might."
+
+"He only, as I understand, gave an inarticulate cry?"
+
+"Yes."
+
+"A call for help, you thought?"
+
+"Yes. He waved his hands."
+
+"But it might have been a cry of surprise. Astonishment at the
+unexpected sight of you might cause him to throw up his hands?"
+
+"It is possible."
+
+"And you thought he was pulled back?"
+
+"He disappeared so suddenly."
+
+"He might have leaped back. You did not see anyone else in the
+room?"
+
+"No, but this horrible man confessed to having been there, and
+the Lascar was at the foot of the stairs."
+
+"Quite so. Your husband, as far as you could see, had his
+ordinary clothes on?"
+
+"But without his collar or tie. I distinctly saw his bare
+throat."
+
+"Had he ever spoken of Swandam Lane?"
+
+"Never."
+
+"Had he ever showed any signs of having taken opium?"
+
+"Never."
+
+"Thank you, Mrs. St. Clair. Those are the principal points about
+which I wished to be absolutely clear. We shall now have a little
+supper and then retire, for we may have a very busy day
+to-morrow."
+
+A large and comfortable double-bedded room had been placed at our
+disposal, and I was quickly between the sheets, for I was weary
+after my night of adventure. Sherlock Holmes was a man, however,
+who, when he had an unsolved problem upon his mind, would go for
+days, and even for a week, without rest, turning it over,
+rearranging his facts, looking at it from every point of view
+until he had either fathomed it or convinced himself that his
+data were insufficient. It was soon evident to me that he was now
+preparing for an all-night sitting. He took off his coat and
+waistcoat, put on a large blue dressing-gown, and then wandered
+about the room collecting pillows from his bed and cushions from
+the sofa and armchairs. With these he constructed a sort of
+Eastern divan, upon which he perched himself cross-legged, with
+an ounce of shag tobacco and a box of matches laid out in front
+of him. In the dim light of the lamp I saw him sitting there, an
+old briar pipe between his lips, his eyes fixed vacantly upon the
+corner of the ceiling, the blue smoke curling up from him,
+silent, motionless, with the light shining upon his strong-set
+aquiline features. So he sat as I dropped off to sleep, and so he
+sat when a sudden ejaculation caused me to wake up, and I found
+the summer sun shining into the apartment. The pipe was still
+between his lips, the smoke still curled upward, and the room was
+full of a dense tobacco haze, but nothing remained of the heap of
+shag which I had seen upon the previous night.
+
+"Awake, Watson?" he asked.
+
+"Yes."
+
+"Game for a morning drive?"
+
+"Certainly."
+
+"Then dress. No one is stirring yet, but I know where the
+stable-boy sleeps, and we shall soon have the trap out." He
+chuckled to himself as he spoke, his eyes twinkled, and he seemed
+a different man to the sombre thinker of the previous night.
+
+As I dressed I glanced at my watch. It was no wonder that no one
+was stirring. It was twenty-five minutes past four. I had hardly
+finished when Holmes returned with the news that the boy was
+putting in the horse.
+
+"I want to test a little theory of mine," said he, pulling on his
+boots. "I think, Watson, that you are now standing in the
+presence of one of the most absolute fools in Europe. I deserve
+to be kicked from here to Charing Cross. But I think I have the
+key of the affair now."
+
+"And where is it?" I asked, smiling.
+
+"In the bathroom," he answered. "Oh, yes, I am not joking," he
+continued, seeing my look of incredulity. "I have just been
+there, and I have taken it out, and I have got it in this
+Gladstone bag. Come on, my boy, and we shall see whether it will
+not fit the lock."
+
+We made our way downstairs as quietly as possible, and out into
+the bright morning sunshine. In the road stood our horse and
+trap, with the half-clad stable-boy waiting at the head. We both
+sprang in, and away we dashed down the London Road. A few country
+carts were stirring, bearing in vegetables to the metropolis, but
+the lines of villas on either side were as silent and lifeless as
+some city in a dream.
+
+"It has been in some points a singular case," said Holmes,
+flicking the horse on into a gallop. "I confess that I have been
+as blind as a mole, but it is better to learn wisdom late than
+never to learn it at all."
+
+In town the earliest risers were just beginning to look sleepily
+from their windows as we drove through the streets of the Surrey
+side. Passing down the Waterloo Bridge Road we crossed over the
+river, and dashing up Wellington Street wheeled sharply to the
+right and found ourselves in Bow Street. Sherlock Holmes was well
+known to the force, and the two constables at the door saluted
+him. One of them held the horse's head while the other led us in.
+
+"Who is on duty?" asked Holmes.
+
+"Inspector Bradstreet, sir."
+
+"Ah, Bradstreet, how are you?" A tall, stout official had come
+down the stone-flagged passage, in a peaked cap and frogged
+jacket. "I wish to have a quiet word with you, Bradstreet."
+"Certainly, Mr. Holmes. Step into my room here." It was a small,
+office-like room, with a huge ledger upon the table, and a
+telephone projecting from the wall. The inspector sat down at his
+desk.
+
+"What can I do for you, Mr. Holmes?"
+
+"I called about that beggarman, Boone--the one who was charged
+with being concerned in the disappearance of Mr. Neville St.
+Clair, of Lee."
+
+"Yes. He was brought up and remanded for further inquiries."
+
+"So I heard. You have him here?"
+
+"In the cells."
+
+"Is he quiet?"
+
+"Oh, he gives no trouble. But he is a dirty scoundrel."
+
+"Dirty?"
+
+"Yes, it is all we can do to make him wash his hands, and his
+face is as black as a tinker's. Well, when once his case has been
+settled, he will have a regular prison bath; and I think, if you
+saw him, you would agree with me that he needed it."
+
+"I should like to see him very much."
+
+"Would you? That is easily done. Come this way. You can leave
+your bag."
+
+"No, I think that I'll take it."
+
+"Very good. Come this way, if you please." He led us down a
+passage, opened a barred door, passed down a winding stair, and
+brought us to a whitewashed corridor with a line of doors on each
+side.
+
+"The third on the right is his," said the inspector. "Here it
+is!" He quietly shot back a panel in the upper part of the door
+and glanced through.
+
+"He is asleep," said he. "You can see him very well."
+
+We both put our eyes to the grating. The prisoner lay with his
+face towards us, in a very deep sleep, breathing slowly and
+heavily. He was a middle-sized man, coarsely clad as became his
+calling, with a coloured shirt protruding through the rent in his
+tattered coat. He was, as the inspector had said, extremely
+dirty, but the grime which covered his face could not conceal its
+repulsive ugliness. A broad wheal from an old scar ran right
+across it from eye to chin, and by its contraction had turned up
+one side of the upper lip, so that three teeth were exposed in a
+perpetual snarl. A shock of very bright red hair grew low over
+his eyes and forehead.
+
+"He's a beauty, isn't he?" said the inspector.
+
+"He certainly needs a wash," remarked Holmes. "I had an idea that
+he might, and I took the liberty of bringing the tools with me."
+He opened the Gladstone bag as he spoke, and took out, to my
+astonishment, a very large bath-sponge.
+
+"He! he! You are a funny one," chuckled the inspector.
+
+"Now, if you will have the great goodness to open that door very
+quietly, we will soon make him cut a much more respectable
+figure."
+
+"Well, I don't know why not," said the inspector. "He doesn't
+look a credit to the Bow Street cells, does he?" He slipped his
+key into the lock, and we all very quietly entered the cell. The
+sleeper half turned, and then settled down once more into a deep
+slumber. Holmes stooped to the water-jug, moistened his sponge,
+and then rubbed it twice vigorously across and down the
+prisoner's face.
+
+"Let me introduce you," he shouted, "to Mr. Neville St. Clair, of
+Lee, in the county of Kent."
+
+Never in my life have I seen such a sight. The man's face peeled
+off under the sponge like the bark from a tree. Gone was the
+coarse brown tint! Gone, too, was the horrid scar which had
+seamed it across, and the twisted lip which had given the
+repulsive sneer to the face! A twitch brought away the tangled
+red hair, and there, sitting up in his bed, was a pale,
+sad-faced, refined-looking man, black-haired and smooth-skinned,
+rubbing his eyes and staring about him with sleepy bewilderment.
+Then suddenly realising the exposure, he broke into a scream and
+threw himself down with his face to the pillow.
+
+"Great heavens!" cried the inspector, "it is, indeed, the missing
+man. I know him from the photograph."
+
+The prisoner turned with the reckless air of a man who abandons
+himself to his destiny. "Be it so," said he. "And pray what am I
+charged with?"
+
+"With making away with Mr. Neville St.-- Oh, come, you can't be
+charged with that unless they make a case of attempted suicide of
+it," said the inspector with a grin. "Well, I have been
+twenty-seven years in the force, but this really takes the cake."
+
+"If I am Mr. Neville St. Clair, then it is obvious that no crime
+has been committed, and that, therefore, I am illegally
+detained."
+
+"No crime, but a very great error has been committed," said
+Holmes. "You would have done better to have trusted your wife."
+
+"It was not the wife; it was the children," groaned the prisoner.
+"God help me, I would not have them ashamed of their father. My
+God! What an exposure! What can I do?"
+
+Sherlock Holmes sat down beside him on the couch and patted him
+kindly on the shoulder.
+
+"If you leave it to a court of law to clear the matter up," said
+he, "of course you can hardly avoid publicity. On the other hand,
+if you convince the police authorities that there is no possible
+case against you, I do not know that there is any reason that the
+details should find their way into the papers. Inspector
+Bradstreet would, I am sure, make notes upon anything which you
+might tell us and submit it to the proper authorities. The case
+would then never go into court at all."
+
+"God bless you!" cried the prisoner passionately. "I would have
+endured imprisonment, ay, even execution, rather than have left
+my miserable secret as a family blot to my children.
+
+"You are the first who have ever heard my story. My father was a
+schoolmaster in Chesterfield, where I received an excellent
+education. I travelled in my youth, took to the stage, and
+finally became a reporter on an evening paper in London. One day
+my editor wished to have a series of articles upon begging in the
+metropolis, and I volunteered to supply them. There was the point
+from which all my adventures started. It was only by trying
+begging as an amateur that I could get the facts upon which to
+base my articles. When an actor I had, of course, learned all the
+secrets of making up, and had been famous in the green-room for
+my skill. I took advantage now of my attainments. I painted my
+face, and to make myself as pitiable as possible I made a good
+scar and fixed one side of my lip in a twist by the aid of a
+small slip of flesh-coloured plaster. Then with a red head of
+hair, and an appropriate dress, I took my station in the business
+part of the city, ostensibly as a match-seller but really as a
+beggar. For seven hours I plied my trade, and when I returned
+home in the evening I found to my surprise that I had received no
+less than 26s. 4d.
+
+"I wrote my articles and thought little more of the matter until,
+some time later, I backed a bill for a friend and had a writ
+served upon me for 25 pounds. I was at my wit's end where to get
+the money, but a sudden idea came to me. I begged a fortnight's
+grace from the creditor, asked for a holiday from my employers,
+and spent the time in begging in the City under my disguise. In
+ten days I had the money and had paid the debt.
+
+"Well, you can imagine how hard it was to settle down to arduous
+work at 2 pounds a week when I knew that I could earn as much in
+a day by smearing my face with a little paint, laying my cap on
+the ground, and sitting still. It was a long fight between my
+pride and the money, but the dollars won at last, and I threw up
+reporting and sat day after day in the corner which I had first
+chosen, inspiring pity by my ghastly face and filling my pockets
+with coppers. Only one man knew my secret. He was the keeper of a
+low den in which I used to lodge in Swandam Lane, where I could
+every morning emerge as a squalid beggar and in the evenings
+transform myself into a well-dressed man about town. This fellow,
+a Lascar, was well paid by me for his rooms, so that I knew that
+my secret was safe in his possession.
+
+"Well, very soon I found that I was saving considerable sums of
+money. I do not mean that any beggar in the streets of London
+could earn 700 pounds a year--which is less than my average
+takings--but I had exceptional advantages in my power of making
+up, and also in a facility of repartee, which improved by
+practice and made me quite a recognised character in the City.
+All day a stream of pennies, varied by silver, poured in upon me,
+and it was a very bad day in which I failed to take 2 pounds.
+
+"As I grew richer I grew more ambitious, took a house in the
+country, and eventually married, without anyone having a
+suspicion as to my real occupation. My dear wife knew that I had
+business in the City. She little knew what.
+
+"Last Monday I had finished for the day and was dressing in my
+room above the opium den when I looked out of my window and saw,
+to my horror and astonishment, that my wife was standing in the
+street, with her eyes fixed full upon me. I gave a cry of
+surprise, threw up my arms to cover my face, and, rushing to my
+confidant, the Lascar, entreated him to prevent anyone from
+coming up to me. I heard her voice downstairs, but I knew that
+she could not ascend. Swiftly I threw off my clothes, pulled on
+those of a beggar, and put on my pigments and wig. Even a wife's
+eyes could not pierce so complete a disguise. But then it
+occurred to me that there might be a search in the room, and that
+the clothes might betray me. I threw open the window, reopening
+by my violence a small cut which I had inflicted upon myself in
+the bedroom that morning. Then I seized my coat, which was
+weighted by the coppers which I had just transferred to it from
+the leather bag in which I carried my takings. I hurled it out of
+the window, and it disappeared into the Thames. The other clothes
+would have followed, but at that moment there was a rush of
+constables up the stair, and a few minutes after I found, rather,
+I confess, to my relief, that instead of being identified as Mr.
+Neville St. Clair, I was arrested as his murderer.
+
+"I do not know that there is anything else for me to explain. I
+was determined to preserve my disguise as long as possible, and
+hence my preference for a dirty face. Knowing that my wife would
+be terribly anxious, I slipped off my ring and confided it to the
+Lascar at a moment when no constable was watching me, together
+with a hurried scrawl, telling her that she had no cause to
+fear."
+
+"That note only reached her yesterday," said Holmes.
+
+"Good God! What a week she must have spent!"
+
+"The police have watched this Lascar," said Inspector Bradstreet,
+"and I can quite understand that he might find it difficult to
+post a letter unobserved. Probably he handed it to some sailor
+customer of his, who forgot all about it for some days."
+
+"That was it," said Holmes, nodding approvingly; "I have no doubt
+of it. But have you never been prosecuted for begging?"
+
+"Many times; but what was a fine to me?"
+
+"It must stop here, however," said Bradstreet. "If the police are
+to hush this thing up, there must be no more of Hugh Boone."
+
+"I have sworn it by the most solemn oaths which a man can take."
+
+"In that case I think that it is probable that no further steps
+may be taken. But if you are found again, then all must come out.
+I am sure, Mr. Holmes, that we are very much indebted to you for
+having cleared the matter up. I wish I knew how you reach your
+results."
+
+"I reached this one," said my friend, "by sitting upon five
+pillows and consuming an ounce of shag. I think, Watson, that if
+we drive to Baker Street we shall just be in time for breakfast."
+
+
+
+VII. THE ADVENTURE OF THE BLUE CARBUNCLE
+
+I had called upon my friend Sherlock Holmes upon the second
+morning after Christmas, with the intention of wishing him the
+compliments of the season. He was lounging upon the sofa in a
+purple dressing-gown, a pipe-rack within his reach upon the
+right, and a pile of crumpled morning papers, evidently newly
+studied, near at hand. Beside the couch was a wooden chair, and
+on the angle of the back hung a very seedy and disreputable
+hard-felt hat, much the worse for wear, and cracked in several
+places. A lens and a forceps lying upon the seat of the chair
+suggested that the hat had been suspended in this manner for the
+purpose of examination.
+
+"You are engaged," said I; "perhaps I interrupt you."
+
+"Not at all. I am glad to have a friend with whom I can discuss
+my results. The matter is a perfectly trivial one"--he jerked his
+thumb in the direction of the old hat--"but there are points in
+connection with it which are not entirely devoid of interest and
+even of instruction."
+
+I seated myself in his armchair and warmed my hands before his
+crackling fire, for a sharp frost had set in, and the windows
+were thick with the ice crystals. "I suppose," I remarked, "that,
+homely as it looks, this thing has some deadly story linked on to
+it--that it is the clue which will guide you in the solution of
+some mystery and the punishment of some crime."
+
+"No, no. No crime," said Sherlock Holmes, laughing. "Only one of
+those whimsical little incidents which will happen when you have
+four million human beings all jostling each other within the
+space of a few square miles. Amid the action and reaction of so
+dense a swarm of humanity, every possible combination of events
+may be expected to take place, and many a little problem will be
+presented which may be striking and bizarre without being
+criminal. We have already had experience of such."
+
+"So much so," I remarked, "that of the last six cases which I
+have added to my notes, three have been entirely free of any
+legal crime."
+
+"Precisely. You allude to my attempt to recover the Irene Adler
+papers, to the singular case of Miss Mary Sutherland, and to the
+adventure of the man with the twisted lip. Well, I have no doubt
+that this small matter will fall into the same innocent category.
+You know Peterson, the commissionaire?"
+
+"Yes."
+
+"It is to him that this trophy belongs."
+
+"It is his hat."
+
+"No, no, he found it. Its owner is unknown. I beg that you will
+look upon it not as a battered billycock but as an intellectual
+problem. And, first, as to how it came here. It arrived upon
+Christmas morning, in company with a good fat goose, which is, I
+have no doubt, roasting at this moment in front of Peterson's
+fire. The facts are these: about four o'clock on Christmas
+morning, Peterson, who, as you know, is a very honest fellow, was
+returning from some small jollification and was making his way
+homeward down Tottenham Court Road. In front of him he saw, in
+the gaslight, a tallish man, walking with a slight stagger, and
+carrying a white goose slung over his shoulder. As he reached the
+corner of Goodge Street, a row broke out between this stranger
+and a little knot of roughs. One of the latter knocked off the
+man's hat, on which he raised his stick to defend himself and,
+swinging it over his head, smashed the shop window behind him.
+Peterson had rushed forward to protect the stranger from his
+assailants; but the man, shocked at having broken the window, and
+seeing an official-looking person in uniform rushing towards him,
+dropped his goose, took to his heels, and vanished amid the
+labyrinth of small streets which lie at the back of Tottenham
+Court Road. The roughs had also fled at the appearance of
+Peterson, so that he was left in possession of the field of
+battle, and also of the spoils of victory in the shape of this
+battered hat and a most unimpeachable Christmas goose."
+
+"Which surely he restored to their owner?"
+
+"My dear fellow, there lies the problem. It is true that 'For
+Mrs. Henry Baker' was printed upon a small card which was tied to
+the bird's left leg, and it is also true that the initials 'H.
+B.' are legible upon the lining of this hat, but as there are
+some thousands of Bakers, and some hundreds of Henry Bakers in
+this city of ours, it is not easy to restore lost property to any
+one of them."
+
+"What, then, did Peterson do?"
+
+"He brought round both hat and goose to me on Christmas morning,
+knowing that even the smallest problems are of interest to me.
+The goose we retained until this morning, when there were signs
+that, in spite of the slight frost, it would be well that it
+should be eaten without unnecessary delay. Its finder has carried
+it off, therefore, to fulfil the ultimate destiny of a goose,
+while I continue to retain the hat of the unknown gentleman who
+lost his Christmas dinner."
+
+"Did he not advertise?"
+
+"No."
+
+"Then, what clue could you have as to his identity?"
+
+"Only as much as we can deduce."
+
+"From his hat?"
+
+"Precisely."
+
+"But you are joking. What can you gather from this old battered
+felt?"
+
+"Here is my lens. You know my methods. What can you gather
+yourself as to the individuality of the man who has worn this
+article?"
+
+I took the tattered object in my hands and turned it over rather
+ruefully. It was a very ordinary black hat of the usual round
+shape, hard and much the worse for wear. The lining had been of
+red silk, but was a good deal discoloured. There was no maker's
+name; but, as Holmes had remarked, the initials "H. B." were
+scrawled upon one side. It was pierced in the brim for a
+hat-securer, but the elastic was missing. For the rest, it was
+cracked, exceedingly dusty, and spotted in several places,
+although there seemed to have been some attempt to hide the
+discoloured patches by smearing them with ink.
+
+"I can see nothing," said I, handing it back to my friend.
+
+"On the contrary, Watson, you can see everything. You fail,
+however, to reason from what you see. You are too timid in
+drawing your inferences."
+
+"Then, pray tell me what it is that you can infer from this hat?"
+
+He picked it up and gazed at it in the peculiar introspective
+fashion which was characteristic of him. "It is perhaps less
+suggestive than it might have been," he remarked, "and yet there
+are a few inferences which are very distinct, and a few others
+which represent at least a strong balance of probability. That
+the man was highly intellectual is of course obvious upon the
+face of it, and also that he was fairly well-to-do within the
+last three years, although he has now fallen upon evil days. He
+had foresight, but has less now than formerly, pointing to a
+moral retrogression, which, when taken with the decline of his
+fortunes, seems to indicate some evil influence, probably drink,
+at work upon him. This may account also for the obvious fact that
+his wife has ceased to love him."
+
+"My dear Holmes!"
+
+"He has, however, retained some degree of self-respect," he
+continued, disregarding my remonstrance. "He is a man who leads a
+sedentary life, goes out little, is out of training entirely, is
+middle-aged, has grizzled hair which he has had cut within the
+last few days, and which he anoints with lime-cream. These are
+the more patent facts which are to be deduced from his hat. Also,
+by the way, that it is extremely improbable that he has gas laid
+on in his house."
+
+"You are certainly joking, Holmes."
+
+"Not in the least. Is it possible that even now, when I give you
+these results, you are unable to see how they are attained?"
+
+"I have no doubt that I am very stupid, but I must confess that I
+am unable to follow you. For example, how did you deduce that
+this man was intellectual?"
+
+For answer Holmes clapped the hat upon his head. It came right
+over the forehead and settled upon the bridge of his nose. "It is
+a question of cubic capacity," said he; "a man with so large a
+brain must have something in it."
+
+"The decline of his fortunes, then?"
+
+"This hat is three years old. These flat brims curled at the edge
+came in then. It is a hat of the very best quality. Look at the
+band of ribbed silk and the excellent lining. If this man could
+afford to buy so expensive a hat three years ago, and has had no
+hat since, then he has assuredly gone down in the world."
+
+"Well, that is clear enough, certainly. But how about the
+foresight and the moral retrogression?"
+
+Sherlock Holmes laughed. "Here is the foresight," said he putting
+his finger upon the little disc and loop of the hat-securer.
+"They are never sold upon hats. If this man ordered one, it is a
+sign of a certain amount of foresight, since he went out of his
+way to take this precaution against the wind. But since we see
+that he has broken the elastic and has not troubled to replace
+it, it is obvious that he has less foresight now than formerly,
+which is a distinct proof of a weakening nature. On the other
+hand, he has endeavoured to conceal some of these stains upon the
+felt by daubing them with ink, which is a sign that he has not
+entirely lost his self-respect."
+
+"Your reasoning is certainly plausible."
+
+"The further points, that he is middle-aged, that his hair is
+grizzled, that it has been recently cut, and that he uses
+lime-cream, are all to be gathered from a close examination of the
+lower part of the lining. The lens discloses a large number of
+hair-ends, clean cut by the scissors of the barber. They all
+appear to be adhesive, and there is a distinct odour of
+lime-cream. This dust, you will observe, is not the gritty, grey
+dust of the street but the fluffy brown dust of the house,
+showing that it has been hung up indoors most of the time, while
+the marks of moisture upon the inside are proof positive that the
+wearer perspired very freely, and could therefore, hardly be in
+the best of training."
+
+"But his wife--you said that she had ceased to love him."
+
+"This hat has not been brushed for weeks. When I see you, my dear
+Watson, with a week's accumulation of dust upon your hat, and
+when your wife allows you to go out in such a state, I shall fear
+that you also have been unfortunate enough to lose your wife's
+affection."
+
+"But he might be a bachelor."
+
+"Nay, he was bringing home the goose as a peace-offering to his
+wife. Remember the card upon the bird's leg."
+
+"You have an answer to everything. But how on earth do you deduce
+that the gas is not laid on in his house?"
+
+"One tallow stain, or even two, might come by chance; but when I
+see no less than five, I think that there can be little doubt
+that the individual must be brought into frequent contact with
+burning tallow--walks upstairs at night probably with his hat in
+one hand and a guttering candle in the other. Anyhow, he never
+got tallow-stains from a gas-jet. Are you satisfied?"
+
+"Well, it is very ingenious," said I, laughing; "but since, as
+you said just now, there has been no crime committed, and no harm
+done save the loss of a goose, all this seems to be rather a
+waste of energy."
+
+Sherlock Holmes had opened his mouth to reply, when the door flew
+open, and Peterson, the commissionaire, rushed into the apartment
+with flushed cheeks and the face of a man who is dazed with
+astonishment.
+
+"The goose, Mr. Holmes! The goose, sir!" he gasped.
+
+"Eh? What of it, then? Has it returned to life and flapped off
+through the kitchen window?" Holmes twisted himself round upon
+the sofa to get a fairer view of the man's excited face.
+
+"See here, sir! See what my wife found in its crop!" He held out
+his hand and displayed upon the centre of the palm a brilliantly
+scintillating blue stone, rather smaller than a bean in size, but
+of such purity and radiance that it twinkled like an electric
+point in the dark hollow of his hand.
+
+Sherlock Holmes sat up with a whistle. "By Jove, Peterson!" said
+he, "this is treasure trove indeed. I suppose you know what you
+have got?"
+
+"A diamond, sir? A precious stone. It cuts into glass as though
+it were putty."
+
+"It's more than a precious stone. It is the precious stone."
+
+"Not the Countess of Morcar's blue carbuncle!" I ejaculated.
+
+"Precisely so. I ought to know its size and shape, seeing that I
+have read the advertisement about it in The Times every day
+lately. It is absolutely unique, and its value can only be
+conjectured, but the reward offered of 1000 pounds is certainly
+not within a twentieth part of the market price."
+
+"A thousand pounds! Great Lord of mercy!" The commissionaire
+plumped down into a chair and stared from one to the other of us.
+
+"That is the reward, and I have reason to know that there are
+sentimental considerations in the background which would induce
+the Countess to part with half her fortune if she could but
+recover the gem."
+
+"It was lost, if I remember aright, at the Hotel Cosmopolitan," I
+remarked.
+
+"Precisely so, on December 22nd, just five days ago. John Horner,
+a plumber, was accused of having abstracted it from the lady's
+jewel-case. The evidence against him was so strong that the case
+has been referred to the Assizes. I have some account of the
+matter here, I believe." He rummaged amid his newspapers,
+glancing over the dates, until at last he smoothed one out,
+doubled it over, and read the following paragraph:
+
+"Hotel Cosmopolitan Jewel Robbery. John Horner, 26, plumber, was
+brought up upon the charge of having upon the 22nd inst.,
+abstracted from the jewel-case of the Countess of Morcar the
+valuable gem known as the blue carbuncle. James Ryder,
+upper-attendant at the hotel, gave his evidence to the effect
+that he had shown Horner up to the dressing-room of the Countess
+of Morcar upon the day of the robbery in order that he might
+solder the second bar of the grate, which was loose. He had
+remained with Horner some little time, but had finally been
+called away. On returning, he found that Horner had disappeared,
+that the bureau had been forced open, and that the small morocco
+casket in which, as it afterwards transpired, the Countess was
+accustomed to keep her jewel, was lying empty upon the
+dressing-table. Ryder instantly gave the alarm, and Horner was
+arrested the same evening; but the stone could not be found
+either upon his person or in his rooms. Catherine Cusack, maid to
+the Countess, deposed to having heard Ryder's cry of dismay on
+discovering the robbery, and to having rushed into the room,
+where she found matters as described by the last witness.
+Inspector Bradstreet, B division, gave evidence as to the arrest
+of Horner, who struggled frantically, and protested his innocence
+in the strongest terms. Evidence of a previous conviction for
+robbery having been given against the prisoner, the magistrate
+refused to deal summarily with the offence, but referred it to
+the Assizes. Horner, who had shown signs of intense emotion
+during the proceedings, fainted away at the conclusion and was
+carried out of court."
+
+"Hum! So much for the police-court," said Holmes thoughtfully,
+tossing aside the paper. "The question for us now to solve is the
+sequence of events leading from a rifled jewel-case at one end to
+the crop of a goose in Tottenham Court Road at the other. You
+see, Watson, our little deductions have suddenly assumed a much
+more important and less innocent aspect. Here is the stone; the
+stone came from the goose, and the goose came from Mr. Henry
+Baker, the gentleman with the bad hat and all the other
+characteristics with which I have bored you. So now we must set
+ourselves very seriously to finding this gentleman and
+ascertaining what part he has played in this little mystery. To
+do this, we must try the simplest means first, and these lie
+undoubtedly in an advertisement in all the evening papers. If
+this fail, I shall have recourse to other methods."
+
+"What will you say?"
+
+"Give me a pencil and that slip of paper. Now, then: 'Found at
+the corner of Goodge Street, a goose and a black felt hat. Mr.
+Henry Baker can have the same by applying at 6:30 this evening at
+221B, Baker Street.' That is clear and concise."
+
+"Very. But will he see it?"
+
+"Well, he is sure to keep an eye on the papers, since, to a poor
+man, the loss was a heavy one. He was clearly so scared by his
+mischance in breaking the window and by the approach of Peterson
+that he thought of nothing but flight, but since then he must
+have bitterly regretted the impulse which caused him to drop his
+bird. Then, again, the introduction of his name will cause him to
+see it, for everyone who knows him will direct his attention to
+it. Here you are, Peterson, run down to the advertising agency
+and have this put in the evening papers."
+
+"In which, sir?"
+
+"Oh, in the Globe, Star, Pall Mall, St. James's, Evening News,
+Standard, Echo, and any others that occur to you."
+
+"Very well, sir. And this stone?"
+
+"Ah, yes, I shall keep the stone. Thank you. And, I say,
+Peterson, just buy a goose on your way back and leave it here
+with me, for we must have one to give to this gentleman in place
+of the one which your family is now devouring."
+
+When the commissionaire had gone, Holmes took up the stone and
+held it against the light. "It's a bonny thing," said he. "Just
+see how it glints and sparkles. Of course it is a nucleus and
+focus of crime. Every good stone is. They are the devil's pet
+baits. In the larger and older jewels every facet may stand for a
+bloody deed. This stone is not yet twenty years old. It was found
+in the banks of the Amoy River in southern China and is remarkable
+in having every characteristic of the carbuncle, save that it is
+blue in shade instead of ruby red. In spite of its youth, it has
+already a sinister history. There have been two murders, a
+vitriol-throwing, a suicide, and several robberies brought about
+for the sake of this forty-grain weight of crystallised charcoal.
+Who would think that so pretty a toy would be a purveyor to the
+gallows and the prison? I'll lock it up in my strong box now and
+drop a line to the Countess to say that we have it."
+
+"Do you think that this man Horner is innocent?"
+
+"I cannot tell."
+
+"Well, then, do you imagine that this other one, Henry Baker, had
+anything to do with the matter?"
+
+"It is, I think, much more likely that Henry Baker is an
+absolutely innocent man, who had no idea that the bird which he
+was carrying was of considerably more value than if it were made
+of solid gold. That, however, I shall determine by a very simple
+test if we have an answer to our advertisement."
+
+"And you can do nothing until then?"
+
+"Nothing."
+
+"In that case I shall continue my professional round. But I shall
+come back in the evening at the hour you have mentioned, for I
+should like to see the solution of so tangled a business."
+
+"Very glad to see you. I dine at seven. There is a woodcock, I
+believe. By the way, in view of recent occurrences, perhaps I
+ought to ask Mrs. Hudson to examine its crop."
+
+I had been delayed at a case, and it was a little after half-past
+six when I found myself in Baker Street once more. As I
+approached the house I saw a tall man in a Scotch bonnet with a
+coat which was buttoned up to his chin waiting outside in the
+bright semicircle which was thrown from the fanlight. Just as I
+arrived the door was opened, and we were shown up together to
+Holmes' room.
+
+"Mr. Henry Baker, I believe," said he, rising from his armchair
+and greeting his visitor with the easy air of geniality which he
+could so readily assume. "Pray take this chair by the fire, Mr.
+Baker. It is a cold night, and I observe that your circulation is
+more adapted for summer than for winter. Ah, Watson, you have
+just come at the right time. Is that your hat, Mr. Baker?"
+
+"Yes, sir, that is undoubtedly my hat."
+
+He was a large man with rounded shoulders, a massive head, and a
+broad, intelligent face, sloping down to a pointed beard of
+grizzled brown. A touch of red in nose and cheeks, with a slight
+tremor of his extended hand, recalled Holmes' surmise as to his
+habits. His rusty black frock-coat was buttoned right up in
+front, with the collar turned up, and his lank wrists protruded
+from his sleeves without a sign of cuff or shirt. He spoke in a
+slow staccato fashion, choosing his words with care, and gave the
+impression generally of a man of learning and letters who had had
+ill-usage at the hands of fortune.
+
+"We have retained these things for some days," said Holmes,
+"because we expected to see an advertisement from you giving your
+address. I am at a loss to know now why you did not advertise."
+
+Our visitor gave a rather shamefaced laugh. "Shillings have not
+been so plentiful with me as they once were," he remarked. "I had
+no doubt that the gang of roughs who assaulted me had carried off
+both my hat and the bird. I did not care to spend more money in a
+hopeless attempt at recovering them."
+
+"Very naturally. By the way, about the bird, we were compelled to
+eat it."
+
+"To eat it!" Our visitor half rose from his chair in his
+excitement.
+
+"Yes, it would have been of no use to anyone had we not done so.
+But I presume that this other goose upon the sideboard, which is
+about the same weight and perfectly fresh, will answer your
+purpose equally well?"
+
+"Oh, certainly, certainly," answered Mr. Baker with a sigh of
+relief.
+
+"Of course, we still have the feathers, legs, crop, and so on of
+your own bird, so if you wish--"
+
+The man burst into a hearty laugh. "They might be useful to me as
+relics of my adventure," said he, "but beyond that I can hardly
+see what use the disjecta membra of my late acquaintance are
+going to be to me. No, sir, I think that, with your permission, I
+will confine my attentions to the excellent bird which I perceive
+upon the sideboard."
+
+Sherlock Holmes glanced sharply across at me with a slight shrug
+of his shoulders.
+
+"There is your hat, then, and there your bird," said he. "By the
+way, would it bore you to tell me where you got the other one
+from? I am somewhat of a fowl fancier, and I have seldom seen a
+better grown goose."
+
+"Certainly, sir," said Baker, who had risen and tucked his newly
+gained property under his arm. "There are a few of us who
+frequent the Alpha Inn, near the Museum--we are to be found in
+the Museum itself during the day, you understand. This year our
+good host, Windigate by name, instituted a goose club, by which,
+on consideration of some few pence every week, we were each to
+receive a bird at Christmas. My pence were duly paid, and the
+rest is familiar to you. I am much indebted to you, sir, for a
+Scotch bonnet is fitted neither to my years nor my gravity." With
+a comical pomposity of manner he bowed solemnly to both of us and
+strode off upon his way.
+
+"So much for Mr. Henry Baker," said Holmes when he had closed the
+door behind him. "It is quite certain that he knows nothing
+whatever about the matter. Are you hungry, Watson?"
+
+"Not particularly."
+
+"Then I suggest that we turn our dinner into a supper and follow
+up this clue while it is still hot."
+
+"By all means."
+
+It was a bitter night, so we drew on our ulsters and wrapped
+cravats about our throats. Outside, the stars were shining coldly
+in a cloudless sky, and the breath of the passers-by blew out
+into smoke like so many pistol shots. Our footfalls rang out
+crisply and loudly as we swung through the doctors' quarter,
+Wimpole Street, Harley Street, and so through Wigmore Street into
+Oxford Street. In a quarter of an hour we were in Bloomsbury at
+the Alpha Inn, which is a small public-house at the corner of one
+of the streets which runs down into Holborn. Holmes pushed open
+the door of the private bar and ordered two glasses of beer from
+the ruddy-faced, white-aproned landlord.
+
+"Your beer should be excellent if it is as good as your geese,"
+said he.
+
+"My geese!" The man seemed surprised.
+
+"Yes. I was speaking only half an hour ago to Mr. Henry Baker,
+who was a member of your goose club."
+
+"Ah! yes, I see. But you see, sir, them's not our geese."
+
+"Indeed! Whose, then?"
+
+"Well, I got the two dozen from a salesman in Covent Garden."
+
+"Indeed? I know some of them. Which was it?"
+
+"Breckinridge is his name."
+
+"Ah! I don't know him. Well, here's your good health landlord,
+and prosperity to your house. Good-night."
+
+"Now for Mr. Breckinridge," he continued, buttoning up his coat
+as we came out into the frosty air. "Remember, Watson that though
+we have so homely a thing as a goose at one end of this chain, we
+have at the other a man who will certainly get seven years' penal
+servitude unless we can establish his innocence. It is possible
+that our inquiry may but confirm his guilt; but, in any case, we
+have a line of investigation which has been missed by the police,
+and which a singular chance has placed in our hands. Let us
+follow it out to the bitter end. Faces to the south, then, and
+quick march!"
+
+We passed across Holborn, down Endell Street, and so through a
+zigzag of slums to Covent Garden Market. One of the largest
+stalls bore the name of Breckinridge upon it, and the proprietor
+a horsey-looking man, with a sharp face and trim side-whiskers was
+helping a boy to put up the shutters.
+
+"Good-evening. It's a cold night," said Holmes.
+
+The salesman nodded and shot a questioning glance at my
+companion.
+
+"Sold out of geese, I see," continued Holmes, pointing at the
+bare slabs of marble.
+
+"Let you have five hundred to-morrow morning."
+
+"That's no good."
+
+"Well, there are some on the stall with the gas-flare."
+
+"Ah, but I was recommended to you."
+
+"Who by?"
+
+"The landlord of the Alpha."
+
+"Oh, yes; I sent him a couple of dozen."
+
+"Fine birds they were, too. Now where did you get them from?"
+
+To my surprise the question provoked a burst of anger from the
+salesman.
+
+"Now, then, mister," said he, with his head cocked and his arms
+akimbo, "what are you driving at? Let's have it straight, now."
+
+"It is straight enough. I should like to know who sold you the
+geese which you supplied to the Alpha."
+
+"Well then, I shan't tell you. So now!"
+
+"Oh, it is a matter of no importance; but I don't know why you
+should be so warm over such a trifle."
+
+"Warm! You'd be as warm, maybe, if you were as pestered as I am.
+When I pay good money for a good article there should be an end
+of the business; but it's 'Where are the geese?' and 'Who did you
+sell the geese to?' and 'What will you take for the geese?' One
+would think they were the only geese in the world, to hear the
+fuss that is made over them."
+
+"Well, I have no connection with any other people who have been
+making inquiries," said Holmes carelessly. "If you won't tell us
+the bet is off, that is all. But I'm always ready to back my
+opinion on a matter of fowls, and I have a fiver on it that the
+bird I ate is country bred."
+
+"Well, then, you've lost your fiver, for it's town bred," snapped
+the salesman.
+
+"It's nothing of the kind."
+
+"I say it is."
+
+"I don't believe it."
+
+"D'you think you know more about fowls than I, who have handled
+them ever since I was a nipper? I tell you, all those birds that
+went to the Alpha were town bred."
+
+"You'll never persuade me to believe that."
+
+"Will you bet, then?"
+
+"It's merely taking your money, for I know that I am right. But
+I'll have a sovereign on with you, just to teach you not to be
+obstinate."
+
+The salesman chuckled grimly. "Bring me the books, Bill," said
+he.
+
+The small boy brought round a small thin volume and a great
+greasy-backed one, laying them out together beneath the hanging
+lamp.
+
+"Now then, Mr. Cocksure," said the salesman, "I thought that I
+was out of geese, but before I finish you'll find that there is
+still one left in my shop. You see this little book?"
+
+"Well?"
+
+"That's the list of the folk from whom I buy. D'you see? Well,
+then, here on this page are the country folk, and the numbers
+after their names are where their accounts are in the big ledger.
+Now, then! You see this other page in red ink? Well, that is a
+list of my town suppliers. Now, look at that third name. Just
+read it out to me."
+
+"Mrs. Oakshott, 117, Brixton Road--249," read Holmes.
+
+"Quite so. Now turn that up in the ledger."
+
+Holmes turned to the page indicated. "Here you are, 'Mrs.
+Oakshott, 117, Brixton Road, egg and poultry supplier.'"
+
+"Now, then, what's the last entry?"
+
+"'December 22nd. Twenty-four geese at 7s. 6d.'"
+
+"Quite so. There you are. And underneath?"
+
+"'Sold to Mr. Windigate of the Alpha, at 12s.'"
+
+"What have you to say now?"
+
+Sherlock Holmes looked deeply chagrined. He drew a sovereign from
+his pocket and threw it down upon the slab, turning away with the
+air of a man whose disgust is too deep for words. A few yards off
+he stopped under a lamp-post and laughed in the hearty, noiseless
+fashion which was peculiar to him.
+
+"When you see a man with whiskers of that cut and the 'Pink 'un'
+protruding out of his pocket, you can always draw him by a bet,"
+said he. "I daresay that if I had put 100 pounds down in front of
+him, that man would not have given me such complete information
+as was drawn from him by the idea that he was doing me on a
+wager. Well, Watson, we are, I fancy, nearing the end of our
+quest, and the only point which remains to be determined is
+whether we should go on to this Mrs. Oakshott to-night, or
+whether we should reserve it for to-morrow. It is clear from what
+that surly fellow said that there are others besides ourselves
+who are anxious about the matter, and I should--"
+
+His remarks were suddenly cut short by a loud hubbub which broke
+out from the stall which we had just left. Turning round we saw a
+little rat-faced fellow standing in the centre of the circle of
+yellow light which was thrown by the swinging lamp, while
+Breckinridge, the salesman, framed in the door of his stall, was
+shaking his fists fiercely at the cringing figure.
+
+"I've had enough of you and your geese," he shouted. "I wish you
+were all at the devil together. If you come pestering me any more
+with your silly talk I'll set the dog at you. You bring Mrs.
+Oakshott here and I'll answer her, but what have you to do with
+it? Did I buy the geese off you?"
+
+"No; but one of them was mine all the same," whined the little
+man.
+
+"Well, then, ask Mrs. Oakshott for it."
+
+"She told me to ask you."
+
+"Well, you can ask the King of Proosia, for all I care. I've had
+enough of it. Get out of this!" He rushed fiercely forward, and
+the inquirer flitted away into the darkness.
+
+"Ha! this may save us a visit to Brixton Road," whispered Holmes.
+"Come with me, and we will see what is to be made of this
+fellow." Striding through the scattered knots of people who
+lounged round the flaring stalls, my companion speedily overtook
+the little man and touched him upon the shoulder. He sprang
+round, and I could see in the gas-light that every vestige of
+colour had been driven from his face.
+
+"Who are you, then? What do you want?" he asked in a quavering
+voice.
+
+"You will excuse me," said Holmes blandly, "but I could not help
+overhearing the questions which you put to the salesman just now.
+I think that I could be of assistance to you."
+
+"You? Who are you? How could you know anything of the matter?"
+
+"My name is Sherlock Holmes. It is my business to know what other
+people don't know."
+
+"But you can know nothing of this?"
+
+"Excuse me, I know everything of it. You are endeavouring to
+trace some geese which were sold by Mrs. Oakshott, of Brixton
+Road, to a salesman named Breckinridge, by him in turn to Mr.
+Windigate, of the Alpha, and by him to his club, of which Mr.
+Henry Baker is a member."
+
+"Oh, sir, you are the very man whom I have longed to meet," cried
+the little fellow with outstretched hands and quivering fingers.
+"I can hardly explain to you how interested I am in this matter."
+
+Sherlock Holmes hailed a four-wheeler which was passing. "In that
+case we had better discuss it in a cosy room rather than in this
+wind-swept market-place," said he. "But pray tell me, before we
+go farther, who it is that I have the pleasure of assisting."
+
+The man hesitated for an instant. "My name is John Robinson," he
+answered with a sidelong glance.
+
+"No, no; the real name," said Holmes sweetly. "It is always
+awkward doing business with an alias."
+
+A flush sprang to the white cheeks of the stranger. "Well then,"
+said he, "my real name is James Ryder."
+
+"Precisely so. Head attendant at the Hotel Cosmopolitan. Pray
+step into the cab, and I shall soon be able to tell you
+everything which you would wish to know."
+
+The little man stood glancing from one to the other of us with
+half-frightened, half-hopeful eyes, as one who is not sure
+whether he is on the verge of a windfall or of a catastrophe.
+Then he stepped into the cab, and in half an hour we were back in
+the sitting-room at Baker Street. Nothing had been said during
+our drive, but the high, thin breathing of our new companion, and
+the claspings and unclaspings of his hands, spoke of the nervous
+tension within him.
+
+"Here we are!" said Holmes cheerily as we filed into the room.
+"The fire looks very seasonable in this weather. You look cold,
+Mr. Ryder. Pray take the basket-chair. I will just put on my
+slippers before we settle this little matter of yours. Now, then!
+You want to know what became of those geese?"
+
+"Yes, sir."
+
+"Or rather, I fancy, of that goose. It was one bird, I imagine in
+which you were interested--white, with a black bar across the
+tail."
+
+Ryder quivered with emotion. "Oh, sir," he cried, "can you tell
+me where it went to?"
+
+"It came here."
+
+"Here?"
+
+"Yes, and a most remarkable bird it proved. I don't wonder that
+you should take an interest in it. It laid an egg after it was
+dead--the bonniest, brightest little blue egg that ever was seen.
+I have it here in my museum."
+
+Our visitor staggered to his feet and clutched the mantelpiece
+with his right hand. Holmes unlocked his strong-box and held up
+the blue carbuncle, which shone out like a star, with a cold,
+brilliant, many-pointed radiance. Ryder stood glaring with a
+drawn face, uncertain whether to claim or to disown it.
+
+"The game's up, Ryder," said Holmes quietly. "Hold up, man, or
+you'll be into the fire! Give him an arm back into his chair,
+Watson. He's not got blood enough to go in for felony with
+impunity. Give him a dash of brandy. So! Now he looks a little
+more human. What a shrimp it is, to be sure!"
+
+For a moment he had staggered and nearly fallen, but the brandy
+brought a tinge of colour into his cheeks, and he sat staring
+with frightened eyes at his accuser.
+
+"I have almost every link in my hands, and all the proofs which I
+could possibly need, so there is little which you need tell me.
+Still, that little may as well be cleared up to make the case
+complete. You had heard, Ryder, of this blue stone of the
+Countess of Morcar's?"
+
+"It was Catherine Cusack who told me of it," said he in a
+crackling voice.
+
+"I see--her ladyship's waiting-maid. Well, the temptation of
+sudden wealth so easily acquired was too much for you, as it has
+been for better men before you; but you were not very scrupulous
+in the means you used. It seems to me, Ryder, that there is the
+making of a very pretty villain in you. You knew that this man
+Horner, the plumber, had been concerned in some such matter
+before, and that suspicion would rest the more readily upon him.
+What did you do, then? You made some small job in my lady's
+room--you and your confederate Cusack--and you managed that he
+should be the man sent for. Then, when he had left, you rifled
+the jewel-case, raised the alarm, and had this unfortunate man
+arrested. You then--"
+
+Ryder threw himself down suddenly upon the rug and clutched at my
+companion's knees. "For God's sake, have mercy!" he shrieked.
+"Think of my father! Of my mother! It would break their hearts. I
+never went wrong before! I never will again. I swear it. I'll
+swear it on a Bible. Oh, don't bring it into court! For Christ's
+sake, don't!"
+
+"Get back into your chair!" said Holmes sternly. "It is very well
+to cringe and crawl now, but you thought little enough of this
+poor Horner in the dock for a crime of which he knew nothing."
+
+"I will fly, Mr. Holmes. I will leave the country, sir. Then the
+charge against him will break down."
+
+"Hum! We will talk about that. And now let us hear a true account
+of the next act. How came the stone into the goose, and how came
+the goose into the open market? Tell us the truth, for there lies
+your only hope of safety."
+
+Ryder passed his tongue over his parched lips. "I will tell you
+it just as it happened, sir," said he. "When Horner had been
+arrested, it seemed to me that it would be best for me to get
+away with the stone at once, for I did not know at what moment
+the police might not take it into their heads to search me and my
+room. There was no place about the hotel where it would be safe.
+I went out, as if on some commission, and I made for my sister's
+house. She had married a man named Oakshott, and lived in Brixton
+Road, where she fattened fowls for the market. All the way there
+every man I met seemed to me to be a policeman or a detective;
+and, for all that it was a cold night, the sweat was pouring down
+my face before I came to the Brixton Road. My sister asked me
+what was the matter, and why I was so pale; but I told her that I
+had been upset by the jewel robbery at the hotel. Then I went
+into the back yard and smoked a pipe and wondered what it would
+be best to do.
+
+"I had a friend once called Maudsley, who went to the bad, and
+has just been serving his time in Pentonville. One day he had met
+me, and fell into talk about the ways of thieves, and how they
+could get rid of what they stole. I knew that he would be true to
+me, for I knew one or two things about him; so I made up my mind
+to go right on to Kilburn, where he lived, and take him into my
+confidence. He would show me how to turn the stone into money.
+But how to get to him in safety? I thought of the agonies I had
+gone through in coming from the hotel. I might at any moment be
+seized and searched, and there would be the stone in my waistcoat
+pocket. I was leaning against the wall at the time and looking at
+the geese which were waddling about round my feet, and suddenly
+an idea came into my head which showed me how I could beat the
+best detective that ever lived.
+
+"My sister had told me some weeks before that I might have the
+pick of her geese for a Christmas present, and I knew that she
+was always as good as her word. I would take my goose now, and in
+it I would carry my stone to Kilburn. There was a little shed in
+the yard, and behind this I drove one of the birds--a fine big
+one, white, with a barred tail. I caught it, and prying its bill
+open, I thrust the stone down its throat as far as my finger
+could reach. The bird gave a gulp, and I felt the stone pass
+along its gullet and down into its crop. But the creature flapped
+and struggled, and out came my sister to know what was the
+matter. As I turned to speak to her the brute broke loose and
+fluttered off among the others.
+
+"'Whatever were you doing with that bird, Jem?' says she.
+
+"'Well,' said I, 'you said you'd give me one for Christmas, and I
+was feeling which was the fattest.'
+
+"'Oh,' says she, 'we've set yours aside for you--Jem's bird, we
+call it. It's the big white one over yonder. There's twenty-six
+of them, which makes one for you, and one for us, and two dozen
+for the market.'
+
+"'Thank you, Maggie,' says I; 'but if it is all the same to you,
+I'd rather have that one I was handling just now.'
+
+"'The other is a good three pound heavier,' said she, 'and we
+fattened it expressly for you.'
+
+"'Never mind. I'll have the other, and I'll take it now,' said I.
+
+"'Oh, just as you like,' said she, a little huffed. 'Which is it
+you want, then?'
+
+"'That white one with the barred tail, right in the middle of the
+flock.'
+
+"'Oh, very well. Kill it and take it with you.'
+
+"Well, I did what she said, Mr. Holmes, and I carried the bird
+all the way to Kilburn. I told my pal what I had done, for he was
+a man that it was easy to tell a thing like that to. He laughed
+until he choked, and we got a knife and opened the goose. My
+heart turned to water, for there was no sign of the stone, and I
+knew that some terrible mistake had occurred. I left the bird,
+rushed back to my sister's, and hurried into the back yard. There
+was not a bird to be seen there.
+
+"'Where are they all, Maggie?' I cried.
+
+"'Gone to the dealer's, Jem.'
+
+"'Which dealer's?'
+
+"'Breckinridge, of Covent Garden.'
+
+"'But was there another with a barred tail?' I asked, 'the same
+as the one I chose?'
+
+"'Yes, Jem; there were two barred-tailed ones, and I could never
+tell them apart.'
+
+"Well, then, of course I saw it all, and I ran off as hard as my
+feet would carry me to this man Breckinridge; but he had sold the
+lot at once, and not one word would he tell me as to where they
+had gone. You heard him yourselves to-night. Well, he has always
+answered me like that. My sister thinks that I am going mad.
+Sometimes I think that I am myself. And now--and now I am myself
+a branded thief, without ever having touched the wealth for which
+I sold my character. God help me! God help me!" He burst into
+convulsive sobbing, with his face buried in his hands.
+
+There was a long silence, broken only by his heavy breathing and
+by the measured tapping of Sherlock Holmes' finger-tips upon the
+edge of the table. Then my friend rose and threw open the door.
+
+"Get out!" said he.
+
+"What, sir! Oh, Heaven bless you!"
+
+"No more words. Get out!"
+
+And no more words were needed. There was a rush, a clatter upon
+the stairs, the bang of a door, and the crisp rattle of running
+footfalls from the street.
+
+"After all, Watson," said Holmes, reaching up his hand for his
+clay pipe, "I am not retained by the police to supply their
+deficiencies. If Horner were in danger it would be another thing;
+but this fellow will not appear against him, and the case must
+collapse. I suppose that I am commuting a felony, but it is just
+possible that I am saving a soul. This fellow will not go wrong
+again; he is too terribly frightened. Send him to gaol now, and
+you make him a gaol-bird for life. Besides, it is the season of
+forgiveness. Chance has put in our way a most singular and
+whimsical problem, and its solution is its own reward. If you
+will have the goodness to touch the bell, Doctor, we will begin
+another investigation, in which, also a bird will be the chief
+feature."
+
+
+
+VIII. THE ADVENTURE OF THE SPECKLED BAND
+
+On glancing over my notes of the seventy odd cases in which I
+have during the last eight years studied the methods of my friend
+Sherlock Holmes, I find many tragic, some comic, a large number
+merely strange, but none commonplace; for, working as he did
+rather for the love of his art than for the acquirement of
+wealth, he refused to associate himself with any investigation
+which did not tend towards the unusual, and even the fantastic.
+Of all these varied cases, however, I cannot recall any which
+presented more singular features than that which was associated
+with the well-known Surrey family of the Roylotts of Stoke Moran.
+The events in question occurred in the early days of my
+association with Holmes, when we were sharing rooms as bachelors
+in Baker Street. It is possible that I might have placed them
+upon record before, but a promise of secrecy was made at the
+time, from which I have only been freed during the last month by
+the untimely death of the lady to whom the pledge was given. It
+is perhaps as well that the facts should now come to light, for I
+have reasons to know that there are widespread rumours as to the
+death of Dr. Grimesby Roylott which tend to make the matter even
+more terrible than the truth.
+
+It was early in April in the year '83 that I woke one morning to
+find Sherlock Holmes standing, fully dressed, by the side of my
+bed. He was a late riser, as a rule, and as the clock on the
+mantelpiece showed me that it was only a quarter-past seven, I
+blinked up at him in some surprise, and perhaps just a little
+resentment, for I was myself regular in my habits.
+
+"Very sorry to knock you up, Watson," said he, "but it's the
+common lot this morning. Mrs. Hudson has been knocked up, she
+retorted upon me, and I on you."
+
+"What is it, then--a fire?"
+
+"No; a client. It seems that a young lady has arrived in a
+considerable state of excitement, who insists upon seeing me. She
+is waiting now in the sitting-room. Now, when young ladies wander
+about the metropolis at this hour of the morning, and knock
+sleepy people up out of their beds, I presume that it is
+something very pressing which they have to communicate. Should it
+prove to be an interesting case, you would, I am sure, wish to
+follow it from the outset. I thought, at any rate, that I should
+call you and give you the chance."
+
+"My dear fellow, I would not miss it for anything."
+
+I had no keener pleasure than in following Holmes in his
+professional investigations, and in admiring the rapid
+deductions, as swift as intuitions, and yet always founded on a
+logical basis with which he unravelled the problems which were
+submitted to him. I rapidly threw on my clothes and was ready in
+a few minutes to accompany my friend down to the sitting-room. A
+lady dressed in black and heavily veiled, who had been sitting in
+the window, rose as we entered.
+
+"Good-morning, madam," said Holmes cheerily. "My name is Sherlock
+Holmes. This is my intimate friend and associate, Dr. Watson,
+before whom you can speak as freely as before myself. Ha! I am
+glad to see that Mrs. Hudson has had the good sense to light the
+fire. Pray draw up to it, and I shall order you a cup of hot
+coffee, for I observe that you are shivering."
+
+"It is not cold which makes me shiver," said the woman in a low
+voice, changing her seat as requested.
+
+"What, then?"
+
+"It is fear, Mr. Holmes. It is terror." She raised her veil as
+she spoke, and we could see that she was indeed in a pitiable
+state of agitation, her face all drawn and grey, with restless
+frightened eyes, like those of some hunted animal. Her features
+and figure were those of a woman of thirty, but her hair was shot
+with premature grey, and her expression was weary and haggard.
+Sherlock Holmes ran her over with one of his quick,
+all-comprehensive glances.
+
+"You must not fear," said he soothingly, bending forward and
+patting her forearm. "We shall soon set matters right, I have no
+doubt. You have come in by train this morning, I see."
+
+"You know me, then?"
+
+"No, but I observe the second half of a return ticket in the palm
+of your left glove. You must have started early, and yet you had
+a good drive in a dog-cart, along heavy roads, before you reached
+the station."
+
+The lady gave a violent start and stared in bewilderment at my
+companion.
+
+"There is no mystery, my dear madam," said he, smiling. "The left
+arm of your jacket is spattered with mud in no less than seven
+places. The marks are perfectly fresh. There is no vehicle save a
+dog-cart which throws up mud in that way, and then only when you
+sit on the left-hand side of the driver."
+
+"Whatever your reasons may be, you are perfectly correct," said
+she. "I started from home before six, reached Leatherhead at
+twenty past, and came in by the first train to Waterloo. Sir, I
+can stand this strain no longer; I shall go mad if it continues.
+I have no one to turn to--none, save only one, who cares for me,
+and he, poor fellow, can be of little aid. I have heard of you,
+Mr. Holmes; I have heard of you from Mrs. Farintosh, whom you
+helped in the hour of her sore need. It was from her that I had
+your address. Oh, sir, do you not think that you could help me,
+too, and at least throw a little light through the dense darkness
+which surrounds me? At present it is out of my power to reward
+you for your services, but in a month or six weeks I shall be
+married, with the control of my own income, and then at least you
+shall not find me ungrateful."
+
+Holmes turned to his desk and, unlocking it, drew out a small
+case-book, which he consulted.
+
+"Farintosh," said he. "Ah yes, I recall the case; it was
+concerned with an opal tiara. I think it was before your time,
+Watson. I can only say, madam, that I shall be happy to devote
+the same care to your case as I did to that of your friend. As to
+reward, my profession is its own reward; but you are at liberty
+to defray whatever expenses I may be put to, at the time which
+suits you best. And now I beg that you will lay before us
+everything that may help us in forming an opinion upon the
+matter."
+
+"Alas!" replied our visitor, "the very horror of my situation
+lies in the fact that my fears are so vague, and my suspicions
+depend so entirely upon small points, which might seem trivial to
+another, that even he to whom of all others I have a right to
+look for help and advice looks upon all that I tell him about it
+as the fancies of a nervous woman. He does not say so, but I can
+read it from his soothing answers and averted eyes. But I have
+heard, Mr. Holmes, that you can see deeply into the manifold
+wickedness of the human heart. You may advise me how to walk amid
+the dangers which encompass me."
+
+"I am all attention, madam."
+
+"My name is Helen Stoner, and I am living with my stepfather, who
+is the last survivor of one of the oldest Saxon families in
+England, the Roylotts of Stoke Moran, on the western border of
+Surrey."
+
+Holmes nodded his head. "The name is familiar to me," said he.
+
+"The family was at one time among the richest in England, and the
+estates extended over the borders into Berkshire in the north,
+and Hampshire in the west. In the last century, however, four
+successive heirs were of a dissolute and wasteful disposition,
+and the family ruin was eventually completed by a gambler in the
+days of the Regency. Nothing was left save a few acres of ground,
+and the two-hundred-year-old house, which is itself crushed under
+a heavy mortgage. The last squire dragged out his existence
+there, living the horrible life of an aristocratic pauper; but
+his only son, my stepfather, seeing that he must adapt himself to
+the new conditions, obtained an advance from a relative, which
+enabled him to take a medical degree and went out to Calcutta,
+where, by his professional skill and his force of character, he
+established a large practice. In a fit of anger, however, caused
+by some robberies which had been perpetrated in the house, he
+beat his native butler to death and narrowly escaped a capital
+sentence. As it was, he suffered a long term of imprisonment and
+afterwards returned to England a morose and disappointed man.
+
+"When Dr. Roylott was in India he married my mother, Mrs. Stoner,
+the young widow of Major-General Stoner, of the Bengal Artillery.
+My sister Julia and I were twins, and we were only two years old
+at the time of my mother's re-marriage. She had a considerable
+sum of money--not less than 1000 pounds a year--and this she
+bequeathed to Dr. Roylott entirely while we resided with him,
+with a provision that a certain annual sum should be allowed to
+each of us in the event of our marriage. Shortly after our return
+to England my mother died--she was killed eight years ago in a
+railway accident near Crewe. Dr. Roylott then abandoned his
+attempts to establish himself in practice in London and took us
+to live with him in the old ancestral house at Stoke Moran. The
+money which my mother had left was enough for all our wants, and
+there seemed to be no obstacle to our happiness.
+
+"But a terrible change came over our stepfather about this time.
+Instead of making friends and exchanging visits with our
+neighbours, who had at first been overjoyed to see a Roylott of
+Stoke Moran back in the old family seat, he shut himself up in
+his house and seldom came out save to indulge in ferocious
+quarrels with whoever might cross his path. Violence of temper
+approaching to mania has been hereditary in the men of the
+family, and in my stepfather's case it had, I believe, been
+intensified by his long residence in the tropics. A series of
+disgraceful brawls took place, two of which ended in the
+police-court, until at last he became the terror of the village,
+and the folks would fly at his approach, for he is a man of
+immense strength, and absolutely uncontrollable in his anger.
+
+"Last week he hurled the local blacksmith over a parapet into a
+stream, and it was only by paying over all the money which I
+could gather together that I was able to avert another public
+exposure. He had no friends at all save the wandering gipsies,
+and he would give these vagabonds leave to encamp upon the few
+acres of bramble-covered land which represent the family estate,
+and would accept in return the hospitality of their tents,
+wandering away with them sometimes for weeks on end. He has a
+passion also for Indian animals, which are sent over to him by a
+correspondent, and he has at this moment a cheetah and a baboon,
+which wander freely over his grounds and are feared by the
+villagers almost as much as their master.
+
+"You can imagine from what I say that my poor sister Julia and I
+had no great pleasure in our lives. No servant would stay with
+us, and for a long time we did all the work of the house. She was
+but thirty at the time of her death, and yet her hair had already
+begun to whiten, even as mine has."
+
+"Your sister is dead, then?"
+
+"She died just two years ago, and it is of her death that I wish
+to speak to you. You can understand that, living the life which I
+have described, we were little likely to see anyone of our own
+age and position. We had, however, an aunt, my mother's maiden
+sister, Miss Honoria Westphail, who lives near Harrow, and we
+were occasionally allowed to pay short visits at this lady's
+house. Julia went there at Christmas two years ago, and met there
+a half-pay major of marines, to whom she became engaged. My
+stepfather learned of the engagement when my sister returned and
+offered no objection to the marriage; but within a fortnight of
+the day which had been fixed for the wedding, the terrible event
+occurred which has deprived me of my only companion."
+
+Sherlock Holmes had been leaning back in his chair with his eyes
+closed and his head sunk in a cushion, but he half opened his
+lids now and glanced across at his visitor.
+
+"Pray be precise as to details," said he.
+
+"It is easy for me to be so, for every event of that dreadful
+time is seared into my memory. The manor-house is, as I have
+already said, very old, and only one wing is now inhabited. The
+bedrooms in this wing are on the ground floor, the sitting-rooms
+being in the central block of the buildings. Of these bedrooms
+the first is Dr. Roylott's, the second my sister's, and the third
+my own. There is no communication between them, but they all open
+out into the same corridor. Do I make myself plain?"
+
+"Perfectly so."
+
+"The windows of the three rooms open out upon the lawn. That
+fatal night Dr. Roylott had gone to his room early, though we
+knew that he had not retired to rest, for my sister was troubled
+by the smell of the strong Indian cigars which it was his custom
+to smoke. She left her room, therefore, and came into mine, where
+she sat for some time, chatting about her approaching wedding. At
+eleven o'clock she rose to leave me, but she paused at the door
+and looked back.
+
+"'Tell me, Helen,' said she, 'have you ever heard anyone whistle
+in the dead of the night?'
+
+"'Never,' said I.
+
+"'I suppose that you could not possibly whistle, yourself, in
+your sleep?'
+
+"'Certainly not. But why?'
+
+"'Because during the last few nights I have always, about three
+in the morning, heard a low, clear whistle. I am a light sleeper,
+and it has awakened me. I cannot tell where it came from--perhaps
+from the next room, perhaps from the lawn. I thought that I would
+just ask you whether you had heard it.'
+
+"'No, I have not. It must be those wretched gipsies in the
+plantation.'
+
+"'Very likely. And yet if it were on the lawn, I wonder that you
+did not hear it also.'
+
+"'Ah, but I sleep more heavily than you.'
+
+"'Well, it is of no great consequence, at any rate.' She smiled
+back at me, closed my door, and a few moments later I heard her
+key turn in the lock."
+
+"Indeed," said Holmes. "Was it your custom always to lock
+yourselves in at night?"
+
+"Always."
+
+"And why?"
+
+"I think that I mentioned to you that the doctor kept a cheetah
+and a baboon. We had no feeling of security unless our doors were
+locked."
+
+"Quite so. Pray proceed with your statement."
+
+"I could not sleep that night. A vague feeling of impending
+misfortune impressed me. My sister and I, you will recollect,
+were twins, and you know how subtle are the links which bind two
+souls which are so closely allied. It was a wild night. The wind
+was howling outside, and the rain was beating and splashing
+against the windows. Suddenly, amid all the hubbub of the gale,
+there burst forth the wild scream of a terrified woman. I knew
+that it was my sister's voice. I sprang from my bed, wrapped a
+shawl round me, and rushed into the corridor. As I opened my door
+I seemed to hear a low whistle, such as my sister described, and
+a few moments later a clanging sound, as if a mass of metal had
+fallen. As I ran down the passage, my sister's door was unlocked,
+and revolved slowly upon its hinges. I stared at it
+horror-stricken, not knowing what was about to issue from it. By
+the light of the corridor-lamp I saw my sister appear at the
+opening, her face blanched with terror, her hands groping for
+help, her whole figure swaying to and fro like that of a
+drunkard. I ran to her and threw my arms round her, but at that
+moment her knees seemed to give way and she fell to the ground.
+She writhed as one who is in terrible pain, and her limbs were
+dreadfully convulsed. At first I thought that she had not
+recognised me, but as I bent over her she suddenly shrieked out
+in a voice which I shall never forget, 'Oh, my God! Helen! It was
+the band! The speckled band!' There was something else which she
+would fain have said, and she stabbed with her finger into the
+air in the direction of the doctor's room, but a fresh convulsion
+seized her and choked her words. I rushed out, calling loudly for
+my stepfather, and I met him hastening from his room in his
+dressing-gown. When he reached my sister's side she was
+unconscious, and though he poured brandy down her throat and sent
+for medical aid from the village, all efforts were in vain, for
+she slowly sank and died without having recovered her
+consciousness. Such was the dreadful end of my beloved sister."
+
+"One moment," said Holmes, "are you sure about this whistle and
+metallic sound? Could you swear to it?"
+
+"That was what the county coroner asked me at the inquiry. It is
+my strong impression that I heard it, and yet, among the crash of
+the gale and the creaking of an old house, I may possibly have
+been deceived."
+
+"Was your sister dressed?"
+
+"No, she was in her night-dress. In her right hand was found the
+charred stump of a match, and in her left a match-box."
+
+"Showing that she had struck a light and looked about her when
+the alarm took place. That is important. And what conclusions did
+the coroner come to?"
+
+"He investigated the case with great care, for Dr. Roylott's
+conduct had long been notorious in the county, but he was unable
+to find any satisfactory cause of death. My evidence showed that
+the door had been fastened upon the inner side, and the windows
+were blocked by old-fashioned shutters with broad iron bars,
+which were secured every night. The walls were carefully sounded,
+and were shown to be quite solid all round, and the flooring was
+also thoroughly examined, with the same result. The chimney is
+wide, but is barred up by four large staples. It is certain,
+therefore, that my sister was quite alone when she met her end.
+Besides, there were no marks of any violence upon her."
+
+"How about poison?"
+
+"The doctors examined her for it, but without success."
+
+"What do you think that this unfortunate lady died of, then?"
+
+"It is my belief that she died of pure fear and nervous shock,
+though what it was that frightened her I cannot imagine."
+
+"Were there gipsies in the plantation at the time?"
+
+"Yes, there are nearly always some there."
+
+"Ah, and what did you gather from this allusion to a band--a
+speckled band?"
+
+"Sometimes I have thought that it was merely the wild talk of
+delirium, sometimes that it may have referred to some band of
+people, perhaps to these very gipsies in the plantation. I do not
+know whether the spotted handkerchiefs which so many of them wear
+over their heads might have suggested the strange adjective which
+she used."
+
+Holmes shook his head like a man who is far from being satisfied.
+
+"These are very deep waters," said he; "pray go on with your
+narrative."
+
+"Two years have passed since then, and my life has been until
+lately lonelier than ever. A month ago, however, a dear friend,
+whom I have known for many years, has done me the honour to ask
+my hand in marriage. His name is Armitage--Percy Armitage--the
+second son of Mr. Armitage, of Crane Water, near Reading. My
+stepfather has offered no opposition to the match, and we are to
+be married in the course of the spring. Two days ago some repairs
+were started in the west wing of the building, and my bedroom
+wall has been pierced, so that I have had to move into the
+chamber in which my sister died, and to sleep in the very bed in
+which she slept. Imagine, then, my thrill of terror when last
+night, as I lay awake, thinking over her terrible fate, I
+suddenly heard in the silence of the night the low whistle which
+had been the herald of her own death. I sprang up and lit the
+lamp, but nothing was to be seen in the room. I was too shaken to
+go to bed again, however, so I dressed, and as soon as it was
+daylight I slipped down, got a dog-cart at the Crown Inn, which
+is opposite, and drove to Leatherhead, from whence I have come on
+this morning with the one object of seeing you and asking your
+advice."
+
+"You have done wisely," said my friend. "But have you told me
+all?"
+
+"Yes, all."
+
+"Miss Roylott, you have not. You are screening your stepfather."
+
+"Why, what do you mean?"
+
+For answer Holmes pushed back the frill of black lace which
+fringed the hand that lay upon our visitor's knee. Five little
+livid spots, the marks of four fingers and a thumb, were printed
+upon the white wrist.
+
+"You have been cruelly used," said Holmes.
+
+The lady coloured deeply and covered over her injured wrist. "He
+is a hard man," she said, "and perhaps he hardly knows his own
+strength."
+
+There was a long silence, during which Holmes leaned his chin
+upon his hands and stared into the crackling fire.
+
+"This is a very deep business," he said at last. "There are a
+thousand details which I should desire to know before I decide
+upon our course of action. Yet we have not a moment to lose. If
+we were to come to Stoke Moran to-day, would it be possible for
+us to see over these rooms without the knowledge of your
+stepfather?"
+
+"As it happens, he spoke of coming into town to-day upon some
+most important business. It is probable that he will be away all
+day, and that there would be nothing to disturb you. We have a
+housekeeper now, but she is old and foolish, and I could easily
+get her out of the way."
+
+"Excellent. You are not averse to this trip, Watson?"
+
+"By no means."
+
+"Then we shall both come. What are you going to do yourself?"
+
+"I have one or two things which I would wish to do now that I am
+in town. But I shall return by the twelve o'clock train, so as to
+be there in time for your coming."
+
+"And you may expect us early in the afternoon. I have myself some
+small business matters to attend to. Will you not wait and
+breakfast?"
+
+"No, I must go. My heart is lightened already since I have
+confided my trouble to you. I shall look forward to seeing you
+again this afternoon." She dropped her thick black veil over her
+face and glided from the room.
+
+"And what do you think of it all, Watson?" asked Sherlock Holmes,
+leaning back in his chair.
+
+"It seems to me to be a most dark and sinister business."
+
+"Dark enough and sinister enough."
+
+"Yet if the lady is correct in saying that the flooring and walls
+are sound, and that the door, window, and chimney are impassable,
+then her sister must have been undoubtedly alone when she met her
+mysterious end."
+
+"What becomes, then, of these nocturnal whistles, and what of the
+very peculiar words of the dying woman?"
+
+"I cannot think."
+
+"When you combine the ideas of whistles at night, the presence of
+a band of gipsies who are on intimate terms with this old doctor,
+the fact that we have every reason to believe that the doctor has
+an interest in preventing his stepdaughter's marriage, the dying
+allusion to a band, and, finally, the fact that Miss Helen Stoner
+heard a metallic clang, which might have been caused by one of
+those metal bars that secured the shutters falling back into its
+place, I think that there is good ground to think that the
+mystery may be cleared along those lines."
+
+"But what, then, did the gipsies do?"
+
+"I cannot imagine."
+
+"I see many objections to any such theory."
+
+"And so do I. It is precisely for that reason that we are going
+to Stoke Moran this day. I want to see whether the objections are
+fatal, or if they may be explained away. But what in the name of
+the devil!"
+
+The ejaculation had been drawn from my companion by the fact that
+our door had been suddenly dashed open, and that a huge man had
+framed himself in the aperture. His costume was a peculiar
+mixture of the professional and of the agricultural, having a
+black top-hat, a long frock-coat, and a pair of high gaiters,
+with a hunting-crop swinging in his hand. So tall was he that his
+hat actually brushed the cross bar of the doorway, and his
+breadth seemed to span it across from side to side. A large face,
+seared with a thousand wrinkles, burned yellow with the sun, and
+marked with every evil passion, was turned from one to the other
+of us, while his deep-set, bile-shot eyes, and his high, thin,
+fleshless nose, gave him somewhat the resemblance to a fierce old
+bird of prey.
+
+"Which of you is Holmes?" asked this apparition.
+
+"My name, sir; but you have the advantage of me," said my
+companion quietly.
+
+"I am Dr. Grimesby Roylott, of Stoke Moran."
+
+"Indeed, Doctor," said Holmes blandly. "Pray take a seat."
+
+"I will do nothing of the kind. My stepdaughter has been here. I
+have traced her. What has she been saying to you?"
+
+"It is a little cold for the time of the year," said Holmes.
+
+"What has she been saying to you?" screamed the old man
+furiously.
+
+"But I have heard that the crocuses promise well," continued my
+companion imperturbably.
+
+"Ha! You put me off, do you?" said our new visitor, taking a step
+forward and shaking his hunting-crop. "I know you, you scoundrel!
+I have heard of you before. You are Holmes, the meddler."
+
+My friend smiled.
+
+"Holmes, the busybody!"
+
+His smile broadened.
+
+"Holmes, the Scotland Yard Jack-in-office!"
+
+Holmes chuckled heartily. "Your conversation is most
+entertaining," said he. "When you go out close the door, for
+there is a decided draught."
+
+"I will go when I have said my say. Don't you dare to meddle with
+my affairs. I know that Miss Stoner has been here. I traced her!
+I am a dangerous man to fall foul of! See here." He stepped
+swiftly forward, seized the poker, and bent it into a curve with
+his huge brown hands.
+
+"See that you keep yourself out of my grip," he snarled, and
+hurling the twisted poker into the fireplace he strode out of the
+room.
+
+"He seems a very amiable person," said Holmes, laughing. "I am
+not quite so bulky, but if he had remained I might have shown him
+that my grip was not much more feeble than his own." As he spoke
+he picked up the steel poker and, with a sudden effort,
+straightened it out again.
+
+"Fancy his having the insolence to confound me with the official
+detective force! This incident gives zest to our investigation,
+however, and I only trust that our little friend will not suffer
+from her imprudence in allowing this brute to trace her. And now,
+Watson, we shall order breakfast, and afterwards I shall walk
+down to Doctors' Commons, where I hope to get some data which may
+help us in this matter."
+
+
+It was nearly one o'clock when Sherlock Holmes returned from his
+excursion. He held in his hand a sheet of blue paper, scrawled
+over with notes and figures.
+
+"I have seen the will of the deceased wife," said he. "To
+determine its exact meaning I have been obliged to work out the
+present prices of the investments with which it is concerned. The
+total income, which at the time of the wife's death was little
+short of 1100 pounds, is now, through the fall in agricultural
+prices, not more than 750 pounds. Each daughter can claim an
+income of 250 pounds, in case of marriage. It is evident,
+therefore, that if both girls had married, this beauty would have
+had a mere pittance, while even one of them would cripple him to
+a very serious extent. My morning's work has not been wasted,
+since it has proved that he has the very strongest motives for
+standing in the way of anything of the sort. And now, Watson,
+this is too serious for dawdling, especially as the old man is
+aware that we are interesting ourselves in his affairs; so if you
+are ready, we shall call a cab and drive to Waterloo. I should be
+very much obliged if you would slip your revolver into your
+pocket. An Eley's No. 2 is an excellent argument with gentlemen
+who can twist steel pokers into knots. That and a tooth-brush
+are, I think, all that we need."
+
+At Waterloo we were fortunate in catching a train for
+Leatherhead, where we hired a trap at the station inn and drove
+for four or five miles through the lovely Surrey lanes. It was a
+perfect day, with a bright sun and a few fleecy clouds in the
+heavens. The trees and wayside hedges were just throwing out
+their first green shoots, and the air was full of the pleasant
+smell of the moist earth. To me at least there was a strange
+contrast between the sweet promise of the spring and this
+sinister quest upon which we were engaged. My companion sat in
+the front of the trap, his arms folded, his hat pulled down over
+his eyes, and his chin sunk upon his breast, buried in the
+deepest thought. Suddenly, however, he started, tapped me on the
+shoulder, and pointed over the meadows.
+
+"Look there!" said he.
+
+A heavily timbered park stretched up in a gentle slope,
+thickening into a grove at the highest point. From amid the
+branches there jutted out the grey gables and high roof-tree of a
+very old mansion.
+
+"Stoke Moran?" said he.
+
+"Yes, sir, that be the house of Dr. Grimesby Roylott," remarked
+the driver.
+
+"There is some building going on there," said Holmes; "that is
+where we are going."
+
+"There's the village," said the driver, pointing to a cluster of
+roofs some distance to the left; "but if you want to get to the
+house, you'll find it shorter to get over this stile, and so by
+the foot-path over the fields. There it is, where the lady is
+walking."
+
+"And the lady, I fancy, is Miss Stoner," observed Holmes, shading
+his eyes. "Yes, I think we had better do as you suggest."
+
+We got off, paid our fare, and the trap rattled back on its way
+to Leatherhead.
+
+"I thought it as well," said Holmes as we climbed the stile,
+"that this fellow should think we had come here as architects, or
+on some definite business. It may stop his gossip.
+Good-afternoon, Miss Stoner. You see that we have been as good as
+our word."
+
+Our client of the morning had hurried forward to meet us with a
+face which spoke her joy. "I have been waiting so eagerly for
+you," she cried, shaking hands with us warmly. "All has turned
+out splendidly. Dr. Roylott has gone to town, and it is unlikely
+that he will be back before evening."
+
+"We have had the pleasure of making the doctor's acquaintance,"
+said Holmes, and in a few words he sketched out what had
+occurred. Miss Stoner turned white to the lips as she listened.
+
+"Good heavens!" she cried, "he has followed me, then."
+
+"So it appears."
+
+"He is so cunning that I never know when I am safe from him. What
+will he say when he returns?"
+
+"He must guard himself, for he may find that there is someone
+more cunning than himself upon his track. You must lock yourself
+up from him to-night. If he is violent, we shall take you away to
+your aunt's at Harrow. Now, we must make the best use of our
+time, so kindly take us at once to the rooms which we are to
+examine."
+
+The building was of grey, lichen-blotched stone, with a high
+central portion and two curving wings, like the claws of a crab,
+thrown out on each side. In one of these wings the windows were
+broken and blocked with wooden boards, while the roof was partly
+caved in, a picture of ruin. The central portion was in little
+better repair, but the right-hand block was comparatively modern,
+and the blinds in the windows, with the blue smoke curling up
+from the chimneys, showed that this was where the family resided.
+Some scaffolding had been erected against the end wall, and the
+stone-work had been broken into, but there were no signs of any
+workmen at the moment of our visit. Holmes walked slowly up and
+down the ill-trimmed lawn and examined with deep attention the
+outsides of the windows.
+
+"This, I take it, belongs to the room in which you used to sleep,
+the centre one to your sister's, and the one next to the main
+building to Dr. Roylott's chamber?"
+
+"Exactly so. But I am now sleeping in the middle one."
+
+"Pending the alterations, as I understand. By the way, there does
+not seem to be any very pressing need for repairs at that end
+wall."
+
+"There were none. I believe that it was an excuse to move me from
+my room."
+
+"Ah! that is suggestive. Now, on the other side of this narrow
+wing runs the corridor from which these three rooms open. There
+are windows in it, of course?"
+
+"Yes, but very small ones. Too narrow for anyone to pass
+through."
+
+"As you both locked your doors at night, your rooms were
+unapproachable from that side. Now, would you have the kindness
+to go into your room and bar your shutters?"
+
+Miss Stoner did so, and Holmes, after a careful examination
+through the open window, endeavoured in every way to force the
+shutter open, but without success. There was no slit through
+which a knife could be passed to raise the bar. Then with his
+lens he tested the hinges, but they were of solid iron, built
+firmly into the massive masonry. "Hum!" said he, scratching his
+chin in some perplexity, "my theory certainly presents some
+difficulties. No one could pass these shutters if they were
+bolted. Well, we shall see if the inside throws any light upon
+the matter."
+
+A small side door led into the whitewashed corridor from which
+the three bedrooms opened. Holmes refused to examine the third
+chamber, so we passed at once to the second, that in which Miss
+Stoner was now sleeping, and in which her sister had met with her
+fate. It was a homely little room, with a low ceiling and a
+gaping fireplace, after the fashion of old country-houses. A
+brown chest of drawers stood in one corner, a narrow
+white-counterpaned bed in another, and a dressing-table on the
+left-hand side of the window. These articles, with two small
+wicker-work chairs, made up all the furniture in the room save
+for a square of Wilton carpet in the centre. The boards round and
+the panelling of the walls were of brown, worm-eaten oak, so old
+and discoloured that it may have dated from the original building
+of the house. Holmes drew one of the chairs into a corner and sat
+silent, while his eyes travelled round and round and up and down,
+taking in every detail of the apartment.
+
+"Where does that bell communicate with?" he asked at last
+pointing to a thick bell-rope which hung down beside the bed, the
+tassel actually lying upon the pillow.
+
+"It goes to the housekeeper's room."
+
+"It looks newer than the other things?"
+
+"Yes, it was only put there a couple of years ago."
+
+"Your sister asked for it, I suppose?"
+
+"No, I never heard of her using it. We used always to get what we
+wanted for ourselves."
+
+"Indeed, it seemed unnecessary to put so nice a bell-pull there.
+You will excuse me for a few minutes while I satisfy myself as to
+this floor." He threw himself down upon his face with his lens in
+his hand and crawled swiftly backward and forward, examining
+minutely the cracks between the boards. Then he did the same with
+the wood-work with which the chamber was panelled. Finally he
+walked over to the bed and spent some time in staring at it and
+in running his eye up and down the wall. Finally he took the
+bell-rope in his hand and gave it a brisk tug.
+
+"Why, it's a dummy," said he.
+
+"Won't it ring?"
+
+"No, it is not even attached to a wire. This is very interesting.
+You can see now that it is fastened to a hook just above where
+the little opening for the ventilator is."
+
+"How very absurd! I never noticed that before."
+
+"Very strange!" muttered Holmes, pulling at the rope. "There are
+one or two very singular points about this room. For example,
+what a fool a builder must be to open a ventilator into another
+room, when, with the same trouble, he might have communicated
+with the outside air!"
+
+"That is also quite modern," said the lady.
+
+"Done about the same time as the bell-rope?" remarked Holmes.
+
+"Yes, there were several little changes carried out about that
+time."
+
+"They seem to have been of a most interesting character--dummy
+bell-ropes, and ventilators which do not ventilate. With your
+permission, Miss Stoner, we shall now carry our researches into
+the inner apartment."
+
+Dr. Grimesby Roylott's chamber was larger than that of his
+step-daughter, but was as plainly furnished. A camp-bed, a small
+wooden shelf full of books, mostly of a technical character, an
+armchair beside the bed, a plain wooden chair against the wall, a
+round table, and a large iron safe were the principal things
+which met the eye. Holmes walked slowly round and examined each
+and all of them with the keenest interest.
+
+"What's in here?" he asked, tapping the safe.
+
+"My stepfather's business papers."
+
+"Oh! you have seen inside, then?"
+
+"Only once, some years ago. I remember that it was full of
+papers."
+
+"There isn't a cat in it, for example?"
+
+"No. What a strange idea!"
+
+"Well, look at this!" He took up a small saucer of milk which
+stood on the top of it.
+
+"No; we don't keep a cat. But there is a cheetah and a baboon."
+
+"Ah, yes, of course! Well, a cheetah is just a big cat, and yet a
+saucer of milk does not go very far in satisfying its wants, I
+daresay. There is one point which I should wish to determine." He
+squatted down in front of the wooden chair and examined the seat
+of it with the greatest attention.
+
+"Thank you. That is quite settled," said he, rising and putting
+his lens in his pocket. "Hullo! Here is something interesting!"
+
+The object which had caught his eye was a small dog lash hung on
+one corner of the bed. The lash, however, was curled upon itself
+and tied so as to make a loop of whipcord.
+
+"What do you make of that, Watson?"
+
+"It's a common enough lash. But I don't know why it should be
+tied."
+
+"That is not quite so common, is it? Ah, me! it's a wicked world,
+and when a clever man turns his brains to crime it is the worst
+of all. I think that I have seen enough now, Miss Stoner, and
+with your permission we shall walk out upon the lawn."
+
+I had never seen my friend's face so grim or his brow so dark as
+it was when we turned from the scene of this investigation. We
+had walked several times up and down the lawn, neither Miss
+Stoner nor myself liking to break in upon his thoughts before he
+roused himself from his reverie.
+
+"It is very essential, Miss Stoner," said he, "that you should
+absolutely follow my advice in every respect."
+
+"I shall most certainly do so."
+
+"The matter is too serious for any hesitation. Your life may
+depend upon your compliance."
+
+"I assure you that I am in your hands."
+
+"In the first place, both my friend and I must spend the night in
+your room."
+
+Both Miss Stoner and I gazed at him in astonishment.
+
+"Yes, it must be so. Let me explain. I believe that that is the
+village inn over there?"
+
+"Yes, that is the Crown."
+
+"Very good. Your windows would be visible from there?"
+
+"Certainly."
+
+"You must confine yourself to your room, on pretence of a
+headache, when your stepfather comes back. Then when you hear him
+retire for the night, you must open the shutters of your window,
+undo the hasp, put your lamp there as a signal to us, and then
+withdraw quietly with everything which you are likely to want
+into the room which you used to occupy. I have no doubt that, in
+spite of the repairs, you could manage there for one night."
+
+"Oh, yes, easily."
+
+"The rest you will leave in our hands."
+
+"But what will you do?"
+
+"We shall spend the night in your room, and we shall investigate
+the cause of this noise which has disturbed you."
+
+"I believe, Mr. Holmes, that you have already made up your mind,"
+said Miss Stoner, laying her hand upon my companion's sleeve.
+
+"Perhaps I have."
+
+"Then, for pity's sake, tell me what was the cause of my sister's
+death."
+
+"I should prefer to have clearer proofs before I speak."
+
+"You can at least tell me whether my own thought is correct, and
+if she died from some sudden fright."
+
+"No, I do not think so. I think that there was probably some more
+tangible cause. And now, Miss Stoner, we must leave you for if
+Dr. Roylott returned and saw us our journey would be in vain.
+Good-bye, and be brave, for if you will do what I have told you,
+you may rest assured that we shall soon drive away the dangers
+that threaten you."
+
+Sherlock Holmes and I had no difficulty in engaging a bedroom and
+sitting-room at the Crown Inn. They were on the upper floor, and
+from our window we could command a view of the avenue gate, and
+of the inhabited wing of Stoke Moran Manor House. At dusk we saw
+Dr. Grimesby Roylott drive past, his huge form looming up beside
+the little figure of the lad who drove him. The boy had some
+slight difficulty in undoing the heavy iron gates, and we heard
+the hoarse roar of the doctor's voice and saw the fury with which
+he shook his clinched fists at him. The trap drove on, and a few
+minutes later we saw a sudden light spring up among the trees as
+the lamp was lit in one of the sitting-rooms.
+
+"Do you know, Watson," said Holmes as we sat together in the
+gathering darkness, "I have really some scruples as to taking you
+to-night. There is a distinct element of danger."
+
+"Can I be of assistance?"
+
+"Your presence might be invaluable."
+
+"Then I shall certainly come."
+
+"It is very kind of you."
+
+"You speak of danger. You have evidently seen more in these rooms
+than was visible to me."
+
+"No, but I fancy that I may have deduced a little more. I imagine
+that you saw all that I did."
+
+"I saw nothing remarkable save the bell-rope, and what purpose
+that could answer I confess is more than I can imagine."
+
+"You saw the ventilator, too?"
+
+"Yes, but I do not think that it is such a very unusual thing to
+have a small opening between two rooms. It was so small that a
+rat could hardly pass through."
+
+"I knew that we should find a ventilator before ever we came to
+Stoke Moran."
+
+"My dear Holmes!"
+
+"Oh, yes, I did. You remember in her statement she said that her
+sister could smell Dr. Roylott's cigar. Now, of course that
+suggested at once that there must be a communication between the
+two rooms. It could only be a small one, or it would have been
+remarked upon at the coroner's inquiry. I deduced a ventilator."
+
+"But what harm can there be in that?"
+
+"Well, there is at least a curious coincidence of dates. A
+ventilator is made, a cord is hung, and a lady who sleeps in the
+bed dies. Does not that strike you?"
+
+"I cannot as yet see any connection."
+
+"Did you observe anything very peculiar about that bed?"
+
+"No."
+
+"It was clamped to the floor. Did you ever see a bed fastened
+like that before?"
+
+"I cannot say that I have."
+
+"The lady could not move her bed. It must always be in the same
+relative position to the ventilator and to the rope--or so we may
+call it, since it was clearly never meant for a bell-pull."
+
+"Holmes," I cried, "I seem to see dimly what you are hinting at.
+We are only just in time to prevent some subtle and horrible
+crime."
+
+"Subtle enough and horrible enough. When a doctor does go wrong
+he is the first of criminals. He has nerve and he has knowledge.
+Palmer and Pritchard were among the heads of their profession.
+This man strikes even deeper, but I think, Watson, that we shall
+be able to strike deeper still. But we shall have horrors enough
+before the night is over; for goodness' sake let us have a quiet
+pipe and turn our minds for a few hours to something more
+cheerful."
+
+
+About nine o'clock the light among the trees was extinguished,
+and all was dark in the direction of the Manor House. Two hours
+passed slowly away, and then, suddenly, just at the stroke of
+eleven, a single bright light shone out right in front of us.
+
+"That is our signal," said Holmes, springing to his feet; "it
+comes from the middle window."
+
+As we passed out he exchanged a few words with the landlord,
+explaining that we were going on a late visit to an acquaintance,
+and that it was possible that we might spend the night there. A
+moment later we were out on the dark road, a chill wind blowing
+in our faces, and one yellow light twinkling in front of us
+through the gloom to guide us on our sombre errand.
+
+There was little difficulty in entering the grounds, for
+unrepaired breaches gaped in the old park wall. Making our way
+among the trees, we reached the lawn, crossed it, and were about
+to enter through the window when out from a clump of laurel
+bushes there darted what seemed to be a hideous and distorted
+child, who threw itself upon the grass with writhing limbs and
+then ran swiftly across the lawn into the darkness.
+
+"My God!" I whispered; "did you see it?"
+
+Holmes was for the moment as startled as I. His hand closed like
+a vice upon my wrist in his agitation. Then he broke into a low
+laugh and put his lips to my ear.
+
+"It is a nice household," he murmured. "That is the baboon."
+
+I had forgotten the strange pets which the doctor affected. There
+was a cheetah, too; perhaps we might find it upon our shoulders
+at any moment. I confess that I felt easier in my mind when,
+after following Holmes' example and slipping off my shoes, I
+found myself inside the bedroom. My companion noiselessly closed
+the shutters, moved the lamp onto the table, and cast his eyes
+round the room. All was as we had seen it in the daytime. Then
+creeping up to me and making a trumpet of his hand, he whispered
+into my ear again so gently that it was all that I could do to
+distinguish the words:
+
+"The least sound would be fatal to our plans."
+
+I nodded to show that I had heard.
+
+"We must sit without light. He would see it through the
+ventilator."
+
+I nodded again.
+
+"Do not go asleep; your very life may depend upon it. Have your
+pistol ready in case we should need it. I will sit on the side of
+the bed, and you in that chair."
+
+I took out my revolver and laid it on the corner of the table.
+
+Holmes had brought up a long thin cane, and this he placed upon
+the bed beside him. By it he laid the box of matches and the
+stump of a candle. Then he turned down the lamp, and we were left
+in darkness.
+
+How shall I ever forget that dreadful vigil? I could not hear a
+sound, not even the drawing of a breath, and yet I knew that my
+companion sat open-eyed, within a few feet of me, in the same
+state of nervous tension in which I was myself. The shutters cut
+off the least ray of light, and we waited in absolute darkness.
+
+From outside came the occasional cry of a night-bird, and once at
+our very window a long drawn catlike whine, which told us that
+the cheetah was indeed at liberty. Far away we could hear the
+deep tones of the parish clock, which boomed out every quarter of
+an hour. How long they seemed, those quarters! Twelve struck, and
+one and two and three, and still we sat waiting silently for
+whatever might befall.
+
+Suddenly there was the momentary gleam of a light up in the
+direction of the ventilator, which vanished immediately, but was
+succeeded by a strong smell of burning oil and heated metal.
+Someone in the next room had lit a dark-lantern. I heard a gentle
+sound of movement, and then all was silent once more, though the
+smell grew stronger. For half an hour I sat with straining ears.
+Then suddenly another sound became audible--a very gentle,
+soothing sound, like that of a small jet of steam escaping
+continually from a kettle. The instant that we heard it, Holmes
+sprang from the bed, struck a match, and lashed furiously with
+his cane at the bell-pull.
+
+"You see it, Watson?" he yelled. "You see it?"
+
+But I saw nothing. At the moment when Holmes struck the light I
+heard a low, clear whistle, but the sudden glare flashing into my
+weary eyes made it impossible for me to tell what it was at which
+my friend lashed so savagely. I could, however, see that his face
+was deadly pale and filled with horror and loathing. He had
+ceased to strike and was gazing up at the ventilator when
+suddenly there broke from the silence of the night the most
+horrible cry to which I have ever listened. It swelled up louder
+and louder, a hoarse yell of pain and fear and anger all mingled
+in the one dreadful shriek. They say that away down in the
+village, and even in the distant parsonage, that cry raised the
+sleepers from their beds. It struck cold to our hearts, and I
+stood gazing at Holmes, and he at me, until the last echoes of it
+had died away into the silence from which it rose.
+
+"What can it mean?" I gasped.
+
+"It means that it is all over," Holmes answered. "And perhaps,
+after all, it is for the best. Take your pistol, and we will
+enter Dr. Roylott's room."
+
+With a grave face he lit the lamp and led the way down the
+corridor. Twice he struck at the chamber door without any reply
+from within. Then he turned the handle and entered, I at his
+heels, with the cocked pistol in my hand.
+
+It was a singular sight which met our eyes. On the table stood a
+dark-lantern with the shutter half open, throwing a brilliant
+beam of light upon the iron safe, the door of which was ajar.
+Beside this table, on the wooden chair, sat Dr. Grimesby Roylott
+clad in a long grey dressing-gown, his bare ankles protruding
+beneath, and his feet thrust into red heelless Turkish slippers.
+Across his lap lay the short stock with the long lash which we
+had noticed during the day. His chin was cocked upward and his
+eyes were fixed in a dreadful, rigid stare at the corner of the
+ceiling. Round his brow he had a peculiar yellow band, with
+brownish speckles, which seemed to be bound tightly round his
+head. As we entered he made neither sound nor motion.
+
+"The band! the speckled band!" whispered Holmes.
+
+I took a step forward. In an instant his strange headgear began
+to move, and there reared itself from among his hair the squat
+diamond-shaped head and puffed neck of a loathsome serpent.
+
+"It is a swamp adder!" cried Holmes; "the deadliest snake in
+India. He has died within ten seconds of being bitten. Violence
+does, in truth, recoil upon the violent, and the schemer falls
+into the pit which he digs for another. Let us thrust this
+creature back into its den, and we can then remove Miss Stoner to
+some place of shelter and let the county police know what has
+happened."
+
+As he spoke he drew the dog-whip swiftly from the dead man's lap,
+and throwing the noose round the reptile's neck he drew it from
+its horrid perch and, carrying it at arm's length, threw it into
+the iron safe, which he closed upon it.
+
+Such are the true facts of the death of Dr. Grimesby Roylott, of
+Stoke Moran. It is not necessary that I should prolong a
+narrative which has already run to too great a length by telling
+how we broke the sad news to the terrified girl, how we conveyed
+her by the morning train to the care of her good aunt at Harrow,
+of how the slow process of official inquiry came to the
+conclusion that the doctor met his fate while indiscreetly
+playing with a dangerous pet. The little which I had yet to learn
+of the case was told me by Sherlock Holmes as we travelled back
+next day.
+
+"I had," said he, "come to an entirely erroneous conclusion which
+shows, my dear Watson, how dangerous it always is to reason from
+insufficient data. The presence of the gipsies, and the use of
+the word 'band,' which was used by the poor girl, no doubt, to
+explain the appearance which she had caught a hurried glimpse of
+by the light of her match, were sufficient to put me upon an
+entirely wrong scent. I can only claim the merit that I instantly
+reconsidered my position when, however, it became clear to me
+that whatever danger threatened an occupant of the room could not
+come either from the window or the door. My attention was
+speedily drawn, as I have already remarked to you, to this
+ventilator, and to the bell-rope which hung down to the bed. The
+discovery that this was a dummy, and that the bed was clamped to
+the floor, instantly gave rise to the suspicion that the rope was
+there as a bridge for something passing through the hole and
+coming to the bed. The idea of a snake instantly occurred to me,
+and when I coupled it with my knowledge that the doctor was
+furnished with a supply of creatures from India, I felt that I
+was probably on the right track. The idea of using a form of
+poison which could not possibly be discovered by any chemical
+test was just such a one as would occur to a clever and ruthless
+man who had had an Eastern training. The rapidity with which such
+a poison would take effect would also, from his point of view, be
+an advantage. It would be a sharp-eyed coroner, indeed, who could
+distinguish the two little dark punctures which would show where
+the poison fangs had done their work. Then I thought of the
+whistle. Of course he must recall the snake before the morning
+light revealed it to the victim. He had trained it, probably by
+the use of the milk which we saw, to return to him when summoned.
+He would put it through this ventilator at the hour that he
+thought best, with the certainty that it would crawl down the
+rope and land on the bed. It might or might not bite the
+occupant, perhaps she might escape every night for a week, but
+sooner or later she must fall a victim.
+
+"I had come to these conclusions before ever I had entered his
+room. An inspection of his chair showed me that he had been in
+the habit of standing on it, which of course would be necessary
+in order that he should reach the ventilator. The sight of the
+safe, the saucer of milk, and the loop of whipcord were enough to
+finally dispel any doubts which may have remained. The metallic
+clang heard by Miss Stoner was obviously caused by her stepfather
+hastily closing the door of his safe upon its terrible occupant.
+Having once made up my mind, you know the steps which I took in
+order to put the matter to the proof. I heard the creature hiss
+as I have no doubt that you did also, and I instantly lit the
+light and attacked it."
+
+"With the result of driving it through the ventilator."
+
+"And also with the result of causing it to turn upon its master
+at the other side. Some of the blows of my cane came home and
+roused its snakish temper, so that it flew upon the first person
+it saw. In this way I am no doubt indirectly responsible for Dr.
+Grimesby Roylott's death, and I cannot say that it is likely to
+weigh very heavily upon my conscience."
+
+
+
+IX. THE ADVENTURE OF THE ENGINEER'S THUMB
+
+Of all the problems which have been submitted to my friend, Mr.
+Sherlock Holmes, for solution during the years of our intimacy,
+there were only two which I was the means of introducing to his
+notice--that of Mr. Hatherley's thumb, and that of Colonel
+Warburton's madness. Of these the latter may have afforded a
+finer field for an acute and original observer, but the other was
+so strange in its inception and so dramatic in its details that
+it may be the more worthy of being placed upon record, even if it
+gave my friend fewer openings for those deductive methods of
+reasoning by which he achieved such remarkable results. The story
+has, I believe, been told more than once in the newspapers, but,
+like all such narratives, its effect is much less striking when
+set forth en bloc in a single half-column of print than when the
+facts slowly evolve before your own eyes, and the mystery clears
+gradually away as each new discovery furnishes a step which leads
+on to the complete truth. At the time the circumstances made a
+deep impression upon me, and the lapse of two years has hardly
+served to weaken the effect.
+
+It was in the summer of '89, not long after my marriage, that the
+events occurred which I am now about to summarise. I had returned
+to civil practice and had finally abandoned Holmes in his Baker
+Street rooms, although I continually visited him and occasionally
+even persuaded him to forgo his Bohemian habits so far as to come
+and visit us. My practice had steadily increased, and as I
+happened to live at no very great distance from Paddington
+Station, I got a few patients from among the officials. One of
+these, whom I had cured of a painful and lingering disease, was
+never weary of advertising my virtues and of endeavouring to send
+me on every sufferer over whom he might have any influence.
+
+One morning, at a little before seven o'clock, I was awakened by
+the maid tapping at the door to announce that two men had come
+from Paddington and were waiting in the consulting-room. I
+dressed hurriedly, for I knew by experience that railway cases
+were seldom trivial, and hastened downstairs. As I descended, my
+old ally, the guard, came out of the room and closed the door
+tightly behind him.
+
+"I've got him here," he whispered, jerking his thumb over his
+shoulder; "he's all right."
+
+"What is it, then?" I asked, for his manner suggested that it was
+some strange creature which he had caged up in my room.
+
+"It's a new patient," he whispered. "I thought I'd bring him
+round myself; then he couldn't slip away. There he is, all safe
+and sound. I must go now, Doctor; I have my dooties, just the
+same as you." And off he went, this trusty tout, without even
+giving me time to thank him.
+
+I entered my consulting-room and found a gentleman seated by the
+table. He was quietly dressed in a suit of heather tweed with a
+soft cloth cap which he had laid down upon my books. Round one of
+his hands he had a handkerchief wrapped, which was mottled all
+over with bloodstains. He was young, not more than
+five-and-twenty, I should say, with a strong, masculine face; but
+he was exceedingly pale and gave me the impression of a man who
+was suffering from some strong agitation, which it took all his
+strength of mind to control.
+
+"I am sorry to knock you up so early, Doctor," said he, "but I
+have had a very serious accident during the night. I came in by
+train this morning, and on inquiring at Paddington as to where I
+might find a doctor, a worthy fellow very kindly escorted me
+here. I gave the maid a card, but I see that she has left it upon
+the side-table."
+
+I took it up and glanced at it. "Mr. Victor Hatherley, hydraulic
+engineer, 16A, Victoria Street (3rd floor)." That was the name,
+style, and abode of my morning visitor. "I regret that I have
+kept you waiting," said I, sitting down in my library-chair. "You
+are fresh from a night journey, I understand, which is in itself
+a monotonous occupation."
+
+"Oh, my night could not be called monotonous," said he, and
+laughed. He laughed very heartily, with a high, ringing note,
+leaning back in his chair and shaking his sides. All my medical
+instincts rose up against that laugh.
+
+"Stop it!" I cried; "pull yourself together!" and I poured out
+some water from a caraffe.
+
+It was useless, however. He was off in one of those hysterical
+outbursts which come upon a strong nature when some great crisis
+is over and gone. Presently he came to himself once more, very
+weary and pale-looking.
+
+"I have been making a fool of myself," he gasped.
+
+"Not at all. Drink this." I dashed some brandy into the water,
+and the colour began to come back to his bloodless cheeks.
+
+"That's better!" said he. "And now, Doctor, perhaps you would
+kindly attend to my thumb, or rather to the place where my thumb
+used to be."
+
+He unwound the handkerchief and held out his hand. It gave even
+my hardened nerves a shudder to look at it. There were four
+protruding fingers and a horrid red, spongy surface where the
+thumb should have been. It had been hacked or torn right out from
+the roots.
+
+"Good heavens!" I cried, "this is a terrible injury. It must have
+bled considerably."
+
+"Yes, it did. I fainted when it was done, and I think that I must
+have been senseless for a long time. When I came to I found that
+it was still bleeding, so I tied one end of my handkerchief very
+tightly round the wrist and braced it up with a twig."
+
+"Excellent! You should have been a surgeon."
+
+"It is a question of hydraulics, you see, and came within my own
+province."
+
+"This has been done," said I, examining the wound, "by a very
+heavy and sharp instrument."
+
+"A thing like a cleaver," said he.
+
+"An accident, I presume?"
+
+"By no means."
+
+"What! a murderous attack?"
+
+"Very murderous indeed."
+
+"You horrify me."
+
+I sponged the wound, cleaned it, dressed it, and finally covered
+it over with cotton wadding and carbolised bandages. He lay back
+without wincing, though he bit his lip from time to time.
+
+"How is that?" I asked when I had finished.
+
+"Capital! Between your brandy and your bandage, I feel a new man.
+I was very weak, but I have had a good deal to go through."
+
+"Perhaps you had better not speak of the matter. It is evidently
+trying to your nerves."
+
+"Oh, no, not now. I shall have to tell my tale to the police;
+but, between ourselves, if it were not for the convincing
+evidence of this wound of mine, I should be surprised if they
+believed my statement, for it is a very extraordinary one, and I
+have not much in the way of proof with which to back it up; and,
+even if they believe me, the clues which I can give them are so
+vague that it is a question whether justice will be done."
+
+"Ha!" cried I, "if it is anything in the nature of a problem
+which you desire to see solved, I should strongly recommend you
+to come to my friend, Mr. Sherlock Holmes, before you go to the
+official police."
+
+"Oh, I have heard of that fellow," answered my visitor, "and I
+should be very glad if he would take the matter up, though of
+course I must use the official police as well. Would you give me
+an introduction to him?"
+
+"I'll do better. I'll take you round to him myself."
+
+"I should be immensely obliged to you."
+
+"We'll call a cab and go together. We shall just be in time to
+have a little breakfast with him. Do you feel equal to it?"
+
+"Yes; I shall not feel easy until I have told my story."
+
+"Then my servant will call a cab, and I shall be with you in an
+instant." I rushed upstairs, explained the matter shortly to my
+wife, and in five minutes was inside a hansom, driving with my
+new acquaintance to Baker Street.
+
+Sherlock Holmes was, as I expected, lounging about his
+sitting-room in his dressing-gown, reading the agony column of The
+Times and smoking his before-breakfast pipe, which was composed
+of all the plugs and dottles left from his smokes of the day
+before, all carefully dried and collected on the corner of the
+mantelpiece. He received us in his quietly genial fashion,
+ordered fresh rashers and eggs, and joined us in a hearty meal.
+When it was concluded he settled our new acquaintance upon the
+sofa, placed a pillow beneath his head, and laid a glass of
+brandy and water within his reach.
+
+"It is easy to see that your experience has been no common one,
+Mr. Hatherley," said he. "Pray, lie down there and make yourself
+absolutely at home. Tell us what you can, but stop when you are
+tired and keep up your strength with a little stimulant."
+
+"Thank you," said my patient, "but I have felt another man since
+the doctor bandaged me, and I think that your breakfast has
+completed the cure. I shall take up as little of your valuable
+time as possible, so I shall start at once upon my peculiar
+experiences."
+
+Holmes sat in his big armchair with the weary, heavy-lidded
+expression which veiled his keen and eager nature, while I sat
+opposite to him, and we listened in silence to the strange story
+which our visitor detailed to us.
+
+"You must know," said he, "that I am an orphan and a bachelor,
+residing alone in lodgings in London. By profession I am a
+hydraulic engineer, and I have had considerable experience of my
+work during the seven years that I was apprenticed to Venner &
+Matheson, the well-known firm, of Greenwich. Two years ago,
+having served my time, and having also come into a fair sum of
+money through my poor father's death, I determined to start in
+business for myself and took professional chambers in Victoria
+Street.
+
+"I suppose that everyone finds his first independent start in
+business a dreary experience. To me it has been exceptionally so.
+During two years I have had three consultations and one small
+job, and that is absolutely all that my profession has brought
+me. My gross takings amount to 27 pounds 10s. Every day, from
+nine in the morning until four in the afternoon, I waited in my
+little den, until at last my heart began to sink, and I came to
+believe that I should never have any practice at all.
+
+"Yesterday, however, just as I was thinking of leaving the
+office, my clerk entered to say there was a gentleman waiting who
+wished to see me upon business. He brought up a card, too, with
+the name of 'Colonel Lysander Stark' engraved upon it. Close at
+his heels came the colonel himself, a man rather over the middle
+size, but of an exceeding thinness. I do not think that I have
+ever seen so thin a man. His whole face sharpened away into nose
+and chin, and the skin of his cheeks was drawn quite tense over
+his outstanding bones. Yet this emaciation seemed to be his
+natural habit, and due to no disease, for his eye was bright, his
+step brisk, and his bearing assured. He was plainly but neatly
+dressed, and his age, I should judge, would be nearer forty than
+thirty.
+
+"'Mr. Hatherley?' said he, with something of a German accent.
+'You have been recommended to me, Mr. Hatherley, as being a man
+who is not only proficient in his profession but is also discreet
+and capable of preserving a secret.'
+
+"I bowed, feeling as flattered as any young man would at such an
+address. 'May I ask who it was who gave me so good a character?'
+
+"'Well, perhaps it is better that I should not tell you that just
+at this moment. I have it from the same source that you are both
+an orphan and a bachelor and are residing alone in London.'
+
+"'That is quite correct,' I answered; 'but you will excuse me if
+I say that I cannot see how all this bears upon my professional
+qualifications. I understand that it was on a professional matter
+that you wished to speak to me?'
+
+"'Undoubtedly so. But you will find that all I say is really to
+the point. I have a professional commission for you, but absolute
+secrecy is quite essential--absolute secrecy, you understand, and
+of course we may expect that more from a man who is alone than
+from one who lives in the bosom of his family.'
+
+"'If I promise to keep a secret,' said I, 'you may absolutely
+depend upon my doing so.'
+
+"He looked very hard at me as I spoke, and it seemed to me that I
+had never seen so suspicious and questioning an eye.
+
+"'Do you promise, then?' said he at last.
+
+"'Yes, I promise.'
+
+"'Absolute and complete silence before, during, and after? No
+reference to the matter at all, either in word or writing?'
+
+"'I have already given you my word.'
+
+"'Very good.' He suddenly sprang up, and darting like lightning
+across the room he flung open the door. The passage outside was
+empty.
+
+"'That's all right,' said he, coming back. 'I know that clerks are
+sometimes curious as to their master's affairs. Now we can talk
+in safety.' He drew up his chair very close to mine and began to
+stare at me again with the same questioning and thoughtful look.
+
+"A feeling of repulsion, and of something akin to fear had begun
+to rise within me at the strange antics of this fleshless man.
+Even my dread of losing a client could not restrain me from
+showing my impatience.
+
+"'I beg that you will state your business, sir,' said I; 'my time
+is of value.' Heaven forgive me for that last sentence, but the
+words came to my lips.
+
+"'How would fifty guineas for a night's work suit you?' he asked.
+
+"'Most admirably.'
+
+"'I say a night's work, but an hour's would be nearer the mark. I
+simply want your opinion about a hydraulic stamping machine which
+has got out of gear. If you show us what is wrong we shall soon
+set it right ourselves. What do you think of such a commission as
+that?'
+
+"'The work appears to be light and the pay munificent.'
+
+"'Precisely so. We shall want you to come to-night by the last
+train.'
+
+"'Where to?'
+
+"'To Eyford, in Berkshire. It is a little place near the borders
+of Oxfordshire, and within seven miles of Reading. There is a
+train from Paddington which would bring you there at about
+11:15.'
+
+"'Very good.'
+
+"'I shall come down in a carriage to meet you.'
+
+"'There is a drive, then?'
+
+"'Yes, our little place is quite out in the country. It is a good
+seven miles from Eyford Station.'
+
+"'Then we can hardly get there before midnight. I suppose there
+would be no chance of a train back. I should be compelled to stop
+the night.'
+
+"'Yes, we could easily give you a shake-down.'
+
+"'That is very awkward. Could I not come at some more convenient
+hour?'
+
+"'We have judged it best that you should come late. It is to
+recompense you for any inconvenience that we are paying to you, a
+young and unknown man, a fee which would buy an opinion from the
+very heads of your profession. Still, of course, if you would
+like to draw out of the business, there is plenty of time to do
+so.'
+
+"I thought of the fifty guineas, and of how very useful they
+would be to me. 'Not at all,' said I, 'I shall be very happy to
+accommodate myself to your wishes. I should like, however, to
+understand a little more clearly what it is that you wish me to
+do.'
+
+"'Quite so. It is very natural that the pledge of secrecy which
+we have exacted from you should have aroused your curiosity. I
+have no wish to commit you to anything without your having it all
+laid before you. I suppose that we are absolutely safe from
+eavesdroppers?'
+
+"'Entirely.'
+
+"'Then the matter stands thus. You are probably aware that
+fuller's-earth is a valuable product, and that it is only found
+in one or two places in England?'
+
+"'I have heard so.'
+
+"'Some little time ago I bought a small place--a very small
+place--within ten miles of Reading. I was fortunate enough to
+discover that there was a deposit of fuller's-earth in one of my
+fields. On examining it, however, I found that this deposit was a
+comparatively small one, and that it formed a link between two
+very much larger ones upon the right and left--both of them,
+however, in the grounds of my neighbours. These good people were
+absolutely ignorant that their land contained that which was
+quite as valuable as a gold-mine. Naturally, it was to my
+interest to buy their land before they discovered its true value,
+but unfortunately I had no capital by which I could do this. I
+took a few of my friends into the secret, however, and they
+suggested that we should quietly and secretly work our own little
+deposit and that in this way we should earn the money which would
+enable us to buy the neighbouring fields. This we have now been
+doing for some time, and in order to help us in our operations we
+erected a hydraulic press. This press, as I have already
+explained, has got out of order, and we wish your advice upon the
+subject. We guard our secret very jealously, however, and if it
+once became known that we had hydraulic engineers coming to our
+little house, it would soon rouse inquiry, and then, if the facts
+came out, it would be good-bye to any chance of getting these
+fields and carrying out our plans. That is why I have made you
+promise me that you will not tell a human being that you are
+going to Eyford to-night. I hope that I make it all plain?'
+
+"'I quite follow you,' said I. 'The only point which I could not
+quite understand was what use you could make of a hydraulic press
+in excavating fuller's-earth, which, as I understand, is dug out
+like gravel from a pit.'
+
+"'Ah!' said he carelessly, 'we have our own process. We compress
+the earth into bricks, so as to remove them without revealing
+what they are. But that is a mere detail. I have taken you fully
+into my confidence now, Mr. Hatherley, and I have shown you how I
+trust you.' He rose as he spoke. 'I shall expect you, then, at
+Eyford at 11:15.'
+
+"'I shall certainly be there.'
+
+"'And not a word to a soul.' He looked at me with a last long,
+questioning gaze, and then, pressing my hand in a cold, dank
+grasp, he hurried from the room.
+
+"Well, when I came to think it all over in cool blood I was very
+much astonished, as you may both think, at this sudden commission
+which had been intrusted to me. On the one hand, of course, I was
+glad, for the fee was at least tenfold what I should have asked
+had I set a price upon my own services, and it was possible that
+this order might lead to other ones. On the other hand, the face
+and manner of my patron had made an unpleasant impression upon
+me, and I could not think that his explanation of the
+fuller's-earth was sufficient to explain the necessity for my
+coming at midnight, and his extreme anxiety lest I should tell
+anyone of my errand. However, I threw all fears to the winds, ate
+a hearty supper, drove to Paddington, and started off, having
+obeyed to the letter the injunction as to holding my tongue.
+
+"At Reading I had to change not only my carriage but my station.
+However, I was in time for the last train to Eyford, and I
+reached the little dim-lit station after eleven o'clock. I was the
+only passenger who got out there, and there was no one upon the
+platform save a single sleepy porter with a lantern. As I passed
+out through the wicket gate, however, I found my acquaintance of
+the morning waiting in the shadow upon the other side. Without a
+word he grasped my arm and hurried me into a carriage, the door
+of which was standing open. He drew up the windows on either
+side, tapped on the wood-work, and away we went as fast as the
+horse could go."
+
+"One horse?" interjected Holmes.
+
+"Yes, only one."
+
+"Did you observe the colour?"
+
+"Yes, I saw it by the side-lights when I was stepping into the
+carriage. It was a chestnut."
+
+"Tired-looking or fresh?"
+
+"Oh, fresh and glossy."
+
+"Thank you. I am sorry to have interrupted you. Pray continue
+your most interesting statement."
+
+"Away we went then, and we drove for at least an hour. Colonel
+Lysander Stark had said that it was only seven miles, but I
+should think, from the rate that we seemed to go, and from the
+time that we took, that it must have been nearer twelve. He sat
+at my side in silence all the time, and I was aware, more than
+once when I glanced in his direction, that he was looking at me
+with great intensity. The country roads seem to be not very good
+in that part of the world, for we lurched and jolted terribly. I
+tried to look out of the windows to see something of where we
+were, but they were made of frosted glass, and I could make out
+nothing save the occasional bright blur of a passing light. Now
+and then I hazarded some remark to break the monotony of the
+journey, but the colonel answered only in monosyllables, and the
+conversation soon flagged. At last, however, the bumping of the
+road was exchanged for the crisp smoothness of a gravel-drive,
+and the carriage came to a stand. Colonel Lysander Stark sprang
+out, and, as I followed after him, pulled me swiftly into a porch
+which gaped in front of us. We stepped, as it were, right out of
+the carriage and into the hall, so that I failed to catch the
+most fleeting glance of the front of the house. The instant that
+I had crossed the threshold the door slammed heavily behind us,
+and I heard faintly the rattle of the wheels as the carriage
+drove away.
+
+"It was pitch dark inside the house, and the colonel fumbled
+about looking for matches and muttering under his breath.
+Suddenly a door opened at the other end of the passage, and a
+long, golden bar of light shot out in our direction. It grew
+broader, and a woman appeared with a lamp in her hand, which she
+held above her head, pushing her face forward and peering at us.
+I could see that she was pretty, and from the gloss with which
+the light shone upon her dark dress I knew that it was a rich
+material. She spoke a few words in a foreign tongue in a tone as
+though asking a question, and when my companion answered in a
+gruff monosyllable she gave such a start that the lamp nearly
+fell from her hand. Colonel Stark went up to her, whispered
+something in her ear, and then, pushing her back into the room
+from whence she had come, he walked towards me again with the
+lamp in his hand.
+
+"'Perhaps you will have the kindness to wait in this room for a
+few minutes,' said he, throwing open another door. It was a
+quiet, little, plainly furnished room, with a round table in the
+centre, on which several German books were scattered. Colonel
+Stark laid down the lamp on the top of a harmonium beside the
+door. 'I shall not keep you waiting an instant,' said he, and
+vanished into the darkness.
+
+"I glanced at the books upon the table, and in spite of my
+ignorance of German I could see that two of them were treatises
+on science, the others being volumes of poetry. Then I walked
+across to the window, hoping that I might catch some glimpse of
+the country-side, but an oak shutter, heavily barred, was folded
+across it. It was a wonderfully silent house. There was an old
+clock ticking loudly somewhere in the passage, but otherwise
+everything was deadly still. A vague feeling of uneasiness began
+to steal over me. Who were these German people, and what were
+they doing living in this strange, out-of-the-way place? And
+where was the place? I was ten miles or so from Eyford, that was
+all I knew, but whether north, south, east, or west I had no
+idea. For that matter, Reading, and possibly other large towns,
+were within that radius, so the place might not be so secluded,
+after all. Yet it was quite certain, from the absolute stillness,
+that we were in the country. I paced up and down the room,
+humming a tune under my breath to keep up my spirits and feeling
+that I was thoroughly earning my fifty-guinea fee.
+
+"Suddenly, without any preliminary sound in the midst of the
+utter stillness, the door of my room swung slowly open. The woman
+was standing in the aperture, the darkness of the hall behind
+her, the yellow light from my lamp beating upon her eager and
+beautiful face. I could see at a glance that she was sick with
+fear, and the sight sent a chill to my own heart. She held up one
+shaking finger to warn me to be silent, and she shot a few
+whispered words of broken English at me, her eyes glancing back,
+like those of a frightened horse, into the gloom behind her.
+
+"'I would go,' said she, trying hard, as it seemed to me, to
+speak calmly; 'I would go. I should not stay here. There is no
+good for you to do.'
+
+"'But, madam,' said I, 'I have not yet done what I came for. I
+cannot possibly leave until I have seen the machine.'
+
+"'It is not worth your while to wait,' she went on. 'You can pass
+through the door; no one hinders.' And then, seeing that I smiled
+and shook my head, she suddenly threw aside her constraint and
+made a step forward, with her hands wrung together. 'For the love
+of Heaven!' she whispered, 'get away from here before it is too
+late!'
+
+"But I am somewhat headstrong by nature, and the more ready to
+engage in an affair when there is some obstacle in the way. I
+thought of my fifty-guinea fee, of my wearisome journey, and of
+the unpleasant night which seemed to be before me. Was it all to
+go for nothing? Why should I slink away without having carried
+out my commission, and without the payment which was my due? This
+woman might, for all I knew, be a monomaniac. With a stout
+bearing, therefore, though her manner had shaken me more than I
+cared to confess, I still shook my head and declared my intention
+of remaining where I was. She was about to renew her entreaties
+when a door slammed overhead, and the sound of several footsteps
+was heard upon the stairs. She listened for an instant, threw up
+her hands with a despairing gesture, and vanished as suddenly and
+as noiselessly as she had come.
+
+"The newcomers were Colonel Lysander Stark and a short thick man
+with a chinchilla beard growing out of the creases of his double
+chin, who was introduced to me as Mr. Ferguson.
+
+"'This is my secretary and manager,' said the colonel. 'By the
+way, I was under the impression that I left this door shut just
+now. I fear that you have felt the draught.'
+
+"'On the contrary,' said I, 'I opened the door myself because I
+felt the room to be a little close.'
+
+"He shot one of his suspicious looks at me. 'Perhaps we had
+better proceed to business, then,' said he. 'Mr. Ferguson and I
+will take you up to see the machine.'
+
+"'I had better put my hat on, I suppose.'
+
+"'Oh, no, it is in the house.'
+
+"'What, you dig fuller's-earth in the house?'
+
+"'No, no. This is only where we compress it. But never mind that.
+All we wish you to do is to examine the machine and to let us
+know what is wrong with it.'
+
+"We went upstairs together, the colonel first with the lamp, the
+fat manager and I behind him. It was a labyrinth of an old house,
+with corridors, passages, narrow winding staircases, and little
+low doors, the thresholds of which were hollowed out by the
+generations who had crossed them. There were no carpets and no
+signs of any furniture above the ground floor, while the plaster
+was peeling off the walls, and the damp was breaking through in
+green, unhealthy blotches. I tried to put on as unconcerned an
+air as possible, but I had not forgotten the warnings of the
+lady, even though I disregarded them, and I kept a keen eye upon
+my two companions. Ferguson appeared to be a morose and silent
+man, but I could see from the little that he said that he was at
+least a fellow-countryman.
+
+"Colonel Lysander Stark stopped at last before a low door, which
+he unlocked. Within was a small, square room, in which the three
+of us could hardly get at one time. Ferguson remained outside,
+and the colonel ushered me in.
+
+"'We are now,' said he, 'actually within the hydraulic press, and
+it would be a particularly unpleasant thing for us if anyone were
+to turn it on. The ceiling of this small chamber is really the
+end of the descending piston, and it comes down with the force of
+many tons upon this metal floor. There are small lateral columns
+of water outside which receive the force, and which transmit and
+multiply it in the manner which is familiar to you. The machine
+goes readily enough, but there is some stiffness in the working
+of it, and it has lost a little of its force. Perhaps you will
+have the goodness to look it over and to show us how we can set
+it right.'
+
+"I took the lamp from him, and I examined the machine very
+thoroughly. It was indeed a gigantic one, and capable of
+exercising enormous pressure. When I passed outside, however, and
+pressed down the levers which controlled it, I knew at once by
+the whishing sound that there was a slight leakage, which allowed
+a regurgitation of water through one of the side cylinders. An
+examination showed that one of the india-rubber bands which was
+round the head of a driving-rod had shrunk so as not quite to
+fill the socket along which it worked. This was clearly the cause
+of the loss of power, and I pointed it out to my companions, who
+followed my remarks very carefully and asked several practical
+questions as to how they should proceed to set it right. When I
+had made it clear to them, I returned to the main chamber of the
+machine and took a good look at it to satisfy my own curiosity.
+It was obvious at a glance that the story of the fuller's-earth
+was the merest fabrication, for it would be absurd to suppose
+that so powerful an engine could be designed for so inadequate a
+purpose. The walls were of wood, but the floor consisted of a
+large iron trough, and when I came to examine it I could see a
+crust of metallic deposit all over it. I had stooped and was
+scraping at this to see exactly what it was when I heard a
+muttered exclamation in German and saw the cadaverous face of the
+colonel looking down at me.
+
+"'What are you doing there?' he asked.
+
+"I felt angry at having been tricked by so elaborate a story as
+that which he had told me. 'I was admiring your fuller's-earth,'
+said I; 'I think that I should be better able to advise you as to
+your machine if I knew what the exact purpose was for which it
+was used.'
+
+"The instant that I uttered the words I regretted the rashness of
+my speech. His face set hard, and a baleful light sprang up in
+his grey eyes.
+
+"'Very well,' said he, 'you shall know all about the machine.' He
+took a step backward, slammed the little door, and turned the key
+in the lock. I rushed towards it and pulled at the handle, but it
+was quite secure, and did not give in the least to my kicks and
+shoves. 'Hullo!' I yelled. 'Hullo! Colonel! Let me out!'
+
+"And then suddenly in the silence I heard a sound which sent my
+heart into my mouth. It was the clank of the levers and the swish
+of the leaking cylinder. He had set the engine at work. The lamp
+still stood upon the floor where I had placed it when examining
+the trough. By its light I saw that the black ceiling was coming
+down upon me, slowly, jerkily, but, as none knew better than
+myself, with a force which must within a minute grind me to a
+shapeless pulp. I threw myself, screaming, against the door, and
+dragged with my nails at the lock. I implored the colonel to let
+me out, but the remorseless clanking of the levers drowned my
+cries. The ceiling was only a foot or two above my head, and with
+my hand upraised I could feel its hard, rough surface. Then it
+flashed through my mind that the pain of my death would depend
+very much upon the position in which I met it. If I lay on my
+face the weight would come upon my spine, and I shuddered to
+think of that dreadful snap. Easier the other way, perhaps; and
+yet, had I the nerve to lie and look up at that deadly black
+shadow wavering down upon me? Already I was unable to stand
+erect, when my eye caught something which brought a gush of hope
+back to my heart.
+
+"I have said that though the floor and ceiling were of iron, the
+walls were of wood. As I gave a last hurried glance around, I saw
+a thin line of yellow light between two of the boards, which
+broadened and broadened as a small panel was pushed backward. For
+an instant I could hardly believe that here was indeed a door
+which led away from death. The next instant I threw myself
+through, and lay half-fainting upon the other side. The panel had
+closed again behind me, but the crash of the lamp, and a few
+moments afterwards the clang of the two slabs of metal, told me
+how narrow had been my escape.
+
+"I was recalled to myself by a frantic plucking at my wrist, and
+I found myself lying upon the stone floor of a narrow corridor,
+while a woman bent over me and tugged at me with her left hand,
+while she held a candle in her right. It was the same good friend
+whose warning I had so foolishly rejected.
+
+"'Come! come!' she cried breathlessly. 'They will be here in a
+moment. They will see that you are not there. Oh, do not waste
+the so-precious time, but come!'
+
+"This time, at least, I did not scorn her advice. I staggered to
+my feet and ran with her along the corridor and down a winding
+stair. The latter led to another broad passage, and just as we
+reached it we heard the sound of running feet and the shouting of
+two voices, one answering the other from the floor on which we
+were and from the one beneath. My guide stopped and looked about
+her like one who is at her wit's end. Then she threw open a door
+which led into a bedroom, through the window of which the moon
+was shining brightly.
+
+"'It is your only chance,' said she. 'It is high, but it may be
+that you can jump it.'
+
+"As she spoke a light sprang into view at the further end of the
+passage, and I saw the lean figure of Colonel Lysander Stark
+rushing forward with a lantern in one hand and a weapon like a
+butcher's cleaver in the other. I rushed across the bedroom,
+flung open the window, and looked out. How quiet and sweet and
+wholesome the garden looked in the moonlight, and it could not be
+more than thirty feet down. I clambered out upon the sill, but I
+hesitated to jump until I should have heard what passed between
+my saviour and the ruffian who pursued me. If she were ill-used,
+then at any risks I was determined to go back to her assistance.
+The thought had hardly flashed through my mind before he was at
+the door, pushing his way past her; but she threw her arms round
+him and tried to hold him back.
+
+"'Fritz! Fritz!' she cried in English, 'remember your promise
+after the last time. You said it should not be again. He will be
+silent! Oh, he will be silent!'
+
+"'You are mad, Elise!' he shouted, struggling to break away from
+her. 'You will be the ruin of us. He has seen too much. Let me
+pass, I say!' He dashed her to one side, and, rushing to the
+window, cut at me with his heavy weapon. I had let myself go, and
+was hanging by the hands to the sill, when his blow fell. I was
+conscious of a dull pain, my grip loosened, and I fell into the
+garden below.
+
+"I was shaken but not hurt by the fall; so I picked myself up and
+rushed off among the bushes as hard as I could run, for I
+understood that I was far from being out of danger yet. Suddenly,
+however, as I ran, a deadly dizziness and sickness came over me.
+I glanced down at my hand, which was throbbing painfully, and
+then, for the first time, saw that my thumb had been cut off and
+that the blood was pouring from my wound. I endeavoured to tie my
+handkerchief round it, but there came a sudden buzzing in my
+ears, and next moment I fell in a dead faint among the
+rose-bushes.
+
+"How long I remained unconscious I cannot tell. It must have been
+a very long time, for the moon had sunk, and a bright morning was
+breaking when I came to myself. My clothes were all sodden with
+dew, and my coat-sleeve was drenched with blood from my wounded
+thumb. The smarting of it recalled in an instant all the
+particulars of my night's adventure, and I sprang to my feet with
+the feeling that I might hardly yet be safe from my pursuers. But
+to my astonishment, when I came to look round me, neither house
+nor garden were to be seen. I had been lying in an angle of the
+hedge close by the highroad, and just a little lower down was a
+long building, which proved, upon my approaching it, to be the
+very station at which I had arrived upon the previous night. Were
+it not for the ugly wound upon my hand, all that had passed
+during those dreadful hours might have been an evil dream.
+
+"Half dazed, I went into the station and asked about the morning
+train. There would be one to Reading in less than an hour. The
+same porter was on duty, I found, as had been there when I
+arrived. I inquired of him whether he had ever heard of Colonel
+Lysander Stark. The name was strange to him. Had he observed a
+carriage the night before waiting for me? No, he had not. Was
+there a police-station anywhere near? There was one about three
+miles off.
+
+"It was too far for me to go, weak and ill as I was. I determined
+to wait until I got back to town before telling my story to the
+police. It was a little past six when I arrived, so I went first
+to have my wound dressed, and then the doctor was kind enough to
+bring me along here. I put the case into your hands and shall do
+exactly what you advise."
+
+We both sat in silence for some little time after listening to
+this extraordinary narrative. Then Sherlock Holmes pulled down
+from the shelf one of the ponderous commonplace books in which he
+placed his cuttings.
+
+"Here is an advertisement which will interest you," said he. "It
+appeared in all the papers about a year ago. Listen to this:
+'Lost, on the 9th inst., Mr. Jeremiah Hayling, aged
+twenty-six, a hydraulic engineer. Left his lodgings at ten
+o'clock at night, and has not been heard of since. Was
+dressed in,' etc., etc. Ha! That represents the last time that
+the colonel needed to have his machine overhauled, I fancy."
+
+"Good heavens!" cried my patient. "Then that explains what the
+girl said."
+
+"Undoubtedly. It is quite clear that the colonel was a cool and
+desperate man, who was absolutely determined that nothing should
+stand in the way of his little game, like those out-and-out
+pirates who will leave no survivor from a captured ship. Well,
+every moment now is precious, so if you feel equal to it we shall
+go down to Scotland Yard at once as a preliminary to starting for
+Eyford."
+
+Some three hours or so afterwards we were all in the train
+together, bound from Reading to the little Berkshire village.
+There were Sherlock Holmes, the hydraulic engineer, Inspector
+Bradstreet, of Scotland Yard, a plain-clothes man, and myself.
+Bradstreet had spread an ordnance map of the county out upon the
+seat and was busy with his compasses drawing a circle with Eyford
+for its centre.
+
+"There you are," said he. "That circle is drawn at a radius of
+ten miles from the village. The place we want must be somewhere
+near that line. You said ten miles, I think, sir."
+
+"It was an hour's good drive."
+
+"And you think that they brought you back all that way when you
+were unconscious?"
+
+"They must have done so. I have a confused memory, too, of having
+been lifted and conveyed somewhere."
+
+"What I cannot understand," said I, "is why they should have
+spared you when they found you lying fainting in the garden.
+Perhaps the villain was softened by the woman's entreaties."
+
+"I hardly think that likely. I never saw a more inexorable face
+in my life."
+
+"Oh, we shall soon clear up all that," said Bradstreet. "Well, I
+have drawn my circle, and I only wish I knew at what point upon
+it the folk that we are in search of are to be found."
+
+"I think I could lay my finger on it," said Holmes quietly.
+
+"Really, now!" cried the inspector, "you have formed your
+opinion! Come, now, we shall see who agrees with you. I say it is
+south, for the country is more deserted there."
+
+"And I say east," said my patient.
+
+"I am for west," remarked the plain-clothes man. "There are
+several quiet little villages up there."
+
+"And I am for north," said I, "because there are no hills there,
+and our friend says that he did not notice the carriage go up
+any."
+
+"Come," cried the inspector, laughing; "it's a very pretty
+diversity of opinion. We have boxed the compass among us. Who do
+you give your casting vote to?"
+
+"You are all wrong."
+
+"But we can't all be."
+
+"Oh, yes, you can. This is my point." He placed his finger in the
+centre of the circle. "This is where we shall find them."
+
+"But the twelve-mile drive?" gasped Hatherley.
+
+"Six out and six back. Nothing simpler. You say yourself that the
+horse was fresh and glossy when you got in. How could it be that
+if it had gone twelve miles over heavy roads?"
+
+"Indeed, it is a likely ruse enough," observed Bradstreet
+thoughtfully. "Of course there can be no doubt as to the nature
+of this gang."
+
+"None at all," said Holmes. "They are coiners on a large scale,
+and have used the machine to form the amalgam which has taken the
+place of silver."
+
+"We have known for some time that a clever gang was at work,"
+said the inspector. "They have been turning out half-crowns by
+the thousand. We even traced them as far as Reading, but could
+get no farther, for they had covered their traces in a way that
+showed that they were very old hands. But now, thanks to this
+lucky chance, I think that we have got them right enough."
+
+But the inspector was mistaken, for those criminals were not
+destined to fall into the hands of justice. As we rolled into
+Eyford Station we saw a gigantic column of smoke which streamed
+up from behind a small clump of trees in the neighbourhood and
+hung like an immense ostrich feather over the landscape.
+
+"A house on fire?" asked Bradstreet as the train steamed off
+again on its way.
+
+"Yes, sir!" said the station-master.
+
+"When did it break out?"
+
+"I hear that it was during the night, sir, but it has got worse,
+and the whole place is in a blaze."
+
+"Whose house is it?"
+
+"Dr. Becher's."
+
+"Tell me," broke in the engineer, "is Dr. Becher a German, very
+thin, with a long, sharp nose?"
+
+The station-master laughed heartily. "No, sir, Dr. Becher is an
+Englishman, and there isn't a man in the parish who has a
+better-lined waistcoat. But he has a gentleman staying with him,
+a patient, as I understand, who is a foreigner, and he looks as
+if a little good Berkshire beef would do him no harm."
+
+The station-master had not finished his speech before we were all
+hastening in the direction of the fire. The road topped a low
+hill, and there was a great widespread whitewashed building in
+front of us, spouting fire at every chink and window, while in
+the garden in front three fire-engines were vainly striving to
+keep the flames under.
+
+"That's it!" cried Hatherley, in intense excitement. "There is
+the gravel-drive, and there are the rose-bushes where I lay. That
+second window is the one that I jumped from."
+
+"Well, at least," said Holmes, "you have had your revenge upon
+them. There can be no question that it was your oil-lamp which,
+when it was crushed in the press, set fire to the wooden walls,
+though no doubt they were too excited in the chase after you to
+observe it at the time. Now keep your eyes open in this crowd for
+your friends of last night, though I very much fear that they are
+a good hundred miles off by now."
+
+And Holmes' fears came to be realised, for from that day to this
+no word has ever been heard either of the beautiful woman, the
+sinister German, or the morose Englishman. Early that morning a
+peasant had met a cart containing several people and some very
+bulky boxes driving rapidly in the direction of Reading, but
+there all traces of the fugitives disappeared, and even Holmes'
+ingenuity failed ever to discover the least clue as to their
+whereabouts.
+
+The firemen had been much perturbed at the strange arrangements
+which they had found within, and still more so by discovering a
+newly severed human thumb upon a window-sill of the second floor.
+About sunset, however, their efforts were at last successful, and
+they subdued the flames, but not before the roof had fallen in,
+and the whole place been reduced to such absolute ruin that, save
+some twisted cylinders and iron piping, not a trace remained of
+the machinery which had cost our unfortunate acquaintance so
+dearly. Large masses of nickel and of tin were discovered stored
+in an out-house, but no coins were to be found, which may have
+explained the presence of those bulky boxes which have been
+already referred to.
+
+How our hydraulic engineer had been conveyed from the garden to
+the spot where he recovered his senses might have remained
+forever a mystery were it not for the soft mould, which told us a
+very plain tale. He had evidently been carried down by two
+persons, one of whom had remarkably small feet and the other
+unusually large ones. On the whole, it was most probable that the
+silent Englishman, being less bold or less murderous than his
+companion, had assisted the woman to bear the unconscious man out
+of the way of danger.
+
+"Well," said our engineer ruefully as we took our seats to return
+once more to London, "it has been a pretty business for me! I
+have lost my thumb and I have lost a fifty-guinea fee, and what
+have I gained?"
+
+"Experience," said Holmes, laughing. "Indirectly it may be of
+value, you know; you have only to put it into words to gain the
+reputation of being excellent company for the remainder of your
+existence."
+
+
+
+X. THE ADVENTURE OF THE NOBLE BACHELOR
+
+The Lord St. Simon marriage, and its curious termination, have
+long ceased to be a subject of interest in those exalted circles
+in which the unfortunate bridegroom moves. Fresh scandals have
+eclipsed it, and their more piquant details have drawn the
+gossips away from this four-year-old drama. As I have reason to
+believe, however, that the full facts have never been revealed to
+the general public, and as my friend Sherlock Holmes had a
+considerable share in clearing the matter up, I feel that no
+memoir of him would be complete without some little sketch of
+this remarkable episode.
+
+It was a few weeks before my own marriage, during the days when I
+was still sharing rooms with Holmes in Baker Street, that he came
+home from an afternoon stroll to find a letter on the table
+waiting for him. I had remained indoors all day, for the weather
+had taken a sudden turn to rain, with high autumnal winds, and
+the Jezail bullet which I had brought back in one of my limbs as
+a relic of my Afghan campaign throbbed with dull persistence.
+With my body in one easy-chair and my legs upon another, I had
+surrounded myself with a cloud of newspapers until at last,
+saturated with the news of the day, I tossed them all aside and
+lay listless, watching the huge crest and monogram upon the
+envelope upon the table and wondering lazily who my friend's
+noble correspondent could be.
+
+"Here is a very fashionable epistle," I remarked as he entered.
+"Your morning letters, if I remember right, were from a
+fish-monger and a tide-waiter."
+
+"Yes, my correspondence has certainly the charm of variety," he
+answered, smiling, "and the humbler are usually the more
+interesting. This looks like one of those unwelcome social
+summonses which call upon a man either to be bored or to lie."
+
+He broke the seal and glanced over the contents.
+
+"Oh, come, it may prove to be something of interest, after all."
+
+"Not social, then?"
+
+"No, distinctly professional."
+
+"And from a noble client?"
+
+"One of the highest in England."
+
+"My dear fellow, I congratulate you."
+
+"I assure you, Watson, without affectation, that the status of my
+client is a matter of less moment to me than the interest of his
+case. It is just possible, however, that that also may not be
+wanting in this new investigation. You have been reading the
+papers diligently of late, have you not?"
+
+"It looks like it," said I ruefully, pointing to a huge bundle in
+the corner. "I have had nothing else to do."
+
+"It is fortunate, for you will perhaps be able to post me up. I
+read nothing except the criminal news and the agony column. The
+latter is always instructive. But if you have followed recent
+events so closely you must have read about Lord St. Simon and his
+wedding?"
+
+"Oh, yes, with the deepest interest."
+
+"That is well. The letter which I hold in my hand is from Lord
+St. Simon. I will read it to you, and in return you must turn
+over these papers and let me have whatever bears upon the matter.
+This is what he says:
+
+"'MY DEAR MR. SHERLOCK HOLMES:--Lord Backwater tells me that I
+may place implicit reliance upon your judgment and discretion. I
+have determined, therefore, to call upon you and to consult you
+in reference to the very painful event which has occurred in
+connection with my wedding. Mr. Lestrade, of Scotland Yard, is
+acting already in the matter, but he assures me that he sees no
+objection to your co-operation, and that he even thinks that
+it might be of some assistance. I will call at four o'clock in
+the afternoon, and, should you have any other engagement at that
+time, I hope that you will postpone it, as this matter is of
+paramount importance. Yours faithfully, ST. SIMON.'
+
+"It is dated from Grosvenor Mansions, written with a quill pen,
+and the noble lord has had the misfortune to get a smear of ink
+upon the outer side of his right little finger," remarked Holmes
+as he folded up the epistle.
+
+"He says four o'clock. It is three now. He will be here in an
+hour."
+
+"Then I have just time, with your assistance, to get clear upon
+the subject. Turn over those papers and arrange the extracts in
+their order of time, while I take a glance as to who our client
+is." He picked a red-covered volume from a line of books of
+reference beside the mantelpiece. "Here he is," said he, sitting
+down and flattening it out upon his knee. "'Lord Robert Walsingham
+de Vere St. Simon, second son of the Duke of Balmoral.' Hum! 'Arms:
+Azure, three caltrops in chief over a fess sable. Born in 1846.'
+He's forty-one years of age, which is mature for marriage. Was
+Under-Secretary for the colonies in a late administration. The
+Duke, his father, was at one time Secretary for Foreign Affairs.
+They inherit Plantagenet blood by direct descent, and Tudor on
+the distaff side. Ha! Well, there is nothing very instructive in
+all this. I think that I must turn to you Watson, for something
+more solid."
+
+"I have very little difficulty in finding what I want," said I,
+"for the facts are quite recent, and the matter struck me as
+remarkable. I feared to refer them to you, however, as I knew
+that you had an inquiry on hand and that you disliked the
+intrusion of other matters."
+
+"Oh, you mean the little problem of the Grosvenor Square
+furniture van. That is quite cleared up now--though, indeed, it
+was obvious from the first. Pray give me the results of your
+newspaper selections."
+
+"Here is the first notice which I can find. It is in the personal
+column of the Morning Post, and dates, as you see, some weeks
+back: 'A marriage has been arranged,' it says, 'and will, if
+rumour is correct, very shortly take place, between Lord Robert
+St. Simon, second son of the Duke of Balmoral, and Miss Hatty
+Doran, the only daughter of Aloysius Doran. Esq., of San
+Francisco, Cal., U.S.A.' That is all."
+
+"Terse and to the point," remarked Holmes, stretching his long,
+thin legs towards the fire.
+
+"There was a paragraph amplifying this in one of the society
+papers of the same week. Ah, here it is: 'There will soon be a
+call for protection in the marriage market, for the present
+free-trade principle appears to tell heavily against our home
+product. One by one the management of the noble houses of Great
+Britain is passing into the hands of our fair cousins from across
+the Atlantic. An important addition has been made during the last
+week to the list of the prizes which have been borne away by
+these charming invaders. Lord St. Simon, who has shown himself
+for over twenty years proof against the little god's arrows, has
+now definitely announced his approaching marriage with Miss Hatty
+Doran, the fascinating daughter of a California millionaire. Miss
+Doran, whose graceful figure and striking face attracted much
+attention at the Westbury House festivities, is an only child,
+and it is currently reported that her dowry will run to
+considerably over the six figures, with expectancies for the
+future. As it is an open secret that the Duke of Balmoral has
+been compelled to sell his pictures within the last few years,
+and as Lord St. Simon has no property of his own save the small
+estate of Birchmoor, it is obvious that the Californian heiress
+is not the only gainer by an alliance which will enable her to
+make the easy and common transition from a Republican lady to a
+British peeress.'"
+
+"Anything else?" asked Holmes, yawning.
+
+"Oh, yes; plenty. Then there is another note in the Morning Post
+to say that the marriage would be an absolutely quiet one, that it
+would be at St. George's, Hanover Square, that only half a dozen
+intimate friends would be invited, and that the party would
+return to the furnished house at Lancaster Gate which has been
+taken by Mr. Aloysius Doran. Two days later--that is, on
+Wednesday last--there is a curt announcement that the wedding had
+taken place, and that the honeymoon would be passed at Lord
+Backwater's place, near Petersfield. Those are all the notices
+which appeared before the disappearance of the bride."
+
+"Before the what?" asked Holmes with a start.
+
+"The vanishing of the lady."
+
+"When did she vanish, then?"
+
+"At the wedding breakfast."
+
+"Indeed. This is more interesting than it promised to be; quite
+dramatic, in fact."
+
+"Yes; it struck me as being a little out of the common."
+
+"They often vanish before the ceremony, and occasionally during
+the honeymoon; but I cannot call to mind anything quite so prompt
+as this. Pray let me have the details."
+
+"I warn you that they are very incomplete."
+
+"Perhaps we may make them less so."
+
+"Such as they are, they are set forth in a single article of a
+morning paper of yesterday, which I will read to you. It is
+headed, 'Singular Occurrence at a Fashionable Wedding':
+
+"'The family of Lord Robert St. Simon has been thrown into the
+greatest consternation by the strange and painful episodes which
+have taken place in connection with his wedding. The ceremony, as
+shortly announced in the papers of yesterday, occurred on the
+previous morning; but it is only now that it has been possible to
+confirm the strange rumours which have been so persistently
+floating about. In spite of the attempts of the friends to hush
+the matter up, so much public attention has now been drawn to it
+that no good purpose can be served by affecting to disregard what
+is a common subject for conversation.
+
+"'The ceremony, which was performed at St. George's, Hanover
+Square, was a very quiet one, no one being present save the
+father of the bride, Mr. Aloysius Doran, the Duchess of Balmoral,
+Lord Backwater, Lord Eustace and Lady Clara St. Simon (the
+younger brother and sister of the bridegroom), and Lady Alicia
+Whittington. The whole party proceeded afterwards to the house of
+Mr. Aloysius Doran, at Lancaster Gate, where breakfast had been
+prepared. It appears that some little trouble was caused by a
+woman, whose name has not been ascertained, who endeavoured to
+force her way into the house after the bridal party, alleging
+that she had some claim upon Lord St. Simon. It was only after a
+painful and prolonged scene that she was ejected by the butler
+and the footman. The bride, who had fortunately entered the house
+before this unpleasant interruption, had sat down to breakfast
+with the rest, when she complained of a sudden indisposition and
+retired to her room. Her prolonged absence having caused some
+comment, her father followed her, but learned from her maid that
+she had only come up to her chamber for an instant, caught up an
+ulster and bonnet, and hurried down to the passage. One of the
+footmen declared that he had seen a lady leave the house thus
+apparelled, but had refused to credit that it was his mistress,
+believing her to be with the company. On ascertaining that his
+daughter had disappeared, Mr. Aloysius Doran, in conjunction with
+the bridegroom, instantly put themselves in communication with
+the police, and very energetic inquiries are being made, which
+will probably result in a speedy clearing up of this very
+singular business. Up to a late hour last night, however, nothing
+had transpired as to the whereabouts of the missing lady. There
+are rumours of foul play in the matter, and it is said that the
+police have caused the arrest of the woman who had caused the
+original disturbance, in the belief that, from jealousy or some
+other motive, she may have been concerned in the strange
+disappearance of the bride.'"
+
+"And is that all?"
+
+"Only one little item in another of the morning papers, but it is
+a suggestive one."
+
+"And it is--"
+
+"That Miss Flora Millar, the lady who had caused the disturbance,
+has actually been arrested. It appears that she was formerly a
+danseuse at the Allegro, and that she has known the bridegroom
+for some years. There are no further particulars, and the whole
+case is in your hands now--so far as it has been set forth in the
+public press."
+
+"And an exceedingly interesting case it appears to be. I would
+not have missed it for worlds. But there is a ring at the bell,
+Watson, and as the clock makes it a few minutes after four, I
+have no doubt that this will prove to be our noble client. Do not
+dream of going, Watson, for I very much prefer having a witness,
+if only as a check to my own memory."
+
+"Lord Robert St. Simon," announced our page-boy, throwing open
+the door. A gentleman entered, with a pleasant, cultured face,
+high-nosed and pale, with something perhaps of petulance about
+the mouth, and with the steady, well-opened eye of a man whose
+pleasant lot it had ever been to command and to be obeyed. His
+manner was brisk, and yet his general appearance gave an undue
+impression of age, for he had a slight forward stoop and a little
+bend of the knees as he walked. His hair, too, as he swept off
+his very curly-brimmed hat, was grizzled round the edges and thin
+upon the top. As to his dress, it was careful to the verge of
+foppishness, with high collar, black frock-coat, white waistcoat,
+yellow gloves, patent-leather shoes, and light-coloured gaiters.
+He advanced slowly into the room, turning his head from left to
+right, and swinging in his right hand the cord which held his
+golden eyeglasses.
+
+"Good-day, Lord St. Simon," said Holmes, rising and bowing. "Pray
+take the basket-chair. This is my friend and colleague, Dr.
+Watson. Draw up a little to the fire, and we will talk this
+matter over."
+
+"A most painful matter to me, as you can most readily imagine,
+Mr. Holmes. I have been cut to the quick. I understand that you
+have already managed several delicate cases of this sort, sir,
+though I presume that they were hardly from the same class of
+society."
+
+"No, I am descending."
+
+"I beg pardon."
+
+"My last client of the sort was a king."
+
+"Oh, really! I had no idea. And which king?"
+
+"The King of Scandinavia."
+
+"What! Had he lost his wife?"
+
+"You can understand," said Holmes suavely, "that I extend to the
+affairs of my other clients the same secrecy which I promise to
+you in yours."
+
+"Of course! Very right! very right! I'm sure I beg pardon. As to
+my own case, I am ready to give you any information which may
+assist you in forming an opinion."
+
+"Thank you. I have already learned all that is in the public
+prints, nothing more. I presume that I may take it as correct--this
+article, for example, as to the disappearance of the bride."
+
+Lord St. Simon glanced over it. "Yes, it is correct, as far as it
+goes."
+
+"But it needs a great deal of supplementing before anyone could
+offer an opinion. I think that I may arrive at my facts most
+directly by questioning you."
+
+"Pray do so."
+
+"When did you first meet Miss Hatty Doran?"
+
+"In San Francisco, a year ago."
+
+"You were travelling in the States?"
+
+"Yes."
+
+"Did you become engaged then?"
+
+"No."
+
+"But you were on a friendly footing?"
+
+"I was amused by her society, and she could see that I was
+amused."
+
+"Her father is very rich?"
+
+"He is said to be the richest man on the Pacific slope."
+
+"And how did he make his money?"
+
+"In mining. He had nothing a few years ago. Then he struck gold,
+invested it, and came up by leaps and bounds."
+
+"Now, what is your own impression as to the young lady's--your
+wife's character?"
+
+The nobleman swung his glasses a little faster and stared down
+into the fire. "You see, Mr. Holmes," said he, "my wife was
+twenty before her father became a rich man. During that time she
+ran free in a mining camp and wandered through woods or
+mountains, so that her education has come from Nature rather than
+from the schoolmaster. She is what we call in England a tomboy,
+with a strong nature, wild and free, unfettered by any sort of
+traditions. She is impetuous--volcanic, I was about to say. She
+is swift in making up her mind and fearless in carrying out her
+resolutions. On the other hand, I would not have given her the
+name which I have the honour to bear"--he gave a little stately
+cough--"had not I thought her to be at bottom a noble woman. I
+believe that she is capable of heroic self-sacrifice and that
+anything dishonourable would be repugnant to her."
+
+"Have you her photograph?"
+
+"I brought this with me." He opened a locket and showed us the
+full face of a very lovely woman. It was not a photograph but an
+ivory miniature, and the artist had brought out the full effect
+of the lustrous black hair, the large dark eyes, and the
+exquisite mouth. Holmes gazed long and earnestly at it. Then he
+closed the locket and handed it back to Lord St. Simon.
+
+"The young lady came to London, then, and you renewed your
+acquaintance?"
+
+"Yes, her father brought her over for this last London season. I
+met her several times, became engaged to her, and have now
+married her."
+
+"She brought, I understand, a considerable dowry?"
+
+"A fair dowry. Not more than is usual in my family."
+
+"And this, of course, remains to you, since the marriage is a
+fait accompli?"
+
+"I really have made no inquiries on the subject."
+
+"Very naturally not. Did you see Miss Doran on the day before the
+wedding?"
+
+"Yes."
+
+"Was she in good spirits?"
+
+"Never better. She kept talking of what we should do in our
+future lives."
+
+"Indeed! That is very interesting. And on the morning of the
+wedding?"
+
+"She was as bright as possible--at least until after the
+ceremony."
+
+"And did you observe any change in her then?"
+
+"Well, to tell the truth, I saw then the first signs that I had
+ever seen that her temper was just a little sharp. The incident
+however, was too trivial to relate and can have no possible
+bearing upon the case."
+
+"Pray let us have it, for all that."
+
+"Oh, it is childish. She dropped her bouquet as we went towards
+the vestry. She was passing the front pew at the time, and it
+fell over into the pew. There was a moment's delay, but the
+gentleman in the pew handed it up to her again, and it did not
+appear to be the worse for the fall. Yet when I spoke to her of
+the matter, she answered me abruptly; and in the carriage, on our
+way home, she seemed absurdly agitated over this trifling cause."
+
+"Indeed! You say that there was a gentleman in the pew. Some of
+the general public were present, then?"
+
+"Oh, yes. It is impossible to exclude them when the church is
+open."
+
+"This gentleman was not one of your wife's friends?"
+
+"No, no; I call him a gentleman by courtesy, but he was quite a
+common-looking person. I hardly noticed his appearance. But
+really I think that we are wandering rather far from the point."
+
+"Lady St. Simon, then, returned from the wedding in a less
+cheerful frame of mind than she had gone to it. What did she do
+on re-entering her father's house?"
+
+"I saw her in conversation with her maid."
+
+"And who is her maid?"
+
+"Alice is her name. She is an American and came from California
+with her."
+
+"A confidential servant?"
+
+"A little too much so. It seemed to me that her mistress allowed
+her to take great liberties. Still, of course, in America they
+look upon these things in a different way."
+
+"How long did she speak to this Alice?"
+
+"Oh, a few minutes. I had something else to think of."
+
+"You did not overhear what they said?"
+
+"Lady St. Simon said something about 'jumping a claim.' She was
+accustomed to use slang of the kind. I have no idea what she
+meant."
+
+"American slang is very expressive sometimes. And what did your
+wife do when she finished speaking to her maid?"
+
+"She walked into the breakfast-room."
+
+"On your arm?"
+
+"No, alone. She was very independent in little matters like that.
+Then, after we had sat down for ten minutes or so, she rose
+hurriedly, muttered some words of apology, and left the room. She
+never came back."
+
+"But this maid, Alice, as I understand, deposes that she went to
+her room, covered her bride's dress with a long ulster, put on a
+bonnet, and went out."
+
+"Quite so. And she was afterwards seen walking into Hyde Park in
+company with Flora Millar, a woman who is now in custody, and who
+had already made a disturbance at Mr. Doran's house that
+morning."
+
+"Ah, yes. I should like a few particulars as to this young lady,
+and your relations to her."
+
+Lord St. Simon shrugged his shoulders and raised his eyebrows.
+"We have been on a friendly footing for some years--I may say on
+a very friendly footing. She used to be at the Allegro. I have
+not treated her ungenerously, and she had no just cause of
+complaint against me, but you know what women are, Mr. Holmes.
+Flora was a dear little thing, but exceedingly hot-headed and
+devotedly attached to me. She wrote me dreadful letters when she
+heard that I was about to be married, and, to tell the truth, the
+reason why I had the marriage celebrated so quietly was that I
+feared lest there might be a scandal in the church. She came to
+Mr. Doran's door just after we returned, and she endeavoured to
+push her way in, uttering very abusive expressions towards my
+wife, and even threatening her, but I had foreseen the
+possibility of something of the sort, and I had two police
+fellows there in private clothes, who soon pushed her out again.
+She was quiet when she saw that there was no good in making a
+row."
+
+"Did your wife hear all this?"
+
+"No, thank goodness, she did not."
+
+"And she was seen walking with this very woman afterwards?"
+
+"Yes. That is what Mr. Lestrade, of Scotland Yard, looks upon as
+so serious. It is thought that Flora decoyed my wife out and laid
+some terrible trap for her."
+
+"Well, it is a possible supposition."
+
+"You think so, too?"
+
+"I did not say a probable one. But you do not yourself look upon
+this as likely?"
+
+"I do not think Flora would hurt a fly."
+
+"Still, jealousy is a strange transformer of characters. Pray
+what is your own theory as to what took place?"
+
+"Well, really, I came to seek a theory, not to propound one. I
+have given you all the facts. Since you ask me, however, I may
+say that it has occurred to me as possible that the excitement of
+this affair, the consciousness that she had made so immense a
+social stride, had the effect of causing some little nervous
+disturbance in my wife."
+
+"In short, that she had become suddenly deranged?"
+
+"Well, really, when I consider that she has turned her back--I
+will not say upon me, but upon so much that many have aspired to
+without success--I can hardly explain it in any other fashion."
+
+"Well, certainly that is also a conceivable hypothesis," said
+Holmes, smiling. "And now, Lord St. Simon, I think that I have
+nearly all my data. May I ask whether you were seated at the
+breakfast-table so that you could see out of the window?"
+
+"We could see the other side of the road and the Park."
+
+"Quite so. Then I do not think that I need to detain you longer.
+I shall communicate with you."
+
+"Should you be fortunate enough to solve this problem," said our
+client, rising.
+
+"I have solved it."
+
+"Eh? What was that?"
+
+"I say that I have solved it."
+
+"Where, then, is my wife?"
+
+"That is a detail which I shall speedily supply."
+
+Lord St. Simon shook his head. "I am afraid that it will take
+wiser heads than yours or mine," he remarked, and bowing in a
+stately, old-fashioned manner he departed.
+
+"It is very good of Lord St. Simon to honour my head by putting
+it on a level with his own," said Sherlock Holmes, laughing. "I
+think that I shall have a whisky and soda and a cigar after all
+this cross-questioning. I had formed my conclusions as to the
+case before our client came into the room."
+
+"My dear Holmes!"
+
+"I have notes of several similar cases, though none, as I
+remarked before, which were quite as prompt. My whole examination
+served to turn my conjecture into a certainty. Circumstantial
+evidence is occasionally very convincing, as when you find a
+trout in the milk, to quote Thoreau's example."
+
+"But I have heard all that you have heard."
+
+"Without, however, the knowledge of pre-existing cases which
+serves me so well. There was a parallel instance in Aberdeen some
+years back, and something on very much the same lines at Munich
+the year after the Franco-Prussian War. It is one of these
+cases--but, hullo, here is Lestrade! Good-afternoon, Lestrade!
+You will find an extra tumbler upon the sideboard, and there are
+cigars in the box."
+
+The official detective was attired in a pea-jacket and cravat,
+which gave him a decidedly nautical appearance, and he carried a
+black canvas bag in his hand. With a short greeting he seated
+himself and lit the cigar which had been offered to him.
+
+"What's up, then?" asked Holmes with a twinkle in his eye. "You
+look dissatisfied."
+
+"And I feel dissatisfied. It is this infernal St. Simon marriage
+case. I can make neither head nor tail of the business."
+
+"Really! You surprise me."
+
+"Who ever heard of such a mixed affair? Every clue seems to slip
+through my fingers. I have been at work upon it all day."
+
+"And very wet it seems to have made you," said Holmes laying his
+hand upon the arm of the pea-jacket.
+
+"Yes, I have been dragging the Serpentine."
+
+"In heaven's name, what for?"
+
+"In search of the body of Lady St. Simon."
+
+Sherlock Holmes leaned back in his chair and laughed heartily.
+
+"Have you dragged the basin of Trafalgar Square fountain?" he
+asked.
+
+"Why? What do you mean?"
+
+"Because you have just as good a chance of finding this lady in
+the one as in the other."
+
+Lestrade shot an angry glance at my companion. "I suppose you
+know all about it," he snarled.
+
+"Well, I have only just heard the facts, but my mind is made up."
+
+"Oh, indeed! Then you think that the Serpentine plays no part in
+the matter?"
+
+"I think it very unlikely."
+
+"Then perhaps you will kindly explain how it is that we found
+this in it?" He opened his bag as he spoke, and tumbled onto the
+floor a wedding-dress of watered silk, a pair of white satin
+shoes and a bride's wreath and veil, all discoloured and soaked
+in water. "There," said he, putting a new wedding-ring upon the
+top of the pile. "There is a little nut for you to crack, Master
+Holmes."
+
+"Oh, indeed!" said my friend, blowing blue rings into the air.
+"You dragged them from the Serpentine?"
+
+"No. They were found floating near the margin by a park-keeper.
+They have been identified as her clothes, and it seemed to me
+that if the clothes were there the body would not be far off."
+
+"By the same brilliant reasoning, every man's body is to be found
+in the neighbourhood of his wardrobe. And pray what did you hope
+to arrive at through this?"
+
+"At some evidence implicating Flora Millar in the disappearance."
+
+"I am afraid that you will find it difficult."
+
+"Are you, indeed, now?" cried Lestrade with some bitterness. "I
+am afraid, Holmes, that you are not very practical with your
+deductions and your inferences. You have made two blunders in as
+many minutes. This dress does implicate Miss Flora Millar."
+
+"And how?"
+
+"In the dress is a pocket. In the pocket is a card-case. In the
+card-case is a note. And here is the very note." He slapped it
+down upon the table in front of him. "Listen to this: 'You will
+see me when all is ready. Come at once. F.H.M.' Now my theory all
+along has been that Lady St. Simon was decoyed away by Flora
+Millar, and that she, with confederates, no doubt, was
+responsible for her disappearance. Here, signed with her
+initials, is the very note which was no doubt quietly slipped
+into her hand at the door and which lured her within their
+reach."
+
+"Very good, Lestrade," said Holmes, laughing. "You really are
+very fine indeed. Let me see it." He took up the paper in a
+listless way, but his attention instantly became riveted, and he
+gave a little cry of satisfaction. "This is indeed important,"
+said he.
+
+"Ha! you find it so?"
+
+"Extremely so. I congratulate you warmly."
+
+Lestrade rose in his triumph and bent his head to look. "Why," he
+shrieked, "you're looking at the wrong side!"
+
+"On the contrary, this is the right side."
+
+"The right side? You're mad! Here is the note written in pencil
+over here."
+
+"And over here is what appears to be the fragment of a hotel
+bill, which interests me deeply."
+
+"There's nothing in it. I looked at it before," said Lestrade.
+"'Oct. 4th, rooms 8s., breakfast 2s. 6d., cocktail 1s., lunch 2s.
+6d., glass sherry, 8d.' I see nothing in that."
+
+"Very likely not. It is most important, all the same. As to the
+note, it is important also, or at least the initials are, so I
+congratulate you again."
+
+"I've wasted time enough," said Lestrade, rising. "I believe in
+hard work and not in sitting by the fire spinning fine theories.
+Good-day, Mr. Holmes, and we shall see which gets to the bottom
+of the matter first." He gathered up the garments, thrust them
+into the bag, and made for the door.
+
+"Just one hint to you, Lestrade," drawled Holmes before his rival
+vanished; "I will tell you the true solution of the matter. Lady
+St. Simon is a myth. There is not, and there never has been, any
+such person."
+
+Lestrade looked sadly at my companion. Then he turned to me,
+tapped his forehead three times, shook his head solemnly, and
+hurried away.
+
+He had hardly shut the door behind him when Holmes rose to put on
+his overcoat. "There is something in what the fellow says about
+outdoor work," he remarked, "so I think, Watson, that I must
+leave you to your papers for a little."
+
+It was after five o'clock when Sherlock Holmes left me, but I had
+no time to be lonely, for within an hour there arrived a
+confectioner's man with a very large flat box. This he unpacked
+with the help of a youth whom he had brought with him, and
+presently, to my very great astonishment, a quite epicurean
+little cold supper began to be laid out upon our humble
+lodging-house mahogany. There were a couple of brace of cold
+woodcock, a pheasant, a pâté de foie gras pie with a group of
+ancient and cobwebby bottles. Having laid out all these luxuries,
+my two visitors vanished away, like the genii of the Arabian
+Nights, with no explanation save that the things had been paid
+for and were ordered to this address.
+
+Just before nine o'clock Sherlock Holmes stepped briskly into the
+room. His features were gravely set, but there was a light in his
+eye which made me think that he had not been disappointed in his
+conclusions.
+
+"They have laid the supper, then," he said, rubbing his hands.
+
+"You seem to expect company. They have laid for five."
+
+"Yes, I fancy we may have some company dropping in," said he. "I
+am surprised that Lord St. Simon has not already arrived. Ha! I
+fancy that I hear his step now upon the stairs."
+
+It was indeed our visitor of the afternoon who came bustling in,
+dangling his glasses more vigorously than ever, and with a very
+perturbed expression upon his aristocratic features.
+
+"My messenger reached you, then?" asked Holmes.
+
+"Yes, and I confess that the contents startled me beyond measure.
+Have you good authority for what you say?"
+
+"The best possible."
+
+Lord St. Simon sank into a chair and passed his hand over his
+forehead.
+
+"What will the Duke say," he murmured, "when he hears that one of
+the family has been subjected to such humiliation?"
+
+"It is the purest accident. I cannot allow that there is any
+humiliation."
+
+"Ah, you look on these things from another standpoint."
+
+"I fail to see that anyone is to blame. I can hardly see how the
+lady could have acted otherwise, though her abrupt method of
+doing it was undoubtedly to be regretted. Having no mother, she
+had no one to advise her at such a crisis."
+
+"It was a slight, sir, a public slight," said Lord St. Simon,
+tapping his fingers upon the table.
+
+"You must make allowance for this poor girl, placed in so
+unprecedented a position."
+
+"I will make no allowance. I am very angry indeed, and I have
+been shamefully used."
+
+"I think that I heard a ring," said Holmes. "Yes, there are steps
+on the landing. If I cannot persuade you to take a lenient view
+of the matter, Lord St. Simon, I have brought an advocate here
+who may be more successful." He opened the door and ushered in a
+lady and gentleman. "Lord St. Simon," said he "allow me to
+introduce you to Mr. and Mrs. Francis Hay Moulton. The lady, I
+think, you have already met."
+
+At the sight of these newcomers our client had sprung from his
+seat and stood very erect, with his eyes cast down and his hand
+thrust into the breast of his frock-coat, a picture of offended
+dignity. The lady had taken a quick step forward and had held out
+her hand to him, but he still refused to raise his eyes. It was
+as well for his resolution, perhaps, for her pleading face was
+one which it was hard to resist.
+
+"You're angry, Robert," said she. "Well, I guess you have every
+cause to be."
+
+"Pray make no apology to me," said Lord St. Simon bitterly.
+
+"Oh, yes, I know that I have treated you real bad and that I
+should have spoken to you before I went; but I was kind of
+rattled, and from the time when I saw Frank here again I just
+didn't know what I was doing or saying. I only wonder I didn't
+fall down and do a faint right there before the altar."
+
+"Perhaps, Mrs. Moulton, you would like my friend and me to leave
+the room while you explain this matter?"
+
+"If I may give an opinion," remarked the strange gentleman,
+"we've had just a little too much secrecy over this business
+already. For my part, I should like all Europe and America to
+hear the rights of it." He was a small, wiry, sunburnt man,
+clean-shaven, with a sharp face and alert manner.
+
+"Then I'll tell our story right away," said the lady. "Frank here
+and I met in '84, in McQuire's camp, near the Rockies, where pa
+was working a claim. We were engaged to each other, Frank and I;
+but then one day father struck a rich pocket and made a pile,
+while poor Frank here had a claim that petered out and came to
+nothing. The richer pa grew the poorer was Frank; so at last pa
+wouldn't hear of our engagement lasting any longer, and he took
+me away to 'Frisco. Frank wouldn't throw up his hand, though; so
+he followed me there, and he saw me without pa knowing anything
+about it. It would only have made him mad to know, so we just
+fixed it all up for ourselves. Frank said that he would go and
+make his pile, too, and never come back to claim me until he had
+as much as pa. So then I promised to wait for him to the end of
+time and pledged myself not to marry anyone else while he lived.
+'Why shouldn't we be married right away, then,' said he, 'and
+then I will feel sure of you; and I won't claim to be your
+husband until I come back?' Well, we talked it over, and he had
+fixed it all up so nicely, with a clergyman all ready in waiting,
+that we just did it right there; and then Frank went off to seek
+his fortune, and I went back to pa.
+
+"The next I heard of Frank was that he was in Montana, and then
+he went prospecting in Arizona, and then I heard of him from New
+Mexico. After that came a long newspaper story about how a
+miners' camp had been attacked by Apache Indians, and there was
+my Frank's name among the killed. I fainted dead away, and I was
+very sick for months after. Pa thought I had a decline and took
+me to half the doctors in 'Frisco. Not a word of news came for a
+year and more, so that I never doubted that Frank was really
+dead. Then Lord St. Simon came to 'Frisco, and we came to London,
+and a marriage was arranged, and pa was very pleased, but I felt
+all the time that no man on this earth would ever take the place
+in my heart that had been given to my poor Frank.
+
+"Still, if I had married Lord St. Simon, of course I'd have done
+my duty by him. We can't command our love, but we can our
+actions. I went to the altar with him with the intention to make
+him just as good a wife as it was in me to be. But you may
+imagine what I felt when, just as I came to the altar rails, I
+glanced back and saw Frank standing and looking at me out of the
+first pew. I thought it was his ghost at first; but when I looked
+again there he was still, with a kind of question in his eyes, as
+if to ask me whether I were glad or sorry to see him. I wonder I
+didn't drop. I know that everything was turning round, and the
+words of the clergyman were just like the buzz of a bee in my
+ear. I didn't know what to do. Should I stop the service and make
+a scene in the church? I glanced at him again, and he seemed to
+know what I was thinking, for he raised his finger to his lips to
+tell me to be still. Then I saw him scribble on a piece of paper,
+and I knew that he was writing me a note. As I passed his pew on
+the way out I dropped my bouquet over to him, and he slipped the
+note into my hand when he returned me the flowers. It was only a
+line asking me to join him when he made the sign to me to do so.
+Of course I never doubted for a moment that my first duty was now
+to him, and I determined to do just whatever he might direct.
+
+"When I got back I told my maid, who had known him in California,
+and had always been his friend. I ordered her to say nothing, but
+to get a few things packed and my ulster ready. I know I ought to
+have spoken to Lord St. Simon, but it was dreadful hard before
+his mother and all those great people. I just made up my mind to
+run away and explain afterwards. I hadn't been at the table ten
+minutes before I saw Frank out of the window at the other side of
+the road. He beckoned to me and then began walking into the Park.
+I slipped out, put on my things, and followed him. Some woman
+came talking something or other about Lord St. Simon to
+me--seemed to me from the little I heard as if he had a little
+secret of his own before marriage also--but I managed to get away
+from her and soon overtook Frank. We got into a cab together, and
+away we drove to some lodgings he had taken in Gordon Square, and
+that was my true wedding after all those years of waiting. Frank
+had been a prisoner among the Apaches, had escaped, came on to
+'Frisco, found that I had given him up for dead and had gone to
+England, followed me there, and had come upon me at last on the
+very morning of my second wedding."
+
+"I saw it in a paper," explained the American. "It gave the name
+and the church but not where the lady lived."
+
+"Then we had a talk as to what we should do, and Frank was all
+for openness, but I was so ashamed of it all that I felt as if I
+should like to vanish away and never see any of them again--just
+sending a line to pa, perhaps, to show him that I was alive. It
+was awful to me to think of all those lords and ladies sitting
+round that breakfast-table and waiting for me to come back. So
+Frank took my wedding-clothes and things and made a bundle of
+them, so that I should not be traced, and dropped them away
+somewhere where no one could find them. It is likely that we
+should have gone on to Paris to-morrow, only that this good
+gentleman, Mr. Holmes, came round to us this evening, though how
+he found us is more than I can think, and he showed us very
+clearly and kindly that I was wrong and that Frank was right, and
+that we should be putting ourselves in the wrong if we were so
+secret. Then he offered to give us a chance of talking to Lord
+St. Simon alone, and so we came right away round to his rooms at
+once. Now, Robert, you have heard it all, and I am very sorry if
+I have given you pain, and I hope that you do not think very
+meanly of me."
+
+Lord St. Simon had by no means relaxed his rigid attitude, but
+had listened with a frowning brow and a compressed lip to this
+long narrative.
+
+"Excuse me," he said, "but it is not my custom to discuss my most
+intimate personal affairs in this public manner."
+
+"Then you won't forgive me? You won't shake hands before I go?"
+
+"Oh, certainly, if it would give you any pleasure." He put out
+his hand and coldly grasped that which she extended to him.
+
+"I had hoped," suggested Holmes, "that you would have joined us
+in a friendly supper."
+
+"I think that there you ask a little too much," responded his
+Lordship. "I may be forced to acquiesce in these recent
+developments, but I can hardly be expected to make merry over
+them. I think that with your permission I will now wish you all a
+very good-night." He included us all in a sweeping bow and
+stalked out of the room.
+
+"Then I trust that you at least will honour me with your
+company," said Sherlock Holmes. "It is always a joy to meet an
+American, Mr. Moulton, for I am one of those who believe that the
+folly of a monarch and the blundering of a minister in far-gone
+years will not prevent our children from being some day citizens
+of the same world-wide country under a flag which shall be a
+quartering of the Union Jack with the Stars and Stripes."
+
+"The case has been an interesting one," remarked Holmes when our
+visitors had left us, "because it serves to show very clearly how
+simple the explanation may be of an affair which at first sight
+seems to be almost inexplicable. Nothing could be more natural
+than the sequence of events as narrated by this lady, and nothing
+stranger than the result when viewed, for instance, by Mr.
+Lestrade of Scotland Yard."
+
+"You were not yourself at fault at all, then?"
+
+"From the first, two facts were very obvious to me, the one that
+the lady had been quite willing to undergo the wedding ceremony,
+the other that she had repented of it within a few minutes of
+returning home. Obviously something had occurred during the
+morning, then, to cause her to change her mind. What could that
+something be? She could not have spoken to anyone when she was
+out, for she had been in the company of the bridegroom. Had she
+seen someone, then? If she had, it must be someone from America
+because she had spent so short a time in this country that she
+could hardly have allowed anyone to acquire so deep an influence
+over her that the mere sight of him would induce her to change
+her plans so completely. You see we have already arrived, by a
+process of exclusion, at the idea that she might have seen an
+American. Then who could this American be, and why should he
+possess so much influence over her? It might be a lover; it might
+be a husband. Her young womanhood had, I knew, been spent in
+rough scenes and under strange conditions. So far I had got
+before I ever heard Lord St. Simon's narrative. When he told us
+of a man in a pew, of the change in the bride's manner, of so
+transparent a device for obtaining a note as the dropping of a
+bouquet, of her resort to her confidential maid, and of her very
+significant allusion to claim-jumping--which in miners' parlance
+means taking possession of that which another person has a prior
+claim to--the whole situation became absolutely clear. She had
+gone off with a man, and the man was either a lover or was a
+previous husband--the chances being in favour of the latter."
+
+"And how in the world did you find them?"
+
+"It might have been difficult, but friend Lestrade held
+information in his hands the value of which he did not himself
+know. The initials were, of course, of the highest importance,
+but more valuable still was it to know that within a week he had
+settled his bill at one of the most select London hotels."
+
+"How did you deduce the select?"
+
+"By the select prices. Eight shillings for a bed and eightpence
+for a glass of sherry pointed to one of the most expensive
+hotels. There are not many in London which charge at that rate.
+In the second one which I visited in Northumberland Avenue, I
+learned by an inspection of the book that Francis H. Moulton, an
+American gentleman, had left only the day before, and on looking
+over the entries against him, I came upon the very items which I
+had seen in the duplicate bill. His letters were to be forwarded
+to 226 Gordon Square; so thither I travelled, and being fortunate
+enough to find the loving couple at home, I ventured to give them
+some paternal advice and to point out to them that it would be
+better in every way that they should make their position a little
+clearer both to the general public and to Lord St. Simon in
+particular. I invited them to meet him here, and, as you see, I
+made him keep the appointment."
+
+"But with no very good result," I remarked. "His conduct was
+certainly not very gracious."
+
+"Ah, Watson," said Holmes, smiling, "perhaps you would not be
+very gracious either, if, after all the trouble of wooing and
+wedding, you found yourself deprived in an instant of wife and of
+fortune. I think that we may judge Lord St. Simon very mercifully
+and thank our stars that we are never likely to find ourselves in
+the same position. Draw your chair up and hand me my violin, for
+the only problem we have still to solve is how to while away
+these bleak autumnal evenings."
+
+
+
+XI. THE ADVENTURE OF THE BERYL CORONET
+
+"Holmes," said I as I stood one morning in our bow-window looking
+down the street, "here is a madman coming along. It seems rather
+sad that his relatives should allow him to come out alone."
+
+My friend rose lazily from his armchair and stood with his hands
+in the pockets of his dressing-gown, looking over my shoulder. It
+was a bright, crisp February morning, and the snow of the day
+before still lay deep upon the ground, shimmering brightly in the
+wintry sun. Down the centre of Baker Street it had been ploughed
+into a brown crumbly band by the traffic, but at either side and
+on the heaped-up edges of the foot-paths it still lay as white as
+when it fell. The grey pavement had been cleaned and scraped, but
+was still dangerously slippery, so that there were fewer
+passengers than usual. Indeed, from the direction of the
+Metropolitan Station no one was coming save the single gentleman
+whose eccentric conduct had drawn my attention.
+
+He was a man of about fifty, tall, portly, and imposing, with a
+massive, strongly marked face and a commanding figure. He was
+dressed in a sombre yet rich style, in black frock-coat, shining
+hat, neat brown gaiters, and well-cut pearl-grey trousers. Yet
+his actions were in absurd contrast to the dignity of his dress
+and features, for he was running hard, with occasional little
+springs, such as a weary man gives who is little accustomed to
+set any tax upon his legs. As he ran he jerked his hands up and
+down, waggled his head, and writhed his face into the most
+extraordinary contortions.
+
+"What on earth can be the matter with him?" I asked. "He is
+looking up at the numbers of the houses."
+
+"I believe that he is coming here," said Holmes, rubbing his
+hands.
+
+"Here?"
+
+"Yes; I rather think he is coming to consult me professionally. I
+think that I recognise the symptoms. Ha! did I not tell you?" As
+he spoke, the man, puffing and blowing, rushed at our door and
+pulled at our bell until the whole house resounded with the
+clanging.
+
+A few moments later he was in our room, still puffing, still
+gesticulating, but with so fixed a look of grief and despair in
+his eyes that our smiles were turned in an instant to horror and
+pity. For a while he could not get his words out, but swayed his
+body and plucked at his hair like one who has been driven to the
+extreme limits of his reason. Then, suddenly springing to his
+feet, he beat his head against the wall with such force that we
+both rushed upon him and tore him away to the centre of the room.
+Sherlock Holmes pushed him down into the easy-chair and, sitting
+beside him, patted his hand and chatted with him in the easy,
+soothing tones which he knew so well how to employ.
+
+"You have come to me to tell your story, have you not?" said he.
+"You are fatigued with your haste. Pray wait until you have
+recovered yourself, and then I shall be most happy to look into
+any little problem which you may submit to me."
+
+The man sat for a minute or more with a heaving chest, fighting
+against his emotion. Then he passed his handkerchief over his
+brow, set his lips tight, and turned his face towards us.
+
+"No doubt you think me mad?" said he.
+
+"I see that you have had some great trouble," responded Holmes.
+
+"God knows I have!--a trouble which is enough to unseat my
+reason, so sudden and so terrible is it. Public disgrace I might
+have faced, although I am a man whose character has never yet
+borne a stain. Private affliction also is the lot of every man;
+but the two coming together, and in so frightful a form, have
+been enough to shake my very soul. Besides, it is not I alone.
+The very noblest in the land may suffer unless some way be found
+out of this horrible affair."
+
+"Pray compose yourself, sir," said Holmes, "and let me have a
+clear account of who you are and what it is that has befallen
+you."
+
+"My name," answered our visitor, "is probably familiar to your
+ears. I am Alexander Holder, of the banking firm of Holder &
+Stevenson, of Threadneedle Street."
+
+The name was indeed well known to us as belonging to the senior
+partner in the second largest private banking concern in the City
+of London. What could have happened, then, to bring one of the
+foremost citizens of London to this most pitiable pass? We
+waited, all curiosity, until with another effort he braced
+himself to tell his story.
+
+"I feel that time is of value," said he; "that is why I hastened
+here when the police inspector suggested that I should secure
+your co-operation. I came to Baker Street by the Underground and
+hurried from there on foot, for the cabs go slowly through this
+snow. That is why I was so out of breath, for I am a man who
+takes very little exercise. I feel better now, and I will put the
+facts before you as shortly and yet as clearly as I can.
+
+"It is, of course, well known to you that in a successful banking
+business as much depends upon our being able to find remunerative
+investments for our funds as upon our increasing our connection
+and the number of our depositors. One of our most lucrative means
+of laying out money is in the shape of loans, where the security
+is unimpeachable. We have done a good deal in this direction
+during the last few years, and there are many noble families to
+whom we have advanced large sums upon the security of their
+pictures, libraries, or plate.
+
+"Yesterday morning I was seated in my office at the bank when a
+card was brought in to me by one of the clerks. I started when I
+saw the name, for it was that of none other than--well, perhaps
+even to you I had better say no more than that it was a name
+which is a household word all over the earth--one of the highest,
+noblest, most exalted names in England. I was overwhelmed by the
+honour and attempted, when he entered, to say so, but he plunged
+at once into business with the air of a man who wishes to hurry
+quickly through a disagreeable task.
+
+"'Mr. Holder,' said he, 'I have been informed that you are in the
+habit of advancing money.'
+
+"'The firm does so when the security is good.' I answered.
+
+"'It is absolutely essential to me,' said he, 'that I should have
+50,000 pounds at once. I could, of course, borrow so trifling a
+sum ten times over from my friends, but I much prefer to make it
+a matter of business and to carry out that business myself. In my
+position you can readily understand that it is unwise to place
+one's self under obligations.'
+
+"'For how long, may I ask, do you want this sum?' I asked.
+
+"'Next Monday I have a large sum due to me, and I shall then most
+certainly repay what you advance, with whatever interest you
+think it right to charge. But it is very essential to me that the
+money should be paid at once.'
+
+"'I should be happy to advance it without further parley from my
+own private purse,' said I, 'were it not that the strain would be
+rather more than it could bear. If, on the other hand, I am to do
+it in the name of the firm, then in justice to my partner I must
+insist that, even in your case, every businesslike precaution
+should be taken.'
+
+"'I should much prefer to have it so,' said he, raising up a
+square, black morocco case which he had laid beside his chair.
+'You have doubtless heard of the Beryl Coronet?'
+
+"'One of the most precious public possessions of the empire,'
+said I.
+
+"'Precisely.' He opened the case, and there, imbedded in soft,
+flesh-coloured velvet, lay the magnificent piece of jewellery
+which he had named. 'There are thirty-nine enormous beryls,' said
+he, 'and the price of the gold chasing is incalculable. The
+lowest estimate would put the worth of the coronet at double the
+sum which I have asked. I am prepared to leave it with you as my
+security.'
+
+"I took the precious case into my hands and looked in some
+perplexity from it to my illustrious client.
+
+"'You doubt its value?' he asked.
+
+"'Not at all. I only doubt--'
+
+"'The propriety of my leaving it. You may set your mind at rest
+about that. I should not dream of doing so were it not absolutely
+certain that I should be able in four days to reclaim it. It is a
+pure matter of form. Is the security sufficient?'
+
+"'Ample.'
+
+"'You understand, Mr. Holder, that I am giving you a strong proof
+of the confidence which I have in you, founded upon all that I
+have heard of you. I rely upon you not only to be discreet and to
+refrain from all gossip upon the matter but, above all, to
+preserve this coronet with every possible precaution because I
+need not say that a great public scandal would be caused if any
+harm were to befall it. Any injury to it would be almost as
+serious as its complete loss, for there are no beryls in the
+world to match these, and it would be impossible to replace them.
+I leave it with you, however, with every confidence, and I shall
+call for it in person on Monday morning.'
+
+"Seeing that my client was anxious to leave, I said no more but,
+calling for my cashier, I ordered him to pay over fifty 1000
+pound notes. When I was alone once more, however, with the
+precious case lying upon the table in front of me, I could not
+but think with some misgivings of the immense responsibility
+which it entailed upon me. There could be no doubt that, as it
+was a national possession, a horrible scandal would ensue if any
+misfortune should occur to it. I already regretted having ever
+consented to take charge of it. However, it was too late to alter
+the matter now, so I locked it up in my private safe and turned
+once more to my work.
+
+"When evening came I felt that it would be an imprudence to leave
+so precious a thing in the office behind me. Bankers' safes had
+been forced before now, and why should not mine be? If so, how
+terrible would be the position in which I should find myself! I
+determined, therefore, that for the next few days I would always
+carry the case backward and forward with me, so that it might
+never be really out of my reach. With this intention, I called a
+cab and drove out to my house at Streatham, carrying the jewel
+with me. I did not breathe freely until I had taken it upstairs
+and locked it in the bureau of my dressing-room.
+
+"And now a word as to my household, Mr. Holmes, for I wish you to
+thoroughly understand the situation. My groom and my page sleep
+out of the house, and may be set aside altogether. I have three
+maid-servants who have been with me a number of years and whose
+absolute reliability is quite above suspicion. Another, Lucy
+Parr, the second waiting-maid, has only been in my service a few
+months. She came with an excellent character, however, and has
+always given me satisfaction. She is a very pretty girl and has
+attracted admirers who have occasionally hung about the place.
+That is the only drawback which we have found to her, but we
+believe her to be a thoroughly good girl in every way.
+
+"So much for the servants. My family itself is so small that it
+will not take me long to describe it. I am a widower and have an
+only son, Arthur. He has been a disappointment to me, Mr.
+Holmes--a grievous disappointment. I have no doubt that I am
+myself to blame. People tell me that I have spoiled him. Very
+likely I have. When my dear wife died I felt that he was all I
+had to love. I could not bear to see the smile fade even for a
+moment from his face. I have never denied him a wish. Perhaps it
+would have been better for both of us had I been sterner, but I
+meant it for the best.
+
+"It was naturally my intention that he should succeed me in my
+business, but he was not of a business turn. He was wild,
+wayward, and, to speak the truth, I could not trust him in the
+handling of large sums of money. When he was young he became a
+member of an aristocratic club, and there, having charming
+manners, he was soon the intimate of a number of men with long
+purses and expensive habits. He learned to play heavily at cards
+and to squander money on the turf, until he had again and again
+to come to me and implore me to give him an advance upon his
+allowance, that he might settle his debts of honour. He tried
+more than once to break away from the dangerous company which he
+was keeping, but each time the influence of his friend, Sir
+George Burnwell, was enough to draw him back again.
+
+"And, indeed, I could not wonder that such a man as Sir George
+Burnwell should gain an influence over him, for he has frequently
+brought him to my house, and I have found myself that I could
+hardly resist the fascination of his manner. He is older than
+Arthur, a man of the world to his finger-tips, one who had been
+everywhere, seen everything, a brilliant talker, and a man of
+great personal beauty. Yet when I think of him in cold blood, far
+away from the glamour of his presence, I am convinced from his
+cynical speech and the look which I have caught in his eyes that
+he is one who should be deeply distrusted. So I think, and so,
+too, thinks my little Mary, who has a woman's quick insight into
+character.
+
+"And now there is only she to be described. She is my niece; but
+when my brother died five years ago and left her alone in the
+world I adopted her, and have looked upon her ever since as my
+daughter. She is a sunbeam in my house--sweet, loving, beautiful,
+a wonderful manager and housekeeper, yet as tender and quiet and
+gentle as a woman could be. She is my right hand. I do not know
+what I could do without her. In only one matter has she ever gone
+against my wishes. Twice my boy has asked her to marry him, for
+he loves her devotedly, but each time she has refused him. I
+think that if anyone could have drawn him into the right path it
+would have been she, and that his marriage might have changed his
+whole life; but now, alas! it is too late--forever too late!
+
+"Now, Mr. Holmes, you know the people who live under my roof, and
+I shall continue with my miserable story.
+
+"When we were taking coffee in the drawing-room that night after
+dinner, I told Arthur and Mary my experience, and of the precious
+treasure which we had under our roof, suppressing only the name
+of my client. Lucy Parr, who had brought in the coffee, had, I am
+sure, left the room; but I cannot swear that the door was closed.
+Mary and Arthur were much interested and wished to see the famous
+coronet, but I thought it better not to disturb it.
+
+"'Where have you put it?' asked Arthur.
+
+"'In my own bureau.'
+
+"'Well, I hope to goodness the house won't be burgled during the
+night.' said he.
+
+"'It is locked up,' I answered.
+
+"'Oh, any old key will fit that bureau. When I was a youngster I
+have opened it myself with the key of the box-room cupboard.'
+
+"He often had a wild way of talking, so that I thought little of
+what he said. He followed me to my room, however, that night with
+a very grave face.
+
+"'Look here, dad,' said he with his eyes cast down, 'can you let
+me have 200 pounds?'
+
+"'No, I cannot!' I answered sharply. 'I have been far too
+generous with you in money matters.'
+
+"'You have been very kind,' said he, 'but I must have this money,
+or else I can never show my face inside the club again.'
+
+"'And a very good thing, too!' I cried.
+
+"'Yes, but you would not have me leave it a dishonoured man,'
+said he. 'I could not bear the disgrace. I must raise the money
+in some way, and if you will not let me have it, then I must try
+other means.'
+
+"I was very angry, for this was the third demand during the
+month. 'You shall not have a farthing from me,' I cried, on which
+he bowed and left the room without another word.
+
+"When he was gone I unlocked my bureau, made sure that my
+treasure was safe, and locked it again. Then I started to go
+round the house to see that all was secure--a duty which I
+usually leave to Mary but which I thought it well to perform
+myself that night. As I came down the stairs I saw Mary herself
+at the side window of the hall, which she closed and fastened as
+I approached.
+
+"'Tell me, dad,' said she, looking, I thought, a little
+disturbed, 'did you give Lucy, the maid, leave to go out
+to-night?'
+
+"'Certainly not.'
+
+"'She came in just now by the back door. I have no doubt that she
+has only been to the side gate to see someone, but I think that
+it is hardly safe and should be stopped.'
+
+"'You must speak to her in the morning, or I will if you prefer
+it. Are you sure that everything is fastened?'
+
+"'Quite sure, dad.'
+
+"'Then, good-night.' I kissed her and went up to my bedroom
+again, where I was soon asleep.
+
+"I am endeavouring to tell you everything, Mr. Holmes, which may
+have any bearing upon the case, but I beg that you will question
+me upon any point which I do not make clear."
+
+"On the contrary, your statement is singularly lucid."
+
+"I come to a part of my story now in which I should wish to be
+particularly so. I am not a very heavy sleeper, and the anxiety
+in my mind tended, no doubt, to make me even less so than usual.
+About two in the morning, then, I was awakened by some sound in
+the house. It had ceased ere I was wide awake, but it had left an
+impression behind it as though a window had gently closed
+somewhere. I lay listening with all my ears. Suddenly, to my
+horror, there was a distinct sound of footsteps moving softly in
+the next room. I slipped out of bed, all palpitating with fear,
+and peeped round the corner of my dressing-room door.
+
+"'Arthur!' I screamed, 'you villain! you thief! How dare you
+touch that coronet?'
+
+"The gas was half up, as I had left it, and my unhappy boy,
+dressed only in his shirt and trousers, was standing beside the
+light, holding the coronet in his hands. He appeared to be
+wrenching at it, or bending it with all his strength. At my cry
+he dropped it from his grasp and turned as pale as death. I
+snatched it up and examined it. One of the gold corners, with
+three of the beryls in it, was missing.
+
+"'You blackguard!' I shouted, beside myself with rage. 'You have
+destroyed it! You have dishonoured me forever! Where are the
+jewels which you have stolen?'
+
+"'Stolen!' he cried.
+
+"'Yes, thief!' I roared, shaking him by the shoulder.
+
+"'There are none missing. There cannot be any missing,' said he.
+
+"'There are three missing. And you know where they are. Must I
+call you a liar as well as a thief? Did I not see you trying to
+tear off another piece?'
+
+"'You have called me names enough,' said he, 'I will not stand it
+any longer. I shall not say another word about this business,
+since you have chosen to insult me. I will leave your house in
+the morning and make my own way in the world.'
+
+"'You shall leave it in the hands of the police!' I cried
+half-mad with grief and rage. 'I shall have this matter probed to
+the bottom.'
+
+"'You shall learn nothing from me,' said he with a passion such
+as I should not have thought was in his nature. 'If you choose to
+call the police, let the police find what they can.'
+
+"By this time the whole house was astir, for I had raised my
+voice in my anger. Mary was the first to rush into my room, and,
+at the sight of the coronet and of Arthur's face, she read the
+whole story and, with a scream, fell down senseless on the
+ground. I sent the house-maid for the police and put the
+investigation into their hands at once. When the inspector and a
+constable entered the house, Arthur, who had stood sullenly with
+his arms folded, asked me whether it was my intention to charge
+him with theft. I answered that it had ceased to be a private
+matter, but had become a public one, since the ruined coronet was
+national property. I was determined that the law should have its
+way in everything.
+
+"'At least,' said he, 'you will not have me arrested at once. It
+would be to your advantage as well as mine if I might leave the
+house for five minutes.'
+
+"'That you may get away, or perhaps that you may conceal what you
+have stolen,' said I. And then, realising the dreadful position
+in which I was placed, I implored him to remember that not only
+my honour but that of one who was far greater than I was at
+stake; and that he threatened to raise a scandal which would
+convulse the nation. He might avert it all if he would but tell
+me what he had done with the three missing stones.
+
+"'You may as well face the matter,' said I; 'you have been caught
+in the act, and no confession could make your guilt more heinous.
+If you but make such reparation as is in your power, by telling
+us where the beryls are, all shall be forgiven and forgotten.'
+
+"'Keep your forgiveness for those who ask for it,' he answered,
+turning away from me with a sneer. I saw that he was too hardened
+for any words of mine to influence him. There was but one way for
+it. I called in the inspector and gave him into custody. A search
+was made at once not only of his person but of his room and of
+every portion of the house where he could possibly have concealed
+the gems; but no trace of them could be found, nor would the
+wretched boy open his mouth for all our persuasions and our
+threats. This morning he was removed to a cell, and I, after
+going through all the police formalities, have hurried round to
+you to implore you to use your skill in unravelling the matter.
+The police have openly confessed that they can at present make
+nothing of it. You may go to any expense which you think
+necessary. I have already offered a reward of 1000 pounds. My
+God, what shall I do! I have lost my honour, my gems, and my son
+in one night. Oh, what shall I do!"
+
+He put a hand on either side of his head and rocked himself to
+and fro, droning to himself like a child whose grief has got
+beyond words.
+
+Sherlock Holmes sat silent for some few minutes, with his brows
+knitted and his eyes fixed upon the fire.
+
+"Do you receive much company?" he asked.
+
+"None save my partner with his family and an occasional friend of
+Arthur's. Sir George Burnwell has been several times lately. No
+one else, I think."
+
+"Do you go out much in society?"
+
+"Arthur does. Mary and I stay at home. We neither of us care for
+it."
+
+"That is unusual in a young girl."
+
+"She is of a quiet nature. Besides, she is not so very young. She
+is four-and-twenty."
+
+"This matter, from what you say, seems to have been a shock to
+her also."
+
+"Terrible! She is even more affected than I."
+
+"You have neither of you any doubt as to your son's guilt?"
+
+"How can we have when I saw him with my own eyes with the coronet
+in his hands."
+
+"I hardly consider that a conclusive proof. Was the remainder of
+the coronet at all injured?"
+
+"Yes, it was twisted."
+
+"Do you not think, then, that he might have been trying to
+straighten it?"
+
+"God bless you! You are doing what you can for him and for me.
+But it is too heavy a task. What was he doing there at all? If
+his purpose were innocent, why did he not say so?"
+
+"Precisely. And if it were guilty, why did he not invent a lie?
+His silence appears to me to cut both ways. There are several
+singular points about the case. What did the police think of the
+noise which awoke you from your sleep?"
+
+"They considered that it might be caused by Arthur's closing his
+bedroom door."
+
+"A likely story! As if a man bent on felony would slam his door
+so as to wake a household. What did they say, then, of the
+disappearance of these gems?"
+
+"They are still sounding the planking and probing the furniture
+in the hope of finding them."
+
+"Have they thought of looking outside the house?"
+
+"Yes, they have shown extraordinary energy. The whole garden has
+already been minutely examined."
+
+"Now, my dear sir," said Holmes, "is it not obvious to you now
+that this matter really strikes very much deeper than either you
+or the police were at first inclined to think? It appeared to you
+to be a simple case; to me it seems exceedingly complex. Consider
+what is involved by your theory. You suppose that your son came
+down from his bed, went, at great risk, to your dressing-room,
+opened your bureau, took out your coronet, broke off by main
+force a small portion of it, went off to some other place,
+concealed three gems out of the thirty-nine, with such skill that
+nobody can find them, and then returned with the other thirty-six
+into the room in which he exposed himself to the greatest danger
+of being discovered. I ask you now, is such a theory tenable?"
+
+"But what other is there?" cried the banker with a gesture of
+despair. "If his motives were innocent, why does he not explain
+them?"
+
+"It is our task to find that out," replied Holmes; "so now, if
+you please, Mr. Holder, we will set off for Streatham together,
+and devote an hour to glancing a little more closely into
+details."
+
+My friend insisted upon my accompanying them in their expedition,
+which I was eager enough to do, for my curiosity and sympathy
+were deeply stirred by the story to which we had listened. I
+confess that the guilt of the banker's son appeared to me to be
+as obvious as it did to his unhappy father, but still I had such
+faith in Holmes' judgment that I felt that there must be some
+grounds for hope as long as he was dissatisfied with the accepted
+explanation. He hardly spoke a word the whole way out to the
+southern suburb, but sat with his chin upon his breast and his
+hat drawn over his eyes, sunk in the deepest thought. Our client
+appeared to have taken fresh heart at the little glimpse of hope
+which had been presented to him, and he even broke into a
+desultory chat with me over his business affairs. A short railway
+journey and a shorter walk brought us to Fairbank, the modest
+residence of the great financier.
+
+Fairbank was a good-sized square house of white stone, standing
+back a little from the road. A double carriage-sweep, with a
+snow-clad lawn, stretched down in front to two large iron gates
+which closed the entrance. On the right side was a small wooden
+thicket, which led into a narrow path between two neat hedges
+stretching from the road to the kitchen door, and forming the
+tradesmen's entrance. On the left ran a lane which led to the
+stables, and was not itself within the grounds at all, being a
+public, though little used, thoroughfare. Holmes left us standing
+at the door and walked slowly all round the house, across the
+front, down the tradesmen's path, and so round by the garden
+behind into the stable lane. So long was he that Mr. Holder and I
+went into the dining-room and waited by the fire until he should
+return. We were sitting there in silence when the door opened and
+a young lady came in. She was rather above the middle height,
+slim, with dark hair and eyes, which seemed the darker against
+the absolute pallor of her skin. I do not think that I have ever
+seen such deadly paleness in a woman's face. Her lips, too, were
+bloodless, but her eyes were flushed with crying. As she swept
+silently into the room she impressed me with a greater sense of
+grief than the banker had done in the morning, and it was the
+more striking in her as she was evidently a woman of strong
+character, with immense capacity for self-restraint. Disregarding
+my presence, she went straight to her uncle and passed her hand
+over his head with a sweet womanly caress.
+
+"You have given orders that Arthur should be liberated, have you
+not, dad?" she asked.
+
+"No, no, my girl, the matter must be probed to the bottom."
+
+"But I am so sure that he is innocent. You know what woman's
+instincts are. I know that he has done no harm and that you will
+be sorry for having acted so harshly."
+
+"Why is he silent, then, if he is innocent?"
+
+"Who knows? Perhaps because he was so angry that you should
+suspect him."
+
+"How could I help suspecting him, when I actually saw him with
+the coronet in his hand?"
+
+"Oh, but he had only picked it up to look at it. Oh, do, do take
+my word for it that he is innocent. Let the matter drop and say
+no more. It is so dreadful to think of our dear Arthur in
+prison!"
+
+"I shall never let it drop until the gems are found--never, Mary!
+Your affection for Arthur blinds you as to the awful consequences
+to me. Far from hushing the thing up, I have brought a gentleman
+down from London to inquire more deeply into it."
+
+"This gentleman?" she asked, facing round to me.
+
+"No, his friend. He wished us to leave him alone. He is round in
+the stable lane now."
+
+"The stable lane?" She raised her dark eyebrows. "What can he
+hope to find there? Ah! this, I suppose, is he. I trust, sir,
+that you will succeed in proving, what I feel sure is the truth,
+that my cousin Arthur is innocent of this crime."
+
+"I fully share your opinion, and I trust, with you, that we may
+prove it," returned Holmes, going back to the mat to knock the
+snow from his shoes. "I believe I have the honour of addressing
+Miss Mary Holder. Might I ask you a question or two?"
+
+"Pray do, sir, if it may help to clear this horrible affair up."
+
+"You heard nothing yourself last night?"
+
+"Nothing, until my uncle here began to speak loudly. I heard
+that, and I came down."
+
+"You shut up the windows and doors the night before. Did you
+fasten all the windows?"
+
+"Yes."
+
+"Were they all fastened this morning?"
+
+"Yes."
+
+"You have a maid who has a sweetheart? I think that you remarked
+to your uncle last night that she had been out to see him?"
+
+"Yes, and she was the girl who waited in the drawing-room, and
+who may have heard uncle's remarks about the coronet."
+
+"I see. You infer that she may have gone out to tell her
+sweetheart, and that the two may have planned the robbery."
+
+"But what is the good of all these vague theories," cried the
+banker impatiently, "when I have told you that I saw Arthur with
+the coronet in his hands?"
+
+"Wait a little, Mr. Holder. We must come back to that. About this
+girl, Miss Holder. You saw her return by the kitchen door, I
+presume?"
+
+"Yes; when I went to see if the door was fastened for the night I
+met her slipping in. I saw the man, too, in the gloom."
+
+"Do you know him?"
+
+"Oh, yes! he is the green-grocer who brings our vegetables round.
+His name is Francis Prosper."
+
+"He stood," said Holmes, "to the left of the door--that is to
+say, farther up the path than is necessary to reach the door?"
+
+"Yes, he did."
+
+"And he is a man with a wooden leg?"
+
+Something like fear sprang up in the young lady's expressive
+black eyes. "Why, you are like a magician," said she. "How do you
+know that?" She smiled, but there was no answering smile in
+Holmes' thin, eager face.
+
+"I should be very glad now to go upstairs," said he. "I shall
+probably wish to go over the outside of the house again. Perhaps
+I had better take a look at the lower windows before I go up."
+
+He walked swiftly round from one to the other, pausing only at
+the large one which looked from the hall onto the stable lane.
+This he opened and made a very careful examination of the sill
+with his powerful magnifying lens. "Now we shall go upstairs,"
+said he at last.
+
+The banker's dressing-room was a plainly furnished little
+chamber, with a grey carpet, a large bureau, and a long mirror.
+Holmes went to the bureau first and looked hard at the lock.
+
+"Which key was used to open it?" he asked.
+
+"That which my son himself indicated--that of the cupboard of the
+lumber-room."
+
+"Have you it here?"
+
+"That is it on the dressing-table."
+
+Sherlock Holmes took it up and opened the bureau.
+
+"It is a noiseless lock," said he. "It is no wonder that it did
+not wake you. This case, I presume, contains the coronet. We must
+have a look at it." He opened the case, and taking out the diadem
+he laid it upon the table. It was a magnificent specimen of the
+jeweller's art, and the thirty-six stones were the finest that I
+have ever seen. At one side of the coronet was a cracked edge,
+where a corner holding three gems had been torn away.
+
+"Now, Mr. Holder," said Holmes, "here is the corner which
+corresponds to that which has been so unfortunately lost. Might I
+beg that you will break it off."
+
+The banker recoiled in horror. "I should not dream of trying,"
+said he.
+
+"Then I will." Holmes suddenly bent his strength upon it, but
+without result. "I feel it give a little," said he; "but, though
+I am exceptionally strong in the fingers, it would take me all my
+time to break it. An ordinary man could not do it. Now, what do
+you think would happen if I did break it, Mr. Holder? There would
+be a noise like a pistol shot. Do you tell me that all this
+happened within a few yards of your bed and that you heard
+nothing of it?"
+
+"I do not know what to think. It is all dark to me."
+
+"But perhaps it may grow lighter as we go. What do you think,
+Miss Holder?"
+
+"I confess that I still share my uncle's perplexity."
+
+"Your son had no shoes or slippers on when you saw him?"
+
+"He had nothing on save only his trousers and shirt."
+
+"Thank you. We have certainly been favoured with extraordinary
+luck during this inquiry, and it will be entirely our own fault
+if we do not succeed in clearing the matter up. With your
+permission, Mr. Holder, I shall now continue my investigations
+outside."
+
+He went alone, at his own request, for he explained that any
+unnecessary footmarks might make his task more difficult. For an
+hour or more he was at work, returning at last with his feet
+heavy with snow and his features as inscrutable as ever.
+
+"I think that I have seen now all that there is to see, Mr.
+Holder," said he; "I can serve you best by returning to my
+rooms."
+
+"But the gems, Mr. Holmes. Where are they?"
+
+"I cannot tell."
+
+The banker wrung his hands. "I shall never see them again!" he
+cried. "And my son? You give me hopes?"
+
+"My opinion is in no way altered."
+
+"Then, for God's sake, what was this dark business which was
+acted in my house last night?"
+
+"If you can call upon me at my Baker Street rooms to-morrow
+morning between nine and ten I shall be happy to do what I can to
+make it clearer. I understand that you give me carte blanche to
+act for you, provided only that I get back the gems, and that you
+place no limit on the sum I may draw."
+
+"I would give my fortune to have them back."
+
+"Very good. I shall look into the matter between this and then.
+Good-bye; it is just possible that I may have to come over here
+again before evening."
+
+It was obvious to me that my companion's mind was now made up
+about the case, although what his conclusions were was more than
+I could even dimly imagine. Several times during our homeward
+journey I endeavoured to sound him upon the point, but he always
+glided away to some other topic, until at last I gave it over in
+despair. It was not yet three when we found ourselves in our
+rooms once more. He hurried to his chamber and was down again in
+a few minutes dressed as a common loafer. With his collar turned
+up, his shiny, seedy coat, his red cravat, and his worn boots, he
+was a perfect sample of the class.
+
+"I think that this should do," said he, glancing into the glass
+above the fireplace. "I only wish that you could come with me,
+Watson, but I fear that it won't do. I may be on the trail in
+this matter, or I may be following a will-o'-the-wisp, but I
+shall soon know which it is. I hope that I may be back in a few
+hours." He cut a slice of beef from the joint upon the sideboard,
+sandwiched it between two rounds of bread, and thrusting this
+rude meal into his pocket he started off upon his expedition.
+
+I had just finished my tea when he returned, evidently in
+excellent spirits, swinging an old elastic-sided boot in his
+hand. He chucked it down into a corner and helped himself to a
+cup of tea.
+
+"I only looked in as I passed," said he. "I am going right on."
+
+"Where to?"
+
+"Oh, to the other side of the West End. It may be some time
+before I get back. Don't wait up for me in case I should be
+late."
+
+"How are you getting on?"
+
+"Oh, so so. Nothing to complain of. I have been out to Streatham
+since I saw you last, but I did not call at the house. It is a
+very sweet little problem, and I would not have missed it for a
+good deal. However, I must not sit gossiping here, but must get
+these disreputable clothes off and return to my highly
+respectable self."
+
+I could see by his manner that he had stronger reasons for
+satisfaction than his words alone would imply. His eyes twinkled,
+and there was even a touch of colour upon his sallow cheeks. He
+hastened upstairs, and a few minutes later I heard the slam of
+the hall door, which told me that he was off once more upon his
+congenial hunt.
+
+I waited until midnight, but there was no sign of his return, so
+I retired to my room. It was no uncommon thing for him to be away
+for days and nights on end when he was hot upon a scent, so that
+his lateness caused me no surprise. I do not know at what hour he
+came in, but when I came down to breakfast in the morning there
+he was with a cup of coffee in one hand and the paper in the
+other, as fresh and trim as possible.
+
+"You will excuse my beginning without you, Watson," said he, "but
+you remember that our client has rather an early appointment this
+morning."
+
+"Why, it is after nine now," I answered. "I should not be
+surprised if that were he. I thought I heard a ring."
+
+It was, indeed, our friend the financier. I was shocked by the
+change which had come over him, for his face which was naturally
+of a broad and massive mould, was now pinched and fallen in,
+while his hair seemed to me at least a shade whiter. He entered
+with a weariness and lethargy which was even more painful than
+his violence of the morning before, and he dropped heavily into
+the armchair which I pushed forward for him.
+
+"I do not know what I have done to be so severely tried," said
+he. "Only two days ago I was a happy and prosperous man, without
+a care in the world. Now I am left to a lonely and dishonoured
+age. One sorrow comes close upon the heels of another. My niece,
+Mary, has deserted me."
+
+"Deserted you?"
+
+"Yes. Her bed this morning had not been slept in, her room was
+empty, and a note for me lay upon the hall table. I had said to
+her last night, in sorrow and not in anger, that if she had
+married my boy all might have been well with him. Perhaps it was
+thoughtless of me to say so. It is to that remark that she refers
+in this note:
+
+"'MY DEAREST UNCLE:--I feel that I have brought trouble upon you,
+and that if I had acted differently this terrible misfortune
+might never have occurred. I cannot, with this thought in my
+mind, ever again be happy under your roof, and I feel that I must
+leave you forever. Do not worry about my future, for that is
+provided for; and, above all, do not search for me, for it will
+be fruitless labour and an ill-service to me. In life or in
+death, I am ever your loving,--MARY.'
+
+"What could she mean by that note, Mr. Holmes? Do you think it
+points to suicide?"
+
+"No, no, nothing of the kind. It is perhaps the best possible
+solution. I trust, Mr. Holder, that you are nearing the end of
+your troubles."
+
+"Ha! You say so! You have heard something, Mr. Holmes; you have
+learned something! Where are the gems?"
+
+"You would not think 1000 pounds apiece an excessive sum for
+them?"
+
+"I would pay ten."
+
+"That would be unnecessary. Three thousand will cover the matter.
+And there is a little reward, I fancy. Have you your check-book?
+Here is a pen. Better make it out for 4000 pounds."
+
+With a dazed face the banker made out the required check. Holmes
+walked over to his desk, took out a little triangular piece of
+gold with three gems in it, and threw it down upon the table.
+
+With a shriek of joy our client clutched it up.
+
+"You have it!" he gasped. "I am saved! I am saved!"
+
+The reaction of joy was as passionate as his grief had been, and
+he hugged his recovered gems to his bosom.
+
+"There is one other thing you owe, Mr. Holder," said Sherlock
+Holmes rather sternly.
+
+"Owe!" He caught up a pen. "Name the sum, and I will pay it."
+
+"No, the debt is not to me. You owe a very humble apology to that
+noble lad, your son, who has carried himself in this matter as I
+should be proud to see my own son do, should I ever chance to
+have one."
+
+"Then it was not Arthur who took them?"
+
+"I told you yesterday, and I repeat to-day, that it was not."
+
+"You are sure of it! Then let us hurry to him at once to let him
+know that the truth is known."
+
+"He knows it already. When I had cleared it all up I had an
+interview with him, and finding that he would not tell me the
+story, I told it to him, on which he had to confess that I was
+right and to add the very few details which were not yet quite
+clear to me. Your news of this morning, however, may open his
+lips."
+
+"For heaven's sake, tell me, then, what is this extraordinary
+mystery!"
+
+"I will do so, and I will show you the steps by which I reached
+it. And let me say to you, first, that which it is hardest for me
+to say and for you to hear: there has been an understanding
+between Sir George Burnwell and your niece Mary. They have now
+fled together."
+
+"My Mary? Impossible!"
+
+"It is unfortunately more than possible; it is certain. Neither
+you nor your son knew the true character of this man when you
+admitted him into your family circle. He is one of the most
+dangerous men in England--a ruined gambler, an absolutely
+desperate villain, a man without heart or conscience. Your niece
+knew nothing of such men. When he breathed his vows to her, as he
+had done to a hundred before her, she flattered herself that she
+alone had touched his heart. The devil knows best what he said,
+but at least she became his tool and was in the habit of seeing
+him nearly every evening."
+
+"I cannot, and I will not, believe it!" cried the banker with an
+ashen face.
+
+"I will tell you, then, what occurred in your house last night.
+Your niece, when you had, as she thought, gone to your room,
+slipped down and talked to her lover through the window which
+leads into the stable lane. His footmarks had pressed right
+through the snow, so long had he stood there. She told him of the
+coronet. His wicked lust for gold kindled at the news, and he
+bent her to his will. I have no doubt that she loved you, but
+there are women in whom the love of a lover extinguishes all
+other loves, and I think that she must have been one. She had
+hardly listened to his instructions when she saw you coming
+downstairs, on which she closed the window rapidly and told you
+about one of the servants' escapade with her wooden-legged lover,
+which was all perfectly true.
+
+"Your boy, Arthur, went to bed after his interview with you but
+he slept badly on account of his uneasiness about his club debts.
+In the middle of the night he heard a soft tread pass his door,
+so he rose and, looking out, was surprised to see his cousin
+walking very stealthily along the passage until she disappeared
+into your dressing-room. Petrified with astonishment, the lad
+slipped on some clothes and waited there in the dark to see what
+would come of this strange affair. Presently she emerged from the
+room again, and in the light of the passage-lamp your son saw
+that she carried the precious coronet in her hands. She passed
+down the stairs, and he, thrilling with horror, ran along and
+slipped behind the curtain near your door, whence he could see
+what passed in the hall beneath. He saw her stealthily open the
+window, hand out the coronet to someone in the gloom, and then
+closing it once more hurry back to her room, passing quite close
+to where he stood hid behind the curtain.
+
+"As long as she was on the scene he could not take any action
+without a horrible exposure of the woman whom he loved. But the
+instant that she was gone he realised how crushing a misfortune
+this would be for you, and how all-important it was to set it
+right. He rushed down, just as he was, in his bare feet, opened
+the window, sprang out into the snow, and ran down the lane,
+where he could see a dark figure in the moonlight. Sir George
+Burnwell tried to get away, but Arthur caught him, and there was
+a struggle between them, your lad tugging at one side of the
+coronet, and his opponent at the other. In the scuffle, your son
+struck Sir George and cut him over the eye. Then something
+suddenly snapped, and your son, finding that he had the coronet
+in his hands, rushed back, closed the window, ascended to your
+room, and had just observed that the coronet had been twisted in
+the struggle and was endeavouring to straighten it when you
+appeared upon the scene."
+
+"Is it possible?" gasped the banker.
+
+"You then roused his anger by calling him names at a moment when
+he felt that he had deserved your warmest thanks. He could not
+explain the true state of affairs without betraying one who
+certainly deserved little enough consideration at his hands. He
+took the more chivalrous view, however, and preserved her
+secret."
+
+"And that was why she shrieked and fainted when she saw the
+coronet," cried Mr. Holder. "Oh, my God! what a blind fool I have
+been! And his asking to be allowed to go out for five minutes!
+The dear fellow wanted to see if the missing piece were at the
+scene of the struggle. How cruelly I have misjudged him!"
+
+"When I arrived at the house," continued Holmes, "I at once went
+very carefully round it to observe if there were any traces in
+the snow which might help me. I knew that none had fallen since
+the evening before, and also that there had been a strong frost
+to preserve impressions. I passed along the tradesmen's path, but
+found it all trampled down and indistinguishable. Just beyond it,
+however, at the far side of the kitchen door, a woman had stood
+and talked with a man, whose round impressions on one side showed
+that he had a wooden leg. I could even tell that they had been
+disturbed, for the woman had run back swiftly to the door, as was
+shown by the deep toe and light heel marks, while Wooden-leg had
+waited a little, and then had gone away. I thought at the time
+that this might be the maid and her sweetheart, of whom you had
+already spoken to me, and inquiry showed it was so. I passed
+round the garden without seeing anything more than random tracks,
+which I took to be the police; but when I got into the stable
+lane a very long and complex story was written in the snow in
+front of me.
+
+"There was a double line of tracks of a booted man, and a second
+double line which I saw with delight belonged to a man with naked
+feet. I was at once convinced from what you had told me that the
+latter was your son. The first had walked both ways, but the
+other had run swiftly, and as his tread was marked in places over
+the depression of the boot, it was obvious that he had passed
+after the other. I followed them up and found they led to the
+hall window, where Boots had worn all the snow away while
+waiting. Then I walked to the other end, which was a hundred
+yards or more down the lane. I saw where Boots had faced round,
+where the snow was cut up as though there had been a struggle,
+and, finally, where a few drops of blood had fallen, to show me
+that I was not mistaken. Boots had then run down the lane, and
+another little smudge of blood showed that it was he who had been
+hurt. When he came to the highroad at the other end, I found that
+the pavement had been cleared, so there was an end to that clue.
+
+"On entering the house, however, I examined, as you remember, the
+sill and framework of the hall window with my lens, and I could
+at once see that someone had passed out. I could distinguish the
+outline of an instep where the wet foot had been placed in coming
+in. I was then beginning to be able to form an opinion as to what
+had occurred. A man had waited outside the window; someone had
+brought the gems; the deed had been overseen by your son; he had
+pursued the thief; had struggled with him; they had each tugged
+at the coronet, their united strength causing injuries which
+neither alone could have effected. He had returned with the
+prize, but had left a fragment in the grasp of his opponent. So
+far I was clear. The question now was, who was the man and who
+was it brought him the coronet?
+
+"It is an old maxim of mine that when you have excluded the
+impossible, whatever remains, however improbable, must be the
+truth. Now, I knew that it was not you who had brought it down,
+so there only remained your niece and the maids. But if it were
+the maids, why should your son allow himself to be accused in
+their place? There could be no possible reason. As he loved his
+cousin, however, there was an excellent explanation why he should
+retain her secret--the more so as the secret was a disgraceful
+one. When I remembered that you had seen her at that window, and
+how she had fainted on seeing the coronet again, my conjecture
+became a certainty.
+
+"And who could it be who was her confederate? A lover evidently,
+for who else could outweigh the love and gratitude which she must
+feel to you? I knew that you went out little, and that your
+circle of friends was a very limited one. But among them was Sir
+George Burnwell. I had heard of him before as being a man of evil
+reputation among women. It must have been he who wore those boots
+and retained the missing gems. Even though he knew that Arthur
+had discovered him, he might still flatter himself that he was
+safe, for the lad could not say a word without compromising his
+own family.
+
+"Well, your own good sense will suggest what measures I took
+next. I went in the shape of a loafer to Sir George's house,
+managed to pick up an acquaintance with his valet, learned that
+his master had cut his head the night before, and, finally, at
+the expense of six shillings, made all sure by buying a pair of
+his cast-off shoes. With these I journeyed down to Streatham and
+saw that they exactly fitted the tracks."
+
+"I saw an ill-dressed vagabond in the lane yesterday evening,"
+said Mr. Holder.
+
+"Precisely. It was I. I found that I had my man, so I came home
+and changed my clothes. It was a delicate part which I had to
+play then, for I saw that a prosecution must be avoided to avert
+scandal, and I knew that so astute a villain would see that our
+hands were tied in the matter. I went and saw him. At first, of
+course, he denied everything. But when I gave him every
+particular that had occurred, he tried to bluster and took down a
+life-preserver from the wall. I knew my man, however, and I
+clapped a pistol to his head before he could strike. Then he
+became a little more reasonable. I told him that we would give
+him a price for the stones he held--1000 pounds apiece. That
+brought out the first signs of grief that he had shown. 'Why,
+dash it all!' said he, 'I've let them go at six hundred for the
+three!' I soon managed to get the address of the receiver who had
+them, on promising him that there would be no prosecution. Off I
+set to him, and after much chaffering I got our stones at 1000
+pounds apiece. Then I looked in upon your son, told him that all
+was right, and eventually got to my bed about two o'clock, after
+what I may call a really hard day's work."
+
+"A day which has saved England from a great public scandal," said
+the banker, rising. "Sir, I cannot find words to thank you, but
+you shall not find me ungrateful for what you have done. Your
+skill has indeed exceeded all that I have heard of it. And now I
+must fly to my dear boy to apologise to him for the wrong which I
+have done him. As to what you tell me of poor Mary, it goes to my
+very heart. Not even your skill can inform me where she is now."
+
+"I think that we may safely say," returned Holmes, "that she is
+wherever Sir George Burnwell is. It is equally certain, too, that
+whatever her sins are, they will soon receive a more than
+sufficient punishment."
+
+
+
+XII. THE ADVENTURE OF THE COPPER BEECHES
+
+"To the man who loves art for its own sake," remarked Sherlock
+Holmes, tossing aside the advertisement sheet of the Daily
+Telegraph, "it is frequently in its least important and lowliest
+manifestations that the keenest pleasure is to be derived. It is
+pleasant to me to observe, Watson, that you have so far grasped
+this truth that in these little records of our cases which you
+have been good enough to draw up, and, I am bound to say,
+occasionally to embellish, you have given prominence not so much
+to the many causes célèbres and sensational trials in which I
+have figured but rather to those incidents which may have been
+trivial in themselves, but which have given room for those
+faculties of deduction and of logical synthesis which I have made
+my special province."
+
+"And yet," said I, smiling, "I cannot quite hold myself absolved
+from the charge of sensationalism which has been urged against my
+records."
+
+"You have erred, perhaps," he observed, taking up a glowing
+cinder with the tongs and lighting with it the long cherry-wood
+pipe which was wont to replace his clay when he was in a
+disputatious rather than a meditative mood--"you have erred
+perhaps in attempting to put colour and life into each of your
+statements instead of confining yourself to the task of placing
+upon record that severe reasoning from cause to effect which is
+really the only notable feature about the thing."
+
+"It seems to me that I have done you full justice in the matter,"
+I remarked with some coldness, for I was repelled by the egotism
+which I had more than once observed to be a strong factor in my
+friend's singular character.
+
+"No, it is not selfishness or conceit," said he, answering, as
+was his wont, my thoughts rather than my words. "If I claim full
+justice for my art, it is because it is an impersonal thing--a
+thing beyond myself. Crime is common. Logic is rare. Therefore it
+is upon the logic rather than upon the crime that you should
+dwell. You have degraded what should have been a course of
+lectures into a series of tales."
+
+It was a cold morning of the early spring, and we sat after
+breakfast on either side of a cheery fire in the old room at
+Baker Street. A thick fog rolled down between the lines of
+dun-coloured houses, and the opposing windows loomed like dark,
+shapeless blurs through the heavy yellow wreaths. Our gas was lit
+and shone on the white cloth and glimmer of china and metal, for
+the table had not been cleared yet. Sherlock Holmes had been
+silent all the morning, dipping continuously into the
+advertisement columns of a succession of papers until at last,
+having apparently given up his search, he had emerged in no very
+sweet temper to lecture me upon my literary shortcomings.
+
+"At the same time," he remarked after a pause, during which he
+had sat puffing at his long pipe and gazing down into the fire,
+"you can hardly be open to a charge of sensationalism, for out of
+these cases which you have been so kind as to interest yourself
+in, a fair proportion do not treat of crime, in its legal sense,
+at all. The small matter in which I endeavoured to help the King
+of Bohemia, the singular experience of Miss Mary Sutherland, the
+problem connected with the man with the twisted lip, and the
+incident of the noble bachelor, were all matters which are
+outside the pale of the law. But in avoiding the sensational, I
+fear that you may have bordered on the trivial."
+
+"The end may have been so," I answered, "but the methods I hold
+to have been novel and of interest."
+
+"Pshaw, my dear fellow, what do the public, the great unobservant
+public, who could hardly tell a weaver by his tooth or a
+compositor by his left thumb, care about the finer shades of
+analysis and deduction! But, indeed, if you are trivial, I cannot
+blame you, for the days of the great cases are past. Man, or at
+least criminal man, has lost all enterprise and originality. As
+to my own little practice, it seems to be degenerating into an
+agency for recovering lost lead pencils and giving advice to
+young ladies from boarding-schools. I think that I have touched
+bottom at last, however. This note I had this morning marks my
+zero-point, I fancy. Read it!" He tossed a crumpled letter across
+to me.
+
+It was dated from Montague Place upon the preceding evening, and
+ran thus:
+
+"DEAR MR. HOLMES:--I am very anxious to consult you as to whether
+I should or should not accept a situation which has been offered
+to me as governess. I shall call at half-past ten to-morrow if I
+do not inconvenience you. Yours faithfully,
+ "VIOLET HUNTER."
+
+"Do you know the young lady?" I asked.
+
+"Not I."
+
+"It is half-past ten now."
+
+"Yes, and I have no doubt that is her ring."
+
+"It may turn out to be of more interest than you think. You
+remember that the affair of the blue carbuncle, which appeared to
+be a mere whim at first, developed into a serious investigation.
+It may be so in this case, also."
+
+"Well, let us hope so. But our doubts will very soon be solved,
+for here, unless I am much mistaken, is the person in question."
+
+As he spoke the door opened and a young lady entered the room.
+She was plainly but neatly dressed, with a bright, quick face,
+freckled like a plover's egg, and with the brisk manner of a
+woman who has had her own way to make in the world.
+
+"You will excuse my troubling you, I am sure," said she, as my
+companion rose to greet her, "but I have had a very strange
+experience, and as I have no parents or relations of any sort
+from whom I could ask advice, I thought that perhaps you would be
+kind enough to tell me what I should do."
+
+"Pray take a seat, Miss Hunter. I shall be happy to do anything
+that I can to serve you."
+
+I could see that Holmes was favourably impressed by the manner
+and speech of his new client. He looked her over in his searching
+fashion, and then composed himself, with his lids drooping and
+his finger-tips together, to listen to her story.
+
+"I have been a governess for five years," said she, "in the
+family of Colonel Spence Munro, but two months ago the colonel
+received an appointment at Halifax, in Nova Scotia, and took his
+children over to America with him, so that I found myself without
+a situation. I advertised, and I answered advertisements, but
+without success. At last the little money which I had saved began
+to run short, and I was at my wit's end as to what I should do.
+
+"There is a well-known agency for governesses in the West End
+called Westaway's, and there I used to call about once a week in
+order to see whether anything had turned up which might suit me.
+Westaway was the name of the founder of the business, but it is
+really managed by Miss Stoper. She sits in her own little office,
+and the ladies who are seeking employment wait in an anteroom,
+and are then shown in one by one, when she consults her ledgers
+and sees whether she has anything which would suit them.
+
+"Well, when I called last week I was shown into the little office
+as usual, but I found that Miss Stoper was not alone. A
+prodigiously stout man with a very smiling face and a great heavy
+chin which rolled down in fold upon fold over his throat sat at
+her elbow with a pair of glasses on his nose, looking very
+earnestly at the ladies who entered. As I came in he gave quite a
+jump in his chair and turned quickly to Miss Stoper.
+
+"'That will do,' said he; 'I could not ask for anything better.
+Capital! capital!' He seemed quite enthusiastic and rubbed his
+hands together in the most genial fashion. He was such a
+comfortable-looking man that it was quite a pleasure to look at
+him.
+
+"'You are looking for a situation, miss?' he asked.
+
+"'Yes, sir.'
+
+"'As governess?'
+
+"'Yes, sir.'
+
+"'And what salary do you ask?'
+
+"'I had 4 pounds a month in my last place with Colonel Spence
+Munro.'
+
+"'Oh, tut, tut! sweating--rank sweating!' he cried, throwing his
+fat hands out into the air like a man who is in a boiling
+passion. 'How could anyone offer so pitiful a sum to a lady with
+such attractions and accomplishments?'
+
+"'My accomplishments, sir, may be less than you imagine,' said I.
+'A little French, a little German, music, and drawing--'
+
+"'Tut, tut!' he cried. 'This is all quite beside the question.
+The point is, have you or have you not the bearing and deportment
+of a lady? There it is in a nutshell. If you have not, you are
+not fitted for the rearing of a child who may some day play a
+considerable part in the history of the country. But if you have
+why, then, how could any gentleman ask you to condescend to
+accept anything under the three figures? Your salary with me,
+madam, would commence at 100 pounds a year.'
+
+"You may imagine, Mr. Holmes, that to me, destitute as I was,
+such an offer seemed almost too good to be true. The gentleman,
+however, seeing perhaps the look of incredulity upon my face,
+opened a pocket-book and took out a note.
+
+"'It is also my custom,' said he, smiling in the most pleasant
+fashion until his eyes were just two little shining slits amid
+the white creases of his face, 'to advance to my young ladies
+half their salary beforehand, so that they may meet any little
+expenses of their journey and their wardrobe.'
+
+"It seemed to me that I had never met so fascinating and so
+thoughtful a man. As I was already in debt to my tradesmen, the
+advance was a great convenience, and yet there was something
+unnatural about the whole transaction which made me wish to know
+a little more before I quite committed myself.
+
+"'May I ask where you live, sir?' said I.
+
+"'Hampshire. Charming rural place. The Copper Beeches, five miles
+on the far side of Winchester. It is the most lovely country, my
+dear young lady, and the dearest old country-house.'
+
+"'And my duties, sir? I should be glad to know what they would
+be.'
+
+"'One child--one dear little romper just six years old. Oh, if
+you could see him killing cockroaches with a slipper! Smack!
+smack! smack! Three gone before you could wink!' He leaned back
+in his chair and laughed his eyes into his head again.
+
+"I was a little startled at the nature of the child's amusement,
+but the father's laughter made me think that perhaps he was
+joking.
+
+"'My sole duties, then,' I asked, 'are to take charge of a single
+child?'
+
+"'No, no, not the sole, not the sole, my dear young lady,' he
+cried. 'Your duty would be, as I am sure your good sense would
+suggest, to obey any little commands my wife might give, provided
+always that they were such commands as a lady might with
+propriety obey. You see no difficulty, heh?'
+
+"'I should be happy to make myself useful.'
+
+"'Quite so. In dress now, for example. We are faddy people, you
+know--faddy but kind-hearted. If you were asked to wear any dress
+which we might give you, you would not object to our little whim.
+Heh?'
+
+"'No,' said I, considerably astonished at his words.
+
+"'Or to sit here, or sit there, that would not be offensive to
+you?'
+
+"'Oh, no.'
+
+"'Or to cut your hair quite short before you come to us?'
+
+"I could hardly believe my ears. As you may observe, Mr. Holmes,
+my hair is somewhat luxuriant, and of a rather peculiar tint of
+chestnut. It has been considered artistic. I could not dream of
+sacrificing it in this offhand fashion.
+
+"'I am afraid that that is quite impossible,' said I. He had been
+watching me eagerly out of his small eyes, and I could see a
+shadow pass over his face as I spoke.
+
+"'I am afraid that it is quite essential,' said he. 'It is a
+little fancy of my wife's, and ladies' fancies, you know, madam,
+ladies' fancies must be consulted. And so you won't cut your
+hair?'
+
+"'No, sir, I really could not,' I answered firmly.
+
+"'Ah, very well; then that quite settles the matter. It is a
+pity, because in other respects you would really have done very
+nicely. In that case, Miss Stoper, I had best inspect a few more
+of your young ladies.'
+
+"The manageress had sat all this while busy with her papers
+without a word to either of us, but she glanced at me now with so
+much annoyance upon her face that I could not help suspecting
+that she had lost a handsome commission through my refusal.
+
+"'Do you desire your name to be kept upon the books?' she asked.
+
+"'If you please, Miss Stoper.'
+
+"'Well, really, it seems rather useless, since you refuse the
+most excellent offers in this fashion,' said she sharply. 'You
+can hardly expect us to exert ourselves to find another such
+opening for you. Good-day to you, Miss Hunter.' She struck a gong
+upon the table, and I was shown out by the page.
+
+"Well, Mr. Holmes, when I got back to my lodgings and found
+little enough in the cupboard, and two or three bills upon the
+table, I began to ask myself whether I had not done a very
+foolish thing. After all, if these people had strange fads and
+expected obedience on the most extraordinary matters, they were
+at least ready to pay for their eccentricity. Very few
+governesses in England are getting 100 pounds a year. Besides,
+what use was my hair to me? Many people are improved by wearing
+it short and perhaps I should be among the number. Next day I was
+inclined to think that I had made a mistake, and by the day after
+I was sure of it. I had almost overcome my pride so far as to go
+back to the agency and inquire whether the place was still open
+when I received this letter from the gentleman himself. I have it
+here and I will read it to you:
+
+ "'The Copper Beeches, near Winchester.
+"'DEAR MISS HUNTER:--Miss Stoper has very kindly given me your
+address, and I write from here to ask you whether you have
+reconsidered your decision. My wife is very anxious that you
+should come, for she has been much attracted by my description of
+you. We are willing to give 30 pounds a quarter, or 120 pounds a
+year, so as to recompense you for any little inconvenience which
+our fads may cause you. They are not very exacting, after all. My
+wife is fond of a particular shade of electric blue and would
+like you to wear such a dress indoors in the morning. You need
+not, however, go to the expense of purchasing one, as we have one
+belonging to my dear daughter Alice (now in Philadelphia), which
+would, I should think, fit you very well. Then, as to sitting
+here or there, or amusing yourself in any manner indicated, that
+need cause you no inconvenience. As regards your hair, it is no
+doubt a pity, especially as I could not help remarking its beauty
+during our short interview, but I am afraid that I must remain
+firm upon this point, and I only hope that the increased salary
+may recompense you for the loss. Your duties, as far as the child
+is concerned, are very light. Now do try to come, and I shall
+meet you with the dog-cart at Winchester. Let me know your train.
+Yours faithfully, JEPHRO RUCASTLE.'
+
+"That is the letter which I have just received, Mr. Holmes, and
+my mind is made up that I will accept it. I thought, however,
+that before taking the final step I should like to submit the
+whole matter to your consideration."
+
+"Well, Miss Hunter, if your mind is made up, that settles the
+question," said Holmes, smiling.
+
+"But you would not advise me to refuse?"
+
+"I confess that it is not the situation which I should like to
+see a sister of mine apply for."
+
+"What is the meaning of it all, Mr. Holmes?"
+
+"Ah, I have no data. I cannot tell. Perhaps you have yourself
+formed some opinion?"
+
+"Well, there seems to me to be only one possible solution. Mr.
+Rucastle seemed to be a very kind, good-natured man. Is it not
+possible that his wife is a lunatic, that he desires to keep the
+matter quiet for fear she should be taken to an asylum, and that
+he humours her fancies in every way in order to prevent an
+outbreak?"
+
+"That is a possible solution--in fact, as matters stand, it is
+the most probable one. But in any case it does not seem to be a
+nice household for a young lady."
+
+"But the money, Mr. Holmes, the money!"
+
+"Well, yes, of course the pay is good--too good. That is what
+makes me uneasy. Why should they give you 120 pounds a year, when
+they could have their pick for 40 pounds? There must be some
+strong reason behind."
+
+"I thought that if I told you the circumstances you would
+understand afterwards if I wanted your help. I should feel so
+much stronger if I felt that you were at the back of me."
+
+"Oh, you may carry that feeling away with you. I assure you that
+your little problem promises to be the most interesting which has
+come my way for some months. There is something distinctly novel
+about some of the features. If you should find yourself in doubt
+or in danger--"
+
+"Danger! What danger do you foresee?"
+
+Holmes shook his head gravely. "It would cease to be a danger if
+we could define it," said he. "But at any time, day or night, a
+telegram would bring me down to your help."
+
+"That is enough." She rose briskly from her chair with the
+anxiety all swept from her face. "I shall go down to Hampshire
+quite easy in my mind now. I shall write to Mr. Rucastle at once,
+sacrifice my poor hair to-night, and start for Winchester
+to-morrow." With a few grateful words to Holmes she bade us both
+good-night and bustled off upon her way.
+
+"At least," said I as we heard her quick, firm steps descending
+the stairs, "she seems to be a young lady who is very well able
+to take care of herself."
+
+"And she would need to be," said Holmes gravely. "I am much
+mistaken if we do not hear from her before many days are past."
+
+It was not very long before my friend's prediction was fulfilled.
+A fortnight went by, during which I frequently found my thoughts
+turning in her direction and wondering what strange side-alley of
+human experience this lonely woman had strayed into. The unusual
+salary, the curious conditions, the light duties, all pointed to
+something abnormal, though whether a fad or a plot, or whether
+the man were a philanthropist or a villain, it was quite beyond
+my powers to determine. As to Holmes, I observed that he sat
+frequently for half an hour on end, with knitted brows and an
+abstracted air, but he swept the matter away with a wave of his
+hand when I mentioned it. "Data! data! data!" he cried
+impatiently. "I can't make bricks without clay." And yet he would
+always wind up by muttering that no sister of his should ever
+have accepted such a situation.
+
+The telegram which we eventually received came late one night
+just as I was thinking of turning in and Holmes was settling down
+to one of those all-night chemical researches which he frequently
+indulged in, when I would leave him stooping over a retort and a
+test-tube at night and find him in the same position when I came
+down to breakfast in the morning. He opened the yellow envelope,
+and then, glancing at the message, threw it across to me.
+
+"Just look up the trains in Bradshaw," said he, and turned back
+to his chemical studies.
+
+The summons was a brief and urgent one.
+
+"Please be at the Black Swan Hotel at Winchester at midday
+to-morrow," it said. "Do come! I am at my wit's end. HUNTER."
+
+"Will you come with me?" asked Holmes, glancing up.
+
+"I should wish to."
+
+"Just look it up, then."
+
+"There is a train at half-past nine," said I, glancing over my
+Bradshaw. "It is due at Winchester at 11:30."
+
+"That will do very nicely. Then perhaps I had better postpone my
+analysis of the acetones, as we may need to be at our best in the
+morning."
+
+By eleven o'clock the next day we were well upon our way to the
+old English capital. Holmes had been buried in the morning papers
+all the way down, but after we had passed the Hampshire border he
+threw them down and began to admire the scenery. It was an ideal
+spring day, a light blue sky, flecked with little fleecy white
+clouds drifting across from west to east. The sun was shining
+very brightly, and yet there was an exhilarating nip in the air,
+which set an edge to a man's energy. All over the countryside,
+away to the rolling hills around Aldershot, the little red and
+grey roofs of the farm-steadings peeped out from amid the light
+green of the new foliage.
+
+"Are they not fresh and beautiful?" I cried with all the
+enthusiasm of a man fresh from the fogs of Baker Street.
+
+But Holmes shook his head gravely.
+
+"Do you know, Watson," said he, "that it is one of the curses of
+a mind with a turn like mine that I must look at everything with
+reference to my own special subject. You look at these scattered
+houses, and you are impressed by their beauty. I look at them,
+and the only thought which comes to me is a feeling of their
+isolation and of the impunity with which crime may be committed
+there."
+
+"Good heavens!" I cried. "Who would associate crime with these
+dear old homesteads?"
+
+"They always fill me with a certain horror. It is my belief,
+Watson, founded upon my experience, that the lowest and vilest
+alleys in London do not present a more dreadful record of sin
+than does the smiling and beautiful countryside."
+
+"You horrify me!"
+
+"But the reason is very obvious. The pressure of public opinion
+can do in the town what the law cannot accomplish. There is no
+lane so vile that the scream of a tortured child, or the thud of
+a drunkard's blow, does not beget sympathy and indignation among
+the neighbours, and then the whole machinery of justice is ever
+so close that a word of complaint can set it going, and there is
+but a step between the crime and the dock. But look at these
+lonely houses, each in its own fields, filled for the most part
+with poor ignorant folk who know little of the law. Think of the
+deeds of hellish cruelty, the hidden wickedness which may go on,
+year in, year out, in such places, and none the wiser. Had this
+lady who appeals to us for help gone to live in Winchester, I
+should never have had a fear for her. It is the five miles of
+country which makes the danger. Still, it is clear that she is
+not personally threatened."
+
+"No. If she can come to Winchester to meet us she can get away."
+
+"Quite so. She has her freedom."
+
+"What CAN be the matter, then? Can you suggest no explanation?"
+
+"I have devised seven separate explanations, each of which would
+cover the facts as far as we know them. But which of these is
+correct can only be determined by the fresh information which we
+shall no doubt find waiting for us. Well, there is the tower of
+the cathedral, and we shall soon learn all that Miss Hunter has
+to tell."
+
+The Black Swan is an inn of repute in the High Street, at no
+distance from the station, and there we found the young lady
+waiting for us. She had engaged a sitting-room, and our lunch
+awaited us upon the table.
+
+"I am so delighted that you have come," she said earnestly. "It
+is so very kind of you both; but indeed I do not know what I
+should do. Your advice will be altogether invaluable to me."
+
+"Pray tell us what has happened to you."
+
+"I will do so, and I must be quick, for I have promised Mr.
+Rucastle to be back before three. I got his leave to come into
+town this morning, though he little knew for what purpose."
+
+"Let us have everything in its due order." Holmes thrust his long
+thin legs out towards the fire and composed himself to listen.
+
+"In the first place, I may say that I have met, on the whole,
+with no actual ill-treatment from Mr. and Mrs. Rucastle. It is
+only fair to them to say that. But I cannot understand them, and
+I am not easy in my mind about them."
+
+"What can you not understand?"
+
+"Their reasons for their conduct. But you shall have it all just
+as it occurred. When I came down, Mr. Rucastle met me here and
+drove me in his dog-cart to the Copper Beeches. It is, as he
+said, beautifully situated, but it is not beautiful in itself,
+for it is a large square block of a house, whitewashed, but all
+stained and streaked with damp and bad weather. There are grounds
+round it, woods on three sides, and on the fourth a field which
+slopes down to the Southampton highroad, which curves past about
+a hundred yards from the front door. This ground in front belongs
+to the house, but the woods all round are part of Lord
+Southerton's preserves. A clump of copper beeches immediately in
+front of the hall door has given its name to the place.
+
+"I was driven over by my employer, who was as amiable as ever,
+and was introduced by him that evening to his wife and the child.
+There was no truth, Mr. Holmes, in the conjecture which seemed to
+us to be probable in your rooms at Baker Street. Mrs. Rucastle is
+not mad. I found her to be a silent, pale-faced woman, much
+younger than her husband, not more than thirty, I should think,
+while he can hardly be less than forty-five. From their
+conversation I have gathered that they have been married about
+seven years, that he was a widower, and that his only child by
+the first wife was the daughter who has gone to Philadelphia. Mr.
+Rucastle told me in private that the reason why she had left them
+was that she had an unreasoning aversion to her stepmother. As
+the daughter could not have been less than twenty, I can quite
+imagine that her position must have been uncomfortable with her
+father's young wife.
+
+"Mrs. Rucastle seemed to me to be colourless in mind as well as
+in feature. She impressed me neither favourably nor the reverse.
+She was a nonentity. It was easy to see that she was passionately
+devoted both to her husband and to her little son. Her light grey
+eyes wandered continually from one to the other, noting every
+little want and forestalling it if possible. He was kind to her
+also in his bluff, boisterous fashion, and on the whole they
+seemed to be a happy couple. And yet she had some secret sorrow,
+this woman. She would often be lost in deep thought, with the
+saddest look upon her face. More than once I have surprised her
+in tears. I have thought sometimes that it was the disposition of
+her child which weighed upon her mind, for I have never met so
+utterly spoiled and so ill-natured a little creature. He is small
+for his age, with a head which is quite disproportionately large.
+His whole life appears to be spent in an alternation between
+savage fits of passion and gloomy intervals of sulking. Giving
+pain to any creature weaker than himself seems to be his one idea
+of amusement, and he shows quite remarkable talent in planning
+the capture of mice, little birds, and insects. But I would
+rather not talk about the creature, Mr. Holmes, and, indeed, he
+has little to do with my story."
+
+"I am glad of all details," remarked my friend, "whether they
+seem to you to be relevant or not."
+
+"I shall try not to miss anything of importance. The one
+unpleasant thing about the house, which struck me at once, was
+the appearance and conduct of the servants. There are only two, a
+man and his wife. Toller, for that is his name, is a rough,
+uncouth man, with grizzled hair and whiskers, and a perpetual
+smell of drink. Twice since I have been with them he has been
+quite drunk, and yet Mr. Rucastle seemed to take no notice of it.
+His wife is a very tall and strong woman with a sour face, as
+silent as Mrs. Rucastle and much less amiable. They are a most
+unpleasant couple, but fortunately I spend most of my time in the
+nursery and my own room, which are next to each other in one
+corner of the building.
+
+"For two days after my arrival at the Copper Beeches my life was
+very quiet; on the third, Mrs. Rucastle came down just after
+breakfast and whispered something to her husband.
+
+"'Oh, yes,' said he, turning to me, 'we are very much obliged to
+you, Miss Hunter, for falling in with our whims so far as to cut
+your hair. I assure you that it has not detracted in the tiniest
+iota from your appearance. We shall now see how the electric-blue
+dress will become you. You will find it laid out upon the bed in
+your room, and if you would be so good as to put it on we should
+both be extremely obliged.'
+
+"The dress which I found waiting for me was of a peculiar shade
+of blue. It was of excellent material, a sort of beige, but it
+bore unmistakable signs of having been worn before. It could not
+have been a better fit if I had been measured for it. Both Mr.
+and Mrs. Rucastle expressed a delight at the look of it, which
+seemed quite exaggerated in its vehemence. They were waiting for
+me in the drawing-room, which is a very large room, stretching
+along the entire front of the house, with three long windows
+reaching down to the floor. A chair had been placed close to the
+central window, with its back turned towards it. In this I was
+asked to sit, and then Mr. Rucastle, walking up and down on the
+other side of the room, began to tell me a series of the funniest
+stories that I have ever listened to. You cannot imagine how
+comical he was, and I laughed until I was quite weary. Mrs.
+Rucastle, however, who has evidently no sense of humour, never so
+much as smiled, but sat with her hands in her lap, and a sad,
+anxious look upon her face. After an hour or so, Mr. Rucastle
+suddenly remarked that it was time to commence the duties of the
+day, and that I might change my dress and go to little Edward in
+the nursery.
+
+"Two days later this same performance was gone through under
+exactly similar circumstances. Again I changed my dress, again I
+sat in the window, and again I laughed very heartily at the funny
+stories of which my employer had an immense répertoire, and which
+he told inimitably. Then he handed me a yellow-backed novel, and
+moving my chair a little sideways, that my own shadow might not
+fall upon the page, he begged me to read aloud to him. I read for
+about ten minutes, beginning in the heart of a chapter, and then
+suddenly, in the middle of a sentence, he ordered me to cease and
+to change my dress.
+
+"You can easily imagine, Mr. Holmes, how curious I became as to
+what the meaning of this extraordinary performance could possibly
+be. They were always very careful, I observed, to turn my face
+away from the window, so that I became consumed with the desire
+to see what was going on behind my back. At first it seemed to be
+impossible, but I soon devised a means. My hand-mirror had been
+broken, so a happy thought seized me, and I concealed a piece of
+the glass in my handkerchief. On the next occasion, in the midst
+of my laughter, I put my handkerchief up to my eyes, and was able
+with a little management to see all that there was behind me. I
+confess that I was disappointed. There was nothing. At least that
+was my first impression. At the second glance, however, I
+perceived that there was a man standing in the Southampton Road,
+a small bearded man in a grey suit, who seemed to be looking in
+my direction. The road is an important highway, and there are
+usually people there. This man, however, was leaning against the
+railings which bordered our field and was looking earnestly up. I
+lowered my handkerchief and glanced at Mrs. Rucastle to find her
+eyes fixed upon me with a most searching gaze. She said nothing,
+but I am convinced that she had divined that I had a mirror in my
+hand and had seen what was behind me. She rose at once.
+
+"'Jephro,' said she, 'there is an impertinent fellow upon the
+road there who stares up at Miss Hunter.'
+
+"'No friend of yours, Miss Hunter?' he asked.
+
+"'No, I know no one in these parts.'
+
+"'Dear me! How very impertinent! Kindly turn round and motion to
+him to go away.'
+
+"'Surely it would be better to take no notice.'
+
+"'No, no, we should have him loitering here always. Kindly turn
+round and wave him away like that.'
+
+"I did as I was told, and at the same instant Mrs. Rucastle drew
+down the blind. That was a week ago, and from that time I have
+not sat again in the window, nor have I worn the blue dress, nor
+seen the man in the road."
+
+"Pray continue," said Holmes. "Your narrative promises to be a
+most interesting one."
+
+"You will find it rather disconnected, I fear, and there may
+prove to be little relation between the different incidents of
+which I speak. On the very first day that I was at the Copper
+Beeches, Mr. Rucastle took me to a small outhouse which stands
+near the kitchen door. As we approached it I heard the sharp
+rattling of a chain, and the sound as of a large animal moving
+about.
+
+"'Look in here!' said Mr. Rucastle, showing me a slit between two
+planks. 'Is he not a beauty?'
+
+"I looked through and was conscious of two glowing eyes, and of a
+vague figure huddled up in the darkness.
+
+"'Don't be frightened,' said my employer, laughing at the start
+which I had given. 'It's only Carlo, my mastiff. I call him mine,
+but really old Toller, my groom, is the only man who can do
+anything with him. We feed him once a day, and not too much then,
+so that he is always as keen as mustard. Toller lets him loose
+every night, and God help the trespasser whom he lays his fangs
+upon. For goodness' sake don't you ever on any pretext set your
+foot over the threshold at night, for it's as much as your life
+is worth.'
+
+"The warning was no idle one, for two nights later I happened to
+look out of my bedroom window about two o'clock in the morning.
+It was a beautiful moonlight night, and the lawn in front of the
+house was silvered over and almost as bright as day. I was
+standing, rapt in the peaceful beauty of the scene, when I was
+aware that something was moving under the shadow of the copper
+beeches. As it emerged into the moonshine I saw what it was. It
+was a giant dog, as large as a calf, tawny tinted, with hanging
+jowl, black muzzle, and huge projecting bones. It walked slowly
+across the lawn and vanished into the shadow upon the other side.
+That dreadful sentinel sent a chill to my heart which I do not
+think that any burglar could have done.
+
+"And now I have a very strange experience to tell you. I had, as
+you know, cut off my hair in London, and I had placed it in a
+great coil at the bottom of my trunk. One evening, after the
+child was in bed, I began to amuse myself by examining the
+furniture of my room and by rearranging my own little things.
+There was an old chest of drawers in the room, the two upper ones
+empty and open, the lower one locked. I had filled the first two
+with my linen, and as I had still much to pack away I was
+naturally annoyed at not having the use of the third drawer. It
+struck me that it might have been fastened by a mere oversight,
+so I took out my bunch of keys and tried to open it. The very
+first key fitted to perfection, and I drew the drawer open. There
+was only one thing in it, but I am sure that you would never
+guess what it was. It was my coil of hair.
+
+"I took it up and examined it. It was of the same peculiar tint,
+and the same thickness. But then the impossibility of the thing
+obtruded itself upon me. How could my hair have been locked in
+the drawer? With trembling hands I undid my trunk, turned out the
+contents, and drew from the bottom my own hair. I laid the two
+tresses together, and I assure you that they were identical. Was
+it not extraordinary? Puzzle as I would, I could make nothing at
+all of what it meant. I returned the strange hair to the drawer,
+and I said nothing of the matter to the Rucastles as I felt that
+I had put myself in the wrong by opening a drawer which they had
+locked.
+
+"I am naturally observant, as you may have remarked, Mr. Holmes,
+and I soon had a pretty good plan of the whole house in my head.
+There was one wing, however, which appeared not to be inhabited
+at all. A door which faced that which led into the quarters of
+the Tollers opened into this suite, but it was invariably locked.
+One day, however, as I ascended the stair, I met Mr. Rucastle
+coming out through this door, his keys in his hand, and a look on
+his face which made him a very different person to the round,
+jovial man to whom I was accustomed. His cheeks were red, his
+brow was all crinkled with anger, and the veins stood out at his
+temples with passion. He locked the door and hurried past me
+without a word or a look.
+
+"This aroused my curiosity, so when I went out for a walk in the
+grounds with my charge, I strolled round to the side from which I
+could see the windows of this part of the house. There were four
+of them in a row, three of which were simply dirty, while the
+fourth was shuttered up. They were evidently all deserted. As I
+strolled up and down, glancing at them occasionally, Mr. Rucastle
+came out to me, looking as merry and jovial as ever.
+
+"'Ah!' said he, 'you must not think me rude if I passed you
+without a word, my dear young lady. I was preoccupied with
+business matters.'
+
+"I assured him that I was not offended. 'By the way,' said I,
+'you seem to have quite a suite of spare rooms up there, and one
+of them has the shutters up.'
+
+"He looked surprised and, as it seemed to me, a little startled
+at my remark.
+
+"'Photography is one of my hobbies,' said he. 'I have made my
+dark room up there. But, dear me! what an observant young lady we
+have come upon. Who would have believed it? Who would have ever
+believed it?' He spoke in a jesting tone, but there was no jest
+in his eyes as he looked at me. I read suspicion there and
+annoyance, but no jest.
+
+"Well, Mr. Holmes, from the moment that I understood that there
+was something about that suite of rooms which I was not to know,
+I was all on fire to go over them. It was not mere curiosity,
+though I have my share of that. It was more a feeling of duty--a
+feeling that some good might come from my penetrating to this
+place. They talk of woman's instinct; perhaps it was woman's
+instinct which gave me that feeling. At any rate, it was there,
+and I was keenly on the lookout for any chance to pass the
+forbidden door.
+
+"It was only yesterday that the chance came. I may tell you that,
+besides Mr. Rucastle, both Toller and his wife find something to
+do in these deserted rooms, and I once saw him carrying a large
+black linen bag with him through the door. Recently he has been
+drinking hard, and yesterday evening he was very drunk; and when
+I came upstairs there was the key in the door. I have no doubt at
+all that he had left it there. Mr. and Mrs. Rucastle were both
+downstairs, and the child was with them, so that I had an
+admirable opportunity. I turned the key gently in the lock,
+opened the door, and slipped through.
+
+"There was a little passage in front of me, unpapered and
+uncarpeted, which turned at a right angle at the farther end.
+Round this corner were three doors in a line, the first and third
+of which were open. They each led into an empty room, dusty and
+cheerless, with two windows in the one and one in the other, so
+thick with dirt that the evening light glimmered dimly through
+them. The centre door was closed, and across the outside of it
+had been fastened one of the broad bars of an iron bed, padlocked
+at one end to a ring in the wall, and fastened at the other with
+stout cord. The door itself was locked as well, and the key was
+not there. This barricaded door corresponded clearly with the
+shuttered window outside, and yet I could see by the glimmer from
+beneath it that the room was not in darkness. Evidently there was
+a skylight which let in light from above. As I stood in the
+passage gazing at the sinister door and wondering what secret it
+might veil, I suddenly heard the sound of steps within the room
+and saw a shadow pass backward and forward against the little
+slit of dim light which shone out from under the door. A mad,
+unreasoning terror rose up in me at the sight, Mr. Holmes. My
+overstrung nerves failed me suddenly, and I turned and ran--ran
+as though some dreadful hand were behind me clutching at the
+skirt of my dress. I rushed down the passage, through the door,
+and straight into the arms of Mr. Rucastle, who was waiting
+outside.
+
+"'So,' said he, smiling, 'it was you, then. I thought that it
+must be when I saw the door open.'
+
+"'Oh, I am so frightened!' I panted.
+
+"'My dear young lady! my dear young lady!'--you cannot think how
+caressing and soothing his manner was--'and what has frightened
+you, my dear young lady?'
+
+"But his voice was just a little too coaxing. He overdid it. I
+was keenly on my guard against him.
+
+"'I was foolish enough to go into the empty wing,' I answered.
+'But it is so lonely and eerie in this dim light that I was
+frightened and ran out again. Oh, it is so dreadfully still in
+there!'
+
+"'Only that?' said he, looking at me keenly.
+
+"'Why, what did you think?' I asked.
+
+"'Why do you think that I lock this door?'
+
+"'I am sure that I do not know.'
+
+"'It is to keep people out who have no business there. Do you
+see?' He was still smiling in the most amiable manner.
+
+"'I am sure if I had known--'
+
+"'Well, then, you know now. And if you ever put your foot over
+that threshold again'--here in an instant the smile hardened into
+a grin of rage, and he glared down at me with the face of a
+demon--'I'll throw you to the mastiff.'
+
+"I was so terrified that I do not know what I did. I suppose that
+I must have rushed past him into my room. I remember nothing
+until I found myself lying on my bed trembling all over. Then I
+thought of you, Mr. Holmes. I could not live there longer without
+some advice. I was frightened of the house, of the man, of the
+woman, of the servants, even of the child. They were all horrible
+to me. If I could only bring you down all would be well. Of
+course I might have fled from the house, but my curiosity was
+almost as strong as my fears. My mind was soon made up. I would
+send you a wire. I put on my hat and cloak, went down to the
+office, which is about half a mile from the house, and then
+returned, feeling very much easier. A horrible doubt came into my
+mind as I approached the door lest the dog might be loose, but I
+remembered that Toller had drunk himself into a state of
+insensibility that evening, and I knew that he was the only one
+in the household who had any influence with the savage creature,
+or who would venture to set him free. I slipped in in safety and
+lay awake half the night in my joy at the thought of seeing you.
+I had no difficulty in getting leave to come into Winchester this
+morning, but I must be back before three o'clock, for Mr. and
+Mrs. Rucastle are going on a visit, and will be away all the
+evening, so that I must look after the child. Now I have told you
+all my adventures, Mr. Holmes, and I should be very glad if you
+could tell me what it all means, and, above all, what I should
+do."
+
+Holmes and I had listened spellbound to this extraordinary story.
+My friend rose now and paced up and down the room, his hands in
+his pockets, and an expression of the most profound gravity upon
+his face.
+
+"Is Toller still drunk?" he asked.
+
+"Yes. I heard his wife tell Mrs. Rucastle that she could do
+nothing with him."
+
+"That is well. And the Rucastles go out to-night?"
+
+"Yes."
+
+"Is there a cellar with a good strong lock?"
+
+"Yes, the wine-cellar."
+
+"You seem to me to have acted all through this matter like a very
+brave and sensible girl, Miss Hunter. Do you think that you could
+perform one more feat? I should not ask it of you if I did not
+think you a quite exceptional woman."
+
+"I will try. What is it?"
+
+"We shall be at the Copper Beeches by seven o'clock, my friend
+and I. The Rucastles will be gone by that time, and Toller will,
+we hope, be incapable. There only remains Mrs. Toller, who might
+give the alarm. If you could send her into the cellar on some
+errand, and then turn the key upon her, you would facilitate
+matters immensely."
+
+"I will do it."
+
+"Excellent! We shall then look thoroughly into the affair. Of
+course there is only one feasible explanation. You have been
+brought there to personate someone, and the real person is
+imprisoned in this chamber. That is obvious. As to who this
+prisoner is, I have no doubt that it is the daughter, Miss Alice
+Rucastle, if I remember right, who was said to have gone to
+America. You were chosen, doubtless, as resembling her in height,
+figure, and the colour of your hair. Hers had been cut off, very
+possibly in some illness through which she has passed, and so, of
+course, yours had to be sacrificed also. By a curious chance you
+came upon her tresses. The man in the road was undoubtedly some
+friend of hers--possibly her fiancé--and no doubt, as you wore
+the girl's dress and were so like her, he was convinced from your
+laughter, whenever he saw you, and afterwards from your gesture,
+that Miss Rucastle was perfectly happy, and that she no longer
+desired his attentions. The dog is let loose at night to prevent
+him from endeavouring to communicate with her. So much is fairly
+clear. The most serious point in the case is the disposition of
+the child."
+
+"What on earth has that to do with it?" I ejaculated.
+
+"My dear Watson, you as a medical man are continually gaining
+light as to the tendencies of a child by the study of the
+parents. Don't you see that the converse is equally valid. I have
+frequently gained my first real insight into the character of
+parents by studying their children. This child's disposition is
+abnormally cruel, merely for cruelty's sake, and whether he
+derives this from his smiling father, as I should suspect, or
+from his mother, it bodes evil for the poor girl who is in their
+power."
+
+"I am sure that you are right, Mr. Holmes," cried our client. "A
+thousand things come back to me which make me certain that you
+have hit it. Oh, let us lose not an instant in bringing help to
+this poor creature."
+
+"We must be circumspect, for we are dealing with a very cunning
+man. We can do nothing until seven o'clock. At that hour we shall
+be with you, and it will not be long before we solve the
+mystery."
+
+We were as good as our word, for it was just seven when we
+reached the Copper Beeches, having put up our trap at a wayside
+public-house. The group of trees, with their dark leaves shining
+like burnished metal in the light of the setting sun, were
+sufficient to mark the house even had Miss Hunter not been
+standing smiling on the door-step.
+
+"Have you managed it?" asked Holmes.
+
+A loud thudding noise came from somewhere downstairs. "That is
+Mrs. Toller in the cellar," said she. "Her husband lies snoring
+on the kitchen rug. Here are his keys, which are the duplicates
+of Mr. Rucastle's."
+
+"You have done well indeed!" cried Holmes with enthusiasm. "Now
+lead the way, and we shall soon see the end of this black
+business."
+
+We passed up the stair, unlocked the door, followed on down a
+passage, and found ourselves in front of the barricade which Miss
+Hunter had described. Holmes cut the cord and removed the
+transverse bar. Then he tried the various keys in the lock, but
+without success. No sound came from within, and at the silence
+Holmes' face clouded over.
+
+"I trust that we are not too late," said he. "I think, Miss
+Hunter, that we had better go in without you. Now, Watson, put
+your shoulder to it, and we shall see whether we cannot make our
+way in."
+
+It was an old rickety door and gave at once before our united
+strength. Together we rushed into the room. It was empty. There
+was no furniture save a little pallet bed, a small table, and a
+basketful of linen. The skylight above was open, and the prisoner
+gone.
+
+"There has been some villainy here," said Holmes; "this beauty
+has guessed Miss Hunter's intentions and has carried his victim
+off."
+
+"But how?"
+
+"Through the skylight. We shall soon see how he managed it." He
+swung himself up onto the roof. "Ah, yes," he cried, "here's the
+end of a long light ladder against the eaves. That is how he did
+it."
+
+"But it is impossible," said Miss Hunter; "the ladder was not
+there when the Rucastles went away."
+
+"He has come back and done it. I tell you that he is a clever and
+dangerous man. I should not be very much surprised if this were
+he whose step I hear now upon the stair. I think, Watson, that it
+would be as well for you to have your pistol ready."
+
+The words were hardly out of his mouth before a man appeared at
+the door of the room, a very fat and burly man, with a heavy
+stick in his hand. Miss Hunter screamed and shrunk against the
+wall at the sight of him, but Sherlock Holmes sprang forward and
+confronted him.
+
+"You villain!" said he, "where's your daughter?"
+
+The fat man cast his eyes round, and then up at the open
+skylight.
+
+"It is for me to ask you that," he shrieked, "you thieves! Spies
+and thieves! I have caught you, have I? You are in my power. I'll
+serve you!" He turned and clattered down the stairs as hard as he
+could go.
+
+"He's gone for the dog!" cried Miss Hunter.
+
+"I have my revolver," said I.
+
+"Better close the front door," cried Holmes, and we all rushed
+down the stairs together. We had hardly reached the hall when we
+heard the baying of a hound, and then a scream of agony, with a
+horrible worrying sound which it was dreadful to listen to. An
+elderly man with a red face and shaking limbs came staggering out
+at a side door.
+
+"My God!" he cried. "Someone has loosed the dog. It's not been
+fed for two days. Quick, quick, or it'll be too late!"
+
+Holmes and I rushed out and round the angle of the house, with
+Toller hurrying behind us. There was the huge famished brute, its
+black muzzle buried in Rucastle's throat, while he writhed and
+screamed upon the ground. Running up, I blew its brains out, and
+it fell over with its keen white teeth still meeting in the great
+creases of his neck. With much labour we separated them and
+carried him, living but horribly mangled, into the house. We laid
+him upon the drawing-room sofa, and having dispatched the sobered
+Toller to bear the news to his wife, I did what I could to
+relieve his pain. We were all assembled round him when the door
+opened, and a tall, gaunt woman entered the room.
+
+"Mrs. Toller!" cried Miss Hunter.
+
+"Yes, miss. Mr. Rucastle let me out when he came back before he
+went up to you. Ah, miss, it is a pity you didn't let me know
+what you were planning, for I would have told you that your pains
+were wasted."
+
+"Ha!" said Holmes, looking keenly at her. "It is clear that Mrs.
+Toller knows more about this matter than anyone else."
+
+"Yes, sir, I do, and I am ready enough to tell what I know."
+
+"Then, pray, sit down, and let us hear it for there are several
+points on which I must confess that I am still in the dark."
+
+"I will soon make it clear to you," said she; "and I'd have done
+so before now if I could ha' got out from the cellar. If there's
+police-court business over this, you'll remember that I was the
+one that stood your friend, and that I was Miss Alice's friend
+too.
+
+"She was never happy at home, Miss Alice wasn't, from the time
+that her father married again. She was slighted like and had no
+say in anything, but it never really became bad for her until
+after she met Mr. Fowler at a friend's house. As well as I could
+learn, Miss Alice had rights of her own by will, but she was so
+quiet and patient, she was, that she never said a word about them
+but just left everything in Mr. Rucastle's hands. He knew he was
+safe with her; but when there was a chance of a husband coming
+forward, who would ask for all that the law would give him, then
+her father thought it time to put a stop on it. He wanted her to
+sign a paper, so that whether she married or not, he could use
+her money. When she wouldn't do it, he kept on worrying her until
+she got brain-fever, and for six weeks was at death's door. Then
+she got better at last, all worn to a shadow, and with her
+beautiful hair cut off; but that didn't make no change in her
+young man, and he stuck to her as true as man could be."
+
+"Ah," said Holmes, "I think that what you have been good enough
+to tell us makes the matter fairly clear, and that I can deduce
+all that remains. Mr. Rucastle then, I presume, took to this
+system of imprisonment?"
+
+"Yes, sir."
+
+"And brought Miss Hunter down from London in order to get rid of
+the disagreeable persistence of Mr. Fowler."
+
+"That was it, sir."
+
+"But Mr. Fowler being a persevering man, as a good seaman should
+be, blockaded the house, and having met you succeeded by certain
+arguments, metallic or otherwise, in convincing you that your
+interests were the same as his."
+
+"Mr. Fowler was a very kind-spoken, free-handed gentleman," said
+Mrs. Toller serenely.
+
+"And in this way he managed that your good man should have no
+want of drink, and that a ladder should be ready at the moment
+when your master had gone out."
+
+"You have it, sir, just as it happened."
+
+"I am sure we owe you an apology, Mrs. Toller," said Holmes, "for
+you have certainly cleared up everything which puzzled us. And
+here comes the country surgeon and Mrs. Rucastle, so I think,
+Watson, that we had best escort Miss Hunter back to Winchester,
+as it seems to me that our locus standi now is rather a
+questionable one."
+
+And thus was solved the mystery of the sinister house with the
+copper beeches in front of the door. Mr. Rucastle survived, but
+was always a broken man, kept alive solely through the care of
+his devoted wife. They still live with their old servants, who
+probably know so much of Rucastle's past life that he finds it
+difficult to part from them. Mr. Fowler and Miss Rucastle were
+married, by special license, in Southampton the day after their
+flight, and he is now the holder of a government appointment in
+the island of Mauritius. As to Miss Violet Hunter, my friend
+Holmes, rather to my disappointment, manifested no further
+interest in her when once she had ceased to be the centre of one
+of his problems, and she is now the head of a private school at
+Walsall, where I believe that she has met with considerable success.
+
+
+
+
+
+
+
+
+
+End of the Project Gutenberg EBook of The Adventures of Sherlock Holmes, by
+Arthur Conan Doyle
+
+*** END OF THIS PROJECT GUTENBERG EBOOK THE ADVENTURES OF SHERLOCK HOLMES ***
+
+***** This file should be named 1661-8.txt or 1661-8.zip *****
+This and all associated files of various formats will be found in:
+ http://www.gutenberg.org/1/6/6/1661/
+
+Produced by an anonymous Project Gutenberg volunteer and Jose Menendez
+
+Updated editions will replace the previous one--the old editions
+will be renamed.
+
+Creating the works from public domain print editions means that no
+one owns a United States copyright in these works, so the Foundation
+(and you!) can copy and distribute it in the United States without
+permission and without paying copyright royalties. Special rules,
+set forth in the General Terms of Use part of this license, apply to
+copying and distributing Project Gutenberg-tm electronic works to
+protect the PROJECT GUTENBERG-tm concept and trademark. Project
+Gutenberg is a registered trademark, and may not be used if you
+charge for the eBooks, unless you receive specific permission. If you
+do not charge anything for copies of this eBook, complying with the
+rules is very easy. You may use this eBook for nearly any purpose
+such as creation of derivative works, reports, performances and
+research. They may be modified and printed and given away--you may do
+practically ANYTHING with public domain eBooks. Redistribution is
+subject to the trademark license, especially commercial
+redistribution.
+
+
+
+*** START: FULL LICENSE ***
+
+THE FULL PROJECT GUTENBERG LICENSE
+PLEASE READ THIS BEFORE YOU DISTRIBUTE OR USE THIS WORK
+
+To protect the Project Gutenberg-tm mission of promoting the free
+distribution of electronic works, by using or distributing this work
+(or any other work associated in any way with the phrase "Project
+Gutenberg"), you agree to comply with all the terms of the Full Project
+Gutenberg-tm License (available with this file or online at
+http://gutenberg.net/license).
+
+
+Section 1. General Terms of Use and Redistributing Project Gutenberg-tm
+electronic works
+
+1.A. By reading or using any part of this Project Gutenberg-tm
+electronic work, you indicate that you have read, understand, agree to
+and accept all the terms of this license and intellectual property
+(trademark/copyright) agreement. If you do not agree to abide by all
+the terms of this agreement, you must cease using and return or destroy
+all copies of Project Gutenberg-tm electronic works in your possession.
+If you paid a fee for obtaining a copy of or access to a Project
+Gutenberg-tm electronic work and you do not agree to be bound by the
+terms of this agreement, you may obtain a refund from the person or
+entity to whom you paid the fee as set forth in paragraph 1.E.8.
+
+1.B. "Project Gutenberg" is a registered trademark. It may only be
+used on or associated in any way with an electronic work by people who
+agree to be bound by the terms of this agreement. There are a few
+things that you can do with most Project Gutenberg-tm electronic works
+even without complying with the full terms of this agreement. See
+paragraph 1.C below. There are a lot of things you can do with Project
+Gutenberg-tm electronic works if you follow the terms of this agreement
+and help preserve free future access to Project Gutenberg-tm electronic
+works. See paragraph 1.E below.
+
+1.C. The Project Gutenberg Literary Archive Foundation ("the Foundation"
+or PGLAF), owns a compilation copyright in the collection of Project
+Gutenberg-tm electronic works. Nearly all the individual works in the
+collection are in the public domain in the United States. If an
+individual work is in the public domain in the United States and you are
+located in the United States, we do not claim a right to prevent you from
+copying, distributing, performing, displaying or creating derivative
+works based on the work as long as all references to Project Gutenberg
+are removed. Of course, we hope that you will support the Project
+Gutenberg-tm mission of promoting free access to electronic works by
+freely sharing Project Gutenberg-tm works in compliance with the terms of
+this agreement for keeping the Project Gutenberg-tm name associated with
+the work. You can easily comply with the terms of this agreement by
+keeping this work in the same format with its attached full Project
+Gutenberg-tm License when you share it without charge with others.
+
+1.D. The copyright laws of the place where you are located also govern
+what you can do with this work. Copyright laws in most countries are in
+a constant state of change. If you are outside the United States, check
+the laws of your country in addition to the terms of this agreement
+before downloading, copying, displaying, performing, distributing or
+creating derivative works based on this work or any other Project
+Gutenberg-tm work. The Foundation makes no representations concerning
+the copyright status of any work in any country outside the United
+States.
+
+1.E. Unless you have removed all references to Project Gutenberg:
+
+1.E.1. The following sentence, with active links to, or other immediate
+access to, the full Project Gutenberg-tm License must appear prominently
+whenever any copy of a Project Gutenberg-tm work (any work on which the
+phrase "Project Gutenberg" appears, or with which the phrase "Project
+Gutenberg" is associated) is accessed, displayed, performed, viewed,
+copied or distributed:
+
+This eBook is for the use of anyone anywhere at no cost and with
+almost no restrictions whatsoever. You may copy it, give it away or
+re-use it under the terms of the Project Gutenberg License included
+with this eBook or online at www.gutenberg.net
+
+1.E.2. If an individual Project Gutenberg-tm electronic work is derived
+from the public domain (does not contain a notice indicating that it is
+posted with permission of the copyright holder), the work can be copied
+and distributed to anyone in the United States without paying any fees
+or charges. If you are redistributing or providing access to a work
+with the phrase "Project Gutenberg" associated with or appearing on the
+work, you must comply either with the requirements of paragraphs 1.E.1
+through 1.E.7 or obtain permission for the use of the work and the
+Project Gutenberg-tm trademark as set forth in paragraphs 1.E.8 or
+1.E.9.
+
+1.E.3. If an individual Project Gutenberg-tm electronic work is posted
+with the permission of the copyright holder, your use and distribution
+must comply with both paragraphs 1.E.1 through 1.E.7 and any additional
+terms imposed by the copyright holder. Additional terms will be linked
+to the Project Gutenberg-tm License for all works posted with the
+permission of the copyright holder found at the beginning of this work.
+
+1.E.4. Do not unlink or detach or remove the full Project Gutenberg-tm
+License terms from this work, or any files containing a part of this
+work or any other work associated with Project Gutenberg-tm.
+
+1.E.5. Do not copy, display, perform, distribute or redistribute this
+electronic work, or any part of this electronic work, without
+prominently displaying the sentence set forth in paragraph 1.E.1 with
+active links or immediate access to the full terms of the Project
+Gutenberg-tm License.
+
+1.E.6. You may convert to and distribute this work in any binary,
+compressed, marked up, nonproprietary or proprietary form, including any
+word processing or hypertext form. However, if you provide access to or
+distribute copies of a Project Gutenberg-tm work in a format other than
+"Plain Vanilla ASCII" or other format used in the official version
+posted on the official Project Gutenberg-tm web site (www.gutenberg.net),
+you must, at no additional cost, fee or expense to the user, provide a
+copy, a means of exporting a copy, or a means of obtaining a copy upon
+request, of the work in its original "Plain Vanilla ASCII" or other
+form. Any alternate format must include the full Project Gutenberg-tm
+License as specified in paragraph 1.E.1.
+
+1.E.7. Do not charge a fee for access to, viewing, displaying,
+performing, copying or distributing any Project Gutenberg-tm works
+unless you comply with paragraph 1.E.8 or 1.E.9.
+
+1.E.8. You may charge a reasonable fee for copies of or providing
+access to or distributing Project Gutenberg-tm electronic works provided
+that
+
+- You pay a royalty fee of 20% of the gross profits you derive from
+ the use of Project Gutenberg-tm works calculated using the method
+ you already use to calculate your applicable taxes. The fee is
+ owed to the owner of the Project Gutenberg-tm trademark, but he
+ has agreed to donate royalties under this paragraph to the
+ Project Gutenberg Literary Archive Foundation. Royalty payments
+ must be paid within 60 days following each date on which you
+ prepare (or are legally required to prepare) your periodic tax
+ returns. Royalty payments should be clearly marked as such and
+ sent to the Project Gutenberg Literary Archive Foundation at the
+ address specified in Section 4, "Information about donations to
+ the Project Gutenberg Literary Archive Foundation."
+
+- You provide a full refund of any money paid by a user who notifies
+ you in writing (or by e-mail) within 30 days of receipt that s/he
+ does not agree to the terms of the full Project Gutenberg-tm
+ License. You must require such a user to return or
+ destroy all copies of the works possessed in a physical medium
+ and discontinue all use of and all access to other copies of
+ Project Gutenberg-tm works.
+
+- You provide, in accordance with paragraph 1.F.3, a full refund of any
+ money paid for a work or a replacement copy, if a defect in the
+ electronic work is discovered and reported to you within 90 days
+ of receipt of the work.
+
+- You comply with all other terms of this agreement for free
+ distribution of Project Gutenberg-tm works.
+
+1.E.9. If you wish to charge a fee or distribute a Project Gutenberg-tm
+electronic work or group of works on different terms than are set
+forth in this agreement, you must obtain permission in writing from
+both the Project Gutenberg Literary Archive Foundation and Michael
+Hart, the owner of the Project Gutenberg-tm trademark. Contact the
+Foundation as set forth in Section 3 below.
+
+1.F.
+
+1.F.1. Project Gutenberg volunteers and employees expend considerable
+effort to identify, do copyright research on, transcribe and proofread
+public domain works in creating the Project Gutenberg-tm
+collection. Despite these efforts, Project Gutenberg-tm electronic
+works, and the medium on which they may be stored, may contain
+"Defects," such as, but not limited to, incomplete, inaccurate or
+corrupt data, transcription errors, a copyright or other intellectual
+property infringement, a defective or damaged disk or other medium, a
+computer virus, or computer codes that damage or cannot be read by
+your equipment.
+
+1.F.2. LIMITED WARRANTY, DISCLAIMER OF DAMAGES - Except for the "Right
+of Replacement or Refund" described in paragraph 1.F.3, the Project
+Gutenberg Literary Archive Foundation, the owner of the Project
+Gutenberg-tm trademark, and any other party distributing a Project
+Gutenberg-tm electronic work under this agreement, disclaim all
+liability to you for damages, costs and expenses, including legal
+fees. YOU AGREE THAT YOU HAVE NO REMEDIES FOR NEGLIGENCE, STRICT
+LIABILITY, BREACH OF WARRANTY OR BREACH OF CONTRACT EXCEPT THOSE
+PROVIDED IN PARAGRAPH 1.F.3. YOU AGREE THAT THE FOUNDATION, THE
+TRADEMARK OWNER, AND ANY DISTRIBUTOR UNDER THIS AGREEMENT WILL NOT BE
+LIABLE TO YOU FOR ACTUAL, DIRECT, INDIRECT, CONSEQUENTIAL, PUNITIVE OR
+INCIDENTAL DAMAGES EVEN IF YOU GIVE NOTICE OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+1.F.3. LIMITED RIGHT OF REPLACEMENT OR REFUND - If you discover a
+defect in this electronic work within 90 days of receiving it, you can
+receive a refund of the money (if any) you paid for it by sending a
+written explanation to the person you received the work from. If you
+received the work on a physical medium, you must return the medium with
+your written explanation. The person or entity that provided you with
+the defective work may elect to provide a replacement copy in lieu of a
+refund. If you received the work electronically, the person or entity
+providing it to you may choose to give you a second opportunity to
+receive the work electronically in lieu of a refund. If the second copy
+is also defective, you may demand a refund in writing without further
+opportunities to fix the problem.
+
+1.F.4. Except for the limited right of replacement or refund set forth
+in paragraph 1.F.3, this work is provided to you 'AS-IS' WITH NO OTHER
+WARRANTIES OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+WARRANTIES OF MERCHANTIBILITY OR FITNESS FOR ANY PURPOSE.
+
+1.F.5. Some states do not allow disclaimers of certain implied
+warranties or the exclusion or limitation of certain types of damages.
+If any disclaimer or limitation set forth in this agreement violates the
+law of the state applicable to this agreement, the agreement shall be
+interpreted to make the maximum disclaimer or limitation permitted by
+the applicable state law. The invalidity or unenforceability of any
+provision of this agreement shall not void the remaining provisions.
+
+1.F.6. INDEMNITY - You agree to indemnify and hold the Foundation, the
+trademark owner, any agent or employee of the Foundation, anyone
+providing copies of Project Gutenberg-tm electronic works in accordance
+with this agreement, and any volunteers associated with the production,
+promotion and distribution of Project Gutenberg-tm electronic works,
+harmless from all liability, costs and expenses, including legal fees,
+that arise directly or indirectly from any of the following which you do
+or cause to occur: (a) distribution of this or any Project Gutenberg-tm
+work, (b) alteration, modification, or additions or deletions to any
+Project Gutenberg-tm work, and (c) any Defect you cause.
+
+
+Section 2. Information about the Mission of Project Gutenberg-tm
+
+Project Gutenberg-tm is synonymous with the free distribution of
+electronic works in formats readable by the widest variety of computers
+including obsolete, old, middle-aged and new computers. It exists
+because of the efforts of hundreds of volunteers and donations from
+people in all walks of life.
+
+Volunteers and financial support to provide volunteers with the
+assistance they need are critical to reaching Project Gutenberg-tm's
+goals and ensuring that the Project Gutenberg-tm collection will
+remain freely available for generations to come. In 2001, the Project
+Gutenberg Literary Archive Foundation was created to provide a secure
+and permanent future for Project Gutenberg-tm and future generations.
+To learn more about the Project Gutenberg Literary Archive Foundation
+and how your efforts and donations can help, see Sections 3 and 4
+and the Foundation web page at http://www.pglaf.org.
+
+
+Section 3. Information about the Project Gutenberg Literary Archive
+Foundation
+
+The Project Gutenberg Literary Archive Foundation is a non profit
+501(c)(3) educational corporation organized under the laws of the
+state of Mississippi and granted tax exempt status by the Internal
+Revenue Service. The Foundation's EIN or federal tax identification
+number is 64-6221541. Its 501(c)(3) letter is posted at
+http://pglaf.org/fundraising. Contributions to the Project Gutenberg
+Literary Archive Foundation are tax deductible to the full extent
+permitted by U.S. federal laws and your state's laws.
+
+The Foundation's principal office is located at 4557 Melan Dr. S.
+Fairbanks, AK, 99712., but its volunteers and employees are scattered
+throughout numerous locations. Its business office is located at
+809 North 1500 West, Salt Lake City, UT 84116, (801) 596-1887, email
+business@pglaf.org. Email contact links and up to date contact
+information can be found at the Foundation's web site and official
+page at http://pglaf.org
+
+For additional contact information:
+ Dr. Gregory B. Newby
+ Chief Executive and Director
+ gbnewby@pglaf.org
+
+
+Section 4. Information about Donations to the Project Gutenberg
+Literary Archive Foundation
+
+Project Gutenberg-tm depends upon and cannot survive without wide
+spread public support and donations to carry out its mission of
+increasing the number of public domain and licensed works that can be
+freely distributed in machine readable form accessible by the widest
+array of equipment including outdated equipment. Many small donations
+($1 to $5,000) are particularly important to maintaining tax exempt
+status with the IRS.
+
+The Foundation is committed to complying with the laws regulating
+charities and charitable donations in all 50 states of the United
+States. Compliance requirements are not uniform and it takes a
+considerable effort, much paperwork and many fees to meet and keep up
+with these requirements. We do not solicit donations in locations
+where we have not received written confirmation of compliance. To
+SEND DONATIONS or determine the status of compliance for any
+particular state visit http://pglaf.org
+
+While we cannot and do not solicit contributions from states where we
+have not met the solicitation requirements, we know of no prohibition
+against accepting unsolicited donations from donors in such states who
+approach us with offers to donate.
+
+International donations are gratefully accepted, but we cannot make
+any statements concerning tax treatment of donations received from
+outside the United States. U.S. laws alone swamp our small staff.
+
+Please check the Project Gutenberg Web pages for current donation
+methods and addresses. Donations are accepted in a number of other
+ways including including checks, online payments and credit card
+donations. To donate, please visit: http://pglaf.org/donate
+
+
+Section 5. General Information About Project Gutenberg-tm electronic
+works.
+
+Professor Michael S. Hart is the originator of the Project Gutenberg-tm
+concept of a library of electronic works that could be freely shared
+with anyone. For thirty years, he produced and distributed Project
+Gutenberg-tm eBooks with only a loose network of volunteer support.
+
+
+Project Gutenberg-tm eBooks are often created from several printed
+editions, all of which are confirmed as Public Domain in the U.S.
+unless a copyright notice is included. Thus, we do not necessarily
+keep eBooks in compliance with any particular paper edition.
+
+
+Most people start at our Web site which has the main PG search facility:
+
+ http://www.gutenberg.net
+
+This Web site includes information about Project Gutenberg-tm,
+including how to make donations to the Project Gutenberg Literary
+Archive Foundation, how to help produce our new eBooks, and how to
+subscribe to our email newsletter to hear about new eBooks.
diff --git a/benchmarks/lcs/control/variable.livecodescript b/benchmarks/lcs/control/variable.livecodescript
new file mode 100644
index 00000000000..e1bc668225c
--- /dev/null
+++ b/benchmarks/lcs/control/variable.livecodescript
@@ -0,0 +1,317 @@
+script "ControlVariable"
+/*
+Copyright (C) 2017 LiveCode Ltd.
+
+This file is part of LiveCode.
+
+LiveCode is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License v3 as published by the Free
+Software Foundation.
+
+LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with LiveCode. If not see . */
+
+constant kRepetitions = 100000
+
+private command BenchmarkArrayAccess pOne, pTwo, pThree, pFour
+ BenchmarkStartTiming "Store[]"
+ repeat kRepetitions times
+ put empty into tVar
+ put 1 into tVar[pOne]
+ put 2 into tVar[pTwo]
+ put 3 into tVar[pThree]
+ put 4 into tVar[pFour]
+ end repeat
+ BenchmarkStopTiming
+
+ BenchmarkStartTiming "Fetch[]"
+ repeat kRepetitions times
+ get tVar[pOne]
+ get tVar[pTwo]
+ get tVar[pThree]
+ get tVar[pFour]
+ end repeat
+ BenchmarkStopTiming
+
+ BenchmarkStartTiming "Store[][]"
+ repeat kRepetitions times
+ put empty into tVar
+ put 1 into tVar[pOne][pTwo]
+ put 2 into tVar[pTwo][pThree]
+ put 3 into tVar[pThree][pFour]
+ put 4 into tVar[pFour][pOne]
+ end repeat
+ BenchmarkStopTiming
+
+ BenchmarkStartTiming "Fetch[][]"
+ repeat kRepetitions times
+ get tVar[pOne][pTwo]
+ get tVar[pTwo][pThree]
+ get tVar[pThree][pFour]
+ get tVar[pFour][pOne]
+ end repeat
+ BenchmarkStopTiming
+end BenchmarkArrayAccess
+
+on BenchmarkArrayNameKeys
+ BenchmarkArrayAccess "one", "two", "three", "four"
+end BenchmarkArrayNameKeys
+
+on BenchmarkArrayIndexKeys
+ BenchmarkArrayAccess 1+0, 2+0, 3+0, 4+0
+end BenchmarkArrayIndexKeys
+
+on BenchmarkArrayStringKeys
+ BenchmarkArrayAccess "on" & "e", "tw" & "o", "thre" & "e", "fou" & "r"
+end BenchmarkArrayStringKeys
+
+on BenchmarkVariableFetchLocal
+ local tVar
+
+ local tName1, tName2, tName3, tName4
+ put "one" into tName1
+ put "two" into tName1
+ put "three" into tName1
+ put "four" into tName1
+
+ local tNumber1, tNumber2, tNumber3, tNumber4
+ put 1 + 0 into tNumber1
+ put 2 + 0 into tNumber2
+ put 3 + 0 into tNumber3
+ put 4 + 0 into tNumber4
+
+ local tString1, tString2, tString3, tString4
+ put "on" & "e" into tString1
+ put "tw" & "o" into tString2
+ put "thre" & "e" into tString3
+ put "fou" & "r" into tString4
+
+ local tSeq1_1, tSeq1_2, tSeq1_3, tSeq1_4
+ put tName1 into tSeq1_1[1]
+ put tName2 into tSeq1_2[1]
+ put tName3 into tSeq1_3[1]
+ put tName4 into tSeq1_4[1]
+
+ local tSeq2_1, tSeq2_2, tSeq2_3, tSeq2_4
+ put tName1 into tSeq2_1[1]
+ put tName1 into tSeq2_1[2]
+ put tName2 into tSeq2_2[1]
+ put tName2 into tSeq2_2[2]
+ put tName3 into tSeq2_3[1]
+ put tName3 into tSeq2_3[2]
+ put tName4 into tSeq2_4[1]
+ put tName4 into tSeq2_4[2]
+
+ put empty into tVar
+ put 100 into tVar
+ BenchmarkStartTiming "Get Base"
+ repeat kRepetitions times
+ get tVar
+ get tVar
+ get tVar
+ get tVar
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tVar
+ put 100 into tVar[tName1]
+ put 100 into tVar[tName2]
+ put 100 into tVar[tName3]
+ put 100 into tVar[tName4]
+ BenchmarkStartTiming "Get Base[]"
+ repeat kRepetitions times
+ get tVar[tName1]
+ get tVar[tName2]
+ get tVar[tName3]
+ get tVar[tName4]
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tVar
+ put 100 into tVar[tNumber1]
+ put 100 into tVar[tNumber2]
+ put 100 into tVar[tNumber3]
+ put 100 into tVar[tNumber4]
+ BenchmarkStartTiming "Get Base[]"
+ repeat kRepetitions times
+ get tVar[tNumber1]
+ get tVar[tNumber2]
+ get tVar[tNumber3]
+ get tVar[tNumber4]
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tVar
+ put 100 into tVar[tString1]
+ put 100 into tVar[tString2]
+ put 100 into tVar[tString3]
+ put 100 into tVar[tString4]
+ BenchmarkStartTiming "Get Base[]"
+ repeat kRepetitions times
+ get tVar[tString1]
+ get tVar[tString2]
+ get tVar[tString3]
+ get tVar[tString4]
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tVar
+ put 100 into tVar[tSeq1_1]
+ put 100 into tVar[tSeq1_2]
+ put 100 into tVar[tSeq1_3]
+ put 100 into tVar[tSeq1_4]
+ BenchmarkStartTiming "Get Base[]"
+ repeat kRepetitions times
+ get tVar[tSeq1_1]
+ get tVar[tSeq1_2]
+ get tVar[tSeq1_3]
+ get tVar[tSeq1_4]
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tVar
+ put 100 into tVar[tName1][tName1]
+ put 100 into tVar[tName2][tName2]
+ put 100 into tVar[tName3][tName3]
+ put 100 into tVar[tName4][tName4]
+ BenchmarkStartTiming "Get Base[][]"
+ repeat kRepetitions times
+ get tVar[tName1][tName1]
+ get tVar[tName2][tName2]
+ get tVar[tName3][tName3]
+ get tVar[tName4][tName4]
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tVar
+ put 100 into tVar[tNumber1][tNumber1]
+ put 100 into tVar[tNumber2][tNumber2]
+ put 100 into tVar[tNumber3][tNumber3]
+ put 100 into tVar[tNumber4][tNumber4]
+ BenchmarkStartTiming "Get Base[][]"
+ repeat kRepetitions times
+ get tVar[tNumber1][tNumber1]
+ get tVar[tNumber2][tNumber2]
+ get tVar[tNumber3][tNumber3]
+ get tVar[tNumber4][tNumber4]
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tVar
+ put 100 into tVar[tString1][tString1]
+ put 100 into tVar[tString2][tString2]
+ put 100 into tVar[tString3][tString3]
+ put 100 into tVar[tString4][tString4]
+ BenchmarkStartTiming "Get Base[][]"
+ repeat kRepetitions times
+ get tVar[tString1][tString1]
+ get tVar[tString2][tString2]
+ get tVar[tString3][tString3]
+ get tVar[tString4][tString4]
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tVar
+ put 100 into tVar[tSeq2_1]
+ put 100 into tVar[tSeq2_2]
+ put 100 into tVar[tSeq2_3]
+ put 100 into tVar[tSeq2_4]
+ BenchmarkStartTiming "Get Base[]"
+ repeat kRepetitions times
+ get tVar[tSeq2_1]
+ get tVar[tSeq2_2]
+ get tVar[tSeq2_3]
+ get tVar[tSeq2_4]
+ end repeat
+ BenchmarkStopTiming
+end BenchmarkVariableFetchLocal
+
+on BenchmarkVariableStoreLocal
+ local tVar, tName, tNumber, tString, tSeq1, tSeq2
+ put "one" into tName
+ put 1 + 0 into tNumber
+ put "on" & "e" into tString
+ put tName into tSeq1[1]
+ put tName into tSeq2[1]
+ put tName into tSeq2[2]
+
+ put empty into tVar
+ put 100 into tVar
+ BenchmarkStartTiming "Replace Into Base"
+ repeat kRepetitions times
+ put 100 into tVar
+ put 100 into tVar
+ put 100 into tVar
+ put 100 into tVar
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tVar
+ put 100 into tVar[tName]
+ BenchmarkStartTiming "Replace Into Base[]"
+ repeat kRepetitions times
+ put 100 into tVar[tName]
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tVar
+ put 100 into tVar[tNumber]
+ BenchmarkStartTiming "Replace Into Base[]"
+ repeat kRepetitions times
+ put 100 into tVar[tNumber]
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tVar
+ put 100 into tVar[tString]
+ BenchmarkStartTiming "Replace Into Base[]"
+ repeat kRepetitions times
+ put 100 into tVar[tString]
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tVar
+ put 100 into tVar[tSeq1]
+ BenchmarkStartTiming "Replace Into Base[]"
+ repeat kRepetitions times
+ put 100 into tVar[tSeq1]
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tVar
+ put 100 into tVar[tName][tName]
+ BenchmarkStartTiming "Replace Into Base[][]"
+ repeat kRepetitions times
+ put 100 into tVar[tName][tName]
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tVar
+ put 100 into tVar[tNumber][tNumber]
+ BenchmarkStartTiming "Replace Into Base[][]"
+ repeat kRepetitions times
+ put 100 into tVar[tNumber][tNumber]
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tVar
+ put 100 into tVar[tString][tString]
+ BenchmarkStartTiming "Replace Into Base[][]"
+ repeat kRepetitions times
+ put 100 into tVar[tString][tString]
+ end repeat
+ BenchmarkStopTiming
+
+ put empty into tVar
+ put 100 into tVar[tSeq2]
+ BenchmarkStartTiming "Replace Into Base[]"
+ repeat kRepetitions times
+ put 100 into tVar[tSeq2]
+ end repeat
+ BenchmarkStopTiming
+end BenchmarkVariableStoreLocal
diff --git a/buildbot.mk b/buildbot.mk
index 6d8c6a7ec76..5bd49d94ecf 100644
--- a/buildbot.mk
+++ b/buildbot.mk
@@ -16,60 +16,28 @@
# This file contains rules used by the LiveCode Buildbot installation at
#
+#
+# Tasks that may be run on Windows workers must be implemented in the
+# buildbot.py script.
# Load version information
include version
+GIT_HASH_HEXIT_COUNT=10
+
# Get git commit information
ifeq ($(BUILD_EDITION),commercial)
-GIT_VERSION=g$(shell git --git-dir=../.git rev-parse --short HEAD)
-else
-GIT_VERSION=g$(shell git rev-parse --short HEAD)
-endif
-
-################################################################
-# Configure with gyp
-################################################################
-
-# Buildbot must set the variables PLATFORM and SUBPLATFORM
-
-ifeq ($(BUILD_SUBPLATFORM),)
-CONFIG_TARGET = config-$(BUILD_PLATFORM)
-else
-CONFIG_TARGET = config-$(BUILD_PLATFORM)-$(BUILD_SUBPLATFORM)
-endif
-
-config:
- $(MAKE) $(CONFIG_TARGET)
-
-.PHONY: config
-
-################################################################
-# Compile
-################################################################
-
-# Buildbot must set the variables PLATFORM and SUBPLATFORM
-
-ifeq ($(BUILD_SUBPLATFORM),)
-COMPILE_TARGET = compile-$(BUILD_PLATFORM)
+GIT_VERSION=g$(shell git --git-dir=../.git rev-parse --short=$(GIT_HASH_HEXIT_COUNT) HEAD)
else
-COMPILE_TARGET = compile-$(BUILD_PLATFORM)-$(BUILD_SUBPLATFORM)
+GIT_VERSION=g$(shell git rev-parse --short=$(GIT_HASH_HEXIT_COUNT) HEAD)
endif
-compile:
- $(MAKE) $(COMPILE_TARGET)
-
-.PHONY: compile
-
################################################################
-# Archive / extract built binaries
+# Extract built binaries
################################################################
-bin-archive:
- tar -Jcvf $(BUILD_PLATFORM)-bin.tar.xz $(BUILD_PLATFORM)-bin
-
bin-extract:
- find . -maxdepth 1 -name '*-bin.tar.xz' -print0 | xargs -0 -n1 tar -xvf
+ find . -maxdepth 1 -name '*-bin.tar.*' -exec tar -xvf '{}' ';'
################################################################
# Installer generation
@@ -114,7 +82,11 @@ else ifeq ($(BUILD_PLATFORM),linux-x86_64)
LIVECODE = $(bin_dir)/LiveCode-Community
buildtool_platform = linux
UPLOAD_ENABLE_CHECKSUM ?= yes
+ifeq ($(BUILD_EDITION),commercial)
UPLOAD_RELEASE_NOTES ?= yes
+else
+ UPLOAD_RELEASE_NOTES ?= no
+endif
endif
# FIXME add --warn-as-error
@@ -126,65 +98,30 @@ buildtool_command = $(LIVECODE) -ui $(BUILDTOOL_STACK) \
# Settings for upload
RSYNC ?= rsync
SHA1SUM ?= sha1sum
-UPLOAD_SERVER ?= meg.on-rev.com
+UPLOAD_SERVER ?= molly.livecode.com
UPLOAD_PATH = staging/$(BUILD_LONG_VERSION)/$(GIT_VERSION)
UPLOAD_MAX_RETRIES = 50
-ifeq ($(BUILD_EDITION),commercial)
- dist-docs: dist-docs-commercial
- dist-docs: dist-guide-commercial
- dist-notes: dist-notes-commercial
-endif
-
-dist-docs: dist-docs-community
-dist-docs: dist-guide-community
-dist-notes: dist-notes-community
+dist-docs: dist-docs-api dist-docs-guide
-dist-docs-community:
+dist-docs-api:
mkdir -p $(docs_build_dir)
$(buildtool_command) --platform $(buildtool_platform) --stage docs \
- --edition community \
- --built-docs-dir $(docs_build_dir)/cooked-community
+ --built-docs-dir $(docs_build_dir)
-dist-docs-commercial:
- mkdir -p $(docs_build_dir)
- $(buildtool_command) --platform $(buildtool_platform) \
- --stage docs --edition indy \
- --built-docs-dir $(docs_build_dir)/cooked-commercial
- $(buildtool_command) --platform $(buildtool_platform) \
- --stage docs --edition business \
- --built-docs-dir $(docs_build_dir)/cooked-commercial
-
-dist-notes-community:
- WKHTMLTOPDF=$(WKHTMLTOPDF) \
- $(buildtool_command) --platform $(buildtool_platform) \
- --stage notes --warn-as-error \
- --built-docs-dir $(docs_build_dir)/cooked-community
-
-dist-notes-commercial:
+dist-notes:
WKHTMLTOPDF=$(WKHTMLTOPDF) \
$(buildtool_command) --platform $(buildtool_platform) \
--stage notes --warn-as-error \
- --built-docs-dir $(docs_build_dir)/cooked-commercial
+ --built-docs-dir $(docs_build_dir)
-dist-guide-community:
+dist-docs-guide:
WKHTMLTOPDF=$(WKHTMLTOPDF) \
$(buildtool_command) --platform $(buildtool_platform) \
- --edition community \
- --stage guide --warn-as-error
-
-dist-guide-commercial:
- WKHTMLTOPDF=$(WKHTMLTOPDF) \
- $(buildtool_command) --platform $(buildtool_platform) \
- --edition indy \
- --stage guide --warn-as-error
- WKHTMLTOPDF=$(WKHTMLTOPDF) \
- $(buildtool_command) --platform $(buildtool_platform) \
- --edition business \
- --stage guide --warn-as-error
+ --stage guide --warn-as-error
ifeq ($(BUILD_EDITION),commercial)
-dist-server: dist-server-commercial
+dist-server: dist-server-communityplus dist-server-indy dist-server-business
endif
dist-server: dist-server-community
@@ -193,29 +130,56 @@ dist-server-community:
$(buildtool_command) --platform mac --platform win --platform linux \
--stage server --edition community --warn-as-error
-dist-server-commercial:
+dist-server-communityplus:
+ $(buildtool_command) --platform mac --platform win --platform linux \
+ --stage server --edition communityplus --warn-as-error
+
+dist-server-indy:
$(buildtool_command) --platform mac --platform win --platform linux \
- --stage server --edition commercial --warn-as-error
+ --stage server --edition indy --warn-as-error
+dist-server-business:
+ $(buildtool_command) --platform mac --platform win --platform linux \
+ --stage server --edition business --warn-as-error
+
ifeq ($(BUILD_EDITION),commercial)
dist-tools: dist-tools-commercial
-distmac-disk: distmac-disk-indy distmac-disk-business
+distmac-disk: distmac-disk-communityplus distmac-disk-indy distmac-disk-business
endif
-dist-tools: dist-tools-community
+dist-tools: dist-tools-community dist-tools-version-check
distmac-disk: distmac-disk-community
dist-tools-community:
$(buildtool_command) --platform mac --platform win --platform linux --stage tools --edition community \
- --built-docs-dir $(docs_build_dir)/cooked-community
+ --built-docs-dir $(docs_build_dir)
dist-tools-commercial:
+ $(buildtool_command) --platform mac --platform win --platform linux --stage tools --edition communityplus \
+ --built-docs-dir $(docs_build_dir)
$(buildtool_command) --platform mac --platform win --platform linux --stage tools --edition indy \
- --built-docs-dir $(docs_build_dir)/cooked-commercial
+ --built-docs-dir $(docs_build_dir)
$(buildtool_command) --platform mac --platform win --platform linux --stage tools --edition business \
- --built-docs-dir $(docs_build_dir)/cooked-commercial
+ --built-docs-dir $(docs_build_dir)
+# Ensure that the version for which we're trying to build installers
+# hasn't already been tagged.
+dist-tools-version-check:
+ @git tag -l | xargs git tag -d ;\
+ git fetch --tags ;\
+ if git rev-parse refs/tags/$(BUILD_SHORT_VERSION) \
+ >/dev/null 2>&1 ; then \
+ echo; \
+ echo "$(BUILD_SHORT_VERSION) has already been released."; \
+ echo "You probably need to update the 'version' file."; \
+ echo; \
+ exit 1; \
+ fi
+
+.PHONY: dist-tools-version-check
distmac-bundle-community:
$(buildtool_command) --platform mac --stage bundle --edition community
+distmac-bundle-communityplus:
+ $(buildtool_command) --platform mac --stage bundle --edition communityplus
distmac-bundle-indy:
$(buildtool_command) --platform mac --stage bundle --edition indy
distmac-bundle-business:
@@ -227,20 +191,37 @@ distmac-bundle-business:
dist-upload-files.txt sha1sum.txt:
set -e; \
find . -maxdepth 1 -name 'LiveCode*-*-Mac.dmg' \
- -o -name 'LiveCode*Installer-*-Windows.exe' \
+ -o -name 'LiveCode*Installer-*-Windows-x86.exe' \
+ -o -name 'LiveCode*Installer-*-Windows-x86_64.exe' \
-o -name 'LiveCode*Installer-*-Linux.*' \
-o -name 'LiveCode*Server-*-Linux*.zip' \
-o -name 'LiveCode*Server-*-Mac.zip' \
- -o -name 'LiveCode*Server-*-Windows.zip' \
+ -o -name 'LiveCode*Server-*-Windows-x86.zip' \
+ -o -name 'LiveCode*Server-*-Windows-x86_64.zip' \
-o -name 'LiveCode*Docs-*.zip' \
-o -name '*-bin.tar.xz' \
- > dist-upload-files.txt; \
+ -o -name '*-bin.tar.bz2' \
+ -o -name 'LiveCodeForFM-Mac-Solution.zip' \
+ -o -name 'LiveCodeForFM-Mac-Plugin.zip' \
+ -o -name 'LiveCodeForFM-Win-x86-Solution.zip' \
+ -o -name 'LiveCodeForFM-Win-x86-Plugin.zip' \
+ -o -name 'LiveCodeForFM-Win-x86_64-Solution.zip' \
+ -o -name 'LiveCodeForFM-Win-x86_64-Plugin.zip' \
+ -o -name 'LiveCodeForFM-All-Solutions.zip' \
+ -o -name 'LiveCodeForFM-All-Plugins.zip' \
+ -o -name 'LiveCodeForFM-Solution.zip' \
+ -o -name 'LiveCodeForFM.zip' \
+ > dist-upload-files.txt; \
if test "${UPLOAD_RELEASE_NOTES}" = "yes"; then \
find . -maxdepth 1 -name 'LiveCodeNotes*.pdf' >> dist-upload-files.txt; \
- find . -maxdepth 1 -name 'LiveCodeNotes*.html' >> dist-upload-file; \
+ find . -maxdepth 1 -name 'LiveCodeNotes*.html' >> dist-upload-files.txt; \
+ find . -maxdepth 1 -name 'LiveCodeUpdates*.md' >> dist-upload-files.txt; \
+ find . -maxdepth 1 -name 'LiveCodeUpdates*.html' >> dist-upload-files.txt; \
+ find . -maxdepth 1 -name 'LiveCodeUserGuide*.html' >> dist-upload-files.txt; \
+ find . -maxdepth 1 -name 'LiveCodeUserGuide*.pdf' >> dist-upload-files.txt; \
fi; \
if test "$(UPLOAD_ENABLE_CHECKSUM)" = "yes"; then \
- $(SHA1SUM) < dist-upload-files.txt > sha1sum.txt; \
+ xargs --arg-file=dist-upload-files.txt $(SHA1SUM) > sha1sum.txt; \
echo sha1sum.txt >> dist-upload-files.txt; \
else \
touch sha1sum.txt; \
@@ -273,11 +254,50 @@ dist-upload: dist-upload-files.txt dist-upload-mkdir
# resulting archive gets transferred to a Mac for signing and
# conversion to a DMG.
distmac-archive:
+ set -e; \
find . -maxdepth 1 -name 'LiveCode*Installer-*-Mac.app' -print0 \
- | xargs -0 tar -Jcvf mac-installer.tar.xz
+ | xargs -0 tar -cvf mac-installer.tar; \
+ cd mac-bin; \
+ find . -maxdepth 1 -name 'livecodeforfm-*.fmplugin' -print0 \
+ | xargs -0 tar --append --file=../mac-installer.tar; \
+ cd ..; \
+ cd win-x86-bin; \
+ find . -maxdepth 1 -name 'livecodeforfm-*.fmx' -print0 \
+ | xargs -0 tar --append --file=../mac-installer.tar; \
+ cd ..; \
+ cd win-x86_64-bin; \
+ find . -maxdepth 1 -name 'livecodeforfm-*.fmx64' -print0 \
+ | xargs -0 tar --append --file=../mac-installer.tar; \
+ cd ..; \
+ bzip2 -c mac-installer.tar > mac-installer.tar.xz
distmac-extract:
- tar -xvf mac-installer.tar.xz
+ set -e; \
+ tar -xvf mac-installer.tar.xz; \
+ cp -r ${private_dir}/filemaker/solutions/LiveCodeForFM.fmp12 . ; \
+ $(buildtool_command) --platform mac --stage fmpackage --debug; \
+ $(buildtool_command) --platform win-x86 --stage fmpackage --debug; \
+ $(buildtool_command) --platform win-x86_64 --stage fmpackage --debug; \
+ $(buildtool_command) --platform universal --stage fmpackage --debug; \
+ find . -maxdepth 1 -name 'LiveCodeForFM-Mac-*.fmp12' -print0 \
+ | xargs -0 zip -r LiveCodeForFM-Mac-Solution.zip; \
+ find . -maxdepth 1 -name 'LiveCodeForFM-Win-x86-*.fmp12' -print0 \
+ | xargs -0 zip -r LiveCodeForFM-Win-x86-Solution.zip; \
+ find . -maxdepth 1 -name 'LiveCodeForFM-Win-x86_64-*.fmp12' -print0 \
+ | xargs -0 zip -r LiveCodeForFM-Win-x86_64-Solution.zip; \
+ find . -maxdepth 1 -name 'LiveCodeForFM-[1-9]*.fmp12' -print0 \
+ | xargs -0 zip -r LiveCodeForFM.zip; \
+ find . -maxdepth 1 -name 'livecodeforfm-*.*' -print0 \
+ | xargs -0 zip -r LiveCodeForFM-All-Plugins.zip; \
+ find . -maxdepth 1 -name 'livecodeforfm-*.fmplugin' -print0 \
+ | xargs -0 zip -r LiveCodeForFM-Mac-Plugin.zip; \
+ find . -maxdepth 1 -name 'livecodeforfm-*.fmx' -print0 \
+ | xargs -0 zip -r LiveCodeForFM-Win-x86-Plugin.zip; \
+ find . -maxdepth 1 -name 'livecodeforfm-*.fmx64' -print0 \
+ | xargs -0 zip -r LiveCodeForFM-Win-x86_64-Plugin.zip; \
+ find . -maxdepth 1 -name 'LiveCodeForFM.fmp12' -print0 \
+ | xargs -0 zip -r LiveCodeForFM-Solution.zip
+
# Final installer creation for Mac
distmac-disk-%: distmac-bundle-%
diff --git a/buildbot.py b/buildbot.py
new file mode 100755
index 00000000000..3b2d16d4465
--- /dev/null
+++ b/buildbot.py
@@ -0,0 +1,269 @@
+#!/usr/bin/env python
+# Copyright (C) 2017 LiveCode Ltd.
+#
+# This file is part of LiveCode.
+#
+# LiveCode is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License v3 as published by the Free
+# Software Foundation.
+#
+# LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LiveCode. If not see .
+
+# This file contains rules used by the LiveCode Buildbot installation
+# at
+#
+# Tasks that may be run on Windows workers must be implemented in this
+# file. Other tasks may be implemented in buildbot.mk, and this
+# script redirects to that Makefile. All buildbot operations should
+# occur via this script, so that buildbot does not invoke
+# platform-specific tools directly.
+
+import sys
+import subprocess
+import os
+import platform as _platform
+import shutil
+import tarfile
+import uuid
+
+# LiveCode build configuration script
+import config
+import fetch
+
+# The set of build tasks that this branch supports
+BUILDBOT_TARGETS = ('fetch', 'config', 'compile', 'bin-archive', 'bin-extract',
+ 'dist-notes', 'dist-docs', 'dist-server', 'dist-tools', 'dist-upload',
+ 'distmac-archive', 'distmac-extract', 'distmac-disk')
+
+SKIP_EXIT_STATUS = 88
+
+def usage(exit_status):
+ print(
+"""Perform continuous integration and release build steps.
+
+Usage:
+ buildbot.py TARGET
+
+Environment variables:
+ BUILD_EDITION LiveCode edition name ("commercial" or "community")
+ BUILD_PLATFORM The target platform for build (e.g. "ios")
+ BUILD_SUBPLATFORM The target subplatform (e.g. "iphoneos10.2")
+
+Many tasks are deferred to the "buildbot.mk" Makefile and the
+"config.py" configuration script. Refer to these for other
+environment variables that may affect the build.
+""")
+
+ sys.exit(exit_status)
+
+def error(message):
+ print("ERROR: " + message)
+ sys.exit(1)
+
+def get_target_triple():
+ return os.environ.get('BUILD_TARGET_TRIPLE')
+
+def get_build_platform():
+ platform = (os.environ.get('BUILD_PLATFORM'),
+ os.environ.get('BUILD_SUBPLATFORM'))
+ if platform[0] is None:
+ error('You must set $BUILD_PLATFORM')
+ return platform
+
+def get_buildtype():
+ return os.environ.get('BUILDTYPE', 'Debug')
+
+def get_build_edition():
+ return os.environ.get('BUILD_EDITION', 'community')
+
+def check_target_triple():
+ # Check that this branch can actually be built for the specified platform
+ triple = get_target_triple()
+ if not triple in config.BUILDBOT_PLATFORM_TRIPLES:
+ print('Buildbot build for "{}" platform is not supported'.format(triple))
+ sys.exit(SKIP_EXIT_STATUS)
+
+################################################################
+# Defer to buildbot.mk
+################################################################
+
+def exec_buildbot_make(target):
+ args = ["make", "-f", "buildbot.mk", target]
+ print(' '.join(args))
+ sys.exit(subprocess.call(args))
+
+################################################################
+# Fetch prebuilts
+################################################################
+
+def exec_fetch(args):
+ print('fetch.py ' + ' '.join(args))
+ sys.exit(fetch.fetch(args))
+
+def do_fetch():
+ check_target_triple()
+ exec_fetch(['--target', get_target_triple()])
+
+################################################################
+# Configure with gyp
+################################################################
+
+def exec_configure(args):
+ print('config.py ' + ' '.join(args))
+ sys.exit(config.configure(args))
+
+def do_configure():
+ check_target_triple()
+ platform, subplatform = get_build_platform()
+
+ if platform == 'ios':
+ if subplatform is None:
+ error('You must set $BUILD_SUBPLATFORM for iOS builds')
+ exec_configure(['--platform', 'ios',
+ '--generator-output',
+ 'build-{}-{}/livecode'.format(platform, subplatform),
+ '-Dtarget_sdk=' + subplatform])
+ else:
+ exec_configure(['--platform', platform])
+ return 0
+
+################################################################
+# Compile
+################################################################
+
+def exec_make(target):
+ args = ['make', target]
+ print(' '.join(args))
+ sys.exit(subprocess.call(args))
+
+# mspdbsrv is the service used by Visual Studio to collect debug
+# data during compilation. One instance is shared by all C++
+# compiler instances and threads. It poses a unique challenge in
+# several ways:
+#
+# - If not running when the build job starts, the build job will
+# automatically spawn it as soon as it needs to emit debug symbols.
+# There's no way to prevent this from happening.
+#
+# - The build job _doesn't_ automatically clean it up when it finishes
+#
+# - By default, mspdbsrv inherits its parent process' file handles,
+# including (unfortunately) some log handles owned by Buildbot. This
+# can prevent Buildbot from detecting that the compile job is finished
+#
+# - If a compile job starts and detects an instance of mspdbsrv already
+# running, by default it will reuse it. So, if you have a compile
+# job A running, and start a second job B, job B will use job A's
+# instance of mspdbsrv. If you kill mspdbsrv when job A finishes,
+# job B will die horribly. To make matters worse, the version of
+# mspdbsrv should match the version of Visual Studio being used.
+#
+# This class works around these problems:
+#
+# - It sets the _MSPDBSRV_ENDPOINT_ to a value that's probably unique to
+# the build, to prevent other builds on the same machine from sharing
+# the same mspdbsrv endpoint
+#
+# - It launches mspdbsrv with _all_ file handles closed, so that it
+# can't block the build from being detected as finished.
+#
+# - It explicitly kills mspdbsrv after the build job has finished.
+#
+# - It wraps all of this into a context manager, so mspdbsrv gets killed
+# even if a Python exception causes a non-local exit.
+class UniqueMspdbsrv(object):
+ def __enter__(self):
+ os.environ['_MSPDBSRV_ENDPOINT_'] = str(uuid.uuid4())
+
+ mspdbsrv_exe = os.path.join(config.get_program_files_x86(),
+ 'Microsoft Visual Studio\\2017\\BuildTools\\VC\\Tools\\MSVC\\14.10.25017\\bin\\HostX86\\x86\\mspdbsrv.exe')
+ args = [mspdbsrv_exe, '-start', '-shutdowntime', '-1']
+ print(' '.join(args))
+ self.proc = subprocess.Popen(args, close_fds=True)
+ return self
+
+ def __exit__(self, type, value, traceback):
+ self.proc.terminate()
+ return False
+
+def exec_msbuild(platform):
+ # Run the make.cmd batch script; it's run using Wine if this is
+ # not actually a Windows system.
+ cwd = 'build-' + platform
+
+ if _platform.system() == 'Windows':
+ with UniqueMspdbsrv() as mspdbsrv:
+ args = ['cmd', '/C', '..\\make.cmd']
+ print(' '.join(args))
+ result = subprocess.call(args, cwd=cwd)
+
+ sys.exit(result)
+
+ else:
+ args = ['wine', 'cmd', '/K', '..\\make.cmd']
+ print(' '.join(args))
+ exit_status = sys.exit(subprocess.call(args, cwd=cwd))
+
+ # Clean up any Wine processes that are still hanging around.
+ # This is important in case the build fails.
+ args = ['wineserver', '-k', '-w']
+ subprocess.call(args, cwd=cwd)
+
+ sys.exit(exit_status)
+
+def do_compile():
+ check_target_triple()
+
+ platform, subplatform = get_build_platform()
+ if platform.startswith('win-'):
+ return exec_msbuild(platform)
+ else:
+ # Just defer to the top level Makefile
+ if platform == 'ios':
+ if subplatform is None:
+ error('You must set $BUILD_SUBPLATFORM for iOS builds')
+ target = 'compile-{}-{}'.format(platform, subplatform)
+ else:
+ target = 'compile-' + platform
+ return exec_make(target)
+
+################################################################
+# Archive / extract built binaries
+################################################################
+
+def do_bin_archive():
+ platform, subplatform = get_build_platform()
+ bindir = platform + '-bin'
+ shutil.make_archive(bindir, 'bztar', '.', bindir)
+
+################################################################
+# Main entry point
+################################################################
+
+def buildbot_task(target):
+ # Check that this branch supports performing the requested buildbot task
+ if not target in BUILDBOT_TARGETS:
+ print('Buildbot build step "{}" is not supported'.format(target))
+ sys.exit(SKIP_EXIT_STATUS)
+
+ if target == 'fetch':
+ return do_fetch()
+ elif target == 'config':
+ return do_configure()
+ elif target == 'compile':
+ return do_compile()
+ elif target == 'bin-archive':
+ return do_bin_archive()
+ else:
+ return exec_buildbot_make(target)
+
+if __name__ == '__main__':
+ if len(sys.argv) < 2:
+ error("You must specify a buildbot target stage")
+ sys.exit(buildbot_task(sys.argv[1]))
diff --git a/builder/builder_tool.livecodescript b/builder/builder_tool.livecodescript
index e204e14dc7e..007f932ab1b 100644
--- a/builder/builder_tool.livecodescript
+++ b/builder/builder_tool.livecodescript
@@ -5,6 +5,7 @@ local sDebug -- True if the builder should run in debugging mode
on startup
set the itemdelimiter to slash
start using stack (item 1 to -2 of the filename of me & slash & "builder_utilities.livecodescript")
+ start using stack (item 1 to -2 of the filename of me & slash & "edition_utilities.livecodescript")
set the itemDelimiter to comma
__loadExternal "revzip"
@@ -25,32 +26,40 @@ on startup
put "community" into tEdition
put "stable" into tBuild
- local tEngineDir, tPrivateDir, tOutputDir, tWorkDir, tDocsDir, tBuiltDocsDir
+ local tEngineDir, tPrivateDir, tOutputDir, tWorkDir, tDocsDir, tBuiltDocsDir, tArch
put 1 into tArgIndex
repeat while tArgIndex is among the keys of tArgs
if tArgs[tArgIndex] is "--platform" then
get tArgs[tArgIndex + 1]
- if it is not among the items of "windows,win,macosx,mac,linux,linux-x86,linux-x86_64" then
+ if it is not among the items of "windows,win,win-x86,win-x86_64,macosx,mac,linux,linux-x86,linux-x86_64,universal" then
__builderLog "error", "Unknown platform '" & tArgs[tArgIndex + 1] & "'"
end if
+ -- Hack the arch from the platform. This should really use
+ -- triples.
+ set the itemdelimiter to "-"
+ put item -1 of it into tArch
+ set the itemdelimiter to comma
+
if it is "linux" then
put true into tPlatforms["linux-x86"]
put true into tPlatforms["linux-x86_64"]
+ else if it is "win" then
+ put true into tPlatforms["win-x86"]
+ put true into tPlatforms["win-x86_64"]
else
- if it is "win" then get "windows"
if it is "mac" then get "macosx"
put true into tPlatforms[it]
end if
add 1 to tArgIndex
else if tArgs[tArgIndex] is "--stage" then
- if tArgs[tArgIndex + 1] is not among the items of "environment,tools,bundle,server,notes,docs,disk,guide" then
+ if tArgs[tArgIndex + 1] is not among the items of "environment,tools,bundle,server,notes,docs,disk,guide,fmpackage" then
__builderLog "error", "Unknown stage '" & tArgs[tArgIndex + 1] & "'"
end if
put tArgs[tArgIndex + 1] into tStage
add 1 to tArgIndex
else if tArgs[tArgIndex] is "--edition" then
- if tArgs[tArgIndex + 1] is not among the items of "community,indy,business,commercial" then
+ if tArgs[tArgIndex + 1] is not among the items of editionNames() then
__builderLog "error", "Unknown edition '" & tArgs[tArgIndex + 1] & "'"
end if
put tArgs[tArgIndex + 1] into tEdition
@@ -121,6 +130,10 @@ on startup
set the name of this stack to "Builder"
+ if tArch is not empty then
+ builderSetTargetArch tArch
+ end if
+
if tEngineDir is not empty then
builderSetEngineDir tEngineDir
end if
diff --git a/builder/builder_utilities.livecodescript b/builder/builder_utilities.livecodescript
index 7ba84e2e237..afbf0659c33 100644
--- a/builder/builder_utilities.livecodescript
+++ b/builder/builder_utilities.livecodescript
@@ -1,7 +1,7 @@
script "BuilderUtilities"
-constant kMergExtVersion = "2016-9-19"
-constant kTSNetVersion = "1.2.3"
+constant kMergExtVersion = "2021-6-16"
+constant kTSNetVersion = "1.4.5"
local sEngineDir
local sWorkDir
@@ -9,6 +9,7 @@ local sOutputDir
local sPrivateDir
local sDocsDir
local sBuiltDocsDir
+local sTargetArch
////////////////////////////////////////////////////////////////////////////////
@@ -52,6 +53,10 @@ command builderSetOutputDir pDir
put pDir into sOutputDir
end builderSetOutputDir
+command builderSetTargetArch pArch
+ put pArch into sTargetArch
+end builderSetTargetArch
+
////////////////////////////////////////////////////////////////////////////////
on builderBuild pWhich, pPlatforms, pEdition, pType
@@ -101,6 +106,15 @@ on builderBuild pWhich, pPlatforms, pEdition, pType
put builderGetBuildNumber() into tBuildNumber
dispatch "archiveBuilderRun" to stack builderArchiveBuilderStack() with tVersion, tBuildNumber, pType
break
+ case "FMPackage"
+ local tGitRevision, tOutputFolder, tPrivateRepo, tTargetArch
+ put builderOutputFolder() into tOutputFolder
+ put builderGetGitFullHash() into tGitRevision
+ put builderPrivateRepoFolder() into tPrivateRepo
+ put builderTargetArch() into tTargetArch
+ repeat for each line tPlatform in pPlatforms
+ dispatch "fmPackageBuilderRun" to stack builderFMPackageBuilderStack() with tPlatform, tPrivateRepo, tOutputFolder, tGitRevision, tTargetArch
+ end repeat
end switch
builderFinalize
@@ -119,7 +133,13 @@ function builderPlatform
end if
throw "Unknown Linux architecture:" && the processor
case "win32"
- return "windows"
+ if the processor is "x86" then
+ return "win-x86"
+ end if
+ if the processor is "x86_64" then
+ return "win-x86_64"
+ end if
+ throw "Unknown Windows architecture:" && the processor
case "macos"
return "macosx"
case "iphone"
@@ -139,8 +159,10 @@ command builderFetchEngine pVersion, pPlatform
end if
if sEngineDir is not empty then
switch pPlatform
- case "windows"
+ case "win-x86"
return sEngineDir & slash & "win-x86-bin"
+ case "win-x86_64"
+ return sEngineDir & slash & "win-x86_64-bin"
case "linux-x86"
return sEngineDir & slash & "linux-x86-bin"
case "linux-x86_64"
@@ -151,8 +173,14 @@ command builderFetchEngine pVersion, pPlatform
return sEngineDir & slash & "mac-bin"
case "ios"
return sEngineDir & slash & "ios-bin"
- case "android"
- return sEngineDir & slash & "android-armv6-bin"
+ case "android-armeabi-v7a"
+ return sEngineDir & slash & "android-armv7-bin"
+ case "android-arm64-v8a"
+ return sEngineDir & slash & "android-arm64-bin"
+ case "android-x86"
+ return sEngineDir & slash & "android-x86-bin"
+ case "android-x86_64"
+ return sEngineDir & slash & "android-x86_64-bin"
case "emscripten"
return sEngineDir & slash & "emscripten-bin"
default
@@ -163,7 +191,8 @@ command builderFetchEngine pVersion, pPlatform
end if
local tPlatform
switch pPlatform
- case "windows"
+ case "win-x86"
+ case "win-x86_64"
get "windows/release"
break
case "linux-x86"
@@ -177,7 +206,10 @@ command builderFetchEngine pVersion, pPlatform
case "ios"
get "ios"
break
- case "android"
+ case "android-armeabi-v7a"
+ case "android-arm64-v8a"
+ case "android-x86"
+ case "android-x86_64"
get "android/release"
break
end switch
@@ -227,6 +259,10 @@ end copyFolder
////////////////////////////////////////////////////////////////////////////////
+function builderTargetArch
+ return sTargetArch
+end builderTargetArch
+
-- Returns the folder of the repository
function builderRepoFolder
set the itemDelimiter to slash
@@ -291,14 +327,21 @@ function builderIDEDocsFolder
return builderIDEFolder() & slash & "Documentation"
end builderIDEDocsFolder
-# Location for api js file in > LC8
-function builderAPIFolder pEdition
- return builderIDEDocsFolder() & slash & "html_viewer/resources/data/" & pEdition & "/api"
+# Location for api js files in > LC8
+function builderAPIFolder pEdition, pWhich
+ local tFolder
+ put builderIDEDocsFolder() & "/html_viewer/resources/data/api" \
+ into tFolder
+ if pWhich is not empty then
+ put "_" & pWhich after tFolder
+ end if
+
+ return tFolder
end builderAPIFolder
# Location for guide js file in > LC8
function builderGuideFolder pEdition
- return builderIDEDocsFolder() & slash & "html_viewer/resources/data/" & pEdition & "/guide"
+ return builderIDEDocsFolder() & slash & "html_viewer/resources/data/guide"
end builderGuideFolder
function builderDocsFolder
@@ -323,8 +366,9 @@ function builderMergExtVersion
return kMergExtVersion
end builderMergExtVersion
-function builderUnpackFolder
- return sWorkDir & "/ext/unpacked"
+function builderUnpackFolder pEdition
+ replace space with "_" in pEdition
+ return builderWorkFolder() & "/ext/unpacked/" & toLower(pEdition)
end builderUnpackFolder
function builderTSNetVersion
@@ -392,6 +436,10 @@ function builderArchiveBuilderStack
return builderSystemPrivateFolder() & slash & "archive_builder.livecodescript"
end builderArchiveBuilderStack
+function builderFMPackageBuilderStack
+ return builderSystemPrivateFolder() & slash & "package_solution.livecodescript"
+end builderFMPackageBuilderStack
+
function builderModuleInterfaceFolder
builderFetchEngine "", "macosx"
return the result & slash & "modules" & slash & "lci"
@@ -402,6 +450,11 @@ function builderPackagedExtensionsFolder
return the result & slash & "packaged_extensions"
end builderPackagedExtensionsFolder
+function builderExtractedDocsFolder
+ builderFetchEngine "", "macosx"
+ return the result & slash & "extracted_docs"
+end builderExtractedDocsFolder
+
-- Returns the engine that should be used to build the installer
function builderInstallerEngine pPlatform
local tEngineFolder
@@ -409,7 +462,8 @@ function builderInstallerEngine pPlatform
put the result into tEngineFolder
switch pPlatform
- case "windows"
+ case "win-x86"
+ case "win-x86_64"
return tEngineFolder & slash & "installer.exe"
case "linux-x86"
return tEngineFolder & slash & "installer"
@@ -481,6 +535,16 @@ end builderGetBuildNumber
////////////////////////////////////////////////////////////////////////////////
+function builderGetGitShortHash
+ return word 1 of shell("git --git-dir=../.git rev-parse --short HEAD")
+end builderGetGitShortHash
+
+function builderGetGitFullHash
+ return word 1 of shell("git --git-dir=../.git rev-parse HEAD")
+end builderGetGitFullHash
+
+////////////////////////////////////////////////////////////////////////////////
+
function getExecutableArchs pInput
get shell("lipo -info" && quote & pInput & quote)
set the itemDelimiter to ":"
@@ -558,7 +622,7 @@ command builderEnsureZip pZipfile, pURL
builderEnsureFolderForFile pZipfile
builderLog "message", "Downloading zip file:" && pZipfile
- get shell(merge("curl -o '[[pZipfile]]' '[[pUrl]]'"))
+ get shell(merge("curl -k -o '[[pZipfile]]' '[[pUrl]]'"))
if the result is not zero then
builderLog "error", "Failed to download zip file:" && it
throw "failure"
@@ -585,12 +649,12 @@ function builderMergExtUrl pMergExtVersion, pEdition
end builderMergExtUrl
private function builderMergExtDownloadedFilePath pMergExtVersion, pEdition
- return sWorkDir & "/ext/downloads/MergExt-" & pEdition & "-" & pMergExtVersion & ".zip"
+ return builderWorkFolder() & "/ext/downloads/MergExt-" & pEdition & "-" & pMergExtVersion & ".zip"
end builderMergExtDownloadedFilePath
private command builderMergExtUnpack pMergExtVersion, pEdition
local tFolder
- put builderUnpackFolder() & slash & "Ext" into tFolder
+ put builderUnpackFolder(pEdition) & slash & "Ext" into tFolder
local tZipFile
put builderMergExtDownloadedFilePath(pMergExtVersion, pEdition) into tZipFile
@@ -610,12 +674,12 @@ function builderTSNetUrl pTSNetVersion, pEdition
end builderTSNetUrl
private function builderTSNetDownloadedFilePath pTSNetVersion, pEdition
- return sWorkDir & "/ext/downloads/tsNet_" & pEdition & "_" & pTSNetVersion & ".zip"
+ return builderWorkFolder() & "/ext/downloads/tsNet_" & pEdition & "_" & pTSNetVersion & ".zip"
end builderTSNetDownloadedFilePath
private command builderTSNetUnpack pTSNetVersion, pEdition
local tFolder
- put builderUnpackFolder() & slash & "Ext" into tFolder
+ put builderUnpackFolder(pEdition) & slash & "Ext" into tFolder
local tZipFile
put builderTSNetDownloadedFilePath(pTSNetVersion, pEdition) into tZipFile
@@ -632,7 +696,7 @@ end builderTSNetUnpack
command builderExtUnpack pEdition
local tFolder
- put builderUnpackFolder() & slash & "Ext" into tFolder
+ put builderUnpackFolder(pEdition) & slash & "Ext" into tFolder
if there is a folder tFolder then
builderLog "message", "Cleaning unpack folder" && tFolder
@@ -640,12 +704,190 @@ command builderExtUnpack pEdition
end if
local tEdition
- put toUpper(char 1 of pEdition) & toLower(char 2 to -1 of pEdition) into tEdition
+ put editionTitleCase(pEdition) into tEdition
-- Ensure that the MergExt bundle is downloaded and unpacked
builderMergExtUnpack builderMergExtVersion(), tEdition
- if pEdition is not "community" then
+ if editionCompare(pEdition, "communityplus") > 0 then
-- Ensure that the TSNet bundle is downloaded and unpacked
builderTSNetUnpack builderTSNetVersion(), tEdition
end if
-end builderExtUnpack
\ No newline at end of file
+end builderExtUnpack
+
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+
+Return valid component categories for note sections
+
+Returns:
+An commma delimited list
+
+**/
+function builderComponentCategories
+ return "engine,IDE,builder,extension"
+end builderComponentCategories
+
+/**
+
+Iterate the components directories of the public and private repositories
+and parse the yaml file in each subdirectory.
+
+Returns:
+An array of component directories with keys folder (full path) & metadata
+(array from of YAML file).
+
+**/
+function builderComponentFolders
+ local tComponentFolders
+ repeat for each line tFolder in builderPrivateRepoFolder() & return & builderRepoFolder()
+ repeat for each line tComponent in folders(tFolder & "/components")
+ if tComponent begins with "." then
+ next repeat
+ end if
+
+ local tPath
+ put tFolder & "/components/" & tComponent & "/component.yml" into tPath
+ if there is not a file tPath then
+ next repeat
+ end if
+
+ local tYAML
+ put builderFileGetUTF8Contents(tPath) into tYAML
+
+ --!TODO Add YAMLToArray script-library so we can have more
+ -- complex metadata structures here if necessary
+ local tLine
+ set the itemdelimiter to colon
+
+ local tMetadata
+ delete variable tMetadata
+ repeat for each line tLine in tYAML
+ put word 1 to -1 of (item 2 to -1 of tLine) into tMetadata[item 1 of tLine]
+ end repeat
+
+ local tIndex
+ put the number of elements of tComponentFolders + 1 into tIndex
+ put tFolder & "/components/" & tComponent into tComponentFolders[tIndex]["folder"]
+ put tMetadata into tComponentFolders[tIndex]["metadata"]
+ end repeat
+ end repeat
+
+ return tComponentFolders
+end builderComponentFolders
+
+/**
+
+Read UTF-8 file
+
+Parameters:
+
+pPath (string):
+full file path
+
+Returns:
+The decoded content of a UTF-8 file with BOM removed if it existed
+
+**/
+function builderFileGetUTF8Contents pPath
+ return builderFileGetContents(pPath, "UTF-8")
+end builderFileGetUTF8Contents
+
+/**
+
+Read file
+
+Parameters:
+
+pPath (string):
+full file path
+
+pEncoding (optional string):
+The encoding to decode with if any. If empty the the binary file
+is returned.
+
+Returns:
+The decoded content of a file with BOM removed if it existed
+
+**/
+function builderFileGetContents pPath, pEncoding
+ local tContents, tResult
+
+ put url("binfile:" & pPath) into tContents
+ put the result into tResult
+ if tResult is not empty then
+ throw merge("Failed to read [[pPath]]: [[tResult]]")
+ end if
+
+ if pEncoding is not empty then
+ __DeleteByteOrderMarks tContents, pEncoding
+ put textDecode(tContents, pEncoding) into tContents
+ end if
+
+ return tContents
+end builderFileGetContents
+
+private command __DeleteByteOrderMarks @xEncoded, pEncoding
+ local tBom
+ put textEncode(numToCodepoint(0xfeff), pEncoding) into tBom
+
+ if xEncoded begins with tBom then
+ delete byte 1 to (the number of bytes in tBom) of xEncoded
+ end if
+end __DeleteByteOrderMarks
+
+/**
+
+Write UTF-8 file
+
+Parameters:
+
+pPath (string):
+full file path
+
+pContents (string):
+The file content to write
+
+**/
+command builderFileSetUTF8Contents pPath, pContents
+ builderFileSetContents pPath, pContents, "UTF-8"
+end builderFileSetUTF8Contents
+
+/**
+
+Write file
+
+Parameters:
+
+pPath (string):
+full file path
+
+pContents:
+The file content to write. Either string or data.
+
+pEncoding (optional string):
+The encoding to encode the string in if any.. If not set
+the binary data of pContents is written.
+
+**/
+command builderFileSetContents pPath, pContents, pEncoding
+ local tResult
+
+ if pEncoding is empty then
+ open file pPath for binary write
+ else
+ open file pPath for pEncoding text write
+ end if
+ put the result into tResult
+ if tResult is not empty then
+ throw merge("Failed to open [[pPath]]: [[tResult]]")
+ end if
+
+ write pContents to file pPath
+ put the result into tResult
+ if tResult is not empty then
+ throw merge("Failed to write [[pPath]]: [[tResult]]")
+ end if
+
+ close file pPath -- unchecked
+end builderFileSetContents
diff --git a/builder/business.png b/builder/business.png
new file mode 100644
index 00000000000..3675b984323
Binary files /dev/null and b/builder/business.png differ
diff --git a/builder/business@extra-high.png b/builder/business@extra-high.png
new file mode 100644
index 00000000000..e7b96366aad
Binary files /dev/null and b/builder/business@extra-high.png differ
diff --git a/builder/commercial.png b/builder/commercial.png
index a96616802ed..6e2a0cd9a2e 100644
Binary files a/builder/commercial.png and b/builder/commercial.png differ
diff --git a/builder/commercial@extra-high.png b/builder/commercial@extra-high.png
new file mode 100644
index 00000000000..1f23a3e0559
Binary files /dev/null and b/builder/commercial@extra-high.png differ
diff --git a/builder/community.png b/builder/community.png
index 28c37a8470a..981c9b943f1 100644
Binary files a/builder/community.png and b/builder/community.png differ
diff --git a/builder/community@extra-high.png b/builder/community@extra-high.png
new file mode 100644
index 00000000000..da955a45487
Binary files /dev/null and b/builder/community@extra-high.png differ
diff --git a/builder/docs_builder.livecodescript b/builder/docs_builder.livecodescript
index 75e3d464e71..e3e865c9792 100644
--- a/builder/docs_builder.livecodescript
+++ b/builder/docs_builder.livecodescript
@@ -1,17 +1,4 @@
script "DocsBuilder"
-# The max number allowed
-constant kFilesPerClump = 50
-
-# Probably not a good idea to change this...
-constant kClumpNamePrefix = "revDocClump_"
-
-private function docsBuilderGetSourceDirectory
- return builderDocsFolder()
-end docsBuilderGetSourceDirectory
-
-private function docsBuilderGetOutputDirectory
- return builderBuiltDocsFolder()
-end docsBuilderGetOutputDirectory
command docsBuilderProgressUpdate pProgress, pMessage
builderLog "message", pMessage
@@ -24,1849 +11,6 @@ command logError pError
builderLog "error", pError, tContext
end logError
-command docsBuilderRun pEdition, pVersion
- set the itemdelimiter to "."
- if item 1 of pVersion > 7 then
- start using stack (builderRepoFolder() & slash & "ide-support/revdocsparser.livecodescript")
- docsBuilderGenerateDocsNew pEdition, pVersion
- exit docsBuilderRun
- end if
-
- local tSourceDir, tOutputDir
- put docsBuilderGetSourceDirectory() into tSourceDir
- put docsBuilderGetOutputDirectory() & "/packaged_xml" into tOutputDir
-
- start using stack (builderIdeRepoFolder() & slash & "Toolset/palettes/revdocumentationlibrary.rev")
-
- builderLog "report", "Building docs into" && tOutputDir
- buildDocumentation tSourceDir & "/dictionary", tSourceDir & "/glossary", tOutputDir & "/dictionary", tOutputDir & "/glossary", tOutputDir, "docsBuilderProgressUpdate", the long id of me
- builderLog "report", "Building docs into" && tOutputDir && "complete"
-end docsBuilderRun
-
-command buildDocumentation pDictionaryInputDirectory, pGlossaryInputDirectory, pDictionaryOutputDirectory, pGlossaryOutputDirectory, pManifestOutputDirectory, pCallback, pCallbackTarget
- initializeProgress pCallback, pCallbackTarget
-
- reportProgress "Cleaning Directory", 0, "Cleaning Existing Structure"
-
- # Create the subdirectories we need.
- pathEnsure (pDictionaryOutputDirectory)
- pathEnsure (pGlossaryOutputDirectory)
-
- # Ensure the subDirectories we need were created.
- if there is no folder pDictionaryOutputDirectory then
- errorShow "libDocumentClumpGenerateAll", "Invalid output directory: " & pDictionaryOutputDirectory
- exit buildDocumentation
- end if
- if there is no folder pGlossaryOutputDirectory then
- errorShow "libDocumentClumpGenerateAll", "Invalid output directory: " & pGlossaryOutputDirectory
- exit buildDocumentation
- end if
-
- # Clean any existing clumps out of memory to prevent interference.
- deleteExistingClumpsFromMemory
-
- local tFileToDirectory, tLinkLookup
- # Get the the file reference information
- libDocumentationListXMLFiles pGlossaryInputDirectory, tFileToDirectory
- reportProgress "Glossary", 0, "Listed XML files"
-
- libDocumentationListXMLFiles pDictionaryInputDirectory, tFileToDirectory
- reportProgress "Dictionary", 0, "Listed XML files"
-
- #Get the cross reference information for the internal links
- libDocumentationCreateDocRefs tFileToDirectory
- put libCreateLookupTable (tFileToDirectory) into tLinkLookup
-
- # Build XRef symmetry - create symmetry entries in the lookup array
- libDocumentationCreateXRefSymmertry tFileToDirectory, tLinkLookup
-
- # Compile the dictionary and glossary into a collection of stacks with
- # compressed custom properties.
- compileDictionaryIntoStacks pDictionaryInputDirectory, pDictionaryOutputDirectory, tFileToDirectory, tLinkLookup
- compileGlossaryIntoStacks pGlossaryInputDirectory, pGlossaryOutputDirectory, tFileToDirectory, tLinkLookup
-
- # Create a manifest in the packaged_xml directory as the files are dynamic.
- createManifest pManifestOutputDirectory
-
- reportProgress empty, 100, "Done"
-end buildDocumentation
-
-local sProgress
-local sProgressCallback
-local sProgressCallbackTarget
-local sProgressStepStatus
-
-// HSC - tested - complies with current dictionary format
-private command initializeProgress pCallback, pCallbackTarget
- put empty into sProgress
- put empty into sProgressStepStatus
-
- # The callback is optional.
- if pCallback is not empty and pCallbackTarget is not empty then
- put pCallback into sProgressCallback
- put pCallbackTarget into sProgressCallbackTarget
- end if
-end initializeProgress
-
-local sLastTime
-private command reportProgress pStep, pPercentage, pMessage
- # This lets us configure the approximate proportions each step is of the whole process,
- # so that the progress is fairly smooth. (These are quite rough...)
- local tProportion
- switch pStep
- case "Dictionary"
- put 20 into tProportion
- break
- case "Glossary"
- put 1 into tProportion
- break
- case "Creating glossary index"
- put 4 into tProportion
- break
- case "Manifest"
- put "4" into tProportion
- break
- case "Cleaning Directory"
- put 11 into tProportion
- break
- case "Creating dictionary index"
- put 33 into tProportion
- break
- case "Verifying dictionary"
- put 37 into tProportion
- break
- end switch
-
- # When a step is complete, add its proportion to the current progress.
- # The current progess is the overall progress plus the step percentage.
- local tStepPercentage
- if pPercentage = 100 then
- if sProgressStepStatus[pStep] is not "Complete" then
- put "Complete" into sProgressStepStatus[pStep]
- add tProportion to sProgress
- end if
- put 0 into tStepPercentage
- else
- put ((pPercentage / 100) * tProportion) into tStepPercentage
- end if
-
- local tCurrentProgress
- put sProgress + tStepPercentage into tCurrentProgress
-
- # Here we can send a message back to the caller to indicate progress
- # of the docs building, but for now we just display progress on the card.
- if sProgressCallback is not empty and sProgressCallbackTarget is not empty then
- send sProgressCallback && "tCurrentProgress, pMessage" to sProgressCallbackTarget
- end if
-
- if the mode of me is not 0 and the visible of me then
- if the millisecs - sLastTime > 500 then
- statusSet pMessage
- set the thumbPosition of scrollbar 1 of me to tCurrentProgress
- put the millisecs into sLastTime
- end if
- end if
-end reportProgress
-
-private command statusSet pMessage
- put pMessage into field "Status" of me
-end statusSet
-
-// HSC - tested - complies with current dictionary format
-private command deleteExistingClumpsFromMemory
- repeat for each line tStack in the mainstacks
- if tStack begins with "revDocClump_" then
- lock messages
- delete stack tStack
- unlock messages
- end if
- end repeat
-end deleteExistingClumpsFromMemory
-
-private command compileGlossaryIntoStacks pInputDirectory, pOutputDirectory, @pFileToDirectory, @pLinkLookup
- local tArrIndex, tFilePath, tRelFilePath, tKeyNumber
-
- local tOldPath
- put the directory into tOldPath
-
- local tPath
- put pInputDirectory into tPath
- set the directory to tPath
-
- reportProgress "Glossary", 0, "Listed XML files"
-
- -- Now loop through the list of files and add the file data to the relevant clump
- local tFileNumber, tClumpNumber, tClumpName, tCount = 1
- repeat with tArrIndex = 1 to the number of elements of pFileToDirectory
- -- Work out which clump to add the file to from its name (number)
- if pFileToDirectory[tArrIndex]["type"] is "glossary" then
- put ((tArrIndex - 1) div kFilesPerClump) + 1 into tClumpNumber
- put kClumpNamePrefix & tClumpNumber into tClumpName
-
- if there is no stack tClumpName then
- libDocumentationClumpCreate tClumpNumber, pOutputDirectory
- end if
-
- -- Get the relative file path of the entry
- put pFileToDirectory[tArrIndex]["path"] into tFilepath
- set the itemDelimiter to slash
- put item -3 to -1 of tFilepath into tRelFilepath
-
- put libDocumentationClumpAddTo(tClumpName, tArrIndex, pFileToDirectory, pOutputDirectory, pLinkLookup) into tKeyNumber
-
- reportProgress "Glossary", ((tArrIndex / the number of elements of pFileToDirectory) * 100), "Added glossary entry: " & item -1 of tFilePath
- //reportProgress "Glossary", ((tArrIndex / the number of lines of pFileToDirectory) * 100), "Added glossary entry: " & item -1 of tFilePath
-
- set the itemDelimiter to comma
-
- end if
- end repeat
-
- -- Clean up
- repeat for each line tStack in the mainStacks
- if char 1 to (the length of kClumpNamePrefix) of tStack is kClumpNamePrefix then
- delete stack tStack
- end if
- end repeat
-
- reportProgress "Glossary", 100, "Glossary Built"
-
- # Build the index for the xml files
- libDocumentationBuildGlossaryIndex pFileToDirectory, pOutputDirectory
-end compileGlossaryIntoStacks
-
-// HSC - tested - complies with current dictionary format
-private command libDocumentationListXMLFiles pDirectory, @rFileToPath
- local tOldDirectory
- put the directory into tOldDirectory
- set the directory to pDirectory
-
- local tDirectories
- put the folders into tDirectories
- filter tDirectories without ".."
-
- local tFiles, tItems
- put the number of elements of rFileToPath into tItems
- repeat for each line tDirectory in tDirectories
- set the directory to pDirectory & slash & tDirectory
- put the files into tFiles
- filter tFiles with "*.xml"
- repeat for each line tFile in tFiles
- if tFile is not "" then
- add 1 to tItems
- put pDirectory & slash & tDirectory & slash & tFile into rFileToPath[tItems]["path"]
- put tFile into rFileToPath[tItems]["name"]
- if the length of tDirectory is 1 then
- put "glossary" into rFileToPath[tItems]["type"]
- else
- put tDirectory into rFileToPath[tItems]["type"]
- end if
- end if
- end repeat
- end repeat
-
- set the directory to tOldDirectory
-
-end libDocumentationListXMLFiles
-
-private command libDocumentationCreateDocRefs @rFileToDirectory
- local tTree, tName, tArrIndex
-
- repeat with tArrIndex = 1 to the number of elements of rFileToDirectory
-
- open file rFileToDirectory[tArrIndex]["path"] for read
- read from file rFileToDirectory[tArrIndex]["path"] until EOF
- // extract the or from the files and update the rFileToDirectory information
-
- put revCreateXMLTree(it, false, true, false) into tTree
- if tTree is not an integer then
- errorShow "Failed to process preferences file with error: " & tTree
- return empty
- end if
-
- put revXMLNodeContents(tTree, "doc/name") into tName
- if matchText(tName,"xmlerr") then
- put revXMLNodeContents(tTree, "doc/term") into tName
- end if
- if matchText(tName,"xmlerr") then
- //breakpoint
- end if
-
- // Build XRef symmetry - add see also links to the array structure
- local tXrefs, tXref, tXrefToReplace, tTextStart, tTextEnd, tOffsetFound
- put libGetTextLocation (it, "", " ", tTextStart, tTextEnd) into tXrefs
- if tTextStart is not 0 and tTextEnd is not 0 then
- replace "" with "" in tXrefs
- put true into tOffsetFound
- set the itemDelimiter to space
- repeat while tOffsetFound
- // need to include the tStartTags in another repeat loop this will be for the new files.
- put libGetTextLocation (tXrefs, "<", ">", tTextStart, tTextEnd) into tXrefToReplace
- if tTextStart is 0 and tTextEnd is 0 then
- put false into tOffsetFound
- else
- put tXrefToReplace into tXref
- replace "<" with "" in tXref
- replace ">" with "" in tXref
- replace "tag=" with "" in tXref
- replace quote with "" in tXref
- replace tXrefToReplace with tXref in tXrefs
- if character 1 of tXref is not "/" then
- put tXref & return after rFileToDirectory[tArrIndex]["xrefs"]
- end if
- end if
- end repeat
- end if
-
- // need the following line as revXMLNodeContents decides to turn "&" into "&"
- put escapeEntities (tName) into tName
-
- put tName into rFileToDirectory[tArrIndex]["ref"]
- close file rFileToDirectory[tArrIndex]["path"]
- end repeat
-end libDocumentationCreateDocRefs
-
-command libDocumentationCreateXRefSymmertry @rFileToDirectory, @rLinkLookup
- local tArrIndex, tReferenceTo
- repeat with tArrIndex = 1 to the number of elements of rFileToDirectory
- if "xrefs" is among the keys of rFileToDirectory[tArrIndex] then
- repeat for each line tReferenceTo in rFileToDirectory[tArrIndex]["xrefs"]
- if rFileToDirectory[tArrIndex]["type"] && rFileToDirectory[tArrIndex]["ref"] is not among the lines of rFileToDirectory[rLinkLookup[tReferenceTo]]["xrefs"] then
- put rFileToDirectory[tArrIndex]["type"] && rFileToDirectory[tArrIndex]["ref"] & return after rFileToDirectory[rLinkLookup[tReferenceTo]]["xrefs"]
- end if
- end repeat
- end if
- end repeat
-end libDocumentationCreateXRefSymmertry
-
-private command createManifest pDirectory
- reportProgress "Manifest", 0, "Listing files for manifest"
-
- local tFiles
- put utilityEnumerateDirectory(pDirectory) into tFiles
-
- reportProgress "Manifest", 70, "Finished listing manifest files"
-
- local tManifest
- repeat for each line tFile in tFiles
- if the last char of tFile is slash then
- # Don't include directories
- next repeat
- end if
- if tFile ends with "/Manifest" then
- next repeat
- end if
- put "file," & slash & tFile & return after tManifest
- end repeat
- delete the last char of tManifest
-
- local tResult
- put tManifest into url ("file:" & pDirectory & "/Manifest")
- put the result into tResult
- if tResult is not empty then
- errorShow "Failed to write manifest at location: " & pDirectory & "/Manifest" & return & "With error: " & tResult
- exit createManifest
- end if
-
- reportProgress "Manifest", 100, "Finished creating manifest"
-end createManifest
-
-# Stolen from standalone builder.
-private function utilityEnumerateDirectory pDirectory, pPrefix
- local tOldDirectory, tResult
- put the folder into tOldDirectory
- set the folder to pDirectory
-
- # OK-2008-09-10 : Bug 7147 - Prevent the possibility of an infinite loop by
- # returning empty if the directory cannot be set to pDirectory
- if the folder is not pDirectory then
- return empty
- end if
-
- repeat for each line tSubDirectory in the folders
- if tSubDirectory is among the items of ".,.." then
- next repeat
- end if
- # For our purposes we need the directory first, so it can be created ahead of file creation..
- put pPrefix & tSubDirectory & "/" & return after tResult
- get utilityEnumerateDirectory(pDirectory & "/" & tSubDirectory, pPrefix & tSubDirectory & "/")
- if it is not empty then
- put it & return after tResult
- end if
- end repeat
- local tFileSize
- repeat for each line tFile in the files
- put pPrefix & tFile & return after tResult
- end repeat
- set the folder to tOldDirectory
- delete the last char of tResult
- return tResult
-end utilityEnumerateDirectory
-
-private function extractFileNumberFromPath pPath
- set the itemDelimiter to slash
- get item -1 of pPath
- set the itemDelimiter to "."
- return item 1 of it
-end extractFileNumberFromPath
-
-private command compileDictionaryIntoStacks pInputDirectory, pOutputDirectory, @pFileToDirectory, @pLinkLookup
- local tDocDirectory, tDirectory, tDirectories, tFile, tFiles, tFilepath
- local tCurrentClumpNumber, tIndexData, tKeyNumber, tRelFilepath, tOutputDirectory
- local tXMLFiles, tFileToPath
-
- local tOldPath
- put the directory into tOldPath
-
- local tPath
- put pInputDirectory into tPath
- set the directory to tPath
-
- reportProgress "Dictionary", 0, "Listed XML files"
-
- -- Now loop through the list of files and add the file data to the relevant clump
- local tFileNumber, tClumpNumber, tClumpName, tCount = 1
- repeat with tArrIndex = 1 to the number of elements of pFileToDirectory
- -- Work out which clump to add the file to from its name (number)
- if pFileToDirectory[tArrIndex]["type"] is not "glossary" then
- put ((tArrIndex - 1) div kFilesPerClump) + 1 into tClumpNumber
- put kClumpNamePrefix & tClumpNumber into tClumpName
-
- if there is no stack tClumpName then
- libDocumentationClumpCreate tClumpNumber, pOutputDirectory
- end if
-
- -- Get the relative file path of the entry
- put pFileToDirectory[tArrIndex]["path"] into tFilepath
- set the itemDelimiter to slash
- put item -3 to -1 of tFilepath into tRelFilepath
-
- put libDocumentationClumpAddTo(tClumpName, tArrIndex, pFileToDirectory, pOutputDirectory, pLinkLookup) into tKeyNumber
-
- if tArrIndex mod 10 is 0 then
- reportProgress "Dictionary", ((tArrIndex / the number of elements of pFileToDirectory) * 100), "Added dictionary entry: " & item -1 of tFilePath
- end if
-
- set the itemDelimiter to comma
-
- end if
- end repeat
-
- -- Clean up
- repeat for each line tStack in the mainStacks
- if char 1 to (the length of kClumpNamePrefix) of tStack is kClumpNamePrefix then
- delete stack tStack
- end if
- end repeat
-
- reportProgress "Dictionary", 100, "Dictionary built"
-
- # Build the index for the xml files
- libDocumentationBuildDictionaryIndex pFileToDirectory, pOutputDirectory
-
- # Verify that the documentation is complete, we only bother doing this with the dictionary,
- # as broken glossary entries don't matter as much.
- local tResult
- libDocumentationVerifyAll "dictionary/", pOutputDirectory
- put the result into tResult
- if the result is not empty then
- throw "generation_failed - " & "libDocumentationClumpGenerateAll", "The following docs failed to build: " & return & tResult
- exit to top
- end if
-end compileDictionaryIntoStacks
-
-private function getIndexFileName pDirectory
- if pDirectory is "dictionary/" then
- return "dict.index"
- else
- return "glos.index"
- end if
-end getIndexFileName
-
-private command libDocumentationVerifyAll pDocDirectory, pOutputDirectory
- reportProgress "Verifying dictionary", 0, "Verifying dictionary"
-
- local tIndexPath
- local tIndexFileName
- put getIndexFileName(pDocDirectory) into tIndexFileName
-
- set the itemDelimiter to slash
- put item 1 to -3 of pOutputDirectory & slash & tIndexFileName into tIndexPath
- set the itemDelimiter to comma
-
- local tIndex
- put url ("binfile:" & tIndexPath) into tIndex
- put arrayDecode(tIndex) into tIndex
-
- local tDocsDirectory
- set the itemDelimiter to slash
- put item 1 to -3 of pOutputDirectory into tDocsDirectory
- set the itemDelimiter to comma
-
- local tResult
- local tType, tTag
- set the itemDelimiter to tab
-
- local tTotal
- put the number of lines of the keys of tIndex into tTotal
-
- local tLineNumber
- put 1 into tLineNumber
- repeat for each key tLine in tIndex
- put "dictionary/" into tType
- put tIndex[tLine]["ID"] into tTag
-
- local tData
- try
- put revDocumentationRetrieve(tType, tTag, tDocsDirectory) into tData
- if tData is empty then
- put "Failed to load dictionary entry: " & tTag && tType & return after tResult
- end if
- catch tError
- put "Failed to load dictionary entry: " & tTag && tType & return after tResult
- end try
-
- if tLineNumber mod 10 = 0 then
- reportProgress "Verifying dictionary", ((tLineNumber / tTotal) * 100), "Verified dictionary entry: " & tLine
- end if
- add 1 to tLineNumber
- end repeat
-
- reportProgress "Verifying dictionary", 100, "Dictionary verified"
-
- return tResult
-end libDocumentationVerifyAll
-
-private command libDocumentationBuildGlossaryIndex pFileToDirectory, pOutputDirectory
- local tStep
- put "Creating glossary index" into tStep
-
- reportProgress tStep, 0, tStep
-
- local tIndexFileName
- put getIndexFileName("glossary/") into tIndexFileName
-
- local tIndexFile
- set the itemDelimiter to slash
- put item 1 to -3 of pOutputDirectory & slash & tIndexFileName into tIndexFile
-
- local tIndex, tPath, tLine
-
- local tArrIndex
-
- repeat with tArrIndex = 1 to the number of elements of pFileToDirectory
- if pFileToDirectory[tArrIndex]["type"] is "glossary" then
- put pFileToDirectory[tArrIndex]["path"] into tPath
- put indexGlossaryLine(tPath, tArrIndex) into tLine
- put tLine & return after tIndex
- end if
- reportProgress tStep, ((tArrIndex / the number of elements of pFileToDirectory) * 100), "Indexed glossary file: " & item -1 of tPath
- end repeat
- set the itemDelimiter to comma
- delete the last char of tIndex
-
- local tResult
- put tIndex into url ("file:" & tIndexFile)
- put the result into tResult
- if tResult is not empty then
- errorShow "Failed to write to file: " & tIndexFile & " with error : " & tResult
- exit libDocumentationBuildGlossaryIndex
- end if
-
- reportProgress tStep, 100, "Index creation finished"
-end libDocumentationBuildGlossaryIndex
-
-// HSC - tested - complies with current dictionary format
-private command libDocumentationBuildDictionaryIndex pFileToDirectory, pOutputDirectory
- local tStep
- put "Creating dictionary index" into tStep
-
- reportProgress tStep, 0, tStep
-
- local tIndexFileName
- put getIndexFileName("dictionary/") into tIndexFileName
-
- local tIndexFile
- set the itemDelimiter to slash
- put item 1 to -3 of pOutputDirectory & slash & tIndexFileName into tIndexFile
-
- local tIndex, tLine, tArrIndex, tPath
- local tLineNumber
- put 0 into tLineNumber
-
- repeat with tArrIndex = 1 to the number of elements of pFileToDirectory
- if pFileToDirectory[tArrIndex]["type"] is not "glossary" then
- add 1 to tLineNumber
- put pFileToDirectory[tArrIndex]["path"] into tPath
- put indexLine(tPath, tArrIndex) into tLine
- put tLine into tIndex[tLineNumber]
- local tSynonyms
- put expandSynonyms(tPath, tArrIndex) into tSynonyms
- if tSynonyms is an array then
- repeat for each key tKey in tSynonyms
- add 1 to tLineNumber
- put tSynonyms[tKey] into tIndex[tLineNumber]
- end repeat
- end if
-
- end if
- reportProgress tStep, ((tArrIndex / the number of elements of pFileToDirectory) * 100), "Indexed dictionary file: " & item -1 of tPath
- end repeat
-
- set the itemDelimiter to comma
- local tResult
- put arrayEncode(tIndex) into url ("binfile:" & tIndexFile)
- put the result into tResult
- if tResult is not empty then
- errorShow "Failed to write to file: " & tIndexFile & " with error: " & tResult
- exit libDocumentationBuildDictionaryIndex
- end if
- reportProgress tStep, 100, "Index creation finished"
-end libDocumentationBuildDictionaryIndex
-
-# This function does the following:
-# 1. Opens the file pDocument and creates an xml tree of the contents.
-# 2. Extract the "synonyms" node and processes it to obtain a list of the synonyms.
-# 3. For each synonym, creates an index line linking to pDocument
-# 4. Returns the list of index lines
-private function expandSynonyms pDocument, pFilename
- local tData
-
- put url ("binfile:" & pDocument) into tData
- if tData is empty then
- errorShow "No data for file: " & pDocument
- exit expandSynonyms
- end if
-
- local tTree
- put revCreateXMLTree(tData, false, true, false) into tTree
-
- local tRoot
-
- put revXMLRootNode(tTree) into tRoot
-
- if tTree is not a number then
- errorShow "The document " & pDocument & " cannot be parsed by revXML"
- exit expandSynonyms
- end if
-
- if tRoot is not "doc" then
- errorShow "The document " & pDocument & " is not a valid dictionary entry because its root node is not "
- exit expandSynonyms
- end if
-
- # Synonyms are stored as:
- #
- # wd
- # window
- # revXMLChildNames gives us a return-delimited list of each node containing a synonym.
- local tNodes
- put revXMLChildNames(tTree, "/doc/synonyms", return, "synonym", true) into tNodes
- if tNodes is empty or item 1 of tNodes is "xmlerr" then
- # No synonyms found, exit now...
- return empty
- end if
-
- local tIndexLine
- put indexLine(pDocument, pFilename) into tIndexLine
-
- local tName
- -- set the itemDelimiter to tab
- -- put item 2 of tIndexLine into tName
- -- set the itemDelimiter to comma
- put tIndexLine["Keyword"] into tName
-
- local tSynonym, tSynonyms, tContent
-
- local tCount
- put 0 into tCount
- repeat for each line tNode in tNodes
- add 1 to tCount
- put revXMLNodeContents(tTree, "/doc/synonyms/" & tNode) into tContent
-
- # For each one, copy the index line from the main doc, but replace the doc's name with the synonym.
- put tIndexLine into tSynonym
-
- --set the itemDelimiter to tab
- # Replace the main name
- # put tContent into item 2 of tSynonym
- put tContent into tSynonym["Keyword"]
-
- # Replace any references to the name in the syntax (hopefully this won't cause irregular syntax problems...)
- --get item 4 of tSynonym
- get tSynonym["Syntax"]
- replace tName with tContent in it
- --put it into item 4 of tSynonym
- put it into tSynonym["Syntax"]
-
- --set the itemDelimiter to comma
-
- --put tSynonym & return after tSynonyms
- put tSynonym into tSynonyms[tCount]
- end repeat
- --delete the last char of tSynonyms
-
- revDeleteXMLTree tTree
-
- return tSynonyms
-end expandSynonyms
-
--- Given the path to an xml documentation entry (dictionary only),
--- returns the line of text in the dictionary index that corresponds
--- to the document.
-// HSC - tested - complies with current dictionary format
-private function indexLine pDoc, pIndex
-
- local tFilename
- set the itemDelimiter to slash
- put item -1 of pDoc into tFilename
-
- local tData
- put url ("file:" & pDoc) into tData
-
- local tArray
- put pIndex into tArray["ID"]
-
- local tTree
- put revCreateXMLTree(tData, false, true, false) into tTree
- if tTree is not a number then
- breakpoint
- end if
-
- local tName, tCategory
-
- put escapeEntities(revXMLNodeContents(tTree, "doc/name")) into tArray["Keyword"]
- put revXMLNodeContents(tTree, "doc/type") into tArray["Type"]
-
- if item 1 of tArray["Keyword"] is "xmlerr" then
- errorShow "Could not extract name from the dictionary file : " & pDoc & " with error: " & tName
- exit indexLine
- end if
-
- if item 1 of tArray["Type"] is "xmlerr" then
- errorShow "Could not extract type from the glossary file : " & pDoc & " with error: " & tCategory
- exit indexLine
- end if
-
- local tSyntax
- set the itemDelimiter to comma
- put extractNodeXML(tTree, "doc/syntax/example") into tSyntax
- if item 1 of tSyntax is "xmlerr" then
- put empty into tArray["Syntax"]
- else
- put auxFormatSyntax(tSyntax) into tArray["Syntax"]
- end if
-
- local tSynonymInfo, tSynonyms
- put revXMLChildContents(tTree, "doc/synonyms", slash, comma, true, 1) into tSynonymInfo
- repeat for each item tChild in tSynonymInfo
- set the itemDelimiter to slash
- put item 2 to -1 of tChild & comma after tSynonyms
- set the itemDelimiter to comma
- end repeat
- if tSynonyms is not empty then
- delete the last char of tSynonyms
- end if
-
- put tSynonyms into tArray["Synonyms"]
-
- local tVersion
- set the itemDelimiter to comma
- put revXMLAttribute(tTree, "doc/history/introduced", "version") into tVersion
- if item 1 of tVersion is "xmlerr" then
- put empty into tArray["Version"]
- else
- put tVersion into tArray["Version"]
- end if
-
- put revDocumentationVersionDate(tArray["Version"]) into tArray["Date"]
- put empty into tArray["Notes"]
-
- local tLibrary
- put revXMLNodeContents(tTree, "doc/library") into tLibrary
- if item 1 of tLibrary is "xmlerr" then
- put empty into tArray["Library"]
- else
- put tLibrary into tArray["Library"]
- end if
-
- local tObjects
- put revXMLChildNames(tTree,"doc/objects",return,,false) into tObjects
- repeat for each word tObject in "Button Field Graphic Scrollbar Image Player Card Stack Group"
- if lower (tObject) is among the lines of tObjects or tObjects is "any object" then
- put merge(" ") into tArray[tObject]
- else
- put empty into tArray[tObject]
- end if
- end repeat
-
- local tClass, tLine
- put revXMLChildNames(tTree,"doc/classes",return,,false) into tClass
-
- put empty into tArray["Platforms"]
-
- if "desktop" is among the lines of tClass then
- put "Desktop, " after tArray["Platforms"]
- end if
-
- if "server" is among the lines of tClass then
- put "Server, " after tArray["Platforms"]
- end if
-
- if "web" is among the lines of tClass then
- put "Web, " after tArray["Platforms"]
- end if
-
- if "mobile" is among the lines of tClass then
- put "Mobile, " after tArray["Platforms"]
- end if
-
- if tArray["Platforms"] is not empty then
- put item 1 to -2 of tArray["Platforms"] into tArray["Platforms"]
- else
- //put "" into tArray["Platforms"]
- put "Desktop, Server, Web, Mobile" into tArray["Platforms"]
- end if
-
- local tSecurity
- put revXMLChildNames(tTree,"doc/security",return,,false) into tSecurity
- put empty into tArray["Security"]
- local tCapitalEntry
- repeat for each line tLine in tSecurity
- put tLine into tCapitalEntry
- put toUpper (character 1 of tCapitalEntry) into character 1 of tCapitalEntry
- put tArray["Security"] & tCapitalEntry & comma & space into tArray["Security"]
- end repeat
- if tArray["Security"] is not empty then
- put item 1 to -2 of tArray["Security"] into tArray["Security"]
- else
- put "None required" into tArray["Security"]
- end if
-
- // We are not supporting Products anymore
- put "" into tArray["Products"]
-
- local tPlatforms
- put extractPlatformInformation(tTree) into tPlatforms
- //HSC-ND put tPlatforms into tArray["Platforms"]
- put tPlatforms into tArray["Operating Systems"]
-
- revDeleteXMLTree tTree
-
- return tArray
-end indexLine
-
-function indexGlossaryLine pDoc, pIndex
- local tFilename
- set the itemDelimiter to slash
- put item -1 of pDoc into tFilename
-
- local tData
- put url ("file:" & pDoc) into tData
-
- local tTree
- put revCreateXMLTree(tData, false, true, false) into tTree
- if tTree is not a number then
- errorShow "Could not parse the glossary file: " & pDoc & " with error: " & tTree
- exit indexGlossaryLine
- end if
-
- local tName, tCategory
- put revXMLNodeContents(tTree, "doc/term") into tName
- put revXMLNodeContents(tTree, "doc/categories/category") into tCategory
-
- if item 1 of tName is "xmlerr" then
- errorShow "Could not extract name from the glossary file : " & pDoc & " with error: " & tName
- exit indexGlossaryLine
- end if
-
- if item 1 of tCategory is "xmlerr" then
- errorShow "Could not extract category from the glossary file : " & pDoc & " with error: " & tCategory
- exit indexGlossaryLine
- end if
-
- local tLine
- put pIndex & tab & tName & tab & tCategory into tLine
-
- return tLine
-end indexGlossaryLine
-
-private function extractPlatformInformation pTree, pMetadata
- local tPlatforms
- # Information about the 4 desktop platforms is already contained in each document,
- # first extract this.
- //if revXMLAttribute(pTree, "doc/platforms", "mac/") then
- //put "MacOS," after tPlatforms
- //end if
-
- local tChildNames
- put revXMLChildNames(pTree,"doc/platforms",return,,false) into tChildNames
-
- if "mac" is among the lines of tChildNames then
- put "Mac OS X," after tPlatforms
- end if
-
- if "windows" is among the lines of tChildNames then
- put "Windows," after tPlatforms
- end if
-
- if "linux" is among the lines of tChildNames then
- put "Linux," after tPlatforms
- end if
-
- if "ios" is among the lines of tChildNames then
- put "iOS," after tPlatforms
- end if
-
- if "android" is among the lines of tChildNames then
- put "Android," after tPlatforms
- end if
- delete the last char of tPlatforms
- --delete the last char of tPlatforms
- return tPlatforms
-end extractPlatformInformation
-
-private function extractNodeXML pTree, pName
- local tXML
- put revXMLText(pTree, pName, false) into tXML
- if item 1 of tXML is "xmlerr" then
- return tXML
- end if
-
- # Chop off the "" at the start as we don't want this and also the " " at the end
- local tName
- set the itemDelimiter to slash
- put item -1 of pName into tName
- set the itemDelimiter to comma
-
- delete char 1 to (the length of tName + 2) of tXML
- delete char -(the length of tName + 3) to -1 of tXML
- return tXML
-end extractNodeXML
-
-private function auxFormatSyntax pSyntax
- local tSyntax, tOffset
- local tReduced = "false"
-
- put pSyntax into tSyntax
-
- if the number of lines of tSyntax > 1 then
- put true into tReduced
- put line 1 of tSyntax into tSyntax
- end if
-
- if the last char of tSyntax is return then delete the last char of tSyntax
-
- put offset("
",tSyntax) into tOffset
- if tOffset <> 0 then add 4 to tOffset
- if (tOffset <> 0) and (tOffset < the length of tSyntax) then
- put char 1 to tOffset - 5 of tSyntax & "" into tSyntax
- put true into tReduced
- end if
-
- replace "" with empty in tSyntax
- replace "
" with empty in tSyntax
- replace tab with space in tSyntax
-
- if tReduced then put " ..." after tSyntax
-
- -- Remove all style tags. This is a workaround for the tabstops bug
- -- remove this line to allow the original style information for syntax
- -- to reappear in the dictionary.
- put replaceText(tSyntax, "(<[/a-zA-Z0-9]+>)", "") into tSyntax
-
- return tSyntax
-end auxFormatSyntax
-
-private function escapeEntities pText
- replace "&" with "&" in pText
- replace quote with """ in pText
- replace "<" with "<" in pText
- replace ">" with ">" in pText
- return pText
-end escapeEntities
-
-// HSC - tested - complies with current dictionary format
-private command libDocumentationClumpCreate pNumber, pDir
- local tClumpName
- ---------
- put kClumpNamePrefix & pNumber into tClumpName
- local tResult
- create invisible stack tClumpName
- save it as pDir & slash & tClumpName & ".rev"
- put the result into tResult
- if tResult is not empty then
- errorShow "Failed to save file to disk at location: " & pDir & slash & tClumpName & ".rev" & " with result: " & tResult
- exit libDocumentationClumpCreate
- end if
- return tClumpName
-end libDocumentationClumpCreate
-
-// HSC - tested - complies with current dictionary format
-private function libDocumentationClumpAddTo pClumpName, pFileIndex, pFileToDirectory, @pOutputDirectory, @pLinkLookup
- -- adds mapping pFilepath -> pClumpName.N to clump
- local tKeyNumber, tPropName, tDir, tData
- local tFilename, tRemainder
-
- put pFileIndex mod kFilesPerClump into tRemainder
- if tRemainder is 0 then
- put kFilesPerClump into tRemainder
- end if
-
- put tRemainder into tKeyNumber
-
- put "c" & tKeyNumber into tPropName
-
- put url ("binfile:" & pFileToDirectory[pFileIndex]["path"]) into tData
-
- if tData is empty then
- errorShow "No data for file: " & pFileToDirectory[pFileIndex]["path"]
- exit libDocumentationClumpAddTo
- end if
-
- // convert the new XML format back to the old type
- libDocumentationOldFormat tData, pFileToDirectory, pLinkLookup
-
- put the compress of tData into tData
- set the tPropName of stack pClumpName to tData
-
- # OK-2007-09-03 : Work around an engine bug to ensure that we don't have any problems
- # saving to mounted network drives on OS X
- # save stack pClumpName
- local tResult
- if there is a file (the filename of stack pClumpName) then
- delete file (the filename of stack pClumpName)
- put the result into tResult
- if tResult is not empty then
- errorShow "Failed to delete old stack file: " & tResult
- exit libDocumentationClumpAddTo
- end if
- end if
-
- save stack pClumpName
- put the result into tResult
- if tResult is not empty then
- errorShow "Failed to save clump: " & pClumpName & " (" & tResult & ")"
- exit libDocumentationClumpAddTo
- end if
-
- set the directory to tDir
- return tKeyNumber
-end libDocumentationClumpAddTo
-
-private function libGetRelatedEntries tData
- local tResult, tTextStart, tTextEnd, tTextToProcess, tTextLine
- put libGetTextLocation (tData, "", " ", tTextStart, tTextEnd) into tTextToProcess
- repeat for each line tTextLine in tTextToProcess
- set the itemdelimiter to slash
- put item 3 of tTextLine into tTextLine
- if tTextLine is empty then
- next repeat
- end if
- set the itemdelimiter to ">"
- put item 0 to 1 of tTextLine into tTextLine
- put char 0 to -6 of tTextLine into tTextLine
- if tTextLine is a number then
- put tTextLine & comma after tResult
- end if
- end repeat
- if tResult is not empty then
- delete the last char of tResult
- end if
- return tResult
-end libGetRelatedEntries
-
-private function libGetSynonyms pTree
- local tResult
- put revXMLChildContents(pTree,"doc/synonyms",comma, return,"false", -1) into tResult
- if char 1 to 6 of tResult is "xmlerr" then
- put empty into tResult
- end if
- return tResult
-end libGetSynonyms
-
-private function libGetTextLocation, pData, pStartToken, pEndToken, @rStart, @rEnd
- local tTextFound
- put empty into tTextFound
- put offset (pStartToken, pData) into rStart
- put offset (pEndToken, pData) into rEnd
- if rStart > rEnd then
- breakpoint
- end if
- if rStart is not 0 and rEnd is not 0 then
- put rEnd + the length of pEndToken - 1 into rEnd
- put char rStart to rEnd of pData into tTextFound
- end if
- return tTextFound
-end libGetTextLocation
-
-function libGetTextText pText
- local tTextText, tTextStart, tTextEnd
- put offset (">", pText) into tTextStart
- if tTextStart is 0 or tTextStart is the length of pText then
- breakpoint
- end if
- put offset("", pText, tTextStart) into tTextEnd
- if tTextEnd is 0 then
- breakpoint
- end if
- put char tTextStart + 1 to tTextStart + tTextEnd - 1 of pText into tTextText
- return tTextText
-end libGetTextText
-
-private function libCreateLookupTable pFileToDirectory
- local tLookup, tArrayIndex
- repeat with tArrayIndex = 1 to the number of elements of pFileToDirectory
- put tArrayIndex into tLookup [pFileToDirectory[tArrayIndex]["type"] && pFileToDirectory[tArrayIndex]["ref"]]
- end repeat
- return tLookup
-end libCreateLookupTable
-
-function libGetLinkText pText, pType, @pFileToDirectory, @pLinkLookup
- local tLinkText, tArrayIndex, tNotFound
- put true into tNotFound
- if offset ("tag=", pText) > 0 then
- // we are using the extened notation
- set the itemdelimiter to quote
- put item 2 of pText into tLinkText
- else
- // the link is implicit in the name
- put libGetTextText (pText) into tLinkText
- end if
- // test that we can access the element we are looking for
- if pLinkLookup[pType && tLinkText] is not a number then
- breakpoint
- end if
- // look up and substitute natural name with file name
- set the itemdelimiter to slash
- // repeat with tArrayIndex = 1 to the number of elements of pFileToDirectory
- // if pFileToDirectory[tArrayIndex]["type"] is pType and pFileToDirectory[tArrayIndex]["ref"] is tLinkText then
- // put item -3 to -1 of pFileToDirectroy[tArrayIndex]["path"] & slash & tArrayIndex & ".xml" into tLinkText
- // put item -3 to -2 of pFileToDirectory[tArrayIndex]["path"] & slash & tArrayIndex & ".xml" into tLinkText
- put item -3 to -2 of pFileToDirectory[pLinkLookup[pType && tLinkText]]["path"] & slash & pLinkLookup[pType && tLinkText] & ".xml" into tLinkText
- //put false into tNotFound
- // exit repeat
- // end if
- //end repeat
- //if tNotFound is true then
- // breakpoint
- // end if
- return tLinkText
-end libGetLinkText
-
-private command libReplaceLinks @rData, @rFileToDirectory, @rLinkLookup
- local tOffsetFound, tOffsetSkip, tStartTags, tStartTagsLink, tEndTags, tTag, tTextStart, tTextEnd, tTextToReplace, tReplaceWith, tLinkText, tTextText
- put ",,,,,,,,," into tStartTags
- put " ,,,,,,,,," into tEndTags
- put true into tOffsetFound
- put 0 into tOffsetSkip
- set the itemdelimiter to comma
- set the caseSensitive to true
- repeat with tTag = 1 to the number of items in tStartTags
- put true into tOffsetFound
- repeat while tOffsetFound
- // need to include the tStartTags in another repeat loop this will be for the new files.
- put libGetTextLocation (rData, item tTag of tStartTagsLink, item tTag of tEndTags, tTextStart, tTextEnd) into tTextToReplace
- if tTextStart is 0 and tTextEnd is 0 then
- put false into tOffsetFound
- else
- // generate the text that is to be inserted
- put "--text-- " into tReplaceWith
- put libGetLinkText (tTextToReplace, char 2 to -2 of item tTag of tStartTags, rFileToDirectory, rLinkLookup) into tLinkText
- put libGetTextText (tTextToReplace) into tTextText
- // replace the text here
- replace "--link--" with tLinkText in tReplaceWith
- replace "--text--" with tTextText in tReplaceWith
- replace tTextToReplace with tReplaceWith in rData
- end if
- end repeat
- end repeat
-end libReplaceLinks
-
-private command libUpdateSyntaxExamples @rData
- // updates the notation
- local tTextToReplace, tReplaceWith, tTextStart, tTextEnd
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToReplace
- if tTextToReplace is empty then
- breakpoint
- else
- put tTextToReplace into tReplaceWith
- replace "" with "" in tReplaceWith
- replace "
" with "" in tReplaceWith
- replace "
" with "
" in tReplaceWith
- replace "
" with "" in tReplaceWith
- replace tTextToReplace with tReplaceWith in rData
- end if
-end libUpdateSyntaxExamples
-
-private command libUpdateObjects @rData
- // updates the ... notation
- local tTextToReplace, tReplaceWith, tTextStart, tTextEnd
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToReplace
- if tTextToReplace is empty then
- breakpoint
- else
- put "--text-- " into tReplaceWith
- if offset (" ", tTextToReplace) > 0 then
- replace "--text--" with "card,--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--text--" with "stack,--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--text--" with "group,--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--text--" with "field,--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--text--" with "button,--text--" in tReplaceWith
- end if
- if offset ("
", tTextToReplace) > 0 then
- replace "--text--" with "graphic,--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--text--" with "scrollbar,--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--text--" with "player,--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--text--" with "image,--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--text--" with "AndroidScroller,--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--text--" with "AndroidBrowser,--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--text--" with "AndroidPlayer,--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--text--" with "iosBrowser,--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--text--" with "iosScroller,--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--text--" with "iosPlayer,--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--text--" with "iosTextInput,--text--" in tReplaceWith
- end if
- replace ",--text--" with "" in tReplaceWith
- replace "--text--" with "" in tReplaceWith
- replace tTextToReplace with tReplaceWith in rData
- end if
-end libUpdateObjects
-
-private command libUpdateReferences @rData, @rFileToDirectory, @rLinkLookup
- // updates the notation
- //replace "" with "" in rData
- //replace " " with "" in rData
-
- # Build XRef symmetry - create symmetry entries in the lookup array
- local tTextToReplace, tReplaceWith, tTextStart, tTextEnd, tReferenceTo, tName, tType, tNewReference, tCapitalEntry
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToReplace
- if tTextStart > 0 and tTextEnd > 0 then
- put tTextToReplace into tReplaceWith
- replace "" with "" in tReplaceWith
- replace " " with "" in tReplaceWith
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tType
- if tTextStart > 0 and tTextEnd > 0 then
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tName
- if tTextStart > 0 and tTextEnd > 0 then
- replace "" with "" in tType
- replace " " with "" in tType
- replace "" with "" in tName
- replace " " with "" in tName
- //set the itemDelimiter to space
- repeat for each line tReferenceTo in rFileToDirectory[rLinkLookup[tType && tName]]["xrefs"]
- put "<" & word 1 of tReferenceTo && "tag=" & quote & word 2 to -1 of tReferenceTo & quote & ">" into tNewReference
- if offset (tNewReference, tReplaceWith) is 0 then
- put word 1 of tReferenceTo into tCapitalEntry
- put toUpper (character 1 of tCapitalEntry) into character 1 of tCapitalEntry
- put word 2 to -1 tReferenceTo && tCapitalEntry & "" & word 1 tReferenceTo & ">" after tNewReference
- replace "" with " " & tNewReference & return & "" in tReplaceWith
- end if
- end repeat
- end if
- end if
- replace tTextToReplace with tReplaceWith in rData
- end if
-end libUpdateReferences
-
-private command libUpdateClassification @rData
- // updates the notation
- replace "" with "" in rData
- replace " " with "" in rData
-end libUpdateClassification
-
-private command libUpdateSummary @rData
- replace "" with "" in rData
- replace "
" with " " in rData
-end libUpdateSummary
-
-private command libUpdateHistory @rData
- // updates the notation
- replace "" with "" in rData
- replace " " with "" in rData
-end libUpdateHistory
-
-private command libUpdatePlatforms @rData
- // updates the ... notation
- replace "" with "" in rData
- replace " " with "" in rData
- replace " " with " " in rData
- replace " " with " " in rData
- replace " " with " " in rData
- replace " " with " " in rData
- replace " " with " " in rData
-end libUpdatePlatforms
-
-private command libUpdateClasses @rData
- // updates the ... notation
- local tTextToReplace, tReplaceWith, tTextStart, tTextEnd
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToReplace
- if tTextToReplace is empty then
- breakpoint
- else
- put "--and----text-- " into tReplaceWith
- if offset (" ", tTextToReplace) > 0 then
- replace "--and--" with", " in tReplaceWith
- replace "--text--" with "--and--Desktop--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--and--" with", " in tReplaceWith
- replace "--text--" with "--and--Server--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--and--" with", " in tReplaceWith
- replace "--text--" with "--and--Web--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--and--" with", " in tReplaceWith
- replace "--text--" with "--and--Mobile--text--" in tReplaceWith
- end if
- replace ", , " with "" in tReplaceWith
- replace "--and----text--" with "" in tReplaceWith
- replace "--text--" with "" in tReplaceWith
- replace ", --and--" with "" in tReplaceWith
- replace "--and--" with " and " in tReplaceWith
- replace tTextToReplace with tReplaceWith in rData
- end if
-end libUpdateClasses
-
-private command libUpdateSecurity @rData
- // updates the ... notation
- local tTextToReplace, tReplaceWith, tTextStart, tTextEnd, tTempReplaceWith
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToReplace
- if tTextToReplace is empty then
- breakpoint
- else
- put "--and----text-- " into tReplaceWith
- if offset (" ", tTextToReplace) > 0 then
- replace "--and--" with", " in tReplaceWith
- replace "--text--" with "--and--Disk--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--and--" with", " in tReplaceWith
- replace "--text--" with "--and--Disk--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--and--" with", " in tReplaceWith
- replace "--text--" with "--and--Network--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--and--" with", " in tReplaceWith
- replace "--text--" with "--and--Process--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--and--" with", " in tReplaceWith
- replace "--text--" with "--and--RegistryRead--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--and--" with", " in tReplaceWith
- replace "--text--" with "--and--RegistryWrite--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--and--" with", " in tReplaceWith
- replace "--text--" with "--and--Stack--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--and--" with", " in tReplaceWith
- replace "--text--" with "--and--Printing--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--and--" with", " in tReplaceWith
- replace "--text--" with "--and--Privacy--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--and--" with", " in tReplaceWith
- replace "--text--" with "--and--AppleScript--text--" in tReplaceWith
- end if
- if offset (" ", tTextToReplace) > 0 then
- replace "--and--" with", " in tReplaceWith
- replace "--text--" with "--and--DoAlternate--text--" in tReplaceWith
- end if
- replace ", , " with "" in tReplaceWith
- replace "--and----text--" with "" in tReplaceWith
- replace "--text--" with "" in tReplaceWith
- replace ", --and--" with "" in tReplaceWith
- replace "--and--" with " and " in tReplaceWith
- replace tTextToReplace with tReplaceWith in rData
- end if
-end libUpdateSecurity
-
-private command libUpdateExampleExamples @rData
- // updates the notation
- local tTextToReplace, tReplaceWith, tTextStart, tTextEnd, tCurrentExampleToReplace, tCurrentExampleToReplaceWith, tDoubleLineSpace, tExampleFound, tFirstExample
- put true into tFirstExample
- put true into tExampleFound
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToReplace
- if tTextToReplace is empty then
- breakpoint
- else
- if offset ("", tTextToReplace) > 0 then
- put true into tDoubleLineSpace
- else
- put false into tDoubleLineSpace
- end if
- put tTextToReplace into tReplaceWith
-
- repeat while true
- put libGetTextLocation (tReplaceWith, "", " ", tTextStart, tTextEnd) into tCurrentExampleToReplace
- if tCurrentExampleToReplace is empty then
- exit repeat
- end if
- put tCurrentExampleToReplace into tCurrentExampleToReplaceWith
-
- if tDoubleLineSpace is true and tFirstExample is false then
- replace "" with "
" in tCurrentExampleToReplaceWith
- else
- replace "" with "" in tCurrentExampleToReplaceWith
- end if
- replace "
" with "
" in tCurrentExampleToReplaceWith
- replace tCurrentExampleToReplace with tCurrentExampleToReplaceWith in tReplaceWith
- if tFirstExample is true then
- put false into tFirstExample
- end if
- end repeat
-
- replace "" with "" in tReplaceWith
- replace " " with " " in tReplaceWith
- replace "
" with "
" in tReplaceWith
- replace "
" with "" in tReplaceWith
- replace tTextToReplace with tReplaceWith in rData
- end if
-end libUpdateExampleExamples
-
-private command libUpdateParameters @rData
- // updates the
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- local tTextToReplace , tTextToReplaceWith, tCurrentParameterToReplace, tCurrentParameterToReplaceWith, tCurrentParameterNameToReplace, tCurrentParameterNameToReplaceWith
- local tCurrentParameterDescriptionToReplace, tCurrentParameterDescriptionToReplaceWith, tCurrentParameterOptionsToReplace, tCurrentParameterOptionsToReplaceWith
- local tCurrentParameterOptionsOptionToReplace, tCurrentParameterOptionsOptionToReplaceWith
- local tCurrentParameterOptionsOptionItemToReplace, tCurrentParameterOptionsOptionItemToReplaceWith
- local tCurrentParameterOptionsOptionDescriptionToReplace, tCurrentParameterOptionsOptionDescriptionToReplaceWith
- local tCurrentParameterOptionsOptionValuesToReplace, tCurrentParameterOptionsOptionValuesToReplaceWith
- local tCurrentParameterOptionsOptionValuesValueToReplace, tCurrentParameterOptionsOptionValuesValueToReplaceWith
- local tCurrentParameterOptionsOptionValuesValueNameToReplace, tCurrentParameterOptionsOptionValuesValueNameToReplaceWith
- local tCurrentParameterOptionsOptionValuesValueDescriptionToReplace, tCurrentParameterOptionsOptionValuesValueDescriptionToReplaceWith
- local tTextStart, tTextEnd, tStrip, tOptionsTitle, tOptionsTitleWith
- // little test from here
- //if "2448 " is among the words of rData or "3388 " is among the words of rData then
- //put tstLine into tstLine
- //end if
- // little test to here
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToReplace
- if the number of lines in tTextToReplace <= 2 and the number of characters in tTextToReplace < 30 then
- if tTextToReplace is not empty then
- replace tTextToReplace with "" in rData
- end if
- else
- put tTextToReplace into tTextToReplaceWith
- // HANDLE THE PARAMETERS
- repeat while true
- put libGetTextLocation (tTextToReplaceWith, "", " ", tTextStart, tTextEnd) into tCurrentParameterToReplace
- if tCurrentParameterToReplace is empty then
- exit repeat
- end if
- put tCurrentParameterToReplace into tCurrentParameterToReplaceWith
- put libGetTextLocation (tCurrentParameterToReplaceWith, "", " ", tTextStart, tTextEnd) into tCurrentParameterNameToReplace
- if tCurrentParameterNameToReplace is not empty then
- put tCurrentParameterNameToReplace into tCurrentParameterNameToReplaceWith
- replace "" with "" in tCurrentParameterNameToReplaceWith
- replace " " with "<#S#><#S#>" in tCurrentParameterNameToReplaceWith
- replace tCurrentParameterNameToReplace with tCurrentParameterNameToReplaceWith in tCurrentParameterToReplaceWith
- end if
- put libGetTextLocation (tCurrentParameterToReplaceWith, "", " ", tTextStart, tTextEnd) into tCurrentParameterDescriptionToReplace
- if tCurrentParameterDescriptionToReplace is not empty then
- put tCurrentParameterDescriptionToReplace into tCurrentParameterDescriptionToReplaceWith
- replace "" with "<#E#><#E#> - " in tCurrentParameterDescriptionToReplaceWith
- replace " " with "" in tCurrentParameterDescriptionToReplaceWith
- replace tCurrentParameterDescriptionToReplace with tCurrentParameterDescriptionToReplaceWith in tCurrentParameterToReplaceWith
- end if
-
- // HANDLE OPTIONS
- repeat while true
- put libGetTextLocation (tCurrentParameterToReplaceWith, "", tTextStart, tTextEnd) into tCurrentParameterOptionsToReplace
- if tCurrentParameterOptionsToReplace is empty then
- exit repeat
- end if
- put tCurrentParameterOptionsToReplace into tCurrentParameterOptionsToReplaceWith
- // HANDLE THE OPTIONS TITLE
- put libGetTextLocation (tCurrentParameterOptionsToReplaceWith, "title=" & quote, quote & ">", tTextStart, tTextEnd) into tOptionsTitle
- put tOptionsTitle into tOptionsTitleWith
-
- if tOptionsTitleWith is not ("title=""e"e&">") and tOptionsTitleWith is not empty then
- replace "title=" & quote with ("") in tOptionsTitleWith
- replace quote & ">" with "
" in tOptionsTitleWith
- replace tOptionsTitle with tOptionsTitleWith in tCurrentParameterOptionsToReplaceWith
- else
- replace tOptionsTitle with "" in tCurrentParameterOptionsToReplaceWith
- end if
- repeat while true
- put libGetTextLocation (tCurrentParameterOptionsToReplaceWith, "", " ", tTextStart, tTextEnd) into tCurrentParameterOptionsOptionToReplace
- if tCurrentParameterOptionsOptionToReplace is empty then
- exit repeat
- end if
- put tCurrentParameterOptionsOptionToReplace into tCurrentParameterOptionsOptionToReplaceWith
- put libGetTextLocation (tCurrentParameterOptionsOptionToReplaceWith, "- ", "
", tTextStart, tTextEnd) into tCurrentParameterOptionsOptionItemToReplace
- if tCurrentParameterOptionsOptionItemToReplace is not empty then
- put tCurrentParameterOptionsOptionItemToReplace into tCurrentParameterOptionsOptionItemToReplaceWith
- replace "- " with "
" in tCurrentParameterOptionsOptionItemToReplaceWith
- // HSC - replace " " with "<#S#><#S#>" in tCurrentParameterOptionsOptionItemToReplaceWith
- replace "" with "<#S#><#S#>" in tCurrentParameterOptionsOptionItemToReplaceWith
- replace tCurrentParameterOptionsOptionItemToReplace with tCurrentParameterOptionsOptionItemToReplaceWith in tCurrentParameterOptionsOptionToReplaceWith
- end if
- put libGetTextLocation (tCurrentParameterOptionsOptionToReplaceWith, "", " ", tTextStart, tTextEnd) into tCurrentParameterOptionsOptionDescriptionToReplace
- if tCurrentParameterOptionsOptionDescriptionToReplace is not empty then
- put tCurrentParameterOptionsOptionDescriptionToReplace into tCurrentParameterOptionsOptionDescriptionToReplaceWith
- replace "" with "<#E#><#E#> - " in tCurrentParameterOptionsOptionDescriptionToReplaceWith
- // HSC - replace " " with "" in tCurrentParameterOptionsOptionDescriptionToReplaceWith
- replace "" with "" in tCurrentParameterOptionsOptionDescriptionToReplaceWith
- replace tCurrentParameterOptionsOptionDescriptionToReplace with tCurrentParameterOptionsOptionDescriptionToReplaceWith in tCurrentParameterOptionsOptionToReplaceWith
- else
- if offset (" ", tCurrentParameterOptionsOptionToReplaceWith) > 0 then
- // HSC - replace " " with "<#E#><#E#>" in tCurrentParameterOptionsOptionToReplaceWith
- replace " " with "<#E#><#E#>" in tCurrentParameterOptionsOptionToReplaceWith
- end if
- end if
-
- // HANDLE VALUES
- put libGetTextLocation (tCurrentParameterOptionsOptionToReplaceWith, "", " ", tTextStart, tTextEnd) into tCurrentParameterOptionsOptionValuesToReplace
- if tCurrentParameterOptionsOptionValuesToReplace is not empty then
- put tCurrentParameterOptionsOptionValuesToReplace into tCurrentParameterOptionsOptionValuesToReplaceWith
- repeat while true
- put libGetTextLocation (tCurrentParameterOptionsOptionValuesToReplaceWith, "", " ", tTextStart, tTextEnd) into tCurrentParameterOptionsOptionValuesValueToReplace
- if tCurrentParameterOptionsOptionValuesValueToReplace is empty then
- exit repeat
- end if
- put tCurrentParameterOptionsOptionValuesValueToReplace into tCurrentParameterOptionsOptionValuesValueToReplaceWith
- put libGetTextLocation (tCurrentParameterOptionsOptionValuesValueToReplaceWith, "", " ", tTextStart, tTextEnd) into tCurrentParameterOptionsOptionValuesValueNameToReplace
- if offset (" ", tCurrentParameterOptionsOptionValuesValueToReplaceWith) > 0
- then
- replace " " with "" in tCurrentParameterOptionsOptionValuesValueToReplaceWith
- if tCurrentParameterOptionsOptionValuesValueNameToReplace is not empty then
- put tCurrentParameterOptionsOptionValuesValueNameToReplace into tCurrentParameterOptionsOptionValuesValueNameToReplaceWith
- replace "" with "" in tCurrentParameterOptionsOptionValuesValueNameToReplaceWith
- replace " " with "" in tCurrentParameterOptionsOptionValuesValueNameToReplaceWith
- replace tCurrentParameterOptionsOptionValuesValueNameToReplace with tCurrentParameterOptionsOptionValuesValueNameToReplaceWith in tCurrentParameterOptionsOptionValuesValueToReplaceWith
- end if
- else
- if tCurrentParameterOptionsOptionValuesValueNameToReplace is not empty then
- put tCurrentParameterOptionsOptionValuesValueNameToReplace into tCurrentParameterOptionsOptionValuesValueNameToReplaceWith
- replace "" with "" in tCurrentParameterOptionsOptionValuesValueNameToReplaceWith
- replace " " with "<#S#><#S#>" in tCurrentParameterOptionsOptionValuesValueNameToReplaceWith
- replace tCurrentParameterOptionsOptionValuesValueNameToReplace with tCurrentParameterOptionsOptionValuesValueNameToReplaceWith in tCurrentParameterOptionsOptionValuesValueToReplaceWith
- end if
- put libGetTextLocation (tCurrentParameterOptionsOptionValuesValueToReplaceWith, "", " ", tTextStart, tTextEnd) into tCurrentParameterOptionsOptionValuesValueDescriptionToReplace
- if tCurrentParameterOptionsOptionValuesValueDescriptionToReplace is not empty then
- put tCurrentParameterOptionsOptionValuesValueDescriptionToReplace into tCurrentParameterOptionsOptionValuesValueDescriptionToReplaceWith
- replace "" with "<#E#><#E#> - " in tCurrentParameterOptionsOptionValuesValueDescriptionToReplaceWith
- replace " " with "" in tCurrentParameterOptionsOptionValuesValueDescriptionToReplaceWith
- replace tCurrentParameterOptionsOptionValuesValueDescriptionToReplace with tCurrentParameterOptionsOptionValuesValueDescriptionToReplaceWith in tCurrentParameterOptionsOptionValuesValueToReplaceWith
- end if
- end if
- replace "" with "" in tCurrentParameterOptionsOptionValuesValueToReplaceWith
- replace " " with "" in tCurrentParameterOptionsOptionValuesValueToReplaceWith
- replace tCurrentParameterOptionsOptionValuesValueToReplace with tCurrentParameterOptionsOptionValuesValueToReplaceWith in tCurrentParameterOptionsOptionValuesToReplaceWith
- end repeat
- replace "" with "" in tCurrentParameterOptionsOptionValuesToReplaceWith
- replace " " with " " in tCurrentParameterOptionsOptionValuesToReplaceWith
- replace tCurrentParameterOptionsOptionValuesToReplace with tCurrentParameterOptionsOptionValuesToReplaceWith in tCurrentParameterOptionsToReplaceWith
- end if
- replace "" with "" in tCurrentParameterOptionsOptionToReplaceWith
- //HSC - replace " " with " " in tCurrentParameterOptionsOptionToReplaceWith
- replace "" with "" in tCurrentParameterOptionsOptionToReplaceWith
- replace tCurrentParameterOptionsOptionToReplace with tCurrentParameterOptionsOptionToReplaceWith in tCurrentParameterOptionsToReplaceWith
- end repeat
- replace "" with "" in tCurrentParameterOptionsToReplaceWith
- replace tCurrentParameterOptionsToReplace with tCurrentParameterOptionsToReplaceWith in tCurrentParameterToReplaceWith
- end repeat
- replace "" with "" in tCurrentParameterToReplaceWith
- replace "
" with "" in tCurrentParameterToReplaceWith
- replace tCurrentParameterToReplace with tCurrentParameterToReplaceWith in tTextToReplaceWith
- end repeat
-
- replace "" with "Parameters:
" in tTextToReplaceWith
- replace " " with "" in tTextToReplaceWith
- // STRIP OUT ALL MARKED BREAKS
- repeat while true
- put libGetTextLocation (tTextToReplaceWith, "<#S#><#S#>", "<#E#><#E#>", tTextStart, tTextEnd) into tStrip
- if tStrip is empty then
- exit repeat
- end if
- replace tStrip with "" in tTextToReplaceWith
- end repeat
- // STRIP OUT THE tags
- replace tTextToReplace with tTextToReplaceWith in rData
- end if
- replace " " with "" in rData
- return rData
-end libUpdateParameters
-
-private command libUpdateDescription @rData
- local tTemp
- // strip the overview, parameters, value and comments tags out of the description tags
- local tTextToReplace, tTextToReplaceSub, tTextToReplaceSubWith, tReplaceWith, tTextStart, tTextEnd, tTextStartSub, tTextEndSub, tPTagRequired
- put false into tPTagRequired
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToReplace
- if tTextToReplace is empty then
- breakpoint
- else
- put tTextToReplace into tReplaceWith
- // process the overview tags
- put libGetTextLocation (tReplaceWith, "", " ", tTextStartSub, tTextEndSub) into tTextToReplaceSub
- if tTextToReplaceSub is not empty then
- put the number of characters in tTextToReplaceSub into tTemp
- if the number of lines in tTextToReplaceSub <= 2 and the number of characters in tTextToReplaceSub < 26 then
- replace tTextToReplaceSub with "" in tReplaceWith
- else
- replace "" with "" in tReplaceWith
- replace "
" with "" in tReplaceWith
- put true into tPTagRequired
- end if
- end if
- // process the parameter tags
- put libGetTextLocation (tReplaceWith, "", " ", tTextStartSub, tTextEndSub) into tTextToReplaceSub
- if tTextToReplaceSub is not empty then
- if the number of lines in tTextToReplaceSub <= 2 and the number of characters in tTextToReplaceSub < 30 then
- replace tTextToReplaceSub with "" in tReplaceWith
- else
- if tPTagRequired is true then
- //replace "" with "
Parameters:
" in tReplaceWith
- replace "" with "
Parameters:
" in tReplaceWith
- else
- //replace "" with "Parameters:
" in tReplaceWith
- replace "" with "Parameters:
" in tReplaceWith
- put true into tPTagRequired
- end if
- //replace " " with "
" in tReplaceWith
- replace " " with "" in tReplaceWith
- replace "" with "" in tReplaceWith
- replace "
" with "
" in tReplaceWith
- end if
- end if
- // process the value tags
- put libGetTextLocation (tReplaceWith, "", " ", tTextStartSub, tTextEndSub) into tTextToReplaceSub
- if tTextToReplaceSub is not empty then
- put the number of characters in tTextToReplaceSub into tTemp
- if the number of lines in tTextToReplaceSub <= 2 and the number of characters in tTextToReplaceSub < 20 then
- replace tTextToReplaceSub with "" in tReplaceWith
- else
- if tPTagRequired is true then
- replace "" with "
Value:
" in tReplaceWith
- else
- replace "" with "Value:
" in tReplaceWith
- put true into tPTagRequired
- end if
- replace "
" with "
" in tReplaceWith
- end if
- end if
- // process the comments tags
- put libGetTextLocation (tReplaceWith, "", " ", tTextStartSub, tTextEndSub) into tTextToReplaceSub
- if tTextToReplaceSub is not empty then
- put the number of characters in tTextToReplaceSub into tTemp
- if the number of lines in tTextToReplaceSub <= 2 and the number of characters in tTextToReplaceSub < 26 then
- replace tTextToReplaceSub with "" in tReplaceWith
- else
- if tPTagRequired is true then
- replace "" with "
Comments:
" in tReplaceWith
- else
- replace "" with "Comments:
" in tReplaceWith
- put true into tPTagRequired
- end if
- replace "
" with "
" in tReplaceWith
- end if
- end if
- replace tTextToReplace with tReplaceWith in rData
- end if
-end libUpdateDescription
-
-private command libRemoveObsolete @rData
- // removes XML tags that contain no data
- // this is needed to suppress referring headings
- local tTextToReplace, tReplaceWith, tTextStart, tTextEnd
- replace " " with "" in rData
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToReplace
- if the number of lines in tTextToReplace is 2 then
- replace tTextToReplace with "" in rData
- end if
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToReplace
- if the number of lines in tTextToReplace is 2 then
- replace tTextToReplace with "" in rData
- end if
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToReplace
- if the number of lines in tTextToReplace is 2 then
- replace tTextToReplace with "" in rData
- end if
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToReplace
- if the number of lines in tTextToReplace is 2 then
- replace tTextToReplace with "" in rData
- end if
-end libRemoveObsolete
-
-private command libUpdateGeneral @rData
- local tTextStart, tTextEnd, tTextToUpdate
- // updates the notation
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToUpdate
- if tTextToUpdate is not empty then
- replace "" with "Warning: " in rData
- replace " " with "" in rData
- end if
- // updates the notation
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToUpdate
- if tTextToUpdate is not empty then
- replace "" with "Note: " in rData
- replace " " with "" in rData
- end if
- // updates the notation
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToUpdate
- if tTextToUpdate is not empty then
- replace "" with " Cross-platform note: " in rData
- replace " " with "" in rData
- end if
- // updates the notation
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToUpdate
- if tTextToUpdate is not empty then
- replace "" with " Caution! " in rData
- replace " " with "" in rData
- end if
- // updates the notation
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToUpdate
- if tTextToUpdate is not empty then
- replace "" with " Cross-platform caution! " in rData
- replace " " with "" in rData
- end if
- // updates the notation
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToUpdate
- if tTextToUpdate is not empty then
- replace "" with "Changes: " in rData
- replace " " with "" in rData
- end if
- // updates the notation
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToUpdate
- if tTextToUpdate is not empty then
- replace "" with " Tip: " in rData
- replace " " with "" in rData
- end if
- // updates the notation
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToUpdate
- if tTextToUpdate is not empty then
- replace "" with " Important! " in rData
- replace " " with "" in rData
- end if
-
- // strip out ASCII 13
- replace numToChar(13) & numToChar(10) with numToChar(10) in rData
- replace numToChar(13) with numToChar(10) in rData
-end libUpdateGeneral
-
-private command libUpdateBoldName @rData
- local tTextStart, tTextEnd, tNameWithTags, tName, tDescription, tDescriptionReplaceWith
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tNameWithTags
- if tNameWithTags is empty then
- breakpoint
- else
- put tNameWithTags into tName
- replace "" with "" in tName
- replace " " with "" in tName
- end if
- if tName is empty then
- breakpoint
- else
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tDescription
- put tDescription into tDescriptionReplaceWith
- replace tName with "" & tName & " " in tDescriptionReplaceWith
- replace "" with "" in tDescriptionReplaceWith
- replace " " with "" in tDescriptionReplaceWith
- replace " " with " " in tDescriptionReplaceWith
- replace " " with " " in tDescriptionReplaceWith
- replace tDescription with tDescriptionReplaceWith in rData
- end if
-end libUpdateBoldName
-
-private command libRemoveSynonyms @rData
- local tTextStart, tTextEnd, tTextToRemove
- put libGetTextLocation (rData, "", " ", tTextStart, tTextEnd) into tTextToRemove
- if tTextToRemove is empty then
- breakpoint
- else
- replace tTextToRemove with "" & return & tab &" " in rData
- end if
-end libRemoveSynonyms
-
-private command libDocumentationOldFormat @rData, @rFileToDirectory, @rLinkLookup
- if offset ("", rData) is 0 then
- // do the dictionary specific stuff
- libUpdateReferences rData, rFileToDirectory, rLinkLookup
- end if
- // now replace the links with the old type
- libReplaceLinks rData, rFileToDirectory, rLinkLookup
- if offset ("", rData) > 0 then
- // do the glossary specific stuff
- libRemoveSynonyms rData
- else
- // do the dictionary specific stuff
- libUpdateSyntaxExamples rData
- libUpdateObjects rData
- libUpdateClassification rData
- libUpdateHistory rData
- libUpdatePlatforms rData
- libUpdateClasses rData
- libUpdateSecurity rData
- libUpdateSummary rData
- libUpdateExampleExamples rData
- libUpdateParameters rData
- libUpdateDescription rData
- libRemoveObsolete rData
- libUpdateGeneral rData
- // little test from here
- //if "" is among the words of rData then
- //put tstLine into tstLine
- //end if
- // little test to here
- //libUpdateBoldName rData
- end if
-end libDocumentationOldFormat
-
-// HSC - tested - complies with current dictionary format
private command pathEnsure pPath
if pPath is empty then
exit pathEnsure
@@ -1882,50 +26,22 @@ private command pathEnsure pPath
end repeat
end pathEnsure
-private function listContainsAllItems pList, pItems
- repeat for each item tItem in pItems
- if tItem is among the items of pList then
- next repeat
- else
- return false
- end if
- end repeat
- return true
-end listContainsAllItems
-
-////////////////////////////////////////////////////////////////////////////////
-
-private function escape pString, pConvertLineEndings
- replace "\" with "\\" in pString
- replace quote with ("\" & quote) in pString
-
- if pConvertLineEndings is true then
- replace (numToChar(13) & CR) with (CR & numToChar(13)) in pString
- replace (CR & numToChar(13)) with CR in pString
- end if
- replace CR with "\n" in pString
- //replace "<" with "<" in pString
- //replace ">" with ">" in pString
- replace tab with "\t" in pString
- return (quote & pString & quote)
-end escape
-
-command docsBuilderGenerateDocsNew pEdition, pVersion
- start using stack (builderRepoFolder() & slash & "ide-support" & slash & "revdocsparser.livecodescript")
+command docsBuilderRun pEdition, pVersion
+ start using stack (builderRepoFolder() & slash & "ide-support/revdocsparser.livecodescript")
- builderExtUnpack pEdition
+ builderExtUnpack "Business"
builderLog "report", "Building guide into" && builderGuideFolder(pEdition) & slash & "distributed_guide.js"
pathEnsure (builderGuideFolder(pEdition))
docsBuilderGenerateDistributedGuide pEdition
- builderLog "report", "Building api into" && builderAPIFolder(pEdition) & slash & "distributed_api.js"
+ builderLog "report", "Building api into" && builderAPIFolder(pEdition)
pathEnsure (builderAPIFolder(pEdition))
docsBuilderGenerateDistributedAPI pEdition
docsBuilderGenerateZip pEdition, pVersion
builderLog "report", "Built docs"
-end docsBuilderGenerateDocsNew
+end docsBuilderRun
private command addToList pElement, @xArray
local tCount
@@ -1946,14 +62,6 @@ private command addFolderToListIfExists pFolder, pThrowIfNot, @xArray
end if
end addFolderToListIfExists
-private function RepoIndyDocsFolder
- return builderPrivateRepoFolder() & slash & "docs" & slash & "indy"
-end RepoIndyDocsFolder
-
-private function RepoBusinessDocsFolder
- return builderPrivateRepoFolder() & slash & "docs" & slash & "business"
-end RepoBusinessDocsFolder
-
private command docsBuilderGetGuideFolders pEdition, @xFolders
local tRepoGuides
put builderRepoFolder() & slash & "docs" & slash & "guides" into tRepoGuides
@@ -1963,55 +71,30 @@ private command docsBuilderGetGuideFolders pEdition, @xFolders
put builderIDEDocsFolder() & slash & "guides" into tIDEGuides
addFolderToListIfExists tIDEGuides, true, xFolders
- if pEdition is not "community" then
- local tIndyGuides
- put RepoIndyDocsFolder() & slash & "guides" into tIndyGuides
- addFolderToListIfExists tIndyGuides, false, xFolders
- end if
+ local tComponents
+ put builderComponentFolders() into tComponents
+
+ repeat for each element tComponent in tComponents
+ -- each non-community guide should have notes on editon support
+ addFolderToListIfExists tComponent["folder"] & slash & "guides", false, xFolders
+ end repeat
- if pEdition is "business" then
- local tBusinessGuides
- put RepoBusinessDocsFolder() & slash & "guides" into tBusinessGuides
- addFolderToListIfExists tBusinessGuides, false, xFolders
- end if
-
addFolderToListIfExists builderBuiltGuidesFolder(), false, xFolders
end docsBuilderGetGuideFolders
private command docsBuilderAddExtFolders pEdition, @xFolders
- local tDefaultFolder
- put the defaultFolder into tDefaultFolder
-
local tTargetFolder
- put builderUnpackFolder() & slash & "Ext" into tTargetFolder
- set the defaultFolder to tTargetFolder
-
- repeat for each line tFolder in the folders
+ put builderUnpackFolder("Business") & slash & "Ext" into tTargetFolder
+ repeat for each line tFolder in folders(tTargetFolder)
if tFolder is ".." then next repeat
addFolderToListIfExists tTargetFolder & slash & tFolder, true, xFolders
end repeat
-
- set the defaultFolder to tDefaultFolder
end docsBuilderAddExtFolders
private command docsBuilderGetAdditionalFolders pEdition, @xFolders
docsBuilderAddExtFolders pEdition, xFolders
end docsBuilderGetAdditionalFolders
-private command docsBuilderGetDictionaryFolders pEdition, @xFolders
- local tCommunityDocs
- put builderRepoFolder() & slash & "docs" into tCommunityDocs
- addFolderToListIfExists tCommunityDocs, true, xFolders
-
- if pEdition is not "community" then
- addFolderToListIfExists RepoIndyDocsFolder(), true, xFolders
- end if
-
- if pEdition is "business" then
- addFolderToListIfExists RepoBusinessDocsFolder(), false, xFolders
- end if
-end docsBuilderGetDictionaryFolders
-
command docsBuilderGenerateDistributedGuide pEdition
local tGuideFoldersA
docsBuilderGetGuideFolders pEdition, tGuideFoldersA
@@ -2054,26 +137,21 @@ end docsFileGetUTF8Contents
-- Find all lcdoc files in pFolder and add them to the list of docs
-- data in xLibraryA
-private command addToDictionaryFromFolder pFolder, @xLibraryA
- local tDefaultFolder
- put the defaultFolder into tDefaultFolder
-
+private command addToDictionaryFromFolder pFolder, pDefaults, @xLibraryA
docsBuilderProgressUpdate "", "Building dictionary from folder" && pFolder
- set the defaultfolder to pFolder
- get the files
+ get files(pFolder)
filter it with "*.lcdoc"
repeat for each line tFile in it
local tText, tParsedA
wait 0 with messages
put docsFileGetUTF8Contents(pFolder & slash & tFile, true) into tText
- put revDocsParseDocText(tText) into tParsedA
+ put revDocsParseDocText(tText, pFolder & slash & tFile, pDefaults) into tParsedA
repeat for each element tDoc in tParsedA["doc"]
-- TODO: Work out why something empty is returned
if tDoc["display name"] is empty then next repeat
addToList tDoc, xLibraryA
end repeat
end repeat
- set the defaultFolder to tDefaultFolder
end addToDictionaryFromFolder
/*
@@ -2083,40 +161,39 @@ pRootDirs (array): An array of paths to the relevant root folders of the
dictionary.
*/
-command docsBuilderParseDictionaryToLibraryArray pRootDirs, @xDocsA
- local tDefaultFolder
- put the defaultFolder into tDefaultFolder
-
- # Get the list of canonical glossary entries
- local tGlossaryA
- repeat for each element tRootDir in pRootDirs
- union tGlossaryA with revDocsCollectGlossarySynonyms(tRootDir)
- end repeat
-
- repeat for each element tRootDir in pRootDirs
+command docsBuilderParseDictionaryToLibraryArray pComponents, @xDocsA
+ repeat for each element tComponent in pComponents
local tDictionaryRoot, tGlossaryRoot
- put tRootDir & slash & "dictionary" into tDictionaryRoot
- put tRootDir & slash & "glossary" into tGlossaryRoot
+ put tComponent["folder"] & slash & "dictionary" into tDictionaryRoot
+ put tComponent["folder"] & slash & "glossary" into tGlossaryRoot
+
+ local tDefaults
+ delete variable tDefaults
+ if tComponent["metadata"]["edition"] is not empty then
+ put editionDisplayName(tComponent["metadata"]["edition"]) into tDefaults["edition"]
+ end if
repeat for each item tRoot in (tDictionaryRoot & "," & tGlossaryRoot)
- set the defaultfolder to tRoot
- repeat for each line tLine in the folders
+ if there is not a folder tRoot then
+ next repeat
+ end if
+
+ repeat for each line tLine in folders(tRoot)
if tLine is ".." then next repeat
- addToDictionaryFromFolder tRoot & slash & tLine, xDocsA
+ addToDictionaryFromFolder tRoot & slash & tLine, tDefaults, xDocsA
end repeat
end repeat
end repeat
- set the defaultFolder to tDefaultFolder
end docsBuilderParseDictionaryToLibraryArray
command docsBuilderParseAdditionalFoldersToLibraryArray pDirs, @xDocsA
local tFolder
repeat for each element tFolder in pDirs
- addToDictionaryFromFolder tFolder, xDocsA
+ addToDictionaryFromFolder tFolder, empty, xDocsA
end repeat
end docsBuilderParseAdditionalFoldersToLibraryArray
-function docsBuilderParseDictionary pLibraryName, pAuthor, pRootDirsA, pAdditionalDirsA, pRecursive
+function docsBuilderParseDictionary pLibraryName, pAuthor, pComponents, pAdditionalDirsA, pRecursive
local tLibraryA
put revDocsModifyForUrl(pLibraryName) into tLibraryA["name"]
@@ -2125,7 +202,7 @@ function docsBuilderParseDictionary pLibraryName, pAuthor, pRootDirsA, pAddition
put "dictionary" into tLibraryA["type"]
-- Special case for the dictionary / glossary data extraction
- docsBuilderParseDictionaryToLibraryArray pRootDirsA, tLibraryA["doc"]
+ docsBuilderParseDictionaryToLibraryArray pComponents, tLibraryA["doc"]
-- Add any additional docs to the dictionary
docsBuilderParseAdditionalFoldersToLibraryArray pAdditionalDirsA, tLibraryA["doc"]
@@ -2138,20 +215,31 @@ function docsBuilderParseDictionary pLibraryName, pAuthor, pRootDirsA, pAddition
end docsBuilderParseDictionary
command docsBuilderGenerateDistributedAPI pEdition
- local tDictionaryFolders, tAdditionalFolders
- docsBuilderGetDictionaryFolders pEdition, tDictionaryFolders
+ local tAdditionalFolders
docsBuilderGetAdditionalFolders pEdition, tAdditionalFolders
local tLibrariesA
+ local tComponents
+ put builderComponentFolders() into tComponents
+
+ -- special case the main docs folder
+ local tIndex
+ put the number of elements of tComponents + 1 into tIndex
+ put builderRepoFolder() & "/docs" into tComponents[tIndex]["folder"]
+ put "engine" into tComponents[tIndex]["metadata"]["category"]
+ put "community" into tComponents[tIndex]["metadata"]["edition"]
+
local tLCSDictionaryA
- put docsBuilderParseDictionary("LiveCode Script", "LiveCode", tDictionaryFolders, tAdditionalFolders, false) into tLCSDictionaryA
+ put docsBuilderParseDictionary("LiveCode Script", "LiveCode", tComponents, tAdditionalFolders, false) into tLCSDictionaryA
if tLCSDictionaryA is empty then
logError "Couldn't parse script dictionary data for" && pEdition
exit docsBuilderGenerateDistributedAPI
end if
+ put "script" into tLCSDictionaryA["filename"]
+ put "livecode_script" into tLCSDictionaryA["api"]
addToList tLCSDictionaryA, tLibrariesA
local tModuleList, tModularA, tModularCount, tBlocksA, tParsedA
@@ -2181,38 +269,68 @@ command docsBuilderGenerateDistributedAPI pEdition
end repeat
put empty into tParsedA
end repeat
- put "LiveCode Builder" into tLCBDictionaryA["display name"]
- put revDocsModifyForUrl("LiveCode Builder") into tLCBDictionaryA["name"]
- put "LiveCode" into tLCBDictionaryA["author"]
- put "dictionary" into tLCBDictionaryA["type"]
if tLCBDictionaryA is empty then
logError "Couldn't parse builder dictionary data for" && pEdition
exit docsBuilderGenerateDistributedAPI
end if
+ put "LiveCode Builder" into tLCBDictionaryA["display name"]
+ put revDocsModifyForUrl("LiveCode Builder") into tLCBDictionaryA["name"]
+ put "LiveCode" into tLCBDictionaryA["author"]
+ put "dictionary" into tLCBDictionaryA["type"]
+ put "builder" into tLCBDictionaryA["filename"]
+ put "livecode_builder" into tLCBDictionaryA["api"]
addToList tLCBDictionaryA, tLibrariesA
local tDatagridA, tDGDocs
put builderIDEDocsFolder() & "/dictionary/datagrid.lcdoc" into tDGDocs
put revDocsParseDocFileToLibraryArray(tDGDocs, "Data Grid", "LiveCode") \
- into tDataGridA
-
+ into tDataGridA
+
if tDataGridA is empty then
builderLog "error", "Couldn't parse datagrid dictionary data for" && pEdition
exit docsBuilderGenerateDistributedAPI
end if
put "dictionary" into tDataGridA["type"]
+ put "dg" into tDataGridA["filename"]
+ put "livecode_script" into tDataGridA["api"]
addToList tDataGridA, tLibrariesA
- local tJSON
- put revDocsFormatLibrariesArrayAsJSON(tLibrariesA) into tJSON
+ local tExtractedDocsFolder
+ put builderExtractedDocsFolder() into tExtractedDocsFolder
- docsBuilderPopulateDatabase pEdition, tLibrariesA
+ local tFiles
+ put files(tExtractedDocsFolder) into tFiles
+ filter tFiles with "*.lcdoc"
+
+ set the itemDelimiter to "."
+ local tFile
+ repeat for each line tFile in tFiles
+ local tLibA
+ put revDocsParseDocFileToLibraryArray(tExtractedDocsFolder & slash & tFile, item -2 of tFile, "LiveCode") into tLibA
+
+ if tLibA is empty then
+ builderLog "error", "Couldn't parse" && item -2 of tFile && "dictionary data for" && pEdition
+ exit docsBuilderGenerateDistributedAPI
+ end if
+ put tLibA["name"] into tLibA["filename"]
+ put "livecode_script" into tLibA["api"]
+
+ addToList tLibA, tLibrariesA
+ end repeat
- put textEncode(tJSON, "utf-8") into url ("binfile:" & builderAPIFolder(pEdition) & slash & "distributed_api.js")
+ docsBuilderPopulateDatabase pEdition, tLibrariesA
+ repeat for each element tLibA in tLibrariesA
+ local tJSON, tFolder
+ put revDocsFormatLibraryDocArrayAsJSON(tLibA) into tJSON
+ put builderAPIFolder(pEdition, tLibA["api"]) into tFolder
+ pathEnsure tFolder
+ put textEncode(tJSON, "utf-8") into url ("binfile:" & tFolder \
+ & slash & tLibA["filename"] & ".js")
+ end repeat
end docsBuilderGenerateDistributedAPI
on docsBuilderPopulateDatabase pEdition, pLibrariesA
@@ -2234,9 +352,9 @@ on docsBuilderPopulateDatabase pEdition, pLibrariesA
revExecuteSQL tConnection,"BEGIN TRANSACTION"
- repeat for each key tKey in pLibrariesA
- builderLog "message", "adding library" && pLibrariesA[tKey]["display name"] && "to docs database"
- revDocsUpdateDatabase tConnection, pLibrariesA[tKey]
+ repeat for each element tLib in pLibrariesA
+ builderLog "message", "adding library" && tLib["display name"] && "to docs database"
+ revDocsUpdateDatabase tConnection, tLib["api"], tLib
if the result is not empty then
logError the result
exit docsBuilderPopulateDatabase
@@ -2249,8 +367,7 @@ end docsBuilderPopulateDatabase
private command docsBuilderGenerateZip pEdition, pVersion
-- Ensure edition string is in titlecase
- put toLower(pEdition) into pEdition
- put toUpper(char 1 of pEdition) into char 1 of pEdition
+ put editionTitleCase(pEdition) into pEdition
put replaceText(pVersion, "[-,\.]", "_") into pVersion
local tInputs, tZipPath
@@ -2278,44 +395,3 @@ private command docsBuilderGenerateZip pEdition, pVersion
builderLog "message", merge("Generated [[tZipPath]]")
end docsBuilderGenerateZip
-
---- LEGACY
-
-function revDocumentationRetrieve pType, pTag, pFolder
- -- We know how many files per clump cuz of kFilesPerClump
- -- pType is either "dictionary/" or "glossary/"
- local tClumpNumber, tFileNumber, tPropNumber, tPropName
- local tClumpName, tDocData, tClumpPath, tType, tOpenClumps
- ---------
-
- put pType into tType
- if the last char of tType is not slash then put slash after tType
-
- if pFolder is empty then
- put revEnvironmentDocumentationPath() & slash & "packaged_xml/" & tType into tClumpPath
- else
- put pFolder & slash & "packaged_xml/" & tType into tClumpPath
- end if
-
- set the itemDelimiter to "."
- put item 1 of pTag into tFileNumber
- if tFileNumber is not a number then
- return empty
- end if
- put ((tFileNumber - 1) div kFilesPerClump) + 1 into tClumpNumber
- put ((tFileNumber - 1) mod kFilesPerClump) + 1 into tPropNumber
-
- put "c" & tPropNumber into tPropName
- put the mainStacks into tOpenClumps
- filter tOpenClumps with kClumpNamePrefix & "*"
-
- put kClumpNamePrefix & tClumpNumber into tClumpName
-
- put the tPropName of stack (tClumpPath & tClumpName & ".rev") into tDocData
- if tDocData is empty then
- return empty
- end if
-
- -- We've got the doc's compressed data, uncompress and return
- return the decompress of tDocData
-end revDocumentationRetrieve
diff --git a/builder/edition_utilities.livecodescript b/builder/edition_utilities.livecodescript
new file mode 100644
index 00000000000..bd082e3fc0d
--- /dev/null
+++ b/builder/edition_utilities.livecodescript
@@ -0,0 +1,58 @@
+script "EditionUtilities"
+constant kEditionNames="community,communityplus,indy,business,commercial"
+function editionNames
+ return kEditionNames
+end editionNames
+
+function editionTitleCase pEdition
+ switch pEdition
+ case "community"
+ return "Community"
+ case "communityplus"
+ return "CommunityPlus"
+ case "indy"
+ return "Indy"
+ case "business"
+ return "Business"
+ case "commercial"
+ return "Commercial"
+ end switch
+end editionTitleCase
+
+function editionDisplayName pEdition
+ switch pEdition
+ case "community"
+ return "Community"
+ case "communityplus"
+ return "Community Plus"
+ case "indy"
+ return "Indy"
+ case "business"
+ return "Business"
+ case "commercial"
+ return "Commercial"
+ end switch
+end editionDisplayName
+
+
+function editionCompare pA, pB
+ local tA, tB
+ put itemOffset(pA, kEditionNames) into tA
+ put itemOffset(pB, kEditionNames) into tB
+ return tA - tB
+end editionCompare
+
+constant kCommercialBaseEditions="communityplus,indy,business,commercial"
+function editionBaseEditionType pEdition
+ if pEdition is among the items of kCommercialBaseEditions then
+ return "Commercial"
+ else
+ return "Community"
+ end if
+end editionBaseEditionType
+
+constant kPrivateRepoEditions="communityplus,indy,business,commercial"
+function editionIsInPrivateRepo pEdition
+ return pEdition is among the items of kPrivateRepoEditions
+end editionIsInPrivateRepo
+
diff --git a/builder/engine_builder.livecodescript b/builder/engine_builder.livecodescript
index b3c8e4cdfc7..8a5b222c142 100644
--- a/builder/engine_builder.livecodescript
+++ b/builder/engine_builder.livecodescript
@@ -189,7 +189,7 @@ private command engineBuilderBuildEnvironment pEdition, pVersion
local tKeyFile
put the tempName into tKeyFile
put tPubKey into URL ("binfile:" & tKeyFile)
- get shell(builderSystemFolder() & "/public_key_setter -ui" && builderCommercialFolder() & "/src/Environment.rev" && tKeyFile)
+ get shell(builderSystemFolder() & "/public_key_setter -ui" && builderCommercialFolder() & "/src/environment.livecode" && tKeyFile)
builderLog "message", it
delete file tKeyFile
diff --git a/builder/installer.livecode b/builder/installer.livecode
new file mode 100755
index 00000000000..82958755f69
Binary files /dev/null and b/builder/installer.livecode differ
diff --git a/builder/installer.rev b/builder/installer.rev
deleted file mode 100755
index e431f674e69..00000000000
Binary files a/builder/installer.rev and /dev/null differ
diff --git a/builder/installer/installeruiconfirmcardbehavior.livecodescript b/builder/installer/installeruiconfirmcardbehavior.livecodescript
new file mode 100644
index 00000000000..f6566becff3
--- /dev/null
+++ b/builder/installer/installeruiconfirmcardbehavior.livecodescript
@@ -0,0 +1,62 @@
+script "InstallerInstallerUIConfirmCardBehavior"
+on preOpenCard
+ setTitleField the long id of field "Page Title", "Ready to Install", "LiveCode Installer"
+
+ local tDetails
+ put "THIS INSTALLATION WILL:" & return after tDetails
+ put return after tDetails
+ put "Install LiveCode to:" && settingsLocation() & return after tDetails
+ put return after tDetails
+
+ local tScope
+ if settingsTarget() is "all users" then
+ put "for all users" into tScope
+ else
+ put "for this user" into tScope
+ end if
+
+ if the platform is not "macos" then
+ if the platform is not "linux" then
+ if settingsDesktopShortcut() then
+ put "Create a desktop shortcut" && tScope & "." & return after tDetails
+ end if
+ end if
+
+ if settingsStartMenuShortcuts() then
+ put "Create start menu shortcuts" && tScope & "." & return after tDetails
+ end if
+
+ put return after tDetails
+ end if
+
+ if locationIsExistingInstall(settingsLocation()) then
+ put "The previous installation of LiveCode at this location will be removed before continuing." & return after tDetails
+ put return after tDetails
+ end if
+
+ if settingsRequireAdminPrivileges() then
+ put "Administrator privileges will be required to perform the installation." & return after tDetails
+ end if
+
+ put tDetails into field "Page Description"
+ set the textColor of char 1 to -1 of field "Page Description" to "#555555"
+
+ set the uEnabled of control "Back" to true
+ set the uLabel of control "Back" to "Back"
+ set the uEnabled of control "Next" to true
+ set the uLabel of control "Next" to "Install"
+ set the uDefault of control "Next" to true
+ set the uEnabled of control "Cancel" to true
+ set the uLabel of control "Cancel" to "Cancel"
+
+ show control "Cancel"
+ show control "Back"
+end preOpenCard
+
+on actionBack
+ if settingsInstallType() is "custom" then
+ go to card "Customize"
+ else
+ go to card "Type"
+ end if
+end actionBack
diff --git a/builder/installer/installeruicustomizecardbehavior.livecodescript b/builder/installer/installeruicustomizecardbehavior.livecodescript
new file mode 100644
index 00000000000..a285fee85a7
--- /dev/null
+++ b/builder/installer/installeruicustomizecardbehavior.livecodescript
@@ -0,0 +1,54 @@
+script "InstallerInstallerUICustomizeCardBehavior"
+on preOpenCard
+ setTitleField the long id of field "Page Title", "Customize", "LiveCode Installer"
+
+ put "Please customize your installation of LiveCode." into field "Page Description"
+
+ set the uLabel of control "All Users" to "Install for all users"
+ set the uLabel of control "This User" to "Install for you only"
+ set the uLabel of control "Desktop Shortcut" to "Create desktop shortcut"
+ set the uLabel of control "Start Menu Shortcut" to "Create start menu shortcut"
+
+ set the uEnabled of control "Back" to true
+ set the uLabel of control "Back" to "Back"
+ set the uEnabled of control "Next" to true
+ set the uDefault of control "Next" to true
+ set the uLabel of control "Next" to "Continue"
+ set the uEnabled of control "Cancel" to true
+ set the uLabel of control "Cancel" to "Cancel"
+
+ show control "Cancel"
+ show control "Back"
+
+ synchronizeUI
+end preOpenCard
+
+command synchronizeUI
+ repeat for each item tState in "all users,this user"
+ set the uCheck of control tState to tState is settingsTarget()
+ end repeat
+
+ put settingsLocation() into field "Location"
+ set the toolTip of field "Location" to settingsLocation()
+
+ set the itemDelimiter to slash
+ set the textColor of the item 1 to -1 of field "Location" to "#555555"
+ set the textColor of the last item of field "Location" to "#569e54"
+
+ set the uCheck of control "Start Menu Shortcut" to settingsStartMenuShortcuts()
+ set the uCheck of control "Desktop Shortcut" to settingsDesktopShortcut()
+
+ set the visible of control "Start Menu Shortcut" to the platform is not "macos"
+ set the visible of control "Desktop Shortcut" to the platform is "win32"
+end synchronizeUI
+
+on onCheckChanged
+ if the short name of the target is among the items of "All Users,This User" then
+ setCustomTargetSetting the short name of the target
+ synchronizeUI
+ else if the short name of the target is "Desktop Shortcut" then
+ setCustomDesktopShortcutSetting the uCheck of control "Desktop Shortcut"
+ else if the short name of the target is "Start Menu Shortcut" then
+ setCustomStartMenuShortcutsSetting the uCheck of control "Start Menu Shortcut"
+ end if
+end onCheckChanged
diff --git a/builder/installer/installeruicustomizechangelocationbuttonbehavior.livecodescript b/builder/installer/installeruicustomizechangelocationbuttonbehavior.livecodescript
new file mode 100644
index 00000000000..11cf831c3ed
--- /dev/null
+++ b/builder/installer/installeruicustomizechangelocationbuttonbehavior.livecodescript
@@ -0,0 +1,27 @@
+script "InstallerInstallerUICustomizeChangeLocationButtonBehavior"
+on mouseUp
+ repeat forever
+ answer folder "Please choose a folder to install into:"
+ if it is not empty then
+ put slash & thisProductFolder() after it
+ if not locationIsSuitable(it) then
+ answer "The location you have chosen is not suitable for the installation. Please choose either an empty folder, or an existing revEnterprise installation folder." with "Okay" and "Cancel"
+ if it is "cancel" then
+ exit mouseUp
+ end if
+ else
+ exit repeat
+ end if
+ else
+ exit mouseUp
+ end if
+ end repeat
+ if it is not empty then
+ setCustomLocationSetting it
+ synchronizeUI
+ end if
+end mouseUp
+
+-- Make sure we block this to stop stack moving logic!
+on mouseDown
+end mouseDown
diff --git a/builder/installer/installeruifinishcardbehavior.livecodescript b/builder/installer/installeruifinishcardbehavior.livecodescript
new file mode 100644
index 00000000000..b278f639a8e
--- /dev/null
+++ b/builder/installer/installeruifinishcardbehavior.livecodescript
@@ -0,0 +1,97 @@
+script "InstallerInstallerUIFinishCardBehavior"
+on preOpenCard
+ if the uError of me is empty then
+ setTitleField the long id of field "Page Title", "Installation Complete", "LiveCode Installer"
+ put "Installation complete." into field "Page Description"
+
+ -- This command returns the effective user ID (EUID)
+ -- If running as root or via su/sudo, the EUID is 0
+ local t_uid
+ if the platform is "Linux" then
+ put shell("id -u") into t_uid
+ else
+ put 1 into t_uid
+ end if
+
+ -- Running LiveCode as root can have undesired consequences
+ -- e.g. wrong ownership of the ~/.runrev folder and contents
+ if t_uid is 0 then
+ hide control "Launch LiveCode"
+ set the uCheck of control "Launch LiveCode" to false
+ else
+ show control "Launch LiveCode"
+ set the uLabel of control "Launch LiveCode" to "Launch LiveCode"
+ set the uCheck of control "Launch LiveCode" to true
+ end if
+
+ hide control "Display Release Notes"
+ --set the uLabel of control "Display Release Notes" to "Display Release Notes"
+
+ hide control "Outcome"
+ hide control "Cancel"
+ hide control "Back"
+ set the uEnabled of control "Next" to true
+ set the uDefault of control "Next" to true
+ set the uLabel of control "Next" to "Finish"
+ else
+ if the uError of me is "Cancelled" then
+ setTitleField the long id of field "Page Title", "Installation Cancelled", "LiveCode Installer"
+ put "The installation was cancelled." into field "Page Description"
+ hide control "Outcome"
+ else
+ setTitleField the long id of field "Page Title", "Installation Failed", "LiveCode Installer"
+ put "The installation was not successful." into field "Page Description"
+ put the uError of me into field "Outcome"
+ show control "Outcome"
+ end if
+
+ hide control "Launch LiveCode"
+ hide control "Display Release Notes"
+
+ hide control "Cancel"
+ set the uEnabled of control "Back" to true
+ set the uLabel of control "Back" to "Quit"
+ set the uDefault of control "Next" to true
+ set the uEnabled of control "Next" to true
+ set the uLabel of control "Next" to "Retry"
+ show control "Back"
+ end if
+ show control "Next"
+end preOpenCard
+
+on actionNext
+ local tPath
+ if the uError of me is empty then
+ if the uCheck of control "Launch LiveCode" then
+ if the platform is "macos" then
+ launch settingsLocation()
+ else if the platform is "win32" then
+ --launch settingsLocation() & slash & "LiveCode.exe"
+ launch settingsLocation() & slash & the uProductTitle of stack "Installer" & ".exe"
+ else -- if the platform is "linux"
+ get the uProduct of stack "Installer"
+ set the itemdelimiter to "."
+ if item 1 of the version < 7 then
+ replace space with empty in it
+ get toLower(it)
+ if the processor is "x86" then
+ put settingsLocation() & slash & it & ".i386" into tPath
+ else
+ put settingsLocation() & slash & it & "." & the processor into tPath
+ end if
+ else
+ // From 7.1, the executable name is no longer lowercase, whitespace-free
+ put settingsLocation() & slash & it & "." & the processor into tPath
+ end if
+ launch quote&tPath"e
+ end if
+ end if
+ quitInstaller
+ else
+ go card "Confirm"
+ end if
+end actionNext
+
+on actionBack
+ quitInstaller
+end actionBack
diff --git a/builder/installer/installeruiinstallcardbehavior.livecodescript b/builder/installer/installeruiinstallcardbehavior.livecodescript
new file mode 100644
index 00000000000..2a6b52d4515
--- /dev/null
+++ b/builder/installer/installeruiinstallcardbehavior.livecodescript
@@ -0,0 +1,112 @@
+script "InstallerInstallerUIInstallCardBehavior"
+########################################################################
+
+local sProgressPeak
+local sProgressDirection
+local sDidCancel
+
+on preOpenCard
+ setTitleField the long id of field "Page Title", "Installation in Progress", "LiveCode Installer"
+
+ put empty into field "Page Description"
+
+ set the uProgress of control "Progress" to 0
+
+ put "Starting installation" into field "Phase"
+
+ hide control "Next"
+ hide control "Back"
+ set the uEnabled of control "Cancel" to true
+ set the uLabel of control "Cancel" to "Cancel"
+end preOpenCard
+
+on openCard
+ local tLocation
+ put settingsLocation() into tLocation
+
+ local tOptions
+ put settingsDesktopShortcut() into tOptions["-desktopshortcut"]
+ put settingsStartMenuShortcuts() into tOptions["-startmenu"]
+ if settingsTarget() is "all users" then
+ put true into tOptions["-allusers"]
+ end if
+
+ put "up" into sProgressDirection
+ put 0 into sProgressPeak
+
+ try
+ put false into sDidCancel
+ installerRun tLocation, tLocation & slash & ".setup.txt", tOptions, not settingsRequireAdminPrivileges()
+ catch tError
+ installerFinished tError
+ end try
+end openCard
+
+on actionCancel
+ put true into sDidCancel
+ installerCancel
+end actionCancel
+
+########################################################################
+
+-- This event is dispatched by the back-end stack when the phase of the install process
+-- changes.
+on installerPhaseChanged pNewPhase
+ switch pNewPhase
+ case "Install"
+ set the uEnabled of control "Cancel" to true
+ put "up" into sProgressDirection
+ put "Installing..." into field "Phase"
+ break
+ case "Uninstall"
+ set the uEnabled of control "Cancel" to false
+ put "up" into sProgressDirection
+ put "Uninstalling existing version..." into field "Phase"
+ break
+ case "Cleanup"
+ set the uEnabled of control "Cancel" to false
+ put "down" into sProgressDirection
+ put "Removing installed files..." into field "Phase"
+ break
+ end switch
+end installerPhaseChanged
+
+-- This event is dispatched by the back-end stack when it receives a progress update from
+-- the child.
+on installerProgressChanged pProgress, pMessage
+ if pProgress > sProgressPeak then
+ put pProgress into sProgressPeak
+ end if
+
+ if sProgressDirection is "down" then
+ put (100 - pProgress) * sProgressPeak / 100.0 into pProgress
+ end if
+
+ updateProgress pProgress, pMessage
+end installerProgressChanged
+
+-- This event is dispatched by the back-end stack when it recieves an error from the child.
+on installerFinished pError
+ if pError is not empty then
+ set the uError of card "Finish" to pError
+ else if sDidCancel then
+ set the uError of card "Finish" to "Cancelled"
+ else
+ set the uError of card "Finish" to empty
+ end if
+ go card "Finish"
+end installerFinished
+
+########################################################################
+
+local sLastUpdate
+
+command updateProgress pNewPercentage, pMessage
+ if sLastUpdate is not empty and (the millisecs - sLastUpdate < 25) then
+ exit updateProgress
+ end if
+ put the millisecs into sLastUpdate
+ set the uProgress of control "Progress" of me to pNewPercentage
+end updateProgress
+
+########################################################################
diff --git a/builder/installer/installeruilicensecardbehavior.livecodescript b/builder/installer/installeruilicensecardbehavior.livecodescript
new file mode 100644
index 00000000000..c937d4fb155
--- /dev/null
+++ b/builder/installer/installeruilicensecardbehavior.livecodescript
@@ -0,0 +1,26 @@
+script "InstallerInstallerUILicenseCardBehavior"
+on preOpenCard
+ setTitleField the long id of field "Page Title", "License Agreement", "LiveCode Installer"
+ put empty into field "Page Description"
+
+ set the uEnabled of control "Back" to true
+ set the uLabel of control "Back" to "Back"
+ set the uEnabled of control "Next" to false
+ set the uDefault of control "Next" to true
+ set the uLabel of control "Next" to "Continue"
+ set the uEnabled of control "Cancel" to true
+ set the uLabel of control "Cancel" to "Cancel"
+
+ show control "Cancel"
+ show control "Back"
+
+ set the uLabel of control "Accept" to "I accept the terms and conditions of this license"
+ set the uCheck of control "Accept" to false
+
+ --set the uText of control "License Agreement" to the uProductLicense of stack "Installer"
+ set the text of field "License" to the uProductLicense of stack "Installer"
+end preOpenCard
+
+on onCheckChanged
+ set the uEnabled of control "Next" to the uCheck of control "Accept"
+end onCheckChanged
diff --git a/builder/installer/installeruistackbehavior.livecodescript b/builder/installer/installeruistackbehavior.livecodescript
new file mode 100644
index 00000000000..9b9df5ec855
--- /dev/null
+++ b/builder/installer/installeruistackbehavior.livecodescript
@@ -0,0 +1,554 @@
+script "InstallerInstallerUIStackBehavior"
+######################################################################
+
+on relaunch
+ return "background"
+end relaunch
+
+on preOpenStack
+ // PM-2016-02-27: [[ Bug 13723]] Use a card border
+ if the platform is "win32" or the platform contains "linux" then
+ local tCards, tCurrentCard, tControlsA
+
+ put the cardNames of stack "InstallerUI" of stack "Installer" into tCards
+ repeat with tCardIndex = 1 to the number of lines in tCards
+ put line tCardIndex of tCards into tCurrentCard
+ set the showBorder of card tCurrentCard of stack "InstallerUI" of stack "Installer" to true
+ end repeat
+ end if
+
+ -- Sort out fonts and sizes
+ configureFonts the short name of me
+
+ -- Make sure there's no error state
+ set the uError of card "Finish" to empty
+
+ if $2 is "-update" then
+ perfromUpdateCheck
+ else if $2 is "-foregroundupdate" then
+ perfromForegroundUpdateCheck
+ else
+ performNormalInstall
+ end if
+end preOpenStack
+
+-- Default handling for next/back/cancel buttons
+on actionNext
+ go next card
+end actionNext
+
+on actionBack
+ go prev card
+end actionBack
+
+on actionCancel
+ quitInstaller
+end actionCancel
+
+command quitInstaller
+ if the environment is "installer" then
+ set the itemDel to "."
+ if the platform is "MacOS" and item 1 to 2 of the systemVersion < 10.7 and $3 is "-unmount" then
+ set the itemDel to slash
+ if item 2 of the effective filename of this stack is "Volumes" then
+ --get shell ("diskutil unmount force" && quote & item 1 to 3 of the effective filename of this stack & quote)
+ end if
+ end if
+ lock messages
+ quit
+ else
+ resetAll
+ exit to top
+ end if
+end quitInstaller
+
+######################################################################
+
+command performNormalInstall
+ if $2 is not empty then
+ set the loc of this stack to $2
+ else
+ set the loc of this stack to the screenLoc
+ end if
+ set the visible of this stack to true
+ set the processType to "foreground"
+ go card "Welcome"
+end performNormalInstall
+
+command perfromUpdateCheck
+ set the uMode of card "UpdateCheck" to "background"
+ set the loc of this stack to the screenloc
+ go card "UpdateCheck"
+end perfromUpdateCheck
+
+command perfromForegroundUpdateCheck
+ set the uMode of card "UpdateCheck" to "foreground"
+ set the loc of this stack to the screenloc
+ go card "UpdateCheck"
+end perfromForegroundUpdateCheck
+
+######################################################################
+
+local sMovingOffset
+
+on mouseDown
+ put the clickLoc into sMovingOffset
+end mouseDown
+
+on mouseUp
+ put empty into sMovingOffset
+end mouseUp
+
+on mouseRelease
+ put empty into sMovingOffset
+end mouseRelease
+
+on mouseMove
+ if sMovingOffset is not empty then
+ get the globalLoc of the mouseLoc
+ set the topLeft of me to item 1 of it - item 1 of sMovingOffset, item 2 of it - item 2 of sMovingOffset
+ end if
+end mouseMove
+
+######################################################################
+
+local sInstallTypeSetting
+local sCustomTargetSetting
+local sCustomLocationSetting
+local sCustomDesktopShortcutSetting
+local sCustomStartMenuShortcutsSetting
+
+function settingsInstallType
+ if sInstallTypeSetting is empty then
+ return "all users"
+ end if
+ return sInstallTypeSetting
+end settingsInstallType
+
+command setInstallTypeSetting pInstallType
+ put pInstallType into sInstallTypeSetting
+end setInstallTypeSetting
+
+function settingsTarget
+ if sInstallTypeSetting is not "custom" then
+ return settingsInstallType()
+ end if
+
+ if sCustomTargetSetting is empty then
+ put "all users" into sCustomTargetSetting
+ end if
+
+ return sCustomTargetSetting
+end settingsTarget
+
+function settingsLocation
+ if settingsInstallType() is not "custom" then
+ return defaultLocationSetting()
+ end if
+
+ if sCustomLocationSetting is empty then
+ put defaultLocationSetting() into sCustomLocationSetting
+ end if
+
+ return sCustomLocationSetting
+end settingsLocation
+
+function settingsDesktopShortcut
+ if settingsInstallType() is not "custom" then
+ return true
+ end if
+
+ if sCustomDesktopShortcutSetting is empty then
+ if the platform is "win32" then
+ put true into sCustomDesktopShortcutSetting
+ else
+ put false into sCustomDesktopShortcutSetting
+ end if
+ end if
+
+ return sCustomDesktopShortcutSetting
+end settingsDesktopShortcut
+
+function settingsStartMenuShortcuts
+ if settingsInstallType() is not "custom" then
+ return true
+ end if
+
+ if sCustomStartMenuShortcutsSetting is empty then
+ if the platform is not "macos" then
+ put true into sCustomStartMenuShortcutsSetting
+ else
+ put false into sCustomStartMenuShortcutsSetting
+ end if
+ end if
+
+ return sCustomStartMenuShortcutsSetting
+end settingsStartMenuShortcuts
+
+function defaultLocationSetting
+ if settingsTarget() is "all users" then
+ return defaultAllUserLocation()
+ else
+ return defaultThisUserLocation()
+ end if
+ return ""
+end defaultLocationSetting
+
+function defaultAllUserLocation
+ switch the platform
+ case "win32"
+ return specialFolderPath("0x0026") & slash & "RunRev/" & thisProductFolder()
+ case "linux"
+ return "/opt/livecode/" & thisProductFolder()
+ case "macos"
+ return specialFolderPath("apps") & slash & thisProductFolder()
+ end switch
+ return ""
+end defaultAllUserLocation
+
+function defaultThisUserLocation
+ switch the platform
+ case "win32"
+ return specialFolderPath("0x001a") & slash & "RunRev/Components/" & thisProductFolder()
+ case "linux"
+ return $HOME & slash & ".runrev/components/" & thisProductFolder()
+ case "macos"
+ return specialFolderPath("home") & slash & "Applications" & slash & thisProductFolder()
+ end switch
+ return ""
+end defaultThisUserLocation
+
+command setCustomTargetSetting pNewSetting
+ put pNewSetting into sCustomTargetSetting
+end setCustomTargetSetting
+
+command setCustomLocationSetting pNewSetting
+ put pNewSetting into sCustomLocationSetting
+end setCustomLocationSetting
+
+command setCustomStartMenuShortcutsSetting pNewSetting
+ put pNewSetting into sCustomStartMenuShortcutsSetting
+end setCustomStartMenuShortcutsSetting
+
+command setCustomDesktopShortcutSetting pNewSetting
+ put pNewSetting into sCustomDesktopShortcutSetting
+end setCustomDesktopShortcutSetting
+
+function thisProductFolder
+ switch the platform
+ case "win32"
+ return the uProductTitle of stack "Installer"
+ case "linux"
+ local tFolder
+ put the uProductTag of stack "Installer" into tFolder
+ put "." & the processor after tFolder
+ return tFolder
+ case "macos"
+ return the uProductTitle of stack "Installer" & ".app"
+ end switch
+ return ""
+end thisProductFolder
+
+function getUpdateFolderLocation
+ switch the platform
+ case "MacOS"
+ return specialFolderPath("home") & "/Library/Application Support/RunRev/Updates/LiveCode"
+ case "Win32"
+ return specialFolderPath(0x001c) & "/RunRev/Updates/LiveCode"
+ case "Linux"
+ return specialFolderPath("home") & "/.runrev/updates/livecode"
+ end switch
+end getUpdateFolderLocation
+
+######################################################################
+
+-- This function returns 'true' if the current settings will require admin privileges.
+-- Originally this was done just by divining 'accessibility' of the location property, but
+-- in actuality it is a function of platform and install type (this user/all users).
+function settingsRequireAdminPrivileges
+
+ -- On Linux we require admin to install 'all user' start menu shortcuts, regardless
+ -- of target location.
+ if the platform is "linux" then
+ if settingsTarget() is "all users" and settingsStartMenuShortcuts() then
+ return true
+ end if
+ end if
+
+ -- On Windows, the same is true
+ if the platform is "win32" then
+ if settingsTarget() is "all users" and (settingsStartMenuShortcuts() or settingsDesktopShortcut()) then
+ return true
+ end if
+ end if
+
+ -- As there seems a rather unpleasant bug in 'open elevated process' on Mac OS X, we
+ -- don't try and elevate there!
+ --if the platform is "macos" then
+ --return true
+ --end if
+
+ -- If we are not 'all users' or do not install any shortcuts *then* admin requirement is
+ -- based on target location.
+ return requiresAdminPrivileges(settingsLocation())
+end settingsRequireAdminPrivileges
+
+######################################################################
+
+-- A target folder is suitable for installation if it doesn't contain a sub-folder which
+-- we want to use. Or, that sub-folder is a rev install.
+function locationIsSuitable pLocation
+ if there is no folder pLocation then
+ return true
+ end if
+
+ if locationIsExistingInstall(pLocation) then
+ return true
+ end if
+
+ return false
+end locationIsSuitable
+
+-- On linux and windows, a target folder is an existing install if it contains '.setup.txt',
+-- '.setup.exe' and a rev engine. On macosx, if it contains a rev app bundle of the same
+-- name.
+function locationIsExistingInstall pLocation
+ if there is no folder pLocation then
+ return false
+ end if
+
+ if the platform is not "macos" then
+ if there is no file (pLocation & "/.setup.txt") or \
+ (there is no file (pLocation & "/.setup.exe") and \
+ there is no file (pLocation & "/.setup.x86") and \
+ there is no file (pLocation & "/setup.x86") and \
+ there is no file (pLocation & "/setup.x86_64")) then
+ return false
+ end if
+
+ local tFiles, tOldFolder
+ put the defaultfolder into tOldFolder
+ set the defaultFolder to pLocation
+ put the files into tFiles
+ set the defaultFolder to tOldFolder
+
+ repeat for each line tFile in tFiles
+ // Case sensitive
+ if matchText(tFile, "LiveCode.*\.(exe|x86|x86_64)") or \
+ matchText(tFile, "livecode.*\.(exe|x86|x86_64)") then
+ return true
+ end if
+ end repeat
+
+ return false
+ else
+ if there is no folder pLocation then
+ return false
+ end if
+ end if
+
+ return true
+end locationIsExistingInstall
+
+-- An install requires admin privileges if it needs them to:
+-- a) if the location doesn't exist then to create it
+-- b) if the location does exist, then to create a file inside it
+-- c) if the location is an existing install, then to delete all files in it
+--
+function requiresAdminPrivileges pLocation
+ if there is no folder pLocation then
+ -- Find the first folder that does exist
+ set the itemDelimiter to slash
+ repeat with x = the number of items of pLocation down to 1
+ if there is a folder (item 1 to x of pLocation) then
+ exit repeat
+ end if
+ end repeat
+
+ -- Now try to create the next level
+ create folder (item 1 to x + 1 of pLocation)
+ if there is no folder (item 1 to x + 1 of pLocation) then
+ return true
+ end if
+
+ -- We successfully created it, so delete it and continue.
+ delete folder (item 1 to x + 1 of pLocation)
+ return false
+ end if
+
+ -- If the location is empty, make sure we can create something inside it
+ if folderIsEmpty(pLocation) then
+ create folder (pLocation & slash & "lctestfolder")
+ if there is no folder (pLocation & slash & "lctestfolder") then
+ return true
+ end if
+
+ delete folder (pLocation & slash & "lctestfolder")
+ return false
+ end if
+
+ -- Finally, if we get here then the target folder must be an existing install. Thus
+ -- recursively check to see if we can delete all files (and folders) in it.
+ local tCanDelete
+ put canDeleteFolder(pLocation) into tCanDelete
+ return not tCanDelete
+end requiresAdminPrivileges
+
+######################################################################
+
+function canDeleteFolder pLocation
+ if the environment is not "installer" then
+ return false
+ end if
+
+ local tOldFolder
+ put the folder into tOldFolder
+ set the folder to pLocation
+
+ repeat for each line tFile in the files
+ do "_internal canDeleteFile (pLocation & slash & tFile)"
+ if not the result then
+ set the folder to tOldFolder
+ return false
+ end if
+ end repeat
+
+ repeat for each line tFolder in the folders
+ if tFolder is ".." then
+ next repeat
+ end if
+
+ if not canDeleteFolder(pLocation & slash & tFolder) then
+ set the folder to tOldFolder
+ return false
+ end if
+ end repeat
+
+ set the folder to tOldFolder
+
+ return true
+end canDeleteFolder
+
+function folderIsEmpty pLocation
+ local tIsEmpty
+
+ local tOldFolder
+ put the folder into tOldFolder
+ set the folder to pLocation
+ if the files is not empty then
+ put false into tIsEmpty
+ else if the folders is not ".." then
+ put false into tIsEmpty
+ else
+ put true into tIsEmpty
+ end if
+ set the folder to tOldFolder
+
+ return tIsEmpty
+end folderIsEmpty
+
+######################################################################
+
+command runFaceless
+ local tOptions
+ parseOptions tOptions
+ if the result is not empty then
+ write "Usage: -ui [-location ] [-allusers] [-desktopshortcut] [-startmenu]" & return to stderr
+ quit 1
+ end if
+
+ -- Compute the target location based on install type, if non specified
+ if tOptions["location"] is empty then
+ if tOptions["allusers"] then
+ put defaultAllUserLocation() into tOptions["location"]
+ else
+ put defaultThisUserLocation() into tOptions["location"]
+ end if
+ end if
+
+ -- Make the log path absolute, if specific
+ if tOptions["log"] is not empty then
+ if char 1 of tOptions["log"] is not "/" and char 2 of tOptions["log"] is not ":" then
+ put the folder & slash before tOptions["log"]
+ end if
+ end if
+
+ actionInstall tOptions["location"], tOptions["location"] & slash & ".setup.txt", tOptions
+end runFaceless
+
+private command parseOptions @rOptions
+ local tIndex
+ -- Skip $0 (executable path) and $1 ('install')
+ -- '-ui' is not included in the cmd line arg vars
+ put 2 into tIndex
+ repeat forever
+ if tIndex >= $# then
+ exit repeat
+ end if
+
+ local tParam, tNextParam
+ put value("$" & tIndex) into tParam
+ if tIndex < $# - 1 then
+ put value("$" & (tIndex + 1)) into tNextParam
+ else
+ put empty into tNextParam
+ end if
+ if tParam begins with "-" then
+ if tNextParam begins with "-" or tNextParam is empty then
+ put true into rOptions[char 2 to -1 of tParam]
+ add 1 to tIndex
+ else
+ put tNextParam into rOptions[char 2 to -1 of tParam]
+ add 2 to tIndex
+ end if
+ else
+ return "syntax error"
+ end if
+ end repeat
+
+ return empty
+end parseOptions
+
+######################################################################
+
+command utilityEnsureFolder pPath
+ local tIndex
+ set the itemDelimiter to "/"
+ repeat with tIndex = 2 to the number of items of pPath
+ if there is no folder (item 1 to tIndex of pPath) then
+ create folder (item 1 to tIndex of pPath)
+ if the result is not empty then
+ return the result
+ end if
+ end if
+ end repeat
+ return empty
+end utilityEnsureFolder
+
+command utilityDeleteFolder pFolder
+ local tOldFolder
+ put the folder into tOldFolder
+ set the folder to pFolder
+ repeat for each line tFile in the files
+ delete file pFolder & slash & tFile
+ if the result is not empty then
+ return the result
+ end if
+ end repeat
+ repeat for each line tFolder in the folders
+ if not (tFolder begins with ".") then
+ utilityDeleteFolder pFolder & slash & tFolder
+ if the result is not empty then
+ return the result
+ end if
+ end if
+ end repeat
+ delete folder pFolder
+ if the result is not empty then
+ return the result
+ end if
+ set the folder to tOldFolder
+ return empty
+end utilityDeleteFolder
+
+######################################################################
diff --git a/builder/installer/installeruitypecardbehavior.livecodescript b/builder/installer/installeruitypecardbehavior.livecodescript
new file mode 100644
index 00000000000..e7f6db167d5
--- /dev/null
+++ b/builder/installer/installeruitypecardbehavior.livecodescript
@@ -0,0 +1,46 @@
+script "InstallerInstallerUITypeCardBehavior"
+on preOpenCard
+ setTitleField the long id of field "Page Title", "Select Installation Type", "LiveCode Installer"
+
+ put "Please choose the type of installation you would like to perform." into field "Page Description"
+
+ set the uType of control "All Users" to "allusers"
+ set the uType of control "This User" to "youonly"
+ set the uType of control "Custom" to "custom"
+
+ set the uEnabled of control "Back" to true
+ set the uLabel of control "Back" to "Back"
+ set the uEnabled of control "Next" to true
+ set the uDefault of control "Next" to true
+ set the uLabel of control "Next" to "Continue"
+ set the uEnabled of control "Cancel" to true
+ set the uLabel of control "Cancel" to "Cancel"
+
+ show control "Cancel"
+ show control "Back"
+
+ synchronizeUI
+end preOpenCard
+
+on onCheckChanged
+ setInstallTypeSetting the short name of the target
+ synchronizeUI
+end onCheckChanged
+
+command synchronizeUI
+ repeat for each item tType in "all users,this user,custom"
+ set the uCheck of control tType of group "Install Type" to settingsInstallType() is tType
+ end repeat
+end synchronizeUI
+
+on actionNext
+ switch settingsInstallType()
+ case "all users"
+ case "this user"
+ go to card "Confirm"
+ break
+ case "custom"
+ go to card "Customize"
+ break
+ end switch
+end actionNext
diff --git a/builder/installer/installeruiupdatecheckcardbehavior.livecodescript b/builder/installer/installeruiupdatecheckcardbehavior.livecodescript
new file mode 100644
index 00000000000..96461aa9921
--- /dev/null
+++ b/builder/installer/installeruiupdatecheckcardbehavior.livecodescript
@@ -0,0 +1,801 @@
+script "InstallerInstallerUIUpdateCheckCardBehavior"
+########################################################################################
+
+constant kUpdateURL = "http://livecode.com/livecode/update/livecode"
+constant kUpdateInterval = 86400
+constant kAnnoyInterval = 600
+
+local sAnnoyMessage
+local sUpdateData
+local sSelectedUpdate
+
+########################################################################################
+
+on preOpenCard
+ put empty into sUpdateData
+ put empty into sSelectedUpdate
+
+ hide control "Cancel"
+ hide control "Back"
+ hide control "Next"
+ put empty into field "Page Description"
+ set the uLabel of group "skip" of me to "Skip This Version"
+ set the uLabel of group "remind" of me to "Remind Me Later"
+ repeat with tIndex = 1 to 4
+ set the uVisible of group ("update_" & tIndex) of me to false
+ end repeat
+ set the text of field "Marketing" to empty
+ set the textStyle of field "Heading" of me to "bold"
+ set the textSize of field "Heading" of me to 24
+ set the text of field "Heading" of me to "Update Checking"
+ setTitleField the long id of field "Page Title", "Updater", "LiveCode Updater"
+ hide group "UpdatesAvailable"
+ hide group "NoUpdatesAvailable"
+ send "startLoading" to group "loader" of group "UpdateChecking"
+ show group "UpdateChecking"
+
+ pass preOpenCard
+end preOpenCard
+
+on openCard
+ send "autoUpdate" to me in 0 seconds
+end openCard
+
+on closeCard
+ if the platform is "MacOS" and the environment is "installer" then
+ do "_internal bounceCancel"
+ end if
+ if sAnnoyMessage is not empty then
+ cancel sAnnoyMessage
+ end if
+ pass closeCard
+end closeCard
+
+-- This is the start of the auto update process.
+-- At this point the installer is still in the background.
+-- If any errors are encountered the installer should just silenty fail.
+-- If any updates are found, the installer should be brought to the foreground.
+--
+command autoUpdate
+ if the uMode of me is "foreground" then
+ set the visible of this stack to true
+ set the processType to "foreground"
+ end if
+
+ preferencesLoad
+ if the result is not empty then
+ actionExitUpdateProcess
+ end if
+
+ -- All update downloads and prefs should be stored in the LiveCoe update folder.
+ -- Make sure this folder exists
+ --
+ utilityEnsureFolder getUpdateFolderLocation()
+ if the result is not empty then
+ actionExitUpdateProcess
+ end if
+
+ -- Load the update pref files, making sure we haven't checked for an update recently.
+ --
+ local tLastUpdateCheckTime, tVersionSkipList
+ parseUpdatePrefFiles tLastUpdateCheckTime, tVersionSkipList
+ if the result is not empty or (the uMode of me is not "foreground" and tLastUpdateCheckTime is not empty and tLastUpdateCheckTime > (the seconds - kUpdateInterval)) then
+ actionExitUpdateProcess
+ end if
+
+ -- Contact the server to see if there are any updates.
+ -- If there are no errors contacting the server, store the time of update check.
+ --
+ -- It's important to silenty fail if no local credentials are found. If this is the case, the install
+ -- has been activated via the comamnd line, and is most likely being run in a network environment
+ -- (e.g. school, university). Updating should be left up to administrators (we could maybe also check by license type?).
+ --
+ local tUpdateData
+ checkForUpdates tUpdateData
+ if the result is not empty then
+ actionExitUpdateProcess
+ end if
+ put the seconds into URL ("file:" & getUpdateLastCheckFileLocation())
+ if not (tUpdateData is an array) or the keys of tUpdateData is empty then
+ actionExitUpdateProcess
+ end if
+
+ processUpdates tUpdateData, tVersionSkipList, sUpdateData
+ if the result is not empty or not (sUpdateData is an array) or the keys of sUpdateData is empty then
+ actionExitUpdateProcess
+ end if
+
+ uiPopulate
+ if the result is not empty then
+ actionExitUpdateProcess
+ end if
+
+ -- If we have reached this point, there have been no errors and there are updates available.
+ -- Bring the installer to the foreground.
+ --
+ showUpdater
+ if the result is not empty then
+ actionExitUpdateProcess
+ end if
+end autoUpdate
+
+########################################################################################
+
+-- Update/Buy Now button clicked.
+-- For paid releases, navigate to store and close updater.
+-- For free releases, download updater and install.
+--
+on actionUpdate
+ switch sUpdateData[sSelectedUpdate]["type"]
+ case "stable"
+ case "maintainence"
+ case "beta"
+ case "development"
+ set the uRemoteURL of card "UpdateDownload" to sUpdateData[sSelectedUpdate]["url"]
+ set the uRemoteChecksum of card "UpdateDownload" to sUpdateData[sSelectedUpdate]["checksum"]
+ go card "UpdateDownload"
+ break
+ end switch
+end actionUpdate
+
+-- Skip This Release button click.
+-- Append the version to the skip file and exit installer.
+--
+on actionSkip
+ put sUpdateData[sSelectedUpdate]["buildnumber"] & return after URL ("file:" & getUpdateVersionSkipFileLocation())
+ actionCancel
+end actionSkip
+
+-- Remind Me Later button clicked.
+-- Just quite installer
+--
+on actionLater
+ actionCancel
+end actionLater
+
+-- An update version have been selected by one on the update nav buttons on the left hand side.
+-- Flag this update and the selected update and update the ui with the appropriate details.
+--
+on actionSelect pType
+ put pType into sSelectedUpdate
+ lock screen
+ uiPopulateNavButtonStates
+ uiPopulateActionButtons
+ uiPopulateMktText
+ unlock screen
+end actionSelect
+
+on actionExitUpdateProcess
+ if the uMode of me is "foreground" then
+ lock screen
+ set the text of field "Heading" of me to "No Updates"
+ hide group "UpdatesAvailable"
+ show group "NoUpdatesAvailable"
+ hide group "UpdateChecking"
+ unlock screen
+ resetAll
+ exit to top
+ else
+ actionCancel
+ end if
+end actionExitUpdateProcess
+
+########################################################################################
+
+-- Bring the updater to the foreground.
+-- On OS X we bounce the Dock icon. On Windows we create a status icon with a balloon.
+-- The above is done using custom commands added to the installer.
+-- The doc icon bounces and the status balloon is shown periodically until the user reacts.
+-- To be updated on Linux. For the moment we just show the installer.
+--
+on showUpdater
+ set the processType to "foreground"
+ switch the platform
+ case "MacOS"
+ set the icon to resolveImageId("icon")
+ if the environment is "installer" then
+ do "_internal bounce"
+ send "showUpdater" to me in kAnnoyInterval seconds
+ put the result into sAnnoyMessage
+ end if
+ break
+ case "Win32"
+ set the statusIcon to resolveImageId("status-icon")
+ set the statusIconTooltip to "LiveCode Updater"
+ if the environment is "installer" then
+ local tTitle, tMsg
+ put "A new version of LiveCode is available" into tTitle
+ put "Your version of LiveCode is out of date. Click to here to begin updating." into tMsg
+ do "_internal showBalloon tTitle tMsg"
+ send "showUpdater" to me in kAnnoyInterval seconds
+ put the result into sAnnoyMessage
+ end if
+ break
+ case "Linux"
+ set the visible of this stack to true
+ break
+ end switch
+ return empty
+end showUpdater
+
+-- Dock icon clicked. Stop bouncing.
+--
+on appleEvent p1, p2, p3
+ if p1 & p2 is "aevtrapp" then
+ set the visible of this stack to true
+ if sAnnoyMessage is not empty then
+ cancel sAnnoyMessage
+ end if
+ end if
+ pass appleEvent
+end appleEvent
+
+on statusIconClick
+ set the visible of this stack to true
+ if sAnnoyMessage is not empty then
+ cancel sAnnoyMessage
+ end if
+end statusIconClick
+
+on mouseDown
+ if the platform is "MacOS" and the environment is "installer" then
+ do "_internal bounceCancel"
+ end if
+ pass mouseDown
+end mouseDown
+
+########################################################################################
+
+-- Parse the update preference files, returning the last time an update was check for
+-- (in seconds) and a return delimited list of versions to skip.
+--
+-- Returns empty if successful, an error string if not.
+--
+private command parseUpdatePrefFiles @rLastUpdateCheckTime, @rVersionSkipList
+ local tUpatePrefFile
+ put getUpdateLastCheckFileLocation() into tUpatePrefFile
+ if there is a file tUpatePrefFile then
+ get URL ("file:" & tUpatePrefFile)
+ if word 1 of it is not empty and word 1 of it is an integer then
+ put word 1 of it into rLastUpdateCheckTime
+ end if
+ end if
+ put getUpdateVersionSkipFileLocation() into tUpatePrefFile
+ if there is a file tUpatePrefFile then
+ put URL ("file:" & tUpatePrefFile) into rVersionSkipList
+ end if
+ return empty
+end parseUpdatePrefFiles
+
+-- Contact the server to see if there are any updates for this user.
+-- Place any update data returned by the server in rUpdateData.
+--
+-- Returns empty if successful, an error string if not.
+--
+private command checkForUpdates @rUpdateData
+ -- The livecode.lcld in the licenses folder stores the email address
+ -- and the (md5 hash of the) password for the currently activated user.
+ --
+ -- MM-2013-06-13: Since community no longer requires activation, don't
+ -- fail if no user details found.
+ --
+ get getLicensesFolderLocation() & "/livecode.lcld"
+ if there is no file it then
+ get getLicensesFolderLocation() & "/livecode-community.lcld"
+ end if
+ if there is no file it then
+ --return "no lcld file"
+ end if
+
+ local tActivationDetails
+ put url ("file:" & it) into tActivationDetails
+ if the first line of tActivationDetails is not "---- LIVECODE ACTIVATION DETAILS (R1) ----" or \
+ the last line of tActivationDetails is not "---- LIVECODE ACTIVATION DETAILS (R1) ----" then
+ --return "invalid lcld file"
+ end if
+ delete the first line of tActivationDetails
+ delete the last line of tActivationDetails
+ split tActivationDetails by return and "="
+
+ if tActivationDetails["email"] is empty then
+ --return "no username"
+ end if
+ if tActivationDetails["password"] is empty then
+ --return "no password"
+ end if
+
+ -- MM-2013-06-13: Since we may no longer have the user's activaiton details,
+ -- the server instead generates us a uniquie ID for the user. Check to see if one has
+ -- already been generated and if so, pass on to the server.
+ --
+ local tUUID
+ put URL ("binfile:" & getUpdateUniqueUserIDFileLocation()) into tUUID
+
+ -- The server communcation is in two steps. Fist we connect with the sever, sending thre username.
+ -- If successful, we'll have a session on the server.
+ --
+ local tSessionID, tChallenge
+ serverLogin tActivationDetails["email"], tUUID, tSessionID, tChallenge
+ if the result is not empty then
+ return the result
+ end if
+
+ -- Secondly, we send a digest of the password baack to the server.
+ -- If successful, we'll get back a list of updates for the current user.
+ --
+ serverList tActivationDetails["password"], tSessionID, tChallenge, getBuildNumber(), getPlatformString(), rUpdateData
+ if the result is not empty then
+ return the result
+ end if
+
+ return empty
+end checkForUpdates
+
+-- Take the raw list of updates from the server and process it for display.
+-- Remove any updates the user doesn't want to see. Form into an array of up to
+-- 3 updates - free, paid and test.
+--
+-- Returns empty if successful, an error string if not.
+--
+private command processUpdates pUpdateData, pVersionSkipList, @rProcessesUpdateData
+ local tIndex
+ put 1 into tIndex
+ repeat while pUpdateData["update." & tIndex & ".ver"] is not empty
+
+ -- Repeat through each update retunred by the server. Each update is of the following form:
+ -- update..ver = e.g. 5.0.0-dp-2
+ -- update..buildnumber = 1455
+ -- update..url = link to download releae for free updates, link to store for paid updates
+ -- update..type = free|paid|free-test|paid-test
+ -- where n is an integer starting from 1.
+ --
+ if pUpdateData["update." & tIndex & ".buildnumber"] is not empty and \
+ pUpdateData["update." & tIndex & ".url"] is not empty and \
+ pUpdateData["update." & tIndex & ".type"] is not empty
+ then
+
+ if pUpdateData["update." & tIndex & ".buildnumber"] is among the lines of pVersionSkipList then
+ add 1 to tIndex
+ next repeat
+ end if
+ if getVersionInstalled(pUpdateData["update." & tIndex & ".ver"], pUpdateData["update." & tIndex & ".buildnumber"]) or pUpdateData["update." & tIndex & ".buildnumber"] is getBuildNumber() then
+ add 1 to tIndex
+ next repeat
+ end if
+
+ -- Make sure free updates have a checksum. Free updates will be automatically downloaded
+ -- and installed. The checksum is needed by the download process.
+ --
+ if pUpdateData["update." & tIndex & ".checksum"] is empty then
+ add 1 to tIndex
+ next repeat
+ end if
+
+ local tType
+ switch pUpdateData["update." & tIndex & ".type"]
+ case "stable"
+ put "stable" into tType
+ break
+ case "maintainence"
+ put "maintainence" into tType
+ break
+ case "beta"
+ put "beta" into tType
+ break
+ case "development"
+ put "development" into tType
+ break
+ default
+ add 1 to tIndex
+ next repeat
+ end switch
+
+ if tType is "stable" and the cNotifyMeOfStableReleases of stack "revPreferences" is false then
+ add 1 to tIndex
+ next repeat
+ end if
+ if tType is "maintainence" and the cNotifyMeOfMaintainenceReleases of stack "revPreferences" is false then
+ add 1 to tIndex
+ next repeat
+ end if
+ if tType is "beta" and the cNotifyMeOfBetaReleases of stack "revPreferences" is false then
+ add 1 to tIndex
+ next repeat
+ end if
+ if tType is "development" and the cNotifyMeOfDevelopmentReleases of stack "revPreferences" is false then
+ add 1 to tIndex
+ next repeat
+ end if
+
+ -- Ignore this release is we have already have one of this type.
+ --
+ if rProcessesUpdateData[tType] is an array then
+ add 1 to tIndex
+ next repeat
+ end if
+
+ put pUpdateData["update." & tIndex & ".url"] into rProcessesUpdateData[tType]["url"]
+ put pUpdateData["update." & tIndex & ".ver"] into rProcessesUpdateData[tType]["version"]
+ put pUpdateData["update." & tIndex & ".type"] into rProcessesUpdateData[tType]["type"]
+ put pUpdateData["update." & tIndex & ".checksum"] into rProcessesUpdateData[tType]["checksum"]
+ put pUpdateData["update." & tIndex & ".buildnumber"] into rProcessesUpdateData[tType]["buildnumber"]
+
+ -- Exctract any marketing data. Marketing data is of the following form:
+ -- update..marketing..content = base64Encoded marketing text
+ -- update..marketing..type = plain|unicode|utf8|rtf|html
+ -- where m is an integer starting from 1.
+ --
+ -- This allows for richly formatted marketing text and the store to aggregate marketing messages
+ -- of different formats.
+ --
+ local tMktIndex
+ put 1 into tMktIndex
+ repeat while pUpdateData["update." & tIndex & ".marketing." & tMktIndex & ".type"] is not empty
+ put base64decode(pUpdateData["update." & tIndex & ".marketing." & tMktIndex & ".content"]) into rProcessesUpdateData[tType]["marketing"][tMktIndex]["content"]
+ put pUpdateData["update." & tIndex & ".marketing." & tMktIndex & ".type"] into rProcessesUpdateData[tType]["marketing"][tMktIndex]["type"]
+ add 1 to tMktIndex
+ end repeat
+
+ -- If no marketing data, then use defaults.
+ --
+ if tMktIndex is 1 then
+ switch pUpdateData["update." & tIndex & ".type"]
+ case "stable"
+ put the uDefaultMktingStableContent of me into rProcessesUpdateData[tType]["marketing"][tMktIndex]["content"]
+ put the uDefaultMktingStableType of me into rProcessesUpdateData[tType]["marketing"][tMktIndex]["type"]
+ break
+ case "maintainence"
+ put the uDefaultMktingMaintainenceContent of me into rProcessesUpdateData[tType]["marketing"][tMktIndex]["content"]
+ put the uDefaultMktingMaintainenceType of me into rProcessesUpdateData[tType]["marketing"][tMktIndex]["type"]
+ break
+ case "beta"
+ put the uDefaultMktingBetaContent of me into rProcessesUpdateData[tType]["marketing"][tMktIndex]["content"]
+ put the uDefaultMktingBetaType of me into rProcessesUpdateData[tType]["marketing"][tMktIndex]["type"]
+ break
+ case "development"
+ put the uDefaultMktingDevelopmentContent of me into rProcessesUpdateData[tType]["marketing"][tMktIndex]["content"]
+ put the uDefaultMktingDevelopmentType of me into rProcessesUpdateData[tType]["marketing"][tMktIndex]["type"]
+ break
+ end switch
+ end if
+
+ end if
+ add 1 to tIndex
+ end repeat
+ return empty
+end processUpdates
+
+########################################################################################
+
+private command uiPopulate
+ lock screen
+ if the number lines in the keys of sUpdateData > 1 then
+ get "Updates Available"
+ else
+ get "Update Available"
+ end if
+ set the text of field "Heading" of me to it
+ setTitleField the long id of field "Page Title", it, "LiveCode Updater"
+ set the uWide of group "skip" of me to true
+ set the uWide of group "remind" of me to true
+ uiPopulateNavButtons
+ uiPopulateActionButtons
+ uiPopulateMktText
+ show group "UpdatesAvailable"
+ hide group "NoUpdatesAvailable"
+ hide group "UpdateChecking"
+ unlock screen
+ return empty
+end uiPopulate
+
+-- The nav buttons are the buttons on the left hand side that allow the user to navigate between
+-- the updates they have avaiable. There will be a maximum of three, and they will be in the order
+-- free paid test.
+--
+private command uiPopulateNavButtons
+ local tNavButtonIndex
+ put 1 into tNavButtonIndex
+ repeat for each word tType in "stable maintainence beta development"
+ if sUpdateData[tType] is not an array then
+ next repeat
+ end if
+
+ -- If we have not yet selected an update, select this one.
+ -- This means that by default, the first update is selected.
+ --
+ if sSelectedUpdate is empty then
+ put tType into sSelectedUpdate
+ end if
+
+ -- We strip out the gm part of the version number unless the update is a new gm.
+ -- e.g. The current version is 4.6.4-gm-1, the update is 4.6.4-gm-2.
+ --
+ local tVersion
+ put sUpdateData[tType]["version"] into tVersion
+ if tVersion contains "gm" then
+ set the itemDel to "-"
+ if item 1 of tVersion is not the version then
+ put item 1 of tVersion into tVersion
+ end if
+ set the itemDel to comma
+ end if
+
+ -- We use the default state to indicate that this is the currently selected update.
+ --
+ --set the uLabel of group ("update_" & tNavButtonIndex) of me to "LiveCode" & return & tVersion
+ set the uLabel of group ("update_" & tNavButtonIndex) of me to tVersion
+ set the uType of group ("update_" & tNavButtonIndex) of me to tType
+ set the uDefault of group ("update_" & tNavButtonIndex) of me to (tNavButtonIndex is 1)
+ set the uVisible of group ("update_" & tNavButtonIndex) of me to true
+
+ add 1 to tNavButtonIndex
+ end repeat
+end uiPopulateNavButtons
+
+private command uiPopulateNavButtonStates
+ --repeat with tIndex = 1 to 3
+ repeat with tIndex = 1 to 4
+ if there is a group ("update_" & tIndex) of me and the visible of group ("update_" & tIndex) of me then
+ set the uDefault of group ("update_" & tIndex) of me to (the uType of group ("update_" & tIndex) of me is sSelectedUpdate)
+ end if
+ end repeat
+end uiPopulateNavButtonStates
+
+-- The action buttons are the three buttons along the bottom of the stack.
+-- They are "Remind Me Later", "Skip This Version" and "Byt/Update Now".
+--
+-- We only ever need to update the but/update now button label.
+--
+private command uiPopulateActionButtons
+ switch sUpdateData[sSelectedUpdate]["type"]
+ case "stable"
+ case "maintainence"
+ case "beta"
+ case "development"
+ set the uLabel of group "update" of me to "Update Now"
+ break
+ end switch
+ set the uDefault of group "update" of me to true
+end uiPopulateActionButtons
+
+private command uiPopulateMktText
+ --set the uFormattedTextArray of control "Marketing Text" to sUpdateData[sSelectedUpdate]["marketing"]
+ set the uFormattedTextArray of control "Marketing" to sUpdateData[sSelectedUpdate]["marketing"]
+end uiPopulateMktText
+
+########################################################################################
+
+private command serverLogin pUserName, pUUID, @rSessionID, @rChallenge
+ local tPostData, tResult
+ put "action=login" & return & \
+ "email=" & pUserName & return & \
+ "uid=" & pUUID into tPostData
+ post encodeForPost(tPostData) to kUpdateUrl
+ if the result is not empty then
+ return the result
+ end if
+ put it into tResult
+ split tResult by return and "="
+ if tResult["result"] is empty then
+ return "error on server login"
+ end if
+ if tResult["result"] is not "success" then
+ return tResult["result"]
+ end if
+ if tResult["session"] is empty or tResult["challenge"] is empty then
+ return "missing challenge or session"
+ end if
+ put tResult["uid"] into URL ("binfile:" & getUpdateUniqueUserIDFileLocation())
+ put tResult["session"] into rSessionID
+ put hexDecode(tResult["challenge"]) into rChallenge
+ return empty
+end serverLogin
+
+private command serverList pPassword, pSessionID, pChallenge, pBuildNumber, pPlatform, @rData
+ local tPostData, tResult
+ put "action=list" & return & \
+ "session=" & pSessionID & return & \
+ "token=" & hexEncode(md5Digest(hexDecode(pPassword) & md5Digest(pChallenge))) & return & \
+ "build=" & pBuildNumber & return & \
+ "platform=" & pPlatform & return & \
+ "type=" & getInstallerType() into tPostData
+ post encodeForPost(tPostData) to kUpdateUrl
+ if the result is not empty then
+ return the result
+ end if
+ put it into tResult
+ split tResult by return and "="
+ if tResult["result"] is empty then
+ return "error on server list"
+ end if
+ if tResult["result"] is not "success" then
+ return tResult["result"]
+ end if
+ delete variable tResult["result"]
+ put tResult into rData
+ return empty
+end serverList
+
+private function encodeForPost pData
+ local tPostData
+ set the itemDelimiter to "="
+ repeat for each line tLine in pData
+ put item 1 of tLine & "=" & the urlEncode of item 2 to -1 of tLine & "&" after tPostData
+ end repeat
+ delete the last char of tPostData
+ return tPostData
+end encodeForPost
+
+private function hexEncode pValue
+ local tHexValue
+ if pValue is empty then
+ return empty
+ end if
+ get binaryDecode("H" & the length of pValue * 2, pValue, tHexValue)
+ return tHexValue
+end hexEncode
+
+private function hexDecode pHexValue
+ if pHexValue is empty then
+ return empty
+ end if
+ return binaryEncode("H" & the length of pHexValue, pHexValue)
+end hexDecode
+
+########################################################################################
+
+-- Returns true if the given vesion is installed.
+--
+-- Makes assumption based on license files - if there is a license file for
+-- the version, the user has downloaed, installed and activated.
+--
+-- For gm releases, the gm part of the version is stripped, so we can't differentaite
+-- between license files for gm-1, gm-2, gm-3 etc.
+-- If there is a license file (e.g. 4.6.4), we can only assume gm-1 is installed.
+--
+-- This licensing stack now been updated to include the build number in the license file.
+-- This solves the GM issue.
+--
+private function getVersionInstalled pVersion, pBuildNumber
+ -- if pVersion contains "-gm-" then
+ -- if not (pVersion ends with "-gm-1") then
+ -- return false
+ -- else
+ -- set the itemDel to "-"
+ -- put item 1 of pVersion into pVersion
+ -- set the itemDel to comma
+ -- end if
+ -- end if
+ replace "." with "_" in pVersion
+ if pVersion contains "-gm-" then
+ set the itemDel to "-"
+ put item 1 of pVersion into pVersion
+ set the itemDel to comma
+ end if
+ if getInstallerType() is "community" then
+ return there is a file (getLicensesFolderLocation() & "/livecode-community-" & pVersion & "-" & pBuildNumber & ".lclk")
+ else
+ return there is a file (getLicensesFolderLocation() & "/livecode-" & pVersion & "-" & pBuildNumber & ".lclk")
+ end if
+end getVersionInstalled
+
+private function getLicensesFolderLocation
+ switch the platform
+ case "Win32"
+ return specialFolderPath(0x001a) & "/RunRev/Licenses"
+ case "MacOS"
+ return specialFolderPath("home") & "/Library/Application Support/RunRev/Licenses"
+ case "Linux"
+ return specialFolderPath("home") & "/.runrev/licenses"
+ end switch
+end getLicensesFolderLocation
+
+private function getUpdateLastCheckFileLocation
+ return getUpdateFolderLocation() & "/update_" & getInstallerType() & "_last_check_time.txt"
+end getUpdateLastCheckFileLocation
+
+private function getUpdateVersionSkipFileLocation
+ return getUpdateFolderLocation() & "/update_" & getInstallerType() & "_version_skip_list.txt"
+end getUpdateVersionSkipFileLocation
+
+private function getUpdateUniqueUserIDFileLocation
+ return getUpdateFolderLocation() & "/update_uuid.txt"
+end getUpdateUniqueUserIDFileLocation
+
+private function getBuildNumber
+ -- get getUpdateFolderLocation() & "/update_override.txt"
+ -- if there is a file it then
+ -- return word 1 of URL ("file:" & it)
+ -- end if
+ return the buildNumber
+end getBuildNumber
+
+private function getPlatformString
+ switch the platform
+ case "Win32"
+ return "windows" & slash & the processor
+ case "MacOS"
+ return "mac" & slash & the processor
+ case "Linux"
+ return "linux" & slash & the processor
+ end switch
+end getPlatformString
+
+########################################################################################
+
+-- Load the prefences stack, setting the appopraite defaults if necessary.
+--
+-- Returns empty if successful, an error string otherwise.
+--
+private command preferencesLoad
+ local tPrefStack
+ put getPreferencesStackLocation() into tPrefStack
+ if not (there is a file tPrefStack) then
+ return "preferences stack not found"
+ end if
+ start using stack tPrefStack
+
+ if not ("cNeverNotifyMeOfReleases" is among the keys of customproperties of stack "revPreferences") then
+ set the cNeverNotifyMeOfReleases of stack "revPreferences" to false
+ end if
+ if not ("cNotifyMeOfStableReleases" is among the keys of customproperties of stack "revPreferences") then
+ set the cNotifyMeOfStableReleases of stack "revPreferences" to true
+ end if
+ if not ("cNotifyMeOfMaintainenceReleases" is among the keys of customproperties of stack "revPreferences") then
+ set the cNotifyMeOfMaintainenceReleases of stack "revPreferences" to true
+ end if
+ if not ("cNotifyMeOfBetaReleases" is among the keys of customproperties of stack "revPreferences") then
+ set the cNotifyMeOfBetaReleases of stack "revPreferences" to true
+ end if
+ if not ("cNotifyMeOfDevelopmentReleases" is among the keys of customproperties of stack "revPreferences") then
+ set the cNotifyMeOfDevelopmentReleases of stack "revPreferences" to true
+ end if
+
+ return empty
+end preferencesLoad
+
+private command preferencesSave
+ local tOldStackFileVersion
+ put the stackFileVersion into tOldStackFileVersion
+ set the stackFileVersion to "2.7"
+ lock messages
+ save stack "revPreferences"
+ unlock messages
+ set the stackFileVersion to tOldStackFileVersion
+ return empty
+end preferencesSave
+
+private function getPreferencesStackLocation
+ -- SN-2015-03-09: [[ LiveCode 7 Prefs ]] Make sure to get the
+ -- right preference file, depending on the version
+ local tLiveCodePost7Prefs, tLiveCodePre7Prefs, tLiveCodePrefsRoot
+ switch the platform
+ case "MacOS"
+ put specialfolderpath("Preferences") & "/RunRev" into tLiveCodePrefsRoot
+ break
+ case "Win32"
+ put specialFolderPath(0x001a) & "/RunRev/Preferences" into tLiveCodePrefsRoot
+ break
+ case "Linux"
+ put specialFolderPath("home") & "/.runrev/preferences" into tLiveCodePrefsRoot
+ break
+ end switch
+
+ put tLiveCodePrefsRoot & "/livecode.rev" into tLiveCodePre7Prefs
+ put tLiveCodePrefsRoot & "/livecode7.rev" into tLiveCodePost7Prefs
+
+ if the char 1 of the version < 7 then
+ -- Pre 7
+ return tLiveCodePre7Prefs
+ else
+ -- We only return the LiveCode 7 prefs path if the file exists
+ -- We default to the pre-7 prefs otherwise.
+ if there is a file tLiveCodePost7Prefs then
+ return tLiveCodePost7Prefs
+ else
+ return tLiveCodePre7Prefs
+ end if
+ end if
+end getPreferencesStackLocation
+
+########################################################################################
diff --git a/builder/installer/installeruiupdatecheckupdatecheckingloadergroupbehavior.livecodescript b/builder/installer/installeruiupdatecheckupdatecheckingloadergroupbehavior.livecodescript
new file mode 100644
index 00000000000..856d6b23e10
--- /dev/null
+++ b/builder/installer/installeruiupdatecheckupdatecheckingloadergroupbehavior.livecodescript
@@ -0,0 +1,26 @@
+script "InstallerInstallerUIUpdateCheckUpdateCheckingLoaderGroupBehavior"
+local sLoading
+
+on startLoading
+ put true into sLoading
+ doLoading
+end startLoading
+
+on doLoading
+ if sLoading then
+ local tPreviousColor, tCurrentColor
+ put the textColor of graphic "line,0" of me into tPreviousColor
+ repeat with x = 1 to the cNumber of me
+ get "line",(x mod the cNumber of me)
+ put the textColor of graphic it of me into tCurrentColor
+ set the textColor of graphic it of me to tPreviousColor
+ put tCurrentColor into tPreviousColor
+ end repeat
+ send "doLoading" to me in (the cDelay of me) milliseconds
+ end if
+end doLoading
+
+on stopLoading
+ put false into sLoading
+end stopLoading
+
diff --git a/builder/installer/installeruiupdatecheckupdatesavailablemarketingfieldbehavior.livecodescript b/builder/installer/installeruiupdatecheckupdatesavailablemarketingfieldbehavior.livecodescript
new file mode 100644
index 00000000000..24d581561d9
--- /dev/null
+++ b/builder/installer/installeruiupdatecheckupdatesavailablemarketingfieldbehavior.livecodescript
@@ -0,0 +1,28 @@
+script "InstallerInstallerUIUpdateCheckUpdatesAvailableMarketingFieldBehavior"
+setProp uFormattedTextArray pNewText
+ local tMktIndex
+ put 1 into tMktIndex
+ put empty into me
+ repeat while pNewText[tMktIndex]["content"] is not empty
+ switch pNewText[tMktIndex]["type"]
+ case "html"
+ set the HTMLText of char (the number of chars in me + 1) of me to pNewText[tMktIndex]["content"]
+ break
+ case "rtf"
+ set the RTFText of char (the number of chars in me + 1) of me to pNewText[tMktIndex]["content"]
+ break
+ case "unicode"
+ set the unicodeText of char (the number of chars in me + 1) of me to pNewText[tMktIndex]["content"]
+ break
+ case "utf8"
+ set the unicodeText of char (the number of chars in me + 1) of me to unidecode(pNewText[tMktIndex]["content"], "UTF8")
+ break
+ case "plain"
+ default
+ set the text of char (the number of chars in me + 1) of me to pNewText[tMktIndex]["content"]
+ break
+ end switch
+ put return after of me
+ add 1 to tMktIndex
+ end repeat
+end uFormattedTextArray
diff --git a/builder/installer/installeruiupdatedownloadcardbehavior.livecodescript b/builder/installer/installeruiupdatedownloadcardbehavior.livecodescript
new file mode 100644
index 00000000000..693d3a31094
--- /dev/null
+++ b/builder/installer/installeruiupdatedownloadcardbehavior.livecodescript
@@ -0,0 +1,194 @@
+script "InstallerInstallerUIUpdateDownloadCardBehavior"
+local sFileName
+
+on preOpenCard
+ setTitleField the long id of field "Page Title", "Downloading Update", "LiveCode Updater"
+ set the uEnabled of control "Cancel" to true
+ set the uLabel of control "Cancel" to "Cancel"
+ set the uDefault of control "Cancel" to false
+ show control "Cancel"
+ hide control "Back"
+ hide control "Next"
+
+ put empty into field "Page Description"
+ set the uProgress of control "Progress" to 0
+ put "Downloading..." into field "Phase"
+
+ downloadNewVersion the uRemoteURL of me, the uRemoteChecksum of me, getUpdateFolderLocation()
+end preOpenCard
+
+on closeCard
+ resetAll
+end closeCard
+
+private command downloadNewVersion pUrl, pCheckSum, pDestination
+ -- HSC - get the path and name of the download destination
+ --
+ local tFileName
+ set the itemDel to slash
+ put the last item of pURL into tFileName
+ put pDestination & slash & tFileName into sFileName
+
+ -- MM - check to see if if there is a cached version and its checkum matches the server version
+ -- if not, download latest revison
+ --
+ if there is no file sFileName or not md5CheckSumValidate(sFileName, pCheckSum) then
+
+ -- MM - do some clean up, removing all old cached installers
+ -- preserve the last update check file though
+ --
+ local tOldFolder
+ put the folder into tOldFolder
+ set the itemDel to slash
+ set the folder to item 1 to -1 of pDestination
+ repeat for each line tFile in the files
+ if not (tFile begins with ".") and not (tFile begins with "update_") then
+ delete file the folder & slash & tFile
+ if the result is not empty then
+ return the result
+ end if
+ end if
+ end repeat
+ set the folder to tOldFolder
+
+ -- MM - set progress callbacks and begin download
+ --
+ set the itemDel to slash
+ put urlEncode(the last item of pURL) into the last item of pURL
+ set the itemDel to comma
+ libURLSetStatusCallback "downloadLatestRevisionUpdates", the long id of me
+ libURLDownloadToFile pUrl, sFileName, "downloadLatestRevisionComplete"
+ else
+
+ -- The file already exists execute it
+ --
+ launchDownloadedInstaller
+ if the result is not empty then
+ set the uError of card "Finish" to the result
+ go to card "Finish"
+ else
+ actionCancel
+ end if
+
+ end if
+end downloadNewVersion
+
+-- HSC - test when a download is complete
+--
+on downloadLatestRevisionComplete pURL, pStatus
+ if pStatus is among the words "downloaded cached" then
+ launchDownloadedInstaller
+ if the result is not empty then
+ set the uError of card "Finish" to the result
+ go to card "Finish"
+ else
+ actionCancel
+ end if
+ else
+ set the uError of card "Finish" to "Error downloading new version"
+ go to card "Finish"
+ end if
+end downloadLatestRevisionComplete
+
+-- MM - update the UI with the instaler download progress
+--
+on downloadLatestRevisionUpdates pURL, pStatus
+ if item 1 of pStatus is "loading" then
+ set the uProgress of control "Progress" to ((item 2 of pStatus / item 3 of pStatus) * 100)
+ else if pStatus is among the words "error timeout" then
+ set the uError of card "Finish" to "Error downloading new version"
+ go to card "Finish"
+ end if
+end downloadLatestRevisionUpdates
+
+-- HSC - launch the installer that was just downloaded
+--
+private command launchDownloadedInstaller
+ put "Launching..." into field "Phase"
+ if sFileName is not empty and there is a file sFileName then
+ local tCommand
+ if the platform is "MacOS" then
+
+ -- For OS X the installer will be a DMG.
+ -- Mount the DMG and extract the name of mounted volume.
+ --
+ local tMountedVolumes, tVolumePath
+ put shell ("hdiutil mount" && quote & sFileName & quote) into tMountedVolumes
+ put empty into tVolumePath
+ set the itemdelimiter to tab
+ repeat for each line tLine in tMountedVolumes
+ repeat for each item tItem in tLine
+ if tItem contains "LiveCode" then
+ put tItem into tVolumePath
+ end if
+ end repeat
+ end repeat
+ set the itemDel to comma
+
+ -- If we have successfuly mounted the DMG and found the volume then extract the app path
+ -- from the DMG and build the launch command, remebering to tell the installer to unmount when done.
+ --
+ if tVolumePath is not empty and there is a folder tVolumePath then
+ local tOldFolder
+ put the folder into tOldFolder
+ set the folder to tVolumePath
+ get the folders
+ set the folder to tOldFolder
+ filter it with "*.app"
+ if the number of lines in it is not 1 then
+ return "Could not find installer within DMG"
+ end if
+ put tVolumePath & "/" & it & "/Contents/MacOS/installer" into tCommand
+ put quote & tCommand & quote && "install" && the loc of this stack && "-unmount" into tCommand
+ else
+ return "Could not mount downloaded disk image."
+ end if
+
+ else
+
+ switch the platform
+ case "Win32"
+ put quote & sFileName & quote && "install" && the loc of this stack into tCommand
+ break
+ case "linux"
+ local tChmodResult
+ get shell("chmod +x " & quote & sFileName & quote)
+ if it is not empty then
+ return "Launching downloaded installer - Setting executable permission failed - " & it
+ end if
+ put sFileName && "install" && the loc of this stack into tCommand
+ break
+ end switch
+
+ end if
+
+ -- Attempt to launch the installer.
+ --
+ open process tCommand for neither
+ if the result is not empty then
+ return "Could not launch downloaded installer:" && the result
+ end if
+
+ return empty
+
+ end if
+
+ return "Could not find downloaded installer"
+end launchDownloadedInstaller
+
+-- MM - returns true if the md5 check sum for the file matches the check sum passed
+--
+private function md5CheckSumValidate pFile, pCheckSum
+ return md5CheckSum(pFile) is pCheckSum
+end md5CheckSumValidate
+
+-- MM - returns the md5 check sum for the given file
+--
+private function md5CheckSum pFile
+ if there is a file pFile then
+ local tCheckSum
+ get md5Digest(URL ("binfile:" & pFile))
+ get binaryDecode("H*", it, tCheckSum)
+ return tCheckSum
+ end if
+end md5CheckSum
diff --git a/builder/installer/installeruiwaitcardbehavior.livecodescript b/builder/installer/installeruiwaitcardbehavior.livecodescript
new file mode 100644
index 00000000000..474a548da51
--- /dev/null
+++ b/builder/installer/installeruiwaitcardbehavior.livecodescript
@@ -0,0 +1,117 @@
+script "InstallerInstallerUIWaitCardBehavior"
+on preOpenCard
+ setTitleField the long id of field "Page Title", "Conflicting Apps", "LiveCode Installer"
+ set the uEnabled of control "Back" to true
+ set the uLabel of control "Back" to "Back"
+ set the uEnabled of control "Next" to false
+ set the uLabel of control "Next" to "Continue"
+ set the uEnabled of control "Cancel" to true
+ set the uLabel of control "Cancel" to "Cancel"
+ show control "Cancel"
+ show control "Next"
+ show control "Back"
+
+ refreshAppsList
+ pass preOpenCard
+end preOpenCard
+
+on closeCard
+ if "refreshAppsList" is in the pendingMessages then
+ cancel item 1 of line lineOffset("refreshAppsList", the pendingMessages) of the pendingMessages
+ end if
+end closeCard
+
+-- We stick on the wait card until there are no more conflicts.
+-- If there are no confilts, move on to installation.
+--
+on refreshAppsList
+ local tConflicts
+ put fetchConflictingApps() into tConflicts
+ if tConflicts is empty then
+ wait 100 millisecs
+ go to card "Install"
+ exit refreshAppsList
+ end if
+ put "LiveCode cannot be installed due to conflicting apps. This is most likely being caused by having a version of LiveCode already running in the install location. To proceed, quit this version of LiveCode." & \
+ return & return & "The installer will automatically continue when these conflicting applications are closed:" & \
+ return & return & tab & tConflicts into field "Page Description"
+ send "refreshAppsList" to me in 2 seconds
+end refreshAppsList
+
+on actionBack
+ if settingsInstallType() is "custom" then
+ go to card "Customize"
+ else
+ go to card "Type"
+ end if
+end actionBack
+
+-- Return a list of executables that conflict with the install.
+--
+private function fetchConflictingApps
+ local tInstallLocation
+ put settingsLocation () into tInstallLocation
+ switch the platform
+ case "Win32"
+ get fetchConflictingWindows(tInstallLocation)
+ break
+ case "MacOS"
+ get fetchConflictingMac(tInstallLocation)
+ break
+ case "Linux"
+ get fetchConflictingLinux(tInstallLocation)
+ break
+ end switch
+ return it
+end fetchConflictingApps
+
+-- On OS X we use the nitfy lsof command which lists the executables running in a given folder
+-- (and who is running them - though in this case not needed)
+--
+private function fetchConflictingMac pInstallPath
+ local tProcessList
+ put "/Contents/MacOS/" after pInstallPath
+ put shell("lsof -Fpcn +D" && quote & pInstallPath & quote) into tProcessList
+
+ local tProcesses, tFoundProcess
+ if tProcessList is not empty then
+ repeat for each line tLine in tProcessList
+ if char 1 of tLine is "p" and tProcesses is not empty then
+ put return after tProcesses
+ end if
+ put char 2 to -1 of tLine & tab after tProcesses
+ end repeat
+ delete char 1 of tProcesses
+ delete char -1 of tProcesses
+ end if
+
+ set the itemDel to tab
+ repeat for each line tProcess in tProcesses
+ if item 2 of tProcess is "LiveCode" then
+ return item 3 of tProcess
+ end if
+ end repeat
+ return empty
+end fetchConflictingMac
+
+-- On Windows we use a custom installer command.
+--
+private function fetchConflictingWindows pInstallPath
+ if the environment is "installer" then
+ put "/LiveCode.exe" after pInstallPath
+ replace slash with backslash in pInstallPath
+ do "_internal listTasksWithModule pInstallPath"
+ return item 1 of the result
+ end if
+end fetchConflictingWindows
+
+-- On Linux, we parse ps.
+-- This needs tweeking. We return the last word which go a bit weird for path names with a space.
+--
+private function fetchConflictingLinux pInstallPath
+ get shell ("ps aux | egrep '" & pInstallPath & "' | grep -v 'grep'")
+ if it is not empty then
+ return the last word of it
+ end if
+ return empty
+end fetchConflictingLinux
diff --git a/builder/installer/installeruiwelcomecardbehavior.livecodescript b/builder/installer/installeruiwelcomecardbehavior.livecodescript
new file mode 100644
index 00000000000..dc139418756
--- /dev/null
+++ b/builder/installer/installeruiwelcomecardbehavior.livecodescript
@@ -0,0 +1,17 @@
+script "InstallerInstallerUIWelcomeCardBehavior"
+on preOpenCard
+ setTitleField the long id of field "Page Title", the uProductTitle of stack "Installer" && "Installer"
+
+ put the uProductDetails of stack "Installer" into field "Page Description"
+
+ set the uEnabled of control "Back" to false
+ set the uLabel of control "Back" to "Back"
+ set the uEnabled of control "Next" to true
+ set the uDefault of control "Next" to true
+ set the uLabel of control "Next" to "Continue"
+ set the uEnabled of control "Cancel" to true
+ set the uLabel of control "Cancel" to "Cancel"
+ show control "Next"
+ show control "Cancel"
+ show control "Back"
+end preOpenCard
diff --git a/builder/installer/stackbehavior.livecodescript b/builder/installer/stackbehavior.livecodescript
new file mode 100644
index 00000000000..78ab7c576ab
--- /dev/null
+++ b/builder/installer/stackbehavior.livecodescript
@@ -0,0 +1,106 @@
+script "InstallerStackBehavior"
+################################################################################
+#
+# STARTUP METHOD
+#
+
+on startup
+ local tAction
+
+ if $1 is "install" then
+ put "install" into tAction
+ else if $1 is "doinstall" then
+ put "doinstall" into tAction
+ else if $1 is "uninstall" then
+ put "uninstall" into tAction
+ else if $1 is "douninstall" then
+ put "douninstall" into tAction
+ else
+ set the itemDelimiter to slash
+ if the last item of $0 contains "setup" then
+ put "uninstall" into tAction
+ else
+ put "install" into tAction
+ end if
+ end if
+
+ switch tAction
+ case "install"
+ if the environment is "installer command line" then
+ runFacelessInstall
+ else
+ hide me
+ send "runInstallerUI" to me in 0 millisecs
+ end if
+ break
+ case "uninstall"
+ if the environment is "installer command line" then
+ runFacelessUninstall
+ else
+ hide me
+ send "runUninstallerUI" to me in 0 millisecs
+ end if
+ break
+ case "doinstall"
+ runInstallerActions
+ break
+ case "douninstall"
+ runUninstallerActions
+ break
+ default
+ quit 1
+ end switch
+end startup
+
+-- MM-2011-04-01: Catch the relaunch message to make sure only a single installer is ever running
+-- Ensures only a single updater is ever run, even if launched by multiple browsers.
+on relaunch pArgs
+ if pArgs is empty then
+ return empty
+ else
+ pass relaunch
+ end if
+end relaunch
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Utility functions removed from the "Tools Installer" stack.
+
+function resolveImageId pImage
+ return the id of image (pImage & ".png") of stack "Resources"
+end resolveImageId
+
+function resolveImageLongId pImage
+ return the long id of image (pImage & ".png") of stack "Resources"
+end resolveImageLongId
+
+function getInstallerType
+ return the cInstallerType of card "Resources" of stack "Resources"
+end getInstallerType
+
+command configureFonts pStack
+ set the textFont of stack pStack to empty
+end configureFonts
+
+command setTitleField pField, pTitle, pSubTitle
+ if pSubTitle is empty then
+ set the text of pField to pTitle
+ set the textStyle of word 1 to -1 of pField to "bold"
+ set the textColor of word 1 to -1 of pField to "#444444"
+ else
+ set the text of pField to pSubTitle && "//" && pTitle
+ set the textColor of word 1 to -1 of pField to "#555555"
+ set the textStyle of word (-the number of words of pTitle) to -1 of pField to "bold"
+ set the textColor of word (-the number of words of pTitle) to -1 of pField to "#444444"
+ end if
+end setTitleField
+
+on errorDialog pError
+ if the environment is "installer command line" then
+ write "[" && the internet date && "]" && ": ERROR " && pError & return to stdout
+ quit 1
+ else
+ answer error "An error occurred when running the installer. Please submit a screenshot of this dialog to http://quality.livecode.com" & return & pError
+ quit 1
+ end if
+end errorDialog
diff --git a/builder/installer/uninstalleruifinishcardbehavior.livecodescript b/builder/installer/uninstalleruifinishcardbehavior.livecodescript
new file mode 100644
index 00000000000..3930c5a875a
--- /dev/null
+++ b/builder/installer/uninstalleruifinishcardbehavior.livecodescript
@@ -0,0 +1,46 @@
+script "InstallerUninstallerUIFinishCardBehavior"
+on preOpenCard
+ if the uError of me is empty then
+ put "Uninstallation Complete" into field "Page Title"
+ put "The uninstallation completed." into field "Page Description"
+ hide control "Outcome"
+ hide control "Cancel"
+ hide control "Back"
+ set the uEnabled of control "Next" to true
+ set the uDefault of control "Next" to true
+ set the uLabel of control "Next" to "Finish"
+ else
+ put "Uninstallation Failed" into field "Page Title"
+ put "The uninstallation was not successful." into field "Page Description"
+ put the uError of me into field "Outcome"
+ show field "Outcome"
+
+ hide control "Cancel"
+ set the uEnabled of control "Back" to true
+ set the uLabel of control "Back" to "Quit"
+ set the uDefault of control "Next" to true
+ set the uEnabled of control "Next" to true
+ set the uLabel of control "Next" to "Retry"
+ show control "Back"
+ end if
+
+ show control "Next"
+end preOpenCard
+
+on actionNext
+ if the uError of me is empty then
+ if the environment is "installer" then
+ lock messages
+ quit
+ end if
+ else
+ go card "Welcome"
+ end if
+end actionNext
+
+on actionBack
+ if the environment is "installer" then
+ lock messages
+ quit
+ end if
+end actionBack
diff --git a/builder/installer/uninstalleruistackbehavior.livecodescript b/builder/installer/uninstalleruistackbehavior.livecodescript
new file mode 100644
index 00000000000..ac9b7281d46
--- /dev/null
+++ b/builder/installer/uninstalleruistackbehavior.livecodescript
@@ -0,0 +1,117 @@
+script "InstallerUninstallerUIStackBehavior"
+######################################################################
+
+on preOpenStack
+ // PM-2016-02-27: [[ Bug 13723]] Use a card border
+ if the platform is "win32" or the platform contains "linux" then
+ local tCards, tCurrentCard, tControlsA
+
+ put the cardNames of stack "UninstallerUI" of stack "Installer" into tCards
+ repeat with tCardIndex = 1 to the number of lines in tCards
+ put line tCardIndex of tCards into tCurrentCard
+ set the showBorder of card tCurrentCard of stack "UninstallerUI" of stack "Installer" to true
+ end repeat
+ end if
+
+ -- Sort out fonts and sizes
+ configureFonts the short name of me
+
+ -- Make sure there's no error state
+ set the uError of card "Finish" to empty
+
+ set the loc of this stack to the screenLoc
+ set the visible of this stack to true
+ set the processType to "foreground"
+
+ go card "Welcome"
+end preOpenStack
+
+-- Default handling for next/back/cancel buttons
+on actionNext
+ go next card
+end actionNext
+
+on actionBack
+ go prev card
+end actionBack
+
+on actionCancel
+ if the environment is "installer" then
+ lock messages
+ quit
+ end if
+end actionCancel
+
+######################################################################
+
+local sMovingOffset
+
+on mouseDown
+ put the clickLoc into sMovingOffset
+end mouseDown
+
+on mouseUp
+ put empty into sMovingOffset
+end mouseUp
+
+on mouseRelease
+ put empty into sMovingOffset
+end mouseRelease
+
+on mouseMove
+ if sMovingOffset is not empty then
+ get the globalLoc of the mouseLoc
+ set the topLeft of me to item 1 of it - item 1 of sMovingOffset, item 2 of it - item 2 of sMovingOffset
+ end if
+end mouseMove
+
+######################################################################
+
+// SN-2015-0925: [[ Bug 11133 ]] Add runFaceless command
+// Copied and adapted from card "Uninstall", function openStack
+command runFaceless
+ local tLocation
+ set the itemDelimiter to slash
+ put item 1 to -2 of the effective filename of this stack into tLocation
+
+ if there is no file (tLocation & slash & ".setup.txt") then
+ write "Not a valid install of LiveCode." & LF & tLocation & slash & ".setup.txt cannot be found" & LF to stderr
+ exit runFaceless
+ end if
+
+ // We are obviously not uninstalling a pre-installed version.
+ actionUninstall tLocation, tLocation & slash & ".setup.txt", false
+end runFaceless
+
+function manifestNeedsElevation pManifest
+ if the environment is not "installer" then
+ return false
+ end if
+
+ set the itemDelimiter to tab
+ repeat for each line tEntry in pManifest
+ switch item 1 of tEntry
+ case "folder"
+ -- Need to work out what to do here
+ break
+ case "file"
+ get item 2 of tEntry
+ replace slash with backslash in it
+ do "_internal canDeleteFile it; get the result"
+ if not it then
+ return true
+ end if
+ break
+ case "registry key"
+ get item 2 of tEntry
+ replace "HKEY_CURRENT_USER" with "HKCU" in it
+ do "_internal canDeleteKey it; get the result"
+ if not it then
+ return true
+ end if
+ break
+ end switch
+ end repeat
+
+ return false
+end manifestNeedsElevation
diff --git a/builder/installer/uninstalleruiuninstallcardbehavior.livecodescript b/builder/installer/uninstalleruiuninstallcardbehavior.livecodescript
new file mode 100644
index 00000000000..3c39ab9140d
--- /dev/null
+++ b/builder/installer/uninstalleruiuninstallcardbehavior.livecodescript
@@ -0,0 +1,73 @@
+script "InstallerUninstallerUIUninstallCardBehavior"
+########################################################################
+
+local sProgressPeak
+local sProgressDirection
+
+on preOpenCard
+ setTitleField the long id of field "Page Title", "Uninstallation in Progress", "LiveCode Installer"
+
+ put empty into field "Page Description"
+
+ set the uProgress of control "Progress" to 0
+
+ put "Starting uninstallation" into field "Phase"
+
+ hide control "Next"
+ hide control "Back"
+ hide control "Cancel"
+end preOpenCard
+
+on openCard
+ local tLocation
+ set the itemDelimiter to slash
+ put item 1 to -2 of the effective filename this stack into tLocation
+
+ if there is no file (tLocation & slash & ".setup.txt") then
+ set the uError of card "Finish" to "Not a valid install of LiveCode."
+ go to card "Finish"
+ exit openCard
+ end if
+
+ put 0 into sProgressPeak
+ put "up" into sProgressDirection
+
+ installerRunUninstall tLocation, tLocation & slash & ".setup.txt", not manifestNeedsElevation(url ("file:" & tLocation & slash & ".setup.txt"))
+end openCard
+
+########################################################################
+
+-- This event is dispatched by the back-end stack when it receives a progress update from
+-- the child.
+on installerProgressChanged pProgress, pMessage
+ if pProgress < sProgressPeak then
+ put "down" into sProgressDirection
+ else
+ put pProgress into sProgressPeak
+ end if
+
+ if sProgressDirection is "down" then
+ put (100 - pProgress) * sProgressPeak / 100.0 into pProgress
+ end if
+
+ updateProgress pProgress, pMessage
+end installerProgressChanged
+
+-- This event is dispatched by the back-end stack when it recieves an error from the child.
+on installerFinished pError
+ if pError is not empty then
+ set the uError of card "Finish" to pError
+ else
+ set the uError of card "Finish" to empty
+ end if
+ go card "Finish"
+end installerFinished
+
+########################################################################
+
+command updateProgress pNewPercentage, pMessage
+ put "Uninstalling..." into field "Phase"
+ set the uProgress of control "Progress" of me to pNewPercentage
+end updateProgress
+
+########################################################################
diff --git a/builder/installer/uninstalleruiwelcomecardbehavior.livecodescript b/builder/installer/uninstalleruiwelcomecardbehavior.livecodescript
new file mode 100644
index 00000000000..1f5c17a58e5
--- /dev/null
+++ b/builder/installer/uninstalleruiwelcomecardbehavior.livecodescript
@@ -0,0 +1,18 @@
+script "InstallerUninstallerUIWelcomeCardBehavior"
+on preOpenCard
+ setTitleField the long id of field "Page Title", the uProductTitle of stack "Installer" && "Uninstaller"
+
+ put "Click 'Uninstall' to begin uninstallation." into field "Page Description"
+
+ set the uEnabled of control "Back" to false
+ set the uLabel of control "Back" to "Back"
+ set the uEnabled of control "Next" to true
+ set the uDefault of control "Next" to true
+ set the uLabel of control "Next" to "Uninstall"
+ set the uEnabled of control "Cancel" to true
+ set the uLabel of control "Cancel" to "Cancel"
+
+ show control "Next"
+ show control "Cancel"
+ hide control "Back"
+end preOpenCard
diff --git a/builder/installer_utilities.livecodescript b/builder/installer_utilities.livecodescript
index fbf6dfd1f4a..6d22a7e1171 100644
--- a/builder/installer_utilities.livecodescript
+++ b/builder/installer_utilities.livecodescript
@@ -13,6 +13,10 @@ constant kRunOnce = "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersio
local sIsFaceless
local sFacelessLog
+private function isInstallerEnvironment
+ return (the environment begins with "installer")
+end isInstallerEnvironment
+
################################################################################
#
# FRONT-END FUNCTIONS
@@ -24,7 +28,7 @@ local sInstallerError
command installerRun pPath, pRecord, pOptions, pWithoutElevation
local tCommand
- if the environment is "installer" then
+ if isInstallerEnvironment() then
put the effective filename of stack "Installer" into tCommand
else
put specialFolderPath("Desktop") & "/installbackend.exe" into tCommand
@@ -73,7 +77,7 @@ end installerRun
command installerRunUninstall pPath, pRecord, pWithoutElevation
local tCommand
- if the environment is "installer" then
+ if isInstallerEnvironment() then
put the effective filename of stack "Installer" into tCommand
else
put "C:/Users/Mark/Desktop/installbackend.exe" into tCommand
@@ -1343,7 +1347,7 @@ end uninstallCanRemoveRegistryKey
local sPayloadArchive
private command payloadOpen pArchive
- if the environment is "installer" then
+ if isInstallerEnvironment() then
if the platform is "MacOS" then
local tPayload
set the itemDel to slash
@@ -1364,7 +1368,7 @@ private command payloadOpen pArchive
end payloadOpen
private command payloadClose
- if the environment is "installer" then
+ if isInstallerEnvironment() then
do "_internal payload close"
else
revZipCloseArchive sPayloadArchive
@@ -1375,7 +1379,7 @@ end payloadClose
private function payloadDescribeItem pItem
local it
- if the environment is "installer" then
+ if isInstallerEnvironment() then
do "_internal payload describe pItem"
if the result is not empty then
get the result
@@ -1391,7 +1395,7 @@ private function payloadDescribeItem pItem
end payloadDescribeItem
private command payloadExtractItemToVariable pItem, @rData
- if the environment is "installer" then
+ if isInstallerEnvironment() then
do "_internal payload extract pItem; put it into rData"
else
revZipExtractItemToVariable sPayloadArchive, pItem, "rData"
@@ -1406,7 +1410,7 @@ end payloadExtractItemToVariable
private command payloadExtractItemToFile pItem, pBaseItem, pFile
local tShortFile
put installShortenPath(pFile) into tShortFile
- if the environment is "installer" then
+ if isInstallerEnvironment() then
if pBaseItem is empty then
log "Payload: Extracting item '" & pItem & "' to file '" & pFile & "'"
do "_internal payload extract pItem to tShortFile"
@@ -1434,7 +1438,7 @@ private command reportCheckCancel
exit reportCheckCancel
end if
- if the environment is "installer" then
+ if isInstallerEnvironment() then
-- Attempt to read 1 line from the parent
read from stdin for 1 line in 0 millisecs
@@ -1462,7 +1466,7 @@ end reportCheckCancel
private command reportPhase pPhase
if not sIsFaceless then
- if the environment is "installer" then
+ if isInstallerEnvironment() then
write "phase" & tab & pPhase & return to stdout
else
log "Phase Changed to -" && pPhase
@@ -1474,7 +1478,7 @@ end reportPhase
private command reportProgress pProgress, pMessage
if not sIsFaceless then
- if the environment is "installer" then
+ if isInstallerEnvironment() then
replace "\" with "\\" in pMessage
replace return with "\n" in pMessage
write "progress" & tab & pProgress & tab & pMessage & return to stdout
@@ -1486,7 +1490,7 @@ end reportProgress
private command reportFinished pIsUninstall
if not sIsFaceless then
- if the environment is "installer" then
+ if isInstallerEnvironment() then
log "Done"
write "done" & return to stdout
end if
@@ -1501,7 +1505,7 @@ end reportFinished
private command reportError pMessage
if not sIsFaceless then
- if the environment is "installer" then
+ if isInstallerEnvironment() then
replace "\" with "\\" in pMessage
replace return with "\n" in pMessage
write "error" & tab & pMessage & return to stdout
diff --git a/builder/markdown_compiler.livecodescript b/builder/markdown_compiler.livecodescript
deleted file mode 100644
index d3cbd113514..00000000000
--- a/builder/markdown_compiler.livecodescript
+++ /dev/null
@@ -1,537 +0,0 @@
-script "MarkdownCompiler"
-/*
-
-Compiles LiveCode flavoured markdown files to HTML
-
-MD:
-##...
-
-*
-1.
-
-**
-
-****
-
-tab tab ...
-
-Images
-![]()
-
-Videos
-!! []()
-
-Links
-[ ]( )
-
-!- -!
-` `
-
-|table header 1|table header 2|
---------------------------------
-|table contents|table contents|
-|table contents|table contents|
-
- */
-
- global gImgRegex, gLinkRegex, gVidRegex
- global gDocumentPrefix, gDocumentSuffix
- global gHeading, gItalic, gList, gIndent, gImg
- global gAnchorCount, gExtension
-
-on libraryStack
- markdownInit
-end libraryStack
-
-command markdownInit
- put 1 into gAnchorCount
-
- put "md" into gExtension
-
- put "" into gDocumentPrefix
- put "" into gDocumentSuffix
-
- put "#" into gHeading
- put "*" into gItalic -- bold is "**"
- put "*" into gList
- put " " into gIndent
- put "!" into gImg
- put "!\[(.*)\]\((.*)\)" into gImgRegex
- put "!!\[.*\]\((.*)\)" into gVidRegex
- put "\[([^\]]*)\]\(([^\)]*)\)" into gLinkRegex
- end markdownInit
-
-function getIndentMargin pIndents
- return (quote & "margin-left:" & 2*pIndents & "em;" & quote)
-end getIndentMargin
-
-function processFileToHTML pFile, @xContents
- local tFileName
- local tFileUrl
- local tFileText
- local tBody
- put pFile & "." & gExtension into tFileName
- put "file:" & notesPath() & slash & tFileName into tFileUrl
- put url tFileUrl into tFileText
- if tFileText is not empty then
- markdownToHTML tFileText, 1, 0, xContents, tBody, false, true
- end if
- return tBody
-end processFileToHTML
-
-function parseEnclosingMarkup pText
- local tRegex
- local tFound
- put "(\/\*|\*\*|\*|`|!-)" into tRegex
- local tStart, tEnd
- if matchChunk(pText, tRegex, tStart, tEnd) is false then
- return pText
- else
- local tParsed
- local tInsides
- if char tStart-1 of pText is "\" then
- put char 1 to tStart-2 of pText & char tStart to tEnd of pText into tParsed
- put char tEnd + 1 to -1 of pText into tInsides
- put tParsed & parseEnclosingMarkup(tInsides) into tParsed
- return tParsed
- end if
- local tWhich
- put char 1 to tStart - 1 of pText into tParsed
- put char tStart to tEnd of pText into tWhich
- put char tEnd + 1 to -1 of pText into pText
- if tWhich is "/*" then
- put "[^\\](\*\/)" into tRegex
- get matchChunk(pText, tRegex, tStart, tEnd)
- else if tWhich is "*" then
- put "[^\\](\*)" into tRegex
- put matchChunk(pText, tRegex, tStart, tEnd) into tFound
- repeat while tFound is true and char tStart + 1 of pText is "*"
- put tInsides & char 1 to tStart + 1 of pText into tInsides
- put char tStart + 2 to -1 of pText into pText
- put matchChunk(pText, tRegex, tStart, tEnd) into tFound
- end repeat
- if tFound is false then
- put tInsides into pText
- end if
- else if tWhich is "**" then
- put "[^\\](\*\*)" into tRegex
- put matchChunk(pText, tRegex, tStart, tEnd) into tFound
- else if tWhich is "!-" then
- put "[^\\](-!)" into tRegex
- put matchChunk(pText, tRegex, tStart, tEnd) into tFound
- else
- put "[^\\](" & tWhich & ")" into tRegex
- put matchChunk(pText, tRegex, tStart, tEnd) into tFound
- end if
- if tFound is false then
- return tParsed & parseEnclosingMarkup(pText)
- end if
- put tInsides & char 1 to tStart - 1 of pText into tInsides
- put char tEnd + 1 to -1 of pText into pText
- if tWhich is "**" then
- put tParsed & "" & parseEnclosingMarkup(tInsides) & " " into tParsed
- else if tWhich is "*" then
- put tParsed & "" & parseEnclosingMarkup(tInsides) & " " into tParsed
- else if tWhich is "`" then
- put tParsed & "" & parseEnclosingMarkup(tInsides) & "" into tParsed
- else if tWhich is "!-" then
- put tParsed & "" & parseEnclosingMarkup(tInsides) & "
" into tParsed
- else if tWhich is "/*" then
- put tParsed & "" & parseEnclosingMarkup(tInsides) & "
" into tParsed
- end if
- put tParsed & parseEnclosingMarkup(pText) into tParsed
- return tParsed
- end if
-end parseEnclosingMarkup
-
-function countOccurrences pOccurrer, pText
- local tOffset
- put offset(pOccurrer, pText) into tOffset
- if tOffset is 0 then
- return 0
- else
- local tEscape
- put char tOffset -1 of pText into tEscape
- put char tOffset + 1 to -1 of pText into pText
- if tEscape is "\" then
- return countOccurrences(pOccurrer, pText)
- else
- return 1 + countOccurrences(pOccurrer, pText)
- end if
- end if
-end countOccurrences
-
-function countConsecutive pOccurrer, pText
- local tCount, tLength
- put the number of chars in pOccurrer into tLength
- put 0 into tCount
- repeat while pText begins with pOccurrer
- add 1 to tCount
- delete char 1 to tLength of pText
- end repeat
- return tCount
-end countConsecutive
-
-function getAnchor pTitle
- local tLink
- put replaceText(pTitle, quote, "_") into tLink
- put word 1 of tLink & gAnchorCount into tLink
- return "id=" & quote & tLink & quote
-end getAnchor
-
-command appendLink pIndent, pTitle, @rContents
- local tLink
- put replaceText(pTitle, quote, "_") into tLink
- put word 1 of tLink & gAnchorCount into tLink
- put rContents & "" & pTitle & " " & CR into rContents
- add 1 to gAnchorCount
-end appendLink
-
-command addLink @pText, pLinkText, pUrl
- local tLinkStart
- local tLinkEnd
- get matchChunk(pText, "(" & gLinkRegex & ")", tLinkStart, tLinkEnd)
- local tBegin
- local tEnd
- put char 0 to tLinkStart-1 of pText into tBegin
- put char tLinkEnd + 1 to -1 of pText into tEnd
- if pLinkText is empty then
- put pUrl into pLinkText
- end if
- put tBegin & "" & pLinkText &" " & tEnd into pText
-end addLink
-
-command addVideo @pText, pUrl
- local tVidStart
- local tVidEnd
- get matchChunk(pText, "(" & gVidRegex & ")", tVidStart, tVidEnd)
- local tBegin
- local tEnd
- put char 0 to tVidStart-1 of pText into tBegin
- put char tVidEnd + 1 to -1 of pText into tEnd
- local tVidOpts
- put " height=" & quote & "100%" & quote & " width=" & quote & "100%" & quote & " frameborder=" & quote & "0" & quote into tVidOpts
- put tBegin & "" & tEnd into pText
-end addVideo
-
-function createTableLine pLine, pIsHeader
- local tNewLine
- local tOffset
- put "" & CR into tNewLine
- set the itemdelimiter to "|"
- repeat with i = 1 to the number of items of pLine
- if pIsHeader then
- put tNewLine & "" & item i of pLine & " " & CR into tNewLine
- else
- put tNewLine & "" & item i of pLine & " " & CR into tNewLine
- end if
- end repeat
- put tNewLine & " " into tNewLine
- return tNewLine
-end createTableLine
-
-function markdownFileToHTML pFileName
- local tText
- put url ("file:" & pFileName) into tText
- markdownInit
- local tContents
- local tBody
- markdownToHTML "", tText, 0, 0, tContents, tBody, false, true
- return (tContents & CR & tBody)
-end markdownFileToHTML
-
-command addImage @pText, pAlt, pSrc
- local tImgStart
- local tImgEnd
- get matchChunk(pText, "(" & gImgRegex & ")", tImgStart, tImgEnd)
- local tBegin
- local tEnd
- put char 0 to tImgStart - 1 of pText into tBegin
- put char tImgEnd + 1 to -1 of pText into tEnd
- put tBegin & " " & tEnd into pText
-end addImage
-
-function markdownToHTML @pText, pHLevel, pCLevel, @xContents, pTopLevel
- replace "<" with "<" in pText
- replace ">" with ">" in pText
-
- local tParsedBody
- local tParsedContents
- local tNumLines
- put the number of lines of pText into tNumLines
-
- local tCurLine
- local tCurHeading
- local tHValue
- local tListDepth
- local tListPrefixStart
- local tListPrefixEnd
- local tQuoteDepth
- local tIsOrdered
- local tNumIndents
- local tClosers
-
- local tImageUrl
- local tVidUrl
- local tAltText
- local tLinkRef
- local tLinkText
- local tStart
- local tEnd
-
- local tSectionLine
- local tLine
-
- repeat with x = 1 to tNumLines
- if tClosers is empty then
- put 0 into tListDepth
- put 0 into tQuoteDepth
- end if
- put line x of pText into tCurLine
-
- # tCurLine - line currently being parsed
- # tParsedBody - text already parsed
- # tClosers - corresponding closing tags of any open ones
-
- # whenever the line starts and ends with | then we are definitely in a table
- if tCurLine begins with "|" and tCurLine ends with "|" then
- if tClosers is "" then # if we are already in a table then continue it
- put createTableLine(tCurLine, false) into tCurLine
- else # otherwise start a new table
- if tClosers is not empty then
- put tParsedBody & tClosers & CR into tParsedBody
- put empty into tClosers
- end if
- put tParsedBody & "" & CR into tParsedBody
- put "
" into tClosers
- if matchText(line x+1 of pText, "[^-]") then # if the next line is not all -
- put createTableLine(tCurLine, false) into tCurLine # then continue the table as usual
- else
- put createTableLine(tCurLine, true) into tCurLine # otherwise this line is a table header
- add 1 to x #and the next line should be skipped
- end if
- end if
- else
- if tClosers is "" then # if this line is not a table line then close the table tag
- put tParsedBody & tClosers & CR into tParsedBody
- put empty into tClosers
- end if
- end if
-
- # remove any indents from the beginning of the line and record the number
- put countConsecutive(gIndent, tCurLine) into tNumIndents
- put char (the number of chars in gIndent * tNumIndents) + 1 to -1 of tCurLine into tCurLine
-
- # check if the line starts with any list characters. If it starts with *, check if there are an odd number, otherwise the star is for bold / italic markup.
- if (tCurLine begins with gList and countOccurrences (gList, tCurLine) mod 2 is 1) or (matchChunk(tCurLine, "^([0-9]+\.[[0-9]*\.*]*)", tListPrefixStart, tListPrefixEnd)) then
- if tClosers begins with "" then # if we were in a paragraph then close the tag
- put tParsedBody & char 1 to 4 of tClosers & CR into tParsedBody
- put char 5 to -1 of tClosers into tClosers
- put 0 into tQuoteDepth
- end if
- if tCurLine begins with gList then # check if the list should be ordered or unordered
- put char 2 to -1 of tCurLine into tCurLine
- put false into tIsOrdered
- else
- put char tListPrefixEnd + 1 to -1 of tCurLine into tCurLine
- put true into tIsOrdered
- end if
- if tListDepth is tNumIndents + 1 then # we are just continuing a list
- if tIsOrdered and char 3 of tClosers is "u" then
- put tParsedBody & "" & CR & "" & CR into tParsedBody
- put " " & char 6 to -1 of tClosers into tClosers
- else if tIsOrdered is false and char 3 of tClosers is "o" then
- put tParsedBody & "" & CR & "" & CR into tParsedBody
- put " " & char 6 to -1 of tClosers into tClosers
- end if
- put "" & tCurLine into tCurLine
- else
- if tListDepth <= tNumIndents then # we are adding nesting to a list
- repeat with i = 1 to tNumIndents + 1 - tListDepth # open the appropriate number of list tags
- if tIsOrdered then
- put tParsedBody & "" & CR into tParsedBody
- put " " & tClosers into tClosers
- else
- put tParsedBody & "" & CR into tParsedBody
- put " " & tClosers into tClosers
- end if
- end repeat
- else # we are substracting nesting from a list
- repeat with i = 1 to tListDepth - 1 - tNumIndents # close the appropriate number of list tags
- put tParsedBody & char 1 to 5 of tClosers & CR into tParsedBody
- put char 6 to -1 of tClosers into tClosers
- end repeat
- end if
- put " " & tCurLine into tCurLine # this line is a list item
- put tNumIndents + 1 into tListDepth # update the list nesting count
- end if
- else # this line is either not part of a list, or it is a line break in a list
- if tListDepth is not 0 then
- if tListDepth is tNumIndents then # it is a line break in a list item
- put " " after line -1 of tParsedBody
- else # not in a list, so close the appropriate number of tags
- repeat with i = 1 to tListDepth
- put tParsedBody & char 1 to 5 of tClosers & CR into tParsedBody
- put char 6 to -1 of tClosers into tClosers
- end repeat
- put 0 into tListDepth
- end if
- end if
- end if
-
- if tCurLine begins with gHeading then # if this is a heading then
- if tClosers is not empty then
- put tParsedBody & tClosers & CR into tParsedBody # close all open tags
- put empty into tClosers
- end if
- put 0 into tHValue
- repeat while char tHValue + 1 of tCurLine is gHeading # count the hashes
- add 1 to tHValue
- end repeat
- if matchText(char tHvalue + 1 to -1 of tCurLine, "(.*) \(contents\)", tCurHeading) then # if we require a table of contents for this section
- local tHashes
- put empty into tHashes
- repeat with j = 0 to tHValue
- put tHashes & "#" into tHashes
- end repeat
- local tLocalConts
- local tLocalBody
- put x + 1 into tSectionLine
- repeat until ((line tSectionLine of pText begins with "#") and (line tSectionLine of pText begins with tHashes is false)) or tSectionLine > tNumLines # find out where the section ends
- add 1 to tSectionLine
- end repeat
- local tSection
- put line x + 1 to tSectionLine -1 of pText into tSection
- put markdownToHTML(tSection, pHLevel, pCLevel - 1, tLocalConts, false) into tLocalBody # and recursively call markdownToHTML on that section, including its 'local' contents in the body
- put tParsedBody & "" & tCurHeading & " " into tParsedBody
- put tParsedBody & CR & tLocalConts & CR & tLocalBody into tParsedBody
- put empty into tCurLine
- put tSectionLine - 1 into x
- else # otherwise it's just a new section
- put char tHValue + 1 to -1 of tCurLine into tCurHeading
- put "" & tCurHeading & " " into tCurLine
- end if
- appendLink pCLevel + tHValue,tCurHeading, tParsedContents # add it to the table of contents
- else
- if tCurLine begins with "!-" or tCurLine begins with "/*" or tCurLine begins with "`" then # for blocks of warnings (!-), notes (/*) or code (`), don't do any further processing to the block
- local tClosing
- switch
- case tCurLine begins with "!-"
- put "-!" into tClosing
- break
- case tCurLine begins with "/*"
- put "*/" into tClosing
- break
- case tCurLine begins with "`"
- put "`" into tClosing
- break
- end switch
- if tClosers is not empty then # close any open tags
- put tParsedBody & tClosers & CR into tParsedBody
- put empty into tClosers
- end if
-
- # Ensure this is a multiline element
- if not char 2 to -1 of tCurLine contains tClosing then
- put x into tSectionLine
- put tCurLine into tLine
- if tNumIndents > 0 then # if there were indents before the block marker, put them inside the block
- local tTabs
- repeat with k = 1 to tNumIndents
- put tTabs & gIndent into tTabs
- end repeat
- if tLine begins with "`" then
- put char 1 of tLine & tTabs & char 2 to -1 of tLine into tLine
- else
- put char 1 to 2 of tLine & tTabs & char 3 to -1 of tLine into tLine
- end if
- put empty into tTabs
- end if
- repeat until tLine ends with tClosing or tSectionLine is tNumLines # find the end of the section
- local tLinkUrl
- repeat while matchText(tLine,gLinkRegex, tLinkText, tLinkUrl) # linkify any links
- addLink tLine, tLinkText, tLinkUrl
- end repeat
- put tParsedBody & tLine & " " & CR into tParsedBody # adding tags to each line
- add 1 to tSectionLine
- put line tSectionLine of pText into tLine
- end repeat
- repeat while matchText(tLine,gLinkRegex, tLinkText, tLinkUrl) # check for links in the last line
- addLink tLine, tLinkText, tLinkUrl
- end repeat
- put tParsedBody & tLine & CR into tParsedBody
- put tSectionLine into x
- put empty into tCurLine
- end if
- else if tCurLine is empty then # if the line is empty
- if tClosers is not empty then
- put tParsedBody & tClosers & CR into tParsedBody
- put empty into tClosers
- end if
- else
- if tListDepth is 0 and tNumIndents <> tQuoteDepth then # if the indent has changed
- if tClosers is not empty then
- put tParsedBody & tClosers & CR into tParsedBody
- put empty into tClosers
- end if
- put 0 into tQuoteDepth
- if tNumIndents is not 0 then # if there is still indent then open a paragraph appropriately
- put tParsedBody & "" & CR into tParsedBody
- put tNumIndents into tQuoteDepth
- put "
" & tClosers into tClosers
- end if
- end if
- if tClosers is empty then
- put "" & tCurLine into tCurLine
- put "
" into tClosers
- end if
- if tClosers is "" then
- put tCurLine & " " into tCurLine
- end if
- end if
- end if
- repeat while matchChunk(tCurLine, "(" & gVidRegex & ")", tStart, tEnd) # linkify any links
- if char tStart -1 of tCurLine is "\" then # unless there is an escape character
- put tParsedBody & char 1 to tStart - 2 of tCurLine & char tStart to tEnd of tCurLine into tParsedBody
- put char tEnd + 1 to -1 of tCurLine into tCurLine
- else
- get matchText(tCurLine, gVidRegex, tVidUrl)
- addVideo tCurLine, tVidUrl
- end if
- end repeat
- repeat while matchChunk(tCurLine, "(" & gImgRegex & ")", tStart, tEnd) # imagify any images
- if char tStart -1 of tCurLine is "\" then # unless there is an escape character
- put tParsedBody & char 1 to tStart - 2 of tCurLine & char tStart to tEnd of tCurLine into tParsedBody
- put char tEnd + 1 to -1 of tCurLine into tCurLine
- else
- get matchText(tCurLine,gImgRegex, tAltText, tImageUrl)
- addImage tCurLine, tAltText, tImageUrl
- end if
- end repeat
- repeat while matchChunk(tCurLine, "(" & gLinkRegex & ")", tStart, tEnd) # linkify any links
- if char tStart -1 of tCurLine is "\" then # unless there is an escape character
- put tParsedBody & char 1 to tStart - 2 of tCurLine & char tStart to tEnd of tCurLine into tParsedBody
- put char tEnd + 1 to -1 of tCurLine into tCurLine
- else
- get matchText(tCurLine, gLinkRegex, tLinkText, tLinkUrl)
- addLink tCurLine, tLinkText, tLinkUrl
- end if
- end repeat
- if tCurLine is not empty then # if the current line has anything in it after that onslaught, then add it to the parsed body
- put tParsedBody & tCurLine & CR into tParsedBody
- end if
- end repeat
-
- # now close any open tags
- put tParsedBody & tClosers into tParsedBody
-
- # and deal with the 'inline' markdown elements (but not in recursive calls)
- if pTopLevel then
- put parseEnclosingMarkup(tParsedBody) into tParsedBody
- end if
-
- put xContents & tParsedContents into xContents
- return tParsedBody
-end markdownToHTML
diff --git a/builder/package_compiler.livecodescript b/builder/package_compiler.livecodescript
index 7e49be792aa..b28b75e96d2 100644
--- a/builder/package_compiler.livecodescript
+++ b/builder/package_compiler.livecodescript
@@ -489,15 +489,33 @@ private command compilerParse @self, pScript
end if
break
case "emit"
- if the number of words of tLine is not 4 or \
- word 2 of tLine is not among the items of "externals,dbdrivers" or \
- word 3 of tLine is not "to" then
- compilerSyntaxError self, "Invalid command, syntax is 'emit to '", tLineNumber
+ local tClass
+ put wordToName(word 2 of tLine) into tClass
+
+ local tMaxWords
+ switch tClass
+ case "externals"
+ case "dbdrivers"
+ delete the last char of tClass
+ put 4 into tMaxWords
+ break
+ case "string"
+ case "variable"
+ put 5 into tMaxWords
+ put wordToName(word 3 of tLine) into tCommand["name"]
+ break
+ default
+ put 0 into tMaxWords
+ end switch
+
+ if the number of words of tLine is not tMaxWords or \
+ word -2 of tLine is not "to" then
+ compilerSyntaxError self, "Invalid command, syntax is 'emit [{ | }] to '", tLineNumber
end if
put "emit" into tCommand["type"]
- put wordToName(word 2 of tLine) into tCommand["class"]
- put wordToName(word 4 of tLine) into tCommand["target"]
+ put tClass into tCommand["class"]
+ put wordToName(word -1 of tLine) into tCommand["target"]
break
case "declare"
if the number of words of tLine is not 5 or \
@@ -829,8 +847,7 @@ private command compilerExecuteCopy @self, pCommand
end if
else
if not abstractThereIsAFile(tSourcePath) then
- compilerBuildWarning self, "Item '" & tSourcePath & "' could not be found", pCommand["line"]
- exit compilerExecuteCopy
+ compilerExecutionError self, "Item '" & tSourcePath & "' could not be found", pCommand["line"]
end if
put pCommand["class"], empty into tItemManifest
end if
@@ -856,7 +873,7 @@ private command compilerExecuteCopy @self, pCommand
end if
if tItemClass is not "folder" and not abstractThereIsAFile(tItemSourcePath) then
- compilerBuildWarning self, "Bundle item '" & tItemSourcePath & "' could not be found", pCommand["line"]
+ compilerExecutionError self, "Bundle item '" & tItemSourcePath & "' could not be found", pCommand["line"]
end if
local tProcess, tSuffix, tManifestType
@@ -971,16 +988,28 @@ private command compilerExecuteEmit @self, pCommand
local tClass
put pCommand["class"] into tClass
- delete the last char of tClass
local tIndex
put the number of elements in self["derived"] + 1 into tIndex
put "derived/" & tClass & "-" & tIndex & ".txt" into self["derived"][tIndex]["name"]
put "text" into self["derived"][tIndex]["type"]
- put self["groups"][tClass] into self["derived"][tIndex]["data"]
+
+ -- allow emitting a a variable to a file
+ switch tClass
+ case "dbdriver"
+ case "external"
+ put self["groups"][tClass] into self["derived"][tIndex]["data"]
+ put empty into self["groups"][tClass]
+ break
+ case "variable"
+ put self["context"][pCommand["name"]] into self["derived"][tIndex]["data"]
+ break
+ case "string"
+ put pCommand["name"] into self["derived"][tIndex]["data"]
+ break
+ end switch
put "file" & tab & tTarget & tab & self["derived"][tIndex]["name"] & return after self["manifest"]
- put empty into self["groups"][tClass]
end compilerExecuteEmit
private command compilerExecuteDeclare @self, pCommand
@@ -1130,8 +1159,7 @@ private command compilerExecuteDesktop @self, pCommand
local tSourcePath
put self["sources"][tSourceType] & slash & tSourceFile into tSourcePath
if not abstractThereIsAFile(tSourcePath) then
- compilerBuildWarning self, "Item '" & tSourcePath & "' could not be found", pCommand["line"]
- exit compilerExecuteDesktop
+ compilerExecutionError self, "Item '" & tSourcePath & "' could not be found", pCommand["line"]
end if
-- If its an application, process the data into a derived file
diff --git a/builder/release-notes-template.html b/builder/release-notes-template.html
index 5e45e502b6f..72a3fe22f47 100644
--- a/builder/release-notes-template.html
+++ b/builder/release-notes-template.html
@@ -611,14 +611,32 @@
font-family: FontAwesome, "DejaVu Sans", sans-serif;
page-break-inside: avoid;
}
-
+
h1 {
+ color: #ffffff;
+ padding: 0;
+ border-radius: 1ex;
+ display: block;
+ }
+
+ h1.community {
background: rgb(159,201,42);
- color: #ffffff;
- padding: 0;
border: 1ex solid rgb(159,201,42);
- border-radius: 1ex;
- display: block;
+ }
+
+ h1.business {
+ background: #000000;
+ border: 1ex solid #000000;
+ }
+
+ h1.indy {
+ background: rgb(48,160,209);
+ border: 1ex solid rgb(48,160,209);
+ }
+
+ h1.communityplus {
+ background: rgb(49,163,102);
+ border: 1ex solid rgb(49,163,102);
}
h1.title {
@@ -661,10 +679,33 @@
}
current_level = level;
}
-
- return ''
- + text +
- ' ';
+
+ if (level == 1)
+ {
+ var t_class = "community";
+ if (text.indexOf("Indy") !== -1)
+ {
+ t_class = "indy";
+ }
+ else if (text.indexOf("Business") !== -1)
+ {
+ t_class = "business";
+ }
+ else if (text.indexOf("Community Plus") !== -1)
+ {
+ t_class = "communityplus";
+ }
+
+ return ''
+ + text +
+ ' ';
+ }
+ else
+ {
+ return ''
+ + text +
+ ' ';
+ }
}
// A paragraph containing just "[TOC]" is a table of contents
diff --git a/builder/release_notes_builder.livecodescript b/builder/release_notes_builder.livecodescript
index f154cd8bcce..68d003f2d8e 100644
--- a/builder/release_notes_builder.livecodescript
+++ b/builder/release_notes_builder.livecodescript
@@ -1,4 +1,8 @@
script "ReleaseNotesBuilder"
+constant kExtensionLcbTypes = "widgets,libraries,modules"
+constant kExtensionLcbStrings = "widget,library,module"
+constant kExtensionScriptTypes = "script-libraries"
+
local sMarkdownText
local sVersion
local sOutputPath
@@ -8,8 +12,8 @@ private command Initialize pVersion, pOutputPath
throw "Release notes output path must be specified"
exit Initialize
end if
-
- start using stack (builderSystemFolder() & slash & "markdown_compiler.livecodescript")
+
+ start using stack (builderSystemFolder() & slash & "edition_utilities.livecodescript")
set the defaultfolder to builderRepoFolder()
set the hideconsolewindows to true
@@ -19,7 +23,7 @@ private command Initialize pVersion, pOutputPath
end Initialize
private command Finalize
- stop using stack (builderSystemFolder() & slash & "markdown_compiler.livecodescript")
+
end Finalize
command releaseNotesBuilderRun pEdition, pVersion, pReleaseType, pOutputDir
@@ -30,11 +34,60 @@ command releaseNotesBuilderRun pEdition, pVersion, pReleaseType, pOutputDir
Initialize pVersion, pOutputDir
BaseCreate
- V1NotesCreate "engine", "engine", "Engine changes"
- V1NotesCreate "ide", "IDE", "IDE changes"
- V2NotesCreate "lcb", "LCB", "LiveCode Builder changes"
- ExtensionsCreate
- DictionaryCreate
+
+ local tComponents
+ put builderComponentFolders() into tComponents
+
+ -- special case some extra folders
+ local tIndex
+ put the number of elements of tComponents + 1 into tIndex
+ put builderRepoFolder() & "/docs" into tComponents[tIndex]["folder"]
+ put "engine" into tComponents[tIndex]["metadata"]["category"]
+ put "community" into tComponents[tIndex]["metadata"]["edition"]
+
+ add 1 to tIndex
+ put builderRepoFolder() & "/ide" into tComponents[tIndex]["folder"]
+ put "ide" into tComponents[tIndex]["metadata"]["category"]
+ put "community" into tComponents[tIndex]["metadata"]["edition"]
+
+ put the number of elements of tComponents + 1 into tIndex
+ put builderRepoFolder() & "/docs/lcb" into tComponents[tIndex]["folder"]
+ put "builder" into tComponents[tIndex]["metadata"]["category"]
+ put "" into tComponents[tIndex]["metadata"]["edition"]
+
+ local tPath, tTypePath
+ local tReposA, tDefaultEdition
+ put builderPrivateRepoFolder() into tReposA["indy"]
+ put builderRepoFolder() into tReposA["community"]
+
+ repeat for each key tDefaultEdition in tReposA
+ put tReposA[tDefaultEdition] into tPath
+
+ repeat for each item tType in kExtensionLcbTypes,kExtensionScriptTypes
+ put tPath & slash & "extensions" & slash & tType into tTypePath
+ if there is not a folder tTypePath then
+ next repeat
+ end if
+
+ repeat for each line tFolder in FileGetSubFolders(tTypePath)
+ put the number of elements of tComponents + 1 into tIndex
+ put tFolder into tComponents[tIndex]["folder"]
+ put "extension" into tComponents[tIndex]["metadata"]["category"]
+
+ local tEdition
+ put ExtensionsGetEdition(tFolder) into tEdition
+ if tEdition is empty then
+ put tDefaultEdition into tEdition
+ end if
+ put tEdition into tComponents[tIndex]["metadata"]["edition"]
+
+ put ExtensionsGetSectionName(tFolder) into tComponents[tIndex]["metadata"]["section"]
+ end repeat
+ end repeat
+ end repeat
+
+ ComponentsCreate tComponents
+ DictionaryCreate tComponents
PreviousCreate
OutputNotes
@@ -42,12 +95,99 @@ command releaseNotesBuilderRun pEdition, pVersion, pReleaseType, pOutputDir
Finalize
- return FileGetUTF8Contents(OutputGetUpdatesFilename("html"))
+ return builderFileGetUTF8Contents(OutputGetUpdatesFilename("html"))
catch tError
+ put tError
builderLog "error", tError
end try
end releaseNotesBuilderRun
+private function PathGetLastComponent pPath
+ set the itemdelimiter to slash
+ return item -1 of pPath
+end PathGetLastComponent
+
+private command ComponentsCreateForEdition pEdition, pCollated, pBugInfo
+ local tDisplayName
+ if pEdition is not empty then
+ put editionDisplayName(pEdition) into tDisplayName
+ end if
+ repeat for each item tCategory in builderComponentCategories()
+ local tTitle
+ if tDisplayName is not empty then
+ put merge("# LiveCode [[ tDisplayName ]] [[ tCategory ]] changes") into tTitle
+ else
+ put merge("# LiveCode [[ tCategory ]] changes") into tTitle
+ end if
+ if NotesHaveContent(pCollated[pEdition][tCategory], pBugInfo[pEdition][tCategory]) then
+ MarkdownAppend "notes", tTitle
+ MarkdownAppend "updates", tTitle
+
+ NotesGenerate tCategory, pCollated[pEdition][tCategory], 1
+ BugGenerate pBugInfo[pEdition][tCategory], tCategory
+ end if
+ end repeat
+end ComponentsCreateForEdition
+
+private command ComponentsCreate pComponents
+ BuilderLog "report", "Creating component release notes"
+
+ local tCollated, tBugInfo
+ repeat for each element tComponent in pComponents
+ ComponentsCreatePath tComponent, tCollated, tBugInfo
+ end repeat
+
+ repeat for each item tEdition in editionNames()
+ ComponentsCreateForEdition tEdition, tCollated, tBugInfo
+ end repeat
+ ComponentsCreateForEdition "", tCollated, tBugInfo
+end ComponentsCreate
+
+private command ComponentsCreatePath pComponent, @xCollated, @xBugInfo
+ local tSkip = true
+ try
+ put there is not a folder (pComponent["folder"] & "/notes") into tSkip
+ end try
+
+ set the itemDelimiter to slash
+ if tSkip then
+ builderLog "report", "Skipping no notes for component" && the last item of pComponent["folder"]
+ exit ComponentsCreatePath
+ end if
+
+ builderLog "report", "Creating release notes for" && the last item of pComponent["folder"]
+
+ if pComponent["metadata"]["section"] is empty then
+ -- just because something is a LCB module or a script library does not mean
+ -- we necessarily want to give it a separate section in the release notes
+ -- for example a widget or library for use purely within the IDE should
+ -- just merge into the IDE notes.
+ ScanAndCollatePath \
+ pComponent["folder"], \
+ xCollated[pComponent["metadata"]["edition"]][pComponent["metadata"]["category"]], \
+ xBugInfo[pComponent["metadata"]["edition"]][pComponent["metadata"]["category"]]
+ else
+ local tCollatedSection, tToMerge
+ ScanAndCollatePath \
+ pComponent["folder"], \
+ tCollatedSection, \
+ xBugInfo[pComponent["metadata"]["edition"]][pComponent["metadata"]["category"]]
+
+ -- Note the use of AppendToSection here means multiple components can be merged
+ -- into the same sub-section of the notes. For example, engine -> Mobile or
+ -- ide -> Script Editor
+ put 1 into tToMerge["__count"]
+ put tCollatedSection into tToMerge[1]
+ put pComponent["metadata"]["section"] into tToMerge[1]["__name"]
+
+ if NotesHaveContent(tCollatedSection) then
+ NotesMerge \
+ tToMerge, \
+ xCollated[pComponent["metadata"]["edition"]][pComponent["metadata"]["category"]]
+ end if
+ end if
+end ComponentsCreatePath
+
private function NotesGetExperimentalText
return "" & \
"Important: This feature is currently experimental. This means it may not be complete, or may fail in some circumstances that you would expect it to work. Please do not be afraid to try it out as we need feedback to develop it further." & \
@@ -106,14 +246,14 @@ private command OutputNotesMarkdown
local tPath
put OutputGetNotesFilename("md") into tPath
builderLog "report", merge("Writing [[tPath]]")
- FileSetUTF8Contents tPath, sMarkdownText["notes"]
+ builderFileSetUTF8Contents tPath, sMarkdownText["notes"]
end OutputNotesMarkdown
private command OutputNotesGuide
local tPath
put OutputGetGuideFilename() into tPath
builderLog "report", merge("Writing [[tPath]]")
- FileSetUTF8Contents tPath, sMarkdownText["notes"]
+ builderFileSetUTF8Contents tPath, sMarkdownText["notes"]
end OutputNotesGuide
private command OutputNotesHtml
@@ -129,14 +269,14 @@ private command OutputNotesHtml
put builderSystemFolder() & "/release-notes-template.html" into tHtmlTemplatePath
local tHtml
- put FileGetUTF8Contents(tHtmlTemplatePath) into tHtml
+ put builderFileGetUTF8Contents(tHtmlTemplatePath) into tHtml
replace "@MARKDOWN@" with tEscaped in tHtml
local tOutpath
put OutputGetNotesFilename("html") into tOutpath
builderLog "report", merge("Writing [[tOutpath]]")
- FileSetUTF8Contents tOutpath, tHtml
+ builderFileSetUTF8Contents tOutpath, tHtml
end OutputNotesHtml
private command OutputNotesPdf
@@ -182,17 +322,92 @@ private command OutputUpdatesMarkdown
local tPath
put OutputGetUpdatesFilename("md") into tPath
builderLog "report", merge("Writing [[tPath]]")
- FileSetUTF8Contents tPath, sMarkdownText["updates"]
+ builderFileSetUTF8Contents tPath, sMarkdownText["updates"]
end OutputUpdatesMarkdown
-private command OutputUpdatesHtml
- local tHtml, tToc
- put markdownToHtml(sMarkdownText["updates"], 3, 0, tToc, true) into tHtml
+// Find
elements and make them
+private command MakeHeadersSmaller @xHTML, pAmount
+ local tStart, tEnd, tOldEnd, tNumber
+ put 1 into tOldEnd
+ repeat while matchChunk(char tOldEnd to -1 of xHTML, \
+ "<(?:\/)?h([0-9]+)>", tStart, tEnd)
+ add tOldEnd - 1 to tEnd
+ add tOldEnd - 1 to tStart
+ put char tStart to tEnd of xHTML into tNumber
+ add pAmount to tNumber
+ put tNumber into char tStart to tEnd of xHTML
+ put tEnd into tOldEnd
+ add the number of chars in tNumber - (tEnd - tStart) + 1 \
+ to tOldEnd
+ end repeat
+end MakeHeadersSmaller
+
+// Find (at least) double blank lines between specified tags
+// and add empty paragraph
+private command RespectBlankLinesBetween @xHTML, pFromTagSuffix, pToTagPrefix
+ put replaceText(xHtml, pFromTagSuffix & ">\n{2,}<" & pToTagPrefix, \
+ pFromTagSuffix & ">" & return & "
" & \
+ return & "<" & pToTagPrefix) into xHtml
+end RespectBlankLinesBetween
+
+private command EnsureMergMarkdown
+ builderExtUnpack "Community"
+ local tMergMarkdown
+ put builderUnpackFolder("Community") & slash & "Ext" into tMergMarkdown
+ local tFolders
+ put folders(tMergMarkdown) into tFolders
+ filter tFolders with "mergMarkdown*"
+ if tFolders is empty then
+ builderLog "error", "couldn't download mergMarkdown"
+ end if
+ put slash & line 1 of tFolders & slash & "mergMarkdown" after tMergMarkdown
+
+ switch the platform
+ case "macos"
+ put ".bundle" after tMergMarkdown
+ break
+ case "linux"
+ if the processor is "x86_64" then
+ put "-x64.so" after tMergMarkdown
+ else
+ put ".so" after tMergMarkdown
+ end if
+ break
+ case "win32"
+ if the processor is "x86_64" then
+ put "-x86_64.dll" after tMergMarkdown
+ else
+ put "-x86.dll" after tMergMarkdown
+ end if
+ break
+ end switch
+ set the externals of the templatestack to tMergMarkdown
+ lock messages
+ create stack
+ unlock messages
+ start using it
+end EnsureMergMarkdown
+
+command OutputUpdatesHtml
+ local tHtml
+ EnsureMergMarkdown
+ put mergMarkdownToXHTML(sMarkdownText["updates"] \
+ ,true,true,true,true,false,true,true,true) into tHtml
+
+ // Shrink all headers by 2
+ MakeHeadersSmaller tHTML, 2
+
+ // Add extra blank paragraphs between any tag &
+ // subsequent header
+ RespectBlankLinesBetween tHTML, "", "h"
+
+ // Add extra blank paragraphs between paragraphs
+ RespectBlankLinesBetween tHTML, "p", "p"
local tPath
put OutputGetUpdatesFilename("html") into tPath
builderLog "report", merge("Writing [[tPath]]")
- FileSetUTF8Contents tPath, tHtml
+ builderFileSetUTF8Contents tPath, tHtml
end OutputUpdatesHtml
----------------------------------------------------------------
@@ -207,6 +422,7 @@ private command BaseCreate
BaseCreateOverview
BaseCreateIssues
+ MarkdownAppend "notes", BaseReadFile("breaking_changes")
MarkdownAppend "notes", BaseReadFile("platforms")
MarkdownAppend "notes", BaseReadFile("setup")
MarkdownAppend "notes", BaseReadFile("proposed_changes")
@@ -249,9 +465,9 @@ end BaseCreateIssues
private function BaseReadFile pBasename
local tPath
- put FileGetPath() & slash & pBasename & ".md" into tPath
+ put FileGetPath("base") & slash & pBasename & ".md" into tPath
if there is a file tPath then
- return FileGetUTF8Contents(tPath)
+ return builderFileGetUTF8Contents(tPath)
else
return empty
end if
@@ -263,41 +479,6 @@ private command BaseCreateUpdates
MarkdownAppend "updates", "Changes in this release include:" & return
end BaseCreateUpdates
-----------------------------------------------------------------
--- Old-style release notes
-----------------------------------------------------------------
-
-/*
-The IDE and the engine use "old-style" release notes. These are
-markdown fragments that have "feature" or "bugfix" in their
-filenames.
-
-Each file details a single bug fix or feature implementation.
-
-* Name the files "bugfix-.md",
- "bugfix--suffix.md", or "feature-.md"
-
-* Put the title as the first line, e.g. "# "
-
-Single-line files are added to the table of bugfixes. Multi-line
-files get their own section in the release notes.
-*/
-private command V1NotesCreate pType, pReadableType, pTitle
- builderLog "report", merge("Creating [[pReadableType]] release notes")
-
- -- First, gather all files, their contents, and their metadata
- local tScannedNotes
- put V1NotesScan(pType) into tScannedNotes
-
- -- Next generate markdown
- if V1NotesHaveContent(tScannedNotes) then
- MarkdownAppend "notes", merge("# [[pTitle]]")
- MarkdownAppend "updates", merge("# [[pTitle]]")
-
- V1NotesGenerate pType, pReadableType, tScannedNotes
- end if
-end V1NotesCreate
-
/*
Build up a datastructure containing all the (raw) data gathered
from the target directory. The return value is a nested array:
@@ -312,15 +493,12 @@ from the target directory. The return value is a nested array:
}
}
*/
-private function V1NotesScan pType
+private command NotesScan pType, @xScan
local tTags, tNumTags
put GitGetRelevantTags(pType) into tTags
put the number of lines in tTags into tNumTags
- local tResult
- put empty into tResult
-
local tVersion, tBaseVersion, tPrevVersion, tTagOffset
local tAllFiles, tVersionFiles, tFile
put line 1 of tTags into tBaseVersion
@@ -342,15 +520,14 @@ private function V1NotesScan pType
end if
end repeat
- V1NotesScanVersion pType, tVersion, tVersionFiles, tResult
+ NotesScanVersion pType, tVersion, tVersionFiles, xScan
add 1 to tTagOffset
end repeat
- return tResult
-end V1NotesScan
+end NotesScan
-private command V1NotesScanVersion pType, pVersion, pFiles, @xScan
+private command NotesScanVersion pType, pVersion, pFiles, @xScan
local tFile, tOldFile, tContents, tError, tFileInfo, tVersion, tBasename
repeat for each line tFile in pFiles
@@ -364,7 +541,7 @@ private command V1NotesScanVersion pType, pVersion, pFiles, @xScan
end repeat
try
- put FileGetUTF8Contents(tFile) into tContents
+ put builderFileGetUTF8Contents(tFile) into tContents
catch tError
builderLog "report", tERror
next repeat
@@ -377,7 +554,15 @@ private command V1NotesScanVersion pType, pVersion, pFiles, @xScan
put tFileInfo["metadata"]["version"] into tVersion
if tVersion is empty then
put pVersion into tVersion
+ else
+ -- filter out touched files with version headers
+ set the itemDelimiter to "-"
+ if item 1 of tVersion is not item 1 of pVersion then
+ builderLog "report", "Filtering touched file with version header" && tFile
+ next repeat
+ end if
end if
+
put tFileInfo["metadata"]["basename"] into tBasename
if tBasename is empty then
put FileGetBasename(tFile) into tBasename
@@ -386,235 +571,12 @@ private command V1NotesScanVersion pType, pVersion, pFiles, @xScan
put tBasename into tFileInfo["basename"]
put tFileInfo into xScan[tVersion][tFile]
end repeat
-end V1NotesScanVersion
-
-private function V1NotesHaveContent pScanData
- local tTagData
- repeat for each element tTagData in pScanData
- if V1NotesHaveContentVersion(tTagData) then
- return true
- end if
- end repeat
- return false
-end V1NotesHaveContent
-
-private function V1NotesHaveContentVersion pScanData
- local tFileInfo
- repeat for each element tFileInfo in pScanData
- if tFileInfo["basename"] contains "feature" then
- return true
- end if
- if tFileInfo["basename"] contains "bugfix" then
- return true
- end if
- end repeat
- return false
-end V1NotesHaveContentVersion
-
-private command V1NotesGenerate pType, pReadableType, pScanData
- local tBugInfo
-
- -- Process versions in reverse order
- local tTags, tTagCount
- put the keys of pScanData into tTags
- GitSortTags tTags
-
- put the number of lines in tTags into tTagCount
-
- local tTag
- repeat tTagCount times
- put line tTagCount of tTags into tTag
- v1NotesGenerateVersion pType, tTag, pScanData[tTag], tBugInfo
- subtract 1 from tTagCount
- end repeat
-
- BugGenerate tBugInfo, pReadableType
-end V1NotesGenerate
-
-private command V1NotesGenerateVersion pType, pVersion, pScanData, @xBugInfo
- local tFile, tFeatures, tBugfixes, tNote
-
- set the itemdelimiter to slash
-
- -- Split note files into features vs bugfixes
- local tFileInfo
- repeat for each key tFile in pScanData
- put pScanData[tFile] into tFileInfo
-
- if tFileInfo["basename"] contains "feature" then
- put tFileInfo["basename"] & slash & tFile & return after tFeatures
- else if tFileInfo["basename"] contains "bugfix" then
- put tFileInfo["basename"] & slash & tFile & return after tBugfixes
- end if
- end repeat
-
- -- Process features first
- sort lines of tFeatures by item 1 of each
- repeat for each line tNote in tFeatures
- put item 2 to -1 of tNote into tFile
- V1NotesGenerateFeature pType, pVersion, pScanData[tFile]
- end repeat
-
- -- Now process bugfixes
- sort lines of tBugfixes by item 1 of each
- repeat for each line tNote in tBugfixes
- put item 2 to -1 of tNote into tFile
- V1NotesGenerateBugfix pType, pVersion, pScanData[tFile], xBugInfo
- end repeat
-end V1NotesGenerateVersion
-
-private function V1NotesGetBugId pFileInfo
- local tBasename, tBugId
- put pFileInfo["basename"] into tBasename
-
- -- Try strict mode first, and issue a warning if no match
- get matchText(tBasename, "(?i)^bugfix-(\d*)($|-)", tBugId)
- if tBugId is not empty then
- return tBugId
- end if
-
- -- Now try again, more tolerantly
- builderLog "warning", merge("Probably misnamed bug fix note '[[tBasename]]'")
-
- get matchText(pFileInfo["basename"], "(?i)bugfix-(\d*)", tBugId)
- if tBugId is empty then
- throw "Could not determine bug ID for '[[tBasename]]'"
- end if
- return tBugId
-end V1NotesGetBugId
-
-private command V1NotesGenerateBugfix pType, pVersion, pFileInfo, @xBugInfo
- local tBugId, tHeader, tBody
-
- put V1NotesGetBugId(pFileInfo) into tBugId
-
- V1NotesSplitHeader pType, pFileInfo, tHeader, tBody
-
- if tHeader is empty then
- exit V1NotesGenerateBugfix
- end if
-
- BugAddInfo xBugInfo, pVersion, tBugId, tHeader
-
- -- If the body is non-empty, generate a paragraph in the
- -- release notes for this bugfix
- if tBody is not empty then
- V1NotesGenerateBlock pVersion, tHeader, tBody
- end if
-end V1NotesGenerateBugfix
-
-private command V1NotesGenerateFeature pType, pVersion, pFileInfo
- local tBasename, tHeader, tBody
- put pFileInfo["basename"] into tBasename
-
- V1NotesSplitHeader pType, pFileInfo, tHeader, tBody
-
- if tHeader is empty then
- exit V1NotesGenerateFeature
- end if
-
- if tBody is empty then
- builderLog "warning", merge("Empty [[pType]] feature note '[[tBaseName]]'")
- exit V1NotesGenerateFeature
- end if
-
- V1NotesGenerateBlock pVersion, tHeader, tBody
-end V1NotesGenerateFeature
-
-private command V1NotesSplitHeader pType, pFileInfo, @rHeader, @rBody
- local tBody, tBasename
- put pFileInfo["markdown"] into tBody
- put pFileInfo["basename"] into tBasename
-
- -- Delete leading empty lines
- repeat while word 1 to -1 of (line 1 of tBody) is empty
- if tBody is empty then
- builderLog "warning", merge("Empty [[pType]] bugfix note '[[tBasename]]'")
- put empty into rHeader
- put empty into rBody
- exit V1NotesSplitHeader
- end if
-
- delete line 1 of tBody
- end repeat
-
- local tFirstLine
- put word 1 to -1 of (line 1 of tBody) into tFirstLine
- if tFirstLine begins with "#" then
- put char 2 to -1 of tFirstLine into rHeader
- put word 1 to -1 of (line 2 to -1 of tBody) into rBody
- end if
-
- if rHeader is empty then
- builderLog "warning", merge("Bad [[pType]] bugfix header in [[tBasename]]")
- exit V1NotesSplitHeader
- end if
-end V1NotesSplitHeader
-
-private command V1NotesGenerateBlock pVersion, pHeader, pBody
- if pVersion is "HEAD" then
- put sVersion into pVersion
- end if
-
- -- Handle "experimental" annotation
- local tAnnotation, tExperimental
- if the last word of pHeader is "(experimental)" then
- put word 1 to -2 of pHeader into pHeader
- put " - experimental" into tAnnotation
- put true into tExperimental
- else
- put false into tExperimental
- end if
-
- MarkdownAppend "notes", merge("## [[pHeader]] ([[pVersion]][[tAnnotation]])")
- MarkdownAppend "notes", pBody & return
-
- if tExperimental then
- MarkdownAppend "notes", NotesGetExperimentalText()
- end if
-
- -- Include only brand new notes in the updater notes
- if pVersion is sVersion then
- MarkdownAppend "updates", merge("## [[pHeader]]")
- MarkdownAppend "updates", pBody & return
-
- if tExperimental then
- MarkdownAppend "updates", NotesGetExperimentalText()
- end if
- end if
-end V1NotesGenerateBlock
+end NotesScanVersion
----------------------------------------------------------------
-- New-style notes
----------------------------------------------------------------
-private command V2NotesCreate pType, pReadableType, pTitle
- builderLog "report", merge("Creating [[pReadableType]] release notes")
-
- local tScannedNotes
- put V2NotesScan(pType) into tScannedNotes
-
- local tCollated, tBugInfo
- V2NotesCollate pType, tScannedNotes, tCollated, tBugInfo
-
- if V2NotesHaveContent(tCollated, tBugInfo) then
- MarkdownAppend "notes", merge("# [[pTitle]]")
- MarkdownAppend "updates", merge("# [[pTitle]]")
-
- V2NotesGenerate pType, tCollated, 1
-
- BugGenerate tBugInfo, pReadableType
- end if
-
-end V2NotesCreate
-
--- There isn't actually any difference between the information
--- that needs to be scanned for V2 notes and the information that
--- needs to be scanned for V1 notes.
-private function V2NotesScan pType
- return V1NotesScan(pType)
-end V2NotesScan
-
/*
Create a tree of section information from the results of scanning
the release notes:
@@ -634,7 +596,7 @@ the release notes:
},
}
*/
-private command V2NotesCollate pType, pScanInfo, @rCollated, @rBugInfo
+private command NotesCollate pType, pScanInfo, @xCollated, @xBugInfo
local tTags, tFile, tTagCount, tVersion
-- Collate notes in descending order of version, so newest appear at the top
@@ -645,13 +607,13 @@ private command V2NotesCollate pType, pScanInfo, @rCollated, @rBugInfo
repeat tTagCount times
put line tTagCount of tTags into tVersion
repeat for each key tFile in pScanInfo[tVersion]
- V2NotesCollateFile pType, tVersion, pScanInfo[tVersion][tFile], rCollated, rBugInfo
+ NotesCollateFile pType, tVersion, pScanInfo[tVersion][tFile], xCollated, xBugInfo
end repeat
subtract 1 from tTagCount
end repeat
-end V2NotesCollate
+end NotesCollate
-private command V2NotesCollateFile pType, pVersion, pFileInfo, @xCollated, @xBugInfo
+private command NotesCollateFile pType, pVersion, pFileInfo, @xCollated, @xBugInfo
local tLine, tSectionPath, tBasename
put pFileInfo["basename"] into tBasename
@@ -662,18 +624,26 @@ private command V2NotesCollateFile pType, pVersion, pFileInfo, @xCollated, @xBug
put 0 into tOldLevel
put false into tHaveContent
+ local tLineCount
+ put the number of lines of pFileInfo["markdown"] into tLineCount
repeat for each line tLine in pFileInfo["markdown"]
-- First check if this is a bug info line
- V2NotesExtractBugInfo tLine, tBugId, tBugDesc
+ local tOnlyAddBug
+ NotesExtractBugInfo tBasename, tLine, tLineCount, tBugId, tBugDesc
+ put it into tOnlyAddBug
if tBugId is not empty then
BugAddInfo xBugInfo, pVersion, tBugId, tBugDesc
- next repeat
-
+ if tOnlyAddBug then
+ next repeat
+ else
+ put empty into tBugId
+ put empty into tBugDesc
+ end if
end if
-- Second, check if it's a section control line
put tLevel into tOldLevel
- V2NotesExtractSectionInfo tLine, tLevel, tName
+ NotesExtractSectionInfo tLine, tLevel, tName
if tLevel is not empty then
if tName is empty then
@@ -688,7 +658,7 @@ private command V2NotesCollateFile pType, pVersion, pFileInfo, @xCollated, @xBug
builderLog "warning", merge("Section without content in [[pType]] note '[[tBasename]]'")
end if
- V2NotesUpdateSectionPath tLevel, tName, xCollated, tSectionPath
+ NotesUpdateSectionPath tLevel, tName, xCollated, tSectionPath
put false into tHaveContent
next repeat
end if
@@ -702,11 +672,11 @@ private command V2NotesCollateFile pType, pVersion, pFileInfo, @xCollated, @xBug
put true into tHaveContent
end if
end repeat
-end V2NotesCollateFile
+end NotesCollateFile
-private command V2NotesUpdateSectionPath pLevel, pName, @xCollated, @xSectionPath
+private command NotesUpdateSectionPath pLevel, pName, @xCollated, @xSectionPath
if pLevel is 0 then
- exit V2NotesUpdateSectionPath
+ exit NotesUpdateSectionPath
end if
if not xSectionPath is an array then
@@ -733,7 +703,7 @@ private command V2NotesUpdateSectionPath pLevel, pName, @xCollated, @xSectionPat
put tId into tPath[pLevel]
if xCollated[tPath]["__name"] is pName then
put tId into xSectionPath[pLevel]
- exit V2NotesUpdateSectionPath
+ exit NotesUpdateSectionPath
end if
end repeat
@@ -747,13 +717,26 @@ private command V2NotesUpdateSectionPath pLevel, pName, @xCollated, @xSectionPat
put tId into xSectionPath[pLevel]
put pName into xCollated[xSectionPath]["__name"]
put 0 into xCollated[xSectionPath]["__count"]
-end V2NotesUpdateSectionPath
+end NotesUpdateSectionPath
-private command V2NotesExtractBugInfo pLine, @rId, @rDesc
- get matchText(pLine, "^\s*#\s+\[(\w*)\]\s+(.*)$", rId, rDesc)
-end V2NotesExtractBugInfo
+private command NotesExtractBugInfo pBaseName, pLine, pLineCount, @rId, @rDesc
+ -- v2 notes are `# [int] description`
+ if matchText(pLine, "^\s*#\s+\[(\w*)\]\s+(.*)$", rId, rDesc) then
+ return true for value
+ end if
+
+ -- check if it's a v1 single line bugfix note
+ split pBaseName with "-"
+ if pBaseName[2] is an integer and \
+ word 1 of pLine is "#" then
+ put pBaseName[2] into rId
+ put word 2 to -1 of pLine into rDesc
+ end if
+
+ return pLineCount is 1 for value
+end NotesExtractBugInfo
-private command V2NotesExtractSectionInfo pLine, @rLevel, @rName
+private command NotesExtractSectionInfo pLine, @rLevel, @rName
local tPrefix
get matchText(pLine, "^\s*(#*)\s+(.*)$", tPrefix, rName)
@@ -762,54 +745,69 @@ private command V2NotesExtractSectionInfo pLine, @rLevel, @rName
else
put empty into rLevel
end if
-end V2NotesExtractSectionInfo
+end NotesExtractSectionInfo
--- Append collated section data from as a new top-level
--- section in with . If there is already a section
--- named in , generate an error.
-private command V2NotesAppendSection pName, pCollatedSection, @xCollated
- local tId
- repeat with tId = 1 to xCollated["__count"]
- if xCollated[tId]["__name"] is pName then
- throw merge("Notes data already contains a section '[[pName]]'")
+private command NotesMerge pLeftCollated, @xRightCollated
+ if pLeftCollated is not an array then
+ exit NotesMerge
+ end if
+
+ if word 1 to -1 of pLeftCollated["__markdown"] is not empty then
+ if xRightCollated["__markdown"] is empty then
+ put return & return after xRightCollated["__markdown"]
end if
- end repeat
+ put pLeftCollated["__markdown"] after xRightCollated["__markdown"]
+ end if
- add 1 to xCollated["__count"]
- put xCollated["__count"] into tId
+ local tLeftID, tRightID
+ repeat with tLeftID = 1 to pLeftCollated["__count"]
+ local tNameFound
+ put false into tNameFound
+ repeat with tRightID = 1 to xRightCollated["__count"]
+ if pLeftCollated[tLeftID]["__name"] is xRightCollated[tRightID]["__name"] then
+ NotesMerge pLeftCollated[tLeftID], xRightCollated[tRightID]
+ put true into tNameFound
+ end if
+ end repeat
+
+ if not tNameFound then
+ add 1 to xRightCollated["__count"]
+ put pLeftCollated[tLeftID] into xRightCollated[xRightCollated["__count"]]
+ end if
+ end repeat
- put pCollatedSection into xCollated[tId]
- put pName into xCollated[tId]["__name"]
-end V2NotesAppendSection
+end NotesMerge
-private function V2NotesHaveContent pCollated, pBugInfo
- if (word 1 to -1 of pCollated["__markdown"]) is not empty then
- return true
- end if
-
- -- Recurse into child nodes
- local tId
- repeat with tId = 1 to pCollated["__count"]
- if V2NotesHaveContent(pCollated[tId]) then
+private function NotesHaveContent pCollated, pBugInfo
+ if pCollated is an array then
+ if (word 1 to -1 of pCollated["__markdown"]) is not empty then
return true
end if
- end repeat
- if the number of elements in pBugInfo > 0 then
+ -- Recurse into child nodes
+ local tId
+ repeat with tId = 1 to pCollated["__count"]
+ if NotesHaveContent(pCollated[tId]) then
+ return true
+ end if
+ end repeat
+ end if
+
+ if pBugInfo is an array and the number of elements in pBugInfo > 0 then
return true
end if
return false
-end V2NotesHaveContent
+end NotesHaveContent
-private command V2NotesGenerate pType, pCollated, pLevel
- MarkdownAppend "notes", V2NotesGenerateContent(pType, pCollated, pLevel)
- MarkdownAppend "updates", V2NotesGenerateContent(pType, pCollated, pLevel)
-end V2NotesGenerate
+private command NotesGenerate pType, pCollated, pLevel
+ MarkdownAppend "notes", NotesGenerateContent(pType, pCollated, pLevel)
+ MarkdownAppend "updates", NotesGenerateContent(pType, pCollated, pLevel)
+end NotesGenerate
-- If is true, then only generate content that's brand new in
-- the release that notes are being generated for
-private function V2NotesGenerateContent pType, pCollated, pLevel
+private function NotesGenerateContent pType, pCollated, pLevel
-- Compute the content from this node + all child nodes
local tContent
@@ -824,7 +822,7 @@ private function V2NotesGenerateContent pType, pCollated, pLevel
local tSectionContent, tHeader
repeat with tId = 1 to pCollated["__count"]
- put V2NotesGenerateContent(pType, pCollated[tId], pLevel + 1) into tSectionContent
+ put NotesGenerateContent(pType, pCollated[tId], pLevel + 1) into tSectionContent
-- Only generate a subsection header if the subsection (and all
-- the subsections it contains) doesn't contain any notes
@@ -841,71 +839,7 @@ private function V2NotesGenerateContent pType, pCollated, pLevel
end repeat
return tContent
-end V2NotesGenerateContent
-
-----------------------------------------------------------------
--- Extension release notes
-----------------------------------------------------------------
-
-constant kExtensionTypes = "widgets,libraries,modules"
-constant kExtensionStrings = "widget,library,module"
-
-private command ExtensionsCreate
- BuilderLog "report", "Creating extension release notes"
-
- local tType, tTypePath, tFolder
- local tCollated, tBugInfo
- repeat for each item tType in kExtensionTypes
- put FileGetPath("extensions") & slash & tType into tTypePath
-
- repeat for each line tFolder in FileGetSubFolders(tTypePath)
- ExtensionsCreatePath tFolder, tCollated, tBugInfo
- end repeat
-
- end repeat
-
- if V2NotesHaveContent(tCollated, tBugInfo) then
- MarkdownAppend "notes", "# LiveCode extension changes"
- MarkdownAppend "updates", "# LiveCode extension changes"
-
- V2NotesGenerate "extensions", tCollated, 1
- BugGenerate tBugInfo, "extension"
- end if
-end ExtensionsCreate
-
-private command ExtensionsCreatePath pExtPath, @xCollated, @xBugInfo
- set the itemdelimiter to slash
-
- -- Skip the extension if it doesn't appear to have been compiled
- if there is not a file ExtensionsGetManifestPath(pExtPath) then
- builderLog "report", "Skipping uncompiled extension" && item -1 of pExtPath
- exit ExtensionsCreatePath
- end if
-
- builderLog "report", "Creating release notes for" && item -1 of pExtPath
-
- -- Scan and collate all information for this particular extension
- local tNotesPath
- put pExtPath & "/notes" into tNotesPath
- if there is not a folder tNotesPath then
- exit ExtensionsCreatePath
- end if
-
- local tScan, tExtCollated
- put V2NotesScan(tNotesPath) into tScan
- V2NotesCollate pExtPath, tScan, tExtCollated, xBugInfo
-
- -- Add the collated info in the top-level collation structure
- try
- local tName
- put ExtensionsGetSectionName(pExtPath) into tName
- catch tError
- builderLog "warning", tError
- exit ExtensionsCreatePath
- end try
-
- V2NotesAppendSection tName, tExtCollated, xCollated
-end ExtensionsCreatePath
+end NotesGenerateContent
private function ExtensionsGetSectionName pExtPath
local tName, tType, tTypeOffset, tPrettyType
@@ -914,8 +848,8 @@ private function ExtensionsGetSectionName pExtPath
put item -2 of pExtPath into tType
set the itemdelimiter to comma
- put itemoffset(tType, kExtensionTypes) into tTypeOffset
- put item tTypeOffset of kExtensionStrings into tPrettyType
+ put itemoffset(tType, kExtensionLcbTypes) into tTypeOffset
+ put item tTypeOffset of kExtensionLcbStrings into tPrettyType
put ExtensionsGetName(pExtPath) into tName
if word -1 of tName is not tPrettyType then
@@ -926,8 +860,46 @@ private function ExtensionsGetSectionName pExtPath
end ExtensionsGetSectionName
private function ExtensionsGetName pExtPath
+ if there is a file ExtensionsGetManifestPath(pExtPath) then
+ return ExtensionsGetLCBName(pExtPath)
+ else if there is a file ExtensionsGetDocPath(pExtPath) then
+ -- Script library
+ return ExtensionsGetLCSName(pExtPath)
+ end if
+ return empty
+end ExtensionsGetName
+
+private function ExtensionsGetLCSName pExtPath
+ return ExtensionGetSingleLineElement(pExtPath, "Title")
+end ExtensionsGetLCSName
+
+private function ExtensionsGetEdition pExtPath
+ if there is a file ExtensionsGetDocPath(pExtPath) then
+ return ExtensionGetSingleLineElement(pExtPath, "Edition")
+ end if
+ return empty
+end ExtensionsGetEdition
+
+private function ExtensionGetSingleLineElement pExtPath, pElement
+ local tDoc
+ put builderFileGetContents(ExtensionsGetDocPath(pExtPath)) into tDoc
+
+ local tRegex
+ put "(?i)^" & pElement &":\s+(.*)" into tRegex
+
+ local tValue
+ repeat for each line tLine in tDoc
+ get matchText(word 1 to -1 of tLine, tRegex, tValue)
+ if tValue is not empty then
+ return tValue
+ end if
+ end repeat
+ return empty
+end ExtensionGetSingleLineElement
+
+private function ExtensionsGetLCBName pExtPath
local tManifest, tXmlId
- put FileGetContents(ExtensionsGetManifestPath(pExtPath)) into tManifest
+ put builderFileGetContents(ExtensionsGetManifestPath(pExtPath)) into tManifest
put revXMLCreateTree(tManifest, true, true, false) into tXmlId
if tXmlId begins with "xmlerr" then
@@ -936,11 +908,13 @@ private function ExtensionsGetName pExtPath
local tTargetName
put textDecode(revXMLNodeContents(tXmlId, "/package/title"), "UTF-8") into tTargetName
+
+ revXMLDeleteTree tXmlId
if tTargetName begins with "xmlerr" then
return empty
end if
return tTargetName
-end ExtensionsGetName
+end ExtensionsGetLCBName
private function ExtensionsGetKind pExtPath
-- Horrible-ish hack for extracting the "real" name of the LiveCode
@@ -948,18 +922,43 @@ private function ExtensionsGetKind pExtPath
local tShortName
set the itemdelimiter to slash
put item -1 of pExtPath into tShortName
+
+ if there is no file merge("[[pExtPath]]/[[tShortName]].lcb") then
+ return ExtensionsGetLCSKind(pExtPath, tShortName)
+ else
+ return ExtensionsGetLCBKind(pExtPath, tShortName)
+ end if
+end ExtensionsGetKind
+private function ExtensionsGetLCSKind pExtPath, pShortName
+ local tSource, tLine, tName
+ if there is no file merge("[[pExtPath]]/[[pShortName]].livecodescript") then
+ return empty
+ end if
+ put builderFileGetUTF8Contents(merge("[[pExtPath]]/[[pShortName]].livecodescript")) into tSource
+ repeat for each line tLine in tSource
+ get matchText(tLine, "(?i)^script" && quote & "(.*)" & quote, tName)
+
+ if tName is not empty then
+ exit repeat
+ end if
+ end repeat
+
+ return tName
+end ExtensionsGetLCSKind
+
+private function ExtensionsGetLCBKind pExtPath, pShortName
local tLcbSource, tLine, tModuleName
- put FileGetUTF8Contents(merge("[[pExtPath]]/[[tShortName]].lcb")) into tLcbSource
+ put builderFileGetUTF8Contents(merge("[[pExtPath]]/[[pShortName]].lcb")) into tLcbSource
repeat for each line tLine in tLcbSource
get matchText(tLine, "(?i)^\s*(?:module|widget|library)\s+([\w.]*)", tModuleName)
if tModuleName is not empty then
exit repeat
end if
end repeat
-
+
return tModuleName
-end ExtensionsGetKind
+end ExtensionsGetLCBKind
private function ExtensionsGetManifestPath pExtPath
local tManifestFile
@@ -969,15 +968,35 @@ private function ExtensionsGetManifestPath pExtPath
return tManifestFile
end ExtensionsGetManifestPath
+private function ExtensionsGetDocPath pExtPath
+ local tDocFile
+ put FileGetPath("built-extensions") into tDocFile
+ put slash & ExtensionsGetKind(pExtPath) after tDocFile
+ put slash & "api.lcdoc" after tDocFile
+ return tDocFile
+end ExtensionsGetDocPath
+
+private command ScanAndCollatePath pExtPath, @xCollated, @xBugInfo
+ local tNotesPath
+ put merge("[[pExtPath]]/notes") into tNotesPath
+ if there is not a folder tNotesPath then
+ exit ScanAndCollatePath
+ end if
+
+ local tScan
+ NotesScan tNotesPath, tScan
+ NotesCollate pExtPath, tScan, xCollated, xBugInfo
+end ScanAndCollatePath
+
----------------------------------------------------------------
-- Dictionary change generation
----------------------------------------------------------------
-private command DictionaryCreate
+private command DictionaryCreate pComponents
builderLog "report", "Creating dictionary release notes"
local tAdded, tModified
- DictionaryScan tAdded, tModified
+ DictionaryScan pComponents, tAdded, tModified
sort lines of tAdded ascending text
sort lines of tModified ascending text
@@ -990,28 +1009,38 @@ private command DictionaryCreate
--MarkdownAppend "notes", tModified
end DictionaryCreate
-private command DictionaryScan @xAdded, @xModified
+private command DictionaryScan pComponents, @xAdded, @xModified
-- Get list of changed files
local tTags, tPermittedFiles, tChangedFiles
- put GitGetRelevantTags("dictionary") into tTags
-
- put GitGetChangedFiles("dictionary", the first line of tTags, \
- the last line of tTags) into tChangedFiles
-
- -- Check whether each entry was added or just modified
- local tFile
- repeat for each line tFile in tChangedFiles
- if tFile ends with ".lcdoc" then
- DictionaryScanFile tFile, xAdded, xModified
- end if
+ repeat for each element tComponent in pComponents
+ repeat for each item tFolder in "dictionary,glossary"
+ local tPath
+ put tComponent["folder"] & slash & tFolder into tPath
+ if there is not a folder tPath then
+ next repeat
+ end if
+
+ put GitGetRelevantTags(tPath) into tTags
+
+ put GitGetChangedFiles(tPath, the first line of tTags, \
+ the last line of tTags) into tChangedFiles
+
+ -- Check whether each entry was added or just modified
+ local tFile
+ repeat for each line tFile in tChangedFiles
+ if tFile ends with ".lcdoc" then
+ DictionaryScanFile tFile, xAdded, xModified
+ end if
+ end repeat
+ end repeat
end repeat
end DictionaryScan
private command DictionaryScanFile pFile, @xAdded, @xModified
local tContents, tError
try
- put FileGetUTF8Contents(pFile) into tContents
+ put builderFileGetUTF8Contents(pFile) into tContents
catch tError
BuilderLog "report", tError
exit DictionaryScanFile
@@ -1105,11 +1134,6 @@ private function BugUrl pId
end BugUrl
private command BugGenerate pBugInfo, pBugCategory
- V1BugGenerate pBugInfo, pBugCategory
-end BugGenerate
-
-private command V1BugGenerate pBugInfo, pBugCategory
-
local tTags, tTagCount
put the keys of pBugInfo into tTags
GitSortTags tTags
@@ -1125,7 +1149,7 @@ private command V1BugGenerate pBugInfo, pBugCategory
put (tVersion is sVersion or tVersion is "HEAD") into tCurrent
put pBugInfo[tVersion] into tBugs
- sort lines of tBugs by item 1 of each
+ sort lines of tBugs numeric ascending by item 1 of each
-- Generate heading for table
put tVersion into tPrettyVersion
@@ -1162,73 +1186,7 @@ private command V1BugGenerate pBugInfo, pBugCategory
else if tBugCount > 1 then
MarkDownAppend "updates", merge("[[tBugCount]] [[pBugCategory]] bug fixes.")
end if
-end V1BugGenerate
-
-private command V2BugGenerate pBugInfo, pBugCategory
- local tTags, tTagCount
- put the keys of pBugInfo into tTags
- GitSortTags tTags
- put the number of lines of tTags into tTagCount
-
- if tTagCount is 0 then
- exit V2BugGenerate
- end if
-
- MarkdownAppend "notes", merge("## Specific [[pBugCategory]] bug fixes")
-
- local tVersion, tBugs, tPrettyVersion, tBugList
- local tLine, tId, tDesc, tUrl
- repeat tTagCount times
- put line tTagCount of tTags into tVersion
-
- put pBugInfo[tVersion] into tBugs
- sort lines of tBugs by item 1 of each
-
- put empty into tBugList
-
- -- Generate version info
- if tVersion is "HEAD" then
- put sVersion into tPrettyVersion
- else
- put tVersion into tPrettyVersion
- end if
- put merge("Bugs fixed in [[tPrettyVersion]]:") into tBugList
-
- -- Generate list of bug numbers with links
- repeat for each line tLine in tBugs
- put item 1 of tLine into tId
- put HtmlEscape(item 2 to -1 of tLine) into tDesc
- put BugUrl(tId) into tUrl
-
- put " " & \
- tId & " " & comma after tBugList
- end repeat
- put "." into char -1 of tBugList
-
- -- This version's bugs should be bold
- if tPrettyVersion is sVersion then
- put "**" before tBugList
- put "**" after tBugList
- end if
-
- MarkdownAppend "notes", "*" && tBugList
-
- -- Only this version's bugs should appear in the updater
- if tPrettyVersion is sVersion then
- MarkdownAppend "updates", "## Bugs fixed"
- put empty into tBugList
- repeat for each line tLine in tBugs
- put space & item 1 of tLine & comma after tBugList
- end repeat
- put "." into char -1 of tBugList
- MarkdownAppend "updates", tBugList & return
- end if
-
- subtract 1 from tTagCount
- end repeat
-
- MarkdownAppend "notes", empty
-end V2BugGenerate
+end BugGenerate
----------------------------------------------------------------
-- Markdown helpers
@@ -1386,12 +1344,12 @@ private function GitGetRelevantTags pType
put 0 into tStart
repeat for each line tLine in tTags
- add 1 to tStart
if tLine begins with sNumericVersion then
exit repeat
end if
+ add 1 to tStart
end repeat
- put line (tStart - 1) to -1 of tTags into tTags
+ put line tStart to -1 of tTags into tTags
repeat for each line tLine in tTags
if not (tLine begins with sNumericVersion) then
@@ -1435,15 +1393,6 @@ end GitGetChangedFiles
-- File helpers
----------------------------------------------------------------
-private command DeleteByteOrderMarks @xEncoded, pEncoding
- local tBom
- put textEncode(numToCodepoint(0xfeff), pEncoding) into tBom
-
- if xEncoded begins with tBom then
- delete byte 1 to (the number of bytes in tBom) of xEncoded
- end if
-end DeleteByteOrderMarks
-
private function FileGetBasename pPath
set the itemdelimiter to slash
put item -1 of pPath into pPath
@@ -1472,50 +1421,13 @@ private function FileGetPath pType
return the result & "/packaged_extensions"
case "dictionary"
return builderRepoFolder() & "/docs/dictionary"
+ case "base"
+ return builderRepoFolder() & "/docs/notes-base"
default
return pType
end switch
end FileGetPath
-private function FileGetUTF8Contents pPath
- return FileGetContents(pPath, "UTF-8")
-end FileGetUTF8Contents
-
-private function FileGetContents pPath, pEncoding
- local tContents, tResult
-
- put url("binfile:" & pPath) into tContents
- put the result into tResult
- if tResult is not empty then
- throw merge("Failed to read [[pPath]]: [[tResult]]")
- end if
-
- if pEncoding is not empty then
- DeleteByteOrderMarks tContents, pEncoding
- put textDecode(tContents, pEncoding) into tContents
- end if
-
- return tContents
-end FileGetContents
-
-private command FileSetUTF8Contents pPath, pContents
- local tResult
-
- open file pPath for "UTF-8" text write
- put the result into tResult
- if tResult is not empty then
- throw merge("Failed to open [[pPath]]: [[tResult]]")
- end if
-
- write pContents to file pPath
- put the result into tResult
- if tResult is not empty then
- throw merge("Failed to write [[pPath]]: [[tResult]]")
- end if
-
- close file pPath -- unchecked
-end FileSetUTF8Contents
-
private function FileGetSubFolders pPath
local tOldCwd, tFolder, tResult
put the defaultfolder into tOldCwd
diff --git a/builder/server_builder.livecodescript b/builder/server_builder.livecodescript
index d3cb3cf51da..5e33b17fe69 100644
--- a/builder/server_builder.livecodescript
+++ b/builder/server_builder.livecodescript
@@ -36,7 +36,7 @@ command serverBuilderRun pPlatform, pEdition
-- Clean up any existing output file
delete file tOutputFile
- if pPlatform is "windows" then
+ if pPlatform begins with "win-" then
repeat for each word tExternal in "revdb revzip revxml dbsqlite dbmysql dbpostgresql dbodbc"
get "server-" & tExternal & ".dll"
if there is not a file (tEngineFolder & slash & it) then
@@ -61,7 +61,7 @@ command serverBuilderRun pPlatform, pEdition
end if
local tExeExtension, tOutExeExtension
- if pPlatform is "windows" then
+ if pPlatform begins with "win-" then
put ".exe" into tExeExtension
put ".exe" into tOutExeExtension
--else if pPlatform is "linux" then
@@ -73,7 +73,7 @@ command serverBuilderRun pPlatform, pEdition
end if
local tLibExtension
- if pPlatform is "windows" then
+ if pPlatform begins with "win-" then
put ".dll" into tLibExtension
else if pPlatform is "macosx" then
put ".dylib" into tLibExtension
@@ -109,18 +109,17 @@ command serverBuilderRun pPlatform, pEdition
end if
end repeat
+ local tServerPath, tServerZipPath
+ put tEngineFolder & slash & "server-" & toLower(pEdition) & tExeExtension into tServerPath
if pEdition is "Community" then
- get tEngineFolder & slash & "server-community" & tExeExtension
+ put "livecode-community-server" & tOutExeExtension into tServerZipPath
else
- get tEngineFolder & slash & "server-commercial" & tExeExtension
+ put "livecode-server" & tOutExeExtension into tServerZipPath
end if
- if there is a file it then
+
+ if there is a file tServerPath then
builderLog "message", "Adding livecode-server engine"
- if pEdition is "Community" then
- revZipAddItemWithFile tOutputFile, "livecode-community-server" & tOutExeExtension, it
- else
- revZipAddItemWithFile tOutputFile, "livecode-server" & tOutExeExtension, it
- end if
+ revZipAddItemWithFile tOutputFile, tServerZipPath, tServerPath
if the result is not empty then
throw the result
end if
@@ -174,8 +173,10 @@ function getZipFilenameStub pVersion, pPlatform, pEdition
replace "." with "_" in pVersion
if pPlatform is "macosx" then
put "Mac" into pPlatform
- else if pPlatform is "windows" then
- put "Windows" into pPlatform
+ else if pPlatform is "win-x86" then
+ put "Windows-x86" into pPlatform
+ else if pPlatform is "win-x86_64" then
+ put "Windows-x86_64" into pPlatform
else if pPlatform is "linux-x86" then
put "Linux" into pPlatform
else if pPlatform is "linux-x86_64" then
@@ -183,9 +184,5 @@ function getZipFilenameStub pVersion, pPlatform, pEdition
else if pPlatform is "linux-armv6hf" then
put "Linux-armv6hf" into pPlatform
end if
- if pEdition is "Community" then
- return "LiveCodeCommunityServer-" & pVersion & "-" & pPlatform & ".zip"
- else
- return "LiveCodeServer-" & pVersion & "-" & pPlatform & ".zip"
- end if
+ return "LiveCode" & editionTitleCase(pEdition) & "Server-" & pVersion & "-" & pPlatform & ".zip"
end getZipFilenameStub
diff --git a/builder/tools_builder.livecodescript b/builder/tools_builder.livecodescript
index ee3e60be603..741605a9d1d 100644
--- a/builder/tools_builder.livecodescript
+++ b/builder/tools_builder.livecodescript
@@ -15,7 +15,7 @@ command toolsBuilderRun pPlatform, pEdition, pVersion
-- If on windows or linux, we can't do anything macosxy due to lack of lipo/strip :o(
local tEngineFolders
- get "windows linux-x86 linux-x86_64 linux-armv6hf macosx ios android emscripten"
+ get "win-x86 win-x86_64 linux-x86 linux-x86_64 linux-armv6hf macosx ios android-armeabi-v7a android-arm64-v8a android-x86 android-x86_64 emscripten"
repeat for each word tPlatform in it
builderFetchEngine pVersion, tPlatform
@@ -106,7 +106,7 @@ private command toolsBuilderFilterExternals pFolder, pPlatform
filter tArchiveFiles with "Android/External-*"
revZipCloseArchive pFolder & slash & tLCExt
- if tArchiveFiles is not empty then
+ if tArchiveFiles is empty then
get shell(merge("rm -fv '[[ tLCExt ]]'"))
end if
end repeat
@@ -130,7 +130,7 @@ private command toolsBuilderPrepareExt pEdition, pPlatform
-- Remove un-needed files from the unpacked Ext collection
local tOldFolder
local tCollectionFolder
- put builderUnpackFolder() & slash & "Ext" into tCollectionFolder
+ put builderUnpackFolder(pEdition) & slash & "Ext" into tCollectionFolder
put the defaultFolder into tOldFolder
set the defaultFolder to tCollectionFolder
repeat for each line tExtension in the folders
@@ -155,15 +155,7 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
local tBaseEditionType
put pEdition into tEditionType
- switch tEditionType
- case "Community"
- put "Community" into tBaseEditionType
- break
- case "Indy"
- case "Business"
- put "Commercial" into tBaseEditionType
- break
- end switch
+ put editionBaseEditionType(pEdition) into tBaseEditionType
-- Escape the version (by replacing all non-alphanumeric characters with "_")
local tVersionEscaped
@@ -200,14 +192,19 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
packageCompilerConfigureSource tPackager, "linux-x86", pEngineFolders["linux-x86"]
packageCompilerConfigureSource tPackager, "linux-x86_64", pEngineFolders["linux-x86_64"]
packageCompilerConfigureSource tPackager, "linux-armv6-hf", pEngineFolders["linux-armv6hf"]
- packageCompilerConfigureSource tPackager, "windows", pEngineFolders["windows"]
+ packageCompilerConfigureSource tPackager, "win-x86", pEngineFolders["win-x86"]
+ packageCompilerConfigureSource tPackager, "win-x86_64", pEngineFolders["win-x86_64"]
packageCompilerConfigureSource tPackager, "ios", pEngineFolders["ios"]
- packageCompilerConfigureSource tPackager, "android", pEngineFolders["android"]
+ packageCompilerConfigureSource tPackager, "android-armeabi-v7a", pEngineFolders["android-armeabi-v7a"]
+ packageCompilerConfigureSource tPackager, "android-arm64-v8a", pEngineFolders["android-arm64-v8a"]
+ packageCompilerConfigureSource tPackager, "android-x86", pEngineFolders["android-x86"]
+ packageCompilerConfigureSource tPackager, "android-x86_64", pEngineFolders["android-x86_64"]
packageCompilerConfigureSOurce tPackager, "emscripten", pEngineFolders["emscripten"]
packageCompilerConfigureSource tPackager, "prebuilt", builderRepoFolder() & slash & "prebuilt"
packageCompilerConfigureSource tPackager, "repo", builderRepoFolder()
- packageCompilerConfigureSource tPackager, "ext", builderUnpackFolder()
- if tEditionType is among the items of "indy,business" then
+ packageCompilerConfigureSource tPackager, "ext", builderUnpackFolder(pEdition)
+
+ if editionIsInPrivateRepo(tEditionType) then
packageCompilerConfigureSource tPackager, "private", builderPrivateRepoFolder()
end if
@@ -224,6 +221,8 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
end if
if pPlatform begins with "linux" then
packageCompilerConfigureVariable tPackager, "TargetPlatform", "linux"
+ else if pPlatform begins with "win" then
+ packageCompilerConfigureVariable tPackager, "TargetPlatform", "windows"
else
packageCompilerConfigureVariable tPackager, "TargetPlatform", pPlatform
end if
@@ -232,42 +231,33 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
packageCompilerConfigureVariable tPackager, "EscapedVersionTag", tVersionEscaped
packageCompilerConfigureVariable tPackager, "ProductBranch", char 1 to 3 of pVersion
packageCompilerConfigureVariable tPackager, "TargetArchitectures", "i386"
- if pPlatform is "linux-x86" then
+ if pPlatform ends with "-x86" then
packageCompilerConfigureVariable tPackager, "TargetArchitecture", "x86"
- else if pPlatform is "linux-x86_64" then
+ else if pPlatform ends with "-x86_64" then
packageCompilerConfigureVariable tPackager, "TargetArchitecture", "x86_64"
- else if pPlatform is "linux-armv6hf" then
+ else if pPlatform ends with "-armv6hf" then
packageCompilerConfigureVariable tPackager, "TargetArchitecture", "armv6-hf"
end if
-- Now all the names
local tProductName
- if pEdition is "Community" then
- packageCompilerConfigureVariable tPackager, "ProductTitle", "LiveCode Community" && getReadableVersion(pVersion)
- packageCompilerConfigureVariable tPackager, "ProductTag", "livecodecommunity_" & getTaggedVersion(pVersion)
- put "LiveCode Community" into tProductName
- else if pEdition is "Indy" then
- packageCompilerConfigureVariable tPackager, "ProductTitle", "LiveCode Indy" && getReadableVersion(pVersion)
- packageCompilerConfigureVariable tPackager, "ProductTag", "livecodeindy_" & getTaggedVersion(pVersion)
- put "LiveCode Indy" into tProductName
- else if pEdition is "Business" then
- packageCompilerConfigureVariable tPackager, "ProductTitle", "LiveCode Business" && getReadableVersion(pVersion)
- packageCompilerConfigureVariable tPackager, "ProductTag", "livecodebusiness_" & getTaggedVersion(pVersion)
- put "LiveCode Business" into tProductName
- end if
- -- For Linux only, case-fold the product name to lowercase and
- -- remove all spaces
- if pPlatform is "Linux" or pPlatform is "Linux-x86_64" or pPlatform is "Linux-armv6hf" then
- put toLower(tProductName) into tProductName
- replace " " with "" in tProductName
- end if
+ put "LiveCode" && editionDisplayName(pEdition) into tProductName
+
+ -- product tag is the lowercase product name with spaces removed
+ local tProductTag
+ put toLower(tProductName) into tProductTag
+ replace space with empty in tProductTag
+
+ packageCompilerConfigureVariable tPackager, "ProductTitle", tProductName && getReadableVersion(pVersion)
+ packageCompilerConfigureVariable tPackager, "ProductTag", tProductTag & "_" & getTaggedVersion(pVersion)
+
packageCompilerConfigureVariable tPackager, "ProductName", tProductName
-- The edition tags.
- packageCompilerConfigureVariable tPackager, "EditionTagLower", "-" & toLower(char 1 of tEditionType) & char 2 to -1 of tEditionType
- packageCompilerConfigureVariable tPackager, "EditionTagUpper", "-" & toUpper(char 1 of tEditionType) & char 2 to -1 of tEditionType
- packageCompilerConfigureVariable tPackager, "BaseEditionTagLower", "-" & toLower(char 1 of tBaseEditionType) & char 2 to -1 of tBaseEditionType
- packageCompilerConfigureVariable tPackager, "BaseEditionTagUpper", "-" & toUpper(char 1 of tBaseEditionType) & char 2 to -1 of tBaseEditionType
+ packageCompilerConfigureVariable tPackager, "EditionTagLower", "-" & toLower(tEditionType)
+ packageCompilerConfigureVariable tPackager, "EditionTagUpper", "-" & editionTitleCase(tEditionType)
+ packageCompilerConfigureVariable tPackager, "BaseEditionTagLower", "-" & toLower(tBaseEditionType)
+ packageCompilerConfigureVariable tPackager, "BaseEditionTagUpper", "-" & editionTitleCase(tBaseEditionType)
local tSuccess
put true into tSuccess
@@ -322,7 +312,7 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
lock messages
-- Ensure the correct capitalisation of the edition name
- put toUpper(char 1 of pEdition) & toLower(char 2 to -1 of pEdition) into pEdition
+ put editionTitleCase(pEdition) into pEdition
-- Compute the deploy temp folder
local tTempFolder
@@ -336,7 +326,7 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
builderEnsureFolderForFile tOutputFileStub
local tInstaller
- put the short name of stack (builderSystemFolder() & "/installer.rev") into tInstaller
+ put the short name of stack (builderSystemFolder() & "/installer.livecode") into tInstaller
-- Choose the apporpriate skin to use for the installer
local tResources
@@ -349,26 +339,43 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
set the mainStack of stack tResources to tInstaller
-- Make sure the installer library knows what product it is (for logging file name)
- if pEdition is "Community" then
- set the uProduct of stack tInstaller to "LiveCode Community"
- set the uProductTitle of stack tInstaller to "LiveCode Community" && getReadableVersion(pVersion)
- set the uProductTag of stack tInstaller to "livecodecommunity-" & pVersion
- set the uProductDetails of stack tInstaller to loadTextFile(builderSystemFolder() & "/../Installer/description.txt")
- set the uProductLicense of stack tInstaller to loadTextFile(pIdeFolder & slash & "License Agreement.txt")
- else if pEdition is "Indy" then
- set the uProduct of stack tInstaller to "LiveCode Indy"
- set the uProductTitle of stack tInstaller to "LiveCode Indy" && getReadableVersion(pVersion)
- set the uProductTag of stack tInstaller to "livecodeindy-" & pVersion
- set the uProductDetails of stack tInstaller to loadTextFile(builderSystemFolder() & "/../Installer/description.txt")
- set the uProductLicense of stack tInstaller to loadTextFile(pPrivateFolder & slash & "License Agreement.txt")
- else if pEdition is "Business" then
- set the uProduct of stack tInstaller to "LiveCode Business"
- set the uProductTitle of stack tInstaller to "LiveCode Business" && getReadableVersion(pVersion)
- set the uProductTag of stack tInstaller to "livecodebusiness-" & pVersion
- set the uProductDetails of stack tInstaller to loadTextFile(builderSystemFolder() & "/../Installer/description.txt")
- set the uProductLicense of stack tInstaller to loadTextFile(pPrivateFolder & slash & "License Agreement.txt")
- end if
+ local tProductName
+ put "LiveCode" && editionDisplayName(pEdition) into tProductName
+ local tProductTag
+ put toLower(tProductName) into tProductTag
+ replace space with empty in tProductTag
+
+ set the uProduct of stack tInstaller to tProductName
+ set the uProductTitle of stack tInstaller to tProductName && getReadableVersion(pVersion)
+ set the uProductTag of stack tInstaller to tProductTag & "-" & pVersion
+ set the uProductDetails of stack tInstaller to loadTextFile(builderSystemFolder() & "/../Installer/description.txt")
+
+ switch pEdition
+ case "community"
+ set the uProductLicense of stack tInstaller to loadTextFile(pIdeFolder & slash & "License Agreement.txt")
+ break
+ case "communityplus"
+ set the uProductLicense of stack tInstaller to loadTextFile(pPrivateFolder & slash & "CommunityPlus License Agreement.txt")
+ break
+ default
+ set the uProductLicense of stack tInstaller to loadTextFile(pPrivateFolder & slash & "License Agreement.txt")
+ break
+ end switch
+ -- move behaviors to substacks
+ local tInstallerBehaviors, tInstallerBehavior
+ put files(builderSystemFolder() & "/installer") into tInstallerBehaviors
+ filter tInstallerBehaviors without ".*"
+
+ repeat for each line tInstallerBehavior in tInstallerBehaviors
+ local tInstallerBehaviorPath
+ put builderSystemFolder() & "/installer/" & tInstallerBehavior into tInstallerBehaviorPath
+ if there is a stack tInstallerBehaviorPath then
+ set the scriptOnly of stack tInstallerBehaviorPath to false
+ set the mainstack of stack tInstallerBehaviorPath to tInstaller
+ end if
+ end repeat
+ set the stackFiles of stack tInstaller to empty
-- Save the restructured installer stack out to a temp file and delete from memory
local tInstallerStackfile
@@ -400,6 +407,7 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
put pVersion into tParams["version"]["ProductVersion"]
put pVersion into tParams["version"]["FileVersion"]
+ # TODO: Add the initialisation library and init libs in same way as normal standalone building
# AL-2015-03-14: Use deploy parameters to include libURL scriptified stack in installer standalone
local tAuxStackfiles
if there is a stack "revLibUrl" then
@@ -408,22 +416,15 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
put builderRepoFolder() & slash & "ide-support" & slash & "revliburl.livecodescript" into tAuxStackfiles
end if
put return & builderSystemFolder() & slash & "installer_utilities.livecodescript" after tAuxStackfiles
+ put tAuxStackfiles into tParams["auxiliary_stackfiles"]
- start using stack (builderRepoFolder() & slash & "ide-support" & slash & "revsblibrary.livecodescript")
- repeat for each line tStackFile in tAuxStackfiles
- local tTempStackFile
- put builderMakeTemporaryFile(tTempFolder, "stack") into tTempStackFile
- revSBResaveScriptOnlyStackAsProperStackFile the short name of stack tStackFile, tStackFile, tTempStackFile
- put tTempStackFile & return after tParams["auxiliary_stackfiles"]
- end repeat
- delete the last char of tParams["auxiliary_stackfiles"]
-
- // revLibURL needs to initialise its custom props, and revLoadLibrary must therefore be called.
- put merge("send [[quote]]revLoadLibrary[[quote]] to stack [[quote]]revLibUrl[[quote]]") into tParams["startup_script"]
+ // revLibURL needs to initialise its custom props, and extensionInitialize must therefore be called.
+ put merge("send [[quote]]extensionInitialize[[quote]] to stack [[quote]]revLibUrl[[quote]]") into tParams["startup_script"]
put return & "insert script of stack" && quote & "InstallerUtilities" & quote && "into back" after tParams["startup_script"]
switch pPlatform
- case "windows"
+ case "win-x86"
+ case "win-x86_64"
-- Process the manifest appropriately
local tManifestFile
get windowsManifest()
@@ -434,7 +435,7 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
put tManifestFile into tParams["manifest"]
-- First we deploy the installer unsigned
- put abstractPinFile(builderInstallerEngine("windows")) into tParams["engine"]
+ put abstractPinFile(builderInstallerEngine(pPlatform)) into tParams["engine"]
put tInstallerStackfile into tParams["stackfile"]
put pPackageFile into tParams["payload"]
put tOutputFileStub & ".unsigned.exe" into tParams["output"]
@@ -529,8 +530,8 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
put tInstallerStackFile into tParams["stackfile"]
put tOutputFileStub & ".app" & slash & "Contents/MacOS/Installer" into tParams["output"]
- -- We deploy as 32-bit only for now as the 64-bit slice isn't neccessary
- put "i386" into tParams["architectures"]
+ -- We deploy as 64-bit only as 32-bit apps will be blocked on MacOS 10.15+
+ put "x86-64" into tParams["architectures"]
put url ("binfile:" & pPackageFile) into url ("binfile:" & tOutputFileStub & ".app" & slash & "Contents/Resources/payload")
@@ -553,9 +554,26 @@ private function escapeArg pArg
return pArg
end escapeArg
+-- Needed on MacOS Sierra
+private command clearExtendedAttributes pAppBundle
+ -- make sure you have permission to clear extended attributes from bundle files
+ get shell("chmod -R u+w" && pAppBundle)
+ if the result is not zero then
+ builderLog "error", "Setting permissions failed with error:" && it
+ throw "failure"
+ end if
+
+ -- clear extended attributes from bundle files
+ get shell("xattr -cr" && pAppBundle)
+ if the result is not zero then
+ builderLog "error", "Clearing extended attributes failed with error:" && it
+ throw "failure"
+ end if
+end clearExtendedAttributes
+
private function findSigningIdentity
get shell("/usr/bin/security -q find-identity -v")
- filter it with "*Developer ID Application: Runtime Revolution Ltd*"
+ filter it with "*Developer ID Application:*"
return it
end findSigningIdentity
@@ -579,7 +597,7 @@ command toolsBuilderMakeAppBundle pVersion, pEdition, pPlatform
-- Run the installer to generate the raw app bundle
builderLog "message", "Installing macosx IDE to" && "'" & tAppBundle & "'"
- get shell(tOutputFileStub & ".app/Contents/MacOS/installer install noui -log /dev/stderr -location" && escapeArg(tAppBundle))
+ get shell(tOutputFileStub & ".app/Contents/MacOS/installer install -ui -log /dev/stderr -location" && escapeArg(tAppBundle))
if the result is not zero then
builderLog "error", "Failed to run macosx installer:" && it
throw "failure"
@@ -664,6 +682,8 @@ command toolsBuilderMakeAppBundle pVersion, pEdition, pPlatform
get shell("file" && escapeArg(tFullPath))
if tFile is "Standalone" or "Mach-O" is not among the words of it then next repeat
+ clearExtendedAttributes escapeArg(tFullPath)
+
-- Sign the extension
-- The "--force" parameter strips the existing signature (which was
-- made using a not-valid-for-distribution profile)
@@ -675,7 +695,47 @@ command toolsBuilderMakeAppBundle pVersion, pEdition, pPlatform
end if
end repeat
end repeat
+
+ -- Sign any extension code resources
+ local tExtensions
+ put folders(tAppBundle & "/Contents/Tools/Extensions") into tExtensions
+ repeat for each line tExtension in tExtensions
+ local tCodeFolders
+ put folders(tAppBundle & "/Contents/Tools/Extensions/" & tExtension & "/code") into tCodeFolders
+ filter tCodeFolders with "*iphonesimulator*"
+ if tCodeFolders is empty then next repeat
+
+
+ repeat for each line tCodeFolder in tCodeFolders
+ local tDylibs
+ filter files(tAppBundle & "/Contents/Tools/Extensions/" & tExtension & "/code/" & tCodeFolder) \
+ with "*.dylib" into tDylibs
+ if tDylibs is empty then next repeat
+
+ repeat for each line tFile in tDylibs
+ -- Ignore files that aren't dylibs
+ local tFullCodePath
+ put tAppBundle & "/Contents/Tools/Extensions/" & tExtension & "/code/" & tCodeFolder & "/" & tFile into tFullCodePath
+ get shell("file" && escapeArg(tFullCodePath))
+ if "Mach-O" is not among the words of it then next repeat
+
+ clearExtendedAttributes escapeArg(tFullCodePath)
+
+ -- Sign the extension
+ -- The "--force" parameter strips the existing signature (which was
+ -- made using a not-valid-for-distribution profile)
+ builderLog "message", "Signing iOS extension" && "'" & tFullCodePath & "'"
+ get shell("/usr/bin/codesign --sign" && word 2 of tSigningId && "--force --verbose=2" && escapeArg(tFullCodePath))
+ if the result is not zero then
+ builderLog "error", "Could not sign iOS extension:" && it
+ throw "failure"
+ end if
+ end repeat
+ end repeat
+ end repeat
+ clearExtendedAttributes escapeArg(tAppBundle)
+
builderLog "message", "Signing macosx app bundle" && "'" & tAppBundle & "'"
wait 1 second
get shell("/usr/bin/codesign --sign" && word 2 of tSigningId && "--deep --verbose=2" && escapeArg(tAppBundle))
@@ -685,7 +745,8 @@ command toolsBuilderMakeAppBundle pVersion, pEdition, pPlatform
end if
builderLog "report", "Successfully signed macosx app bundle" && "'" & tAppBundle & "'"
else
- builderLog "warning", "No valid identity found for signing OSX app bundle"
+ builderLog "error", "No valid identity found for signing OSX app bundle"
+ throw "failure"
end if
-- One last permission change (but a non-signature-breaking one) to prevent accidental IDE modifications
@@ -866,7 +927,7 @@ function getReadableVersion pVersion
end getReadableVersion
function getBundleFilenameStub pVersion, pPlatform, pEdition
- return "LiveCode" && the upper of char 1 of pEdition & the lower of char 2 to -1 of pEdition && getFullReadableVersion(pVersion)
+ return "LiveCode" && editionDisplayName(pEdition) && getFullReadableVersion(pVersion)
end getBundleFilenameStub
function getInstallerFilenameStub pVersion, pPlatform, pEdition
@@ -878,13 +939,15 @@ function getInstallerFilenameStub pVersion, pPlatform, pEdition
replace "." with "_" in pVersion
if pPlatform is "macosx" then
put "Mac" into pPlatform
- else if pPlatform is "windows" then
- put "Windows" into pPlatform
+ else if pPlatform is "win-x86" then
+ put "Windows-x86" into pPlatform
+ else if pPlatform is "win-x86_64" then
+ put "Windows-x86_64" into pPlatform
else if pPlatform begins with "linux" then
put "Linux" into pPlatform
end if
- return "LiveCode" & the upper of char 1 of pEdition & the lower of char 2 to -1 of pEdition & "Installer-" & pVersion & "-" & pPlatform
+ return "LiveCode" & editionTitleCase(pEdition) & "Installer-" & pVersion & "-" & pPlatform
end getInstallerFilenameStub
function getDmgFilenameStub pVersion, pPlatform, pEdition
@@ -896,12 +959,14 @@ function getDmgFilenameStub pVersion, pPlatform, pEdition
replace "." with "_" in pVersion
if pPlatform is "macosx" then
put "Mac" into pPlatform
- else if pPlatform is "windows" then
- put "Windows" into pPlatform
+ else if pPlatform is "win-x86" then
+ put "Windows-x86" into pPlatform
+ else if pPlatform is "win-x86_64" then
+ put "Windows-x86_64" into pPlatform
else if pPlatform is "linux" or pPlatform is "linux-x64" or pPlatform is "linux-armv6hf" then
put "Linux" into pPlatform
end if
- return "LiveCode" & the upper of char 1 of pEdition & the lower of char 2 to -1 of pEdition & "-" & pVersion & "-" & pPlatform
+ return "LiveCode" & editionTitleCase(pEdition) & "-" & pVersion & "-" & pPlatform
end getDmgFilenameStub
function loadTextFile pFile
diff --git a/builder/tools_installer_resources.rev b/builder/tools_installer_resources.rev
old mode 100644
new mode 100755
index 58e9fd904d3..9744709f86b
Binary files a/builder/tools_installer_resources.rev and b/builder/tools_installer_resources.rev differ
diff --git a/builder/user_guide_builder.livecodescript b/builder/user_guide_builder.livecodescript
index 46eba61624f..f200a73f664 100644
--- a/builder/user_guide_builder.livecodescript
+++ b/builder/user_guide_builder.livecodescript
@@ -10,7 +10,6 @@ private command Initialize pEdition, pVersion, pOutputPath
exit Initialize
end if
- start using stack (builderSystemFolder() & slash & "markdown_compiler.livecodescript")
set the defaultfolder to builderRepoFolder()
set the hideconsolewindows to true
@@ -21,7 +20,7 @@ private command Initialize pEdition, pVersion, pOutputPath
end Initialize
private command Finalize
- stop using stack (builderSystemFolder() & slash & "markdown_compiler.livecodescript")
+
end Finalize
command guideBuilderRun pEdition, pVersion, pReleaseType, pOutputDir
@@ -51,7 +50,7 @@ private function OutputGetGuideFilename tSuffix, pVersion
end if
local tBasename
- put merge("LiveCode[[sEdition]]UserGuide-") & replaceText(pVersion, "[-,\.]", "_") into tBasename
+ put merge("LiveCodeUserGuide-") & replaceText(pVersion, "[-,\.]", "_") into tBasename
return sOutputPath & slash & tBasename & "." & tSuffix
end OutputGetGuideFilename
diff --git a/builder/windows_manifest.xml b/builder/windows_manifest.xml
index 00484d48e0f..e4e9fdc809d 100644
--- a/builder/windows_manifest.xml
+++ b/builder/windows_manifest.xml
@@ -18,6 +18,6 @@
-
+
diff --git a/common.gypi b/common.gypi
index ecf9f960469..b21d1a1029c 100644
--- a/common.gypi
+++ b/common.gypi
@@ -12,5 +12,26 @@
'config/version.gypi',
'config/yacc.gypi',
],
+
+ # generate platform ID once all config is included
+ 'variables':
+ {
+ 'conditions':
+ [
+ # TODO add windows msvc compiler and crt mode to platform id
+ [
+ '(OS == "mac" or OS == "ios")',
+ {
+ 'platform_id': 'universal-<(OS)-<(target_sdk)',
+ },
+ '(OS == "win")',
+ {
+ 'platform_id': '<(uniform_arch)-win32',
+ },
+ {
+ 'platform_id': '<(uniform_arch)-<(OS)',
+ },
+ ],
+ ],
+ },
}
-
diff --git a/config-rpi.sh b/config-rpi.sh
new file mode 100755
index 00000000000..3018b23a2d8
--- /dev/null
+++ b/config-rpi.sh
@@ -0,0 +1,3 @@
+#/bin/bash
+
+./config.sh --cross --platform linux-armv6hf --cc-prefix ${HOME}/x-tools/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf- --sysroot ${HOME}/x-tools/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot --aux-sysroot /var/lib/schroot/chroots/jessie-armhf --triple arm-linux-gnueabihf
diff --git a/config.py b/config.py
new file mode 100755
index 00000000000..3ee3b7e9800
--- /dev/null
+++ b/config.py
@@ -0,0 +1,851 @@
+#!/usr/bin/env python
+# Copyright (C) 2017 LiveCode Ltd.
+#
+# This file is part of LiveCode.
+#
+# LiveCode is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License v3 as published by the Free
+# Software Foundation.
+#
+# LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LiveCode. If not see .
+
+import sys
+import platform
+import re
+import os
+import subprocess
+import shutil
+
+# The set of platforms for which this branch supports automated builds
+BUILDBOT_PLATFORM_TRIPLES = (
+ 'x86-linux-debian8',
+ 'x86_64-linux-debian8',
+ 'armv7-android-ndk16r15',
+ 'arm64-android-ndk16r15',
+ 'x86-android-ndk16r15',
+ 'x86_64-android-ndk16r15',
+ 'universal-mac-macosx10.9', # Minimum deployment target
+ 'universal-ios-iphoneos14.5',
+ 'universal-ios-iphoneos14.4',
+ 'universal-ios-iphoneos13.2',
+ 'universal-ios-iphoneos12.1',
+ 'universal-ios-iphoneos11.2',
+ 'universal-ios-iphonesimulator14.5',
+ 'universal-ios-iphonesimulator14.4',
+ 'universal-ios-iphonesimulator13.2',
+ 'universal-ios-iphonesimulator12.1',
+ 'universal-ios-iphonesimulator11.2',
+ 'x86-win32', # TODO[2017-03-23] More specific ABI
+ 'x86_64-win32',
+ 'js-emscripten-sdk1.35',
+)
+
+KNOWN_PLATFORMS = (
+ 'linux-x86', 'linux-x86_64', 'linux-armv6hf', 'linux-armv7',
+ 'android-armv6', 'android-armv7', 'android-arm64', 'android-x86', 'android-x86_64',
+ 'mac', 'ios',
+ 'win-x86', 'win-x86_64',
+ 'emscripten'
+)
+
+def usage(exit_status):
+ print(
+"""Use gyp to generate project files when compiling LiveCode.
+
+Usage:
+ config.py [--platform PLATFORM] [OPTION...] [GYP_OPTION ...]
+
+Options:
+ -p, --platform PLATFORM
+ Choose which platform to build for
+ -h, --help Print this message
+ --sysroot SYSROOT
+ Use the given folder for system headers and libraries (only
+ useful when cross-compiling).
+ --aux-sysroot SYSROOT
+ Like --sysroot but --sysroot's headers and libraries
+ come first. Passed to the compiler as -I/-L options
+ instead of a --sysroot option.
+ --triple TRIPLE
+ Required if --aux-sysroot has a `multilib' setup where
+ some headers and libraries are under a subdirectory named
+ with the target triple. This is often the case for Debian/
+ Ubuntu derived distributions.
+ --cc-prefix PREFIX
+ Compiler prefix path e.g.
+ ${HOME}/toolchain/bin/arm-linux-gnueabi-
+ --cross
+ Indicates cross-compilation (you probably want to specify
+ --sysroot/--aux-sysroot and --cc-prefix too).
+ --use-lto
+ [EXPERIMENTAL] Use link-time optimisation when building.
+
+gyp options:
+ --generator-output DIR
+ Put generated build files under DIR
+ --depth PATH Set DEPTH gyp variable to a relative path to PATH
+ -f, --format FORMATS
+ Output formats to generate
+ -Gmsvs_version=WIN_MSVS_VERSION
+ Version of Microsoft Visual Studio to use
+ -Gandroid_ndk_version=ANDROID_NDK_VERSION
+ Version of Android Native Development Kit to use
+ -DOS=OS Target operating system
+ -Dtarget_arch=TARGET_ARCH
+ Target LiveCode to run on ARCH processors
+ -Dtarget_sdk=XCODE_TARGET_SDK
+ Compile LiveCode using the specified SDK in Xcode
+ -Dhost_sdk=XCODE_HOST_SDK
+ Compile build tools using the specified SDK in Xcode
+
+All unrecognised options get passed directly to gyp. If you don't specify
+a required option, config.py will try to guess a suitable value.
+
+The currently-supported PLATFORMs are:
+""")
+ for p in KNOWN_PLATFORMS:
+ print(" " + p)
+ sys.exit(exit_status)
+
+def error(message):
+ print('ERROR: ' + message)
+ sys.exit(1)
+
+def guess_platform():
+ system = platform.system()
+ arch = platform.machine()
+ if system == 'Darwin':
+ return 'mac'
+ if system == 'Linux':
+ if re.match('^(x|i.?)86$', arch) is not None:
+ return 'linux-x86'
+ else:
+ return 'linux-' + arch
+ if system == 'Windows':
+ if arch == 'AMD64':
+ return 'win-x86_64'
+ else:
+ return 'win-x86'
+
+def exec_gyp(args):
+ gyp_lib = os.path.join(os.path.dirname(sys.argv[0]), 'gyp', 'pylib')
+ sys.path.insert(0, gyp_lib)
+ import gyp
+ print('gyp ' + ' '.join(args))
+ sys.exit(gyp.main(args))
+
+################################################################
+# Parse command-line options
+################################################################
+
+def process_env_options(opts):
+ vars = ('OS', 'PLATFORM', 'GENERATOR_OUTPUT', 'FORMATS', 'DEPTH',
+ 'WIN_MSVS_VERSION', 'XCODE_TARGET_SDK', 'XCODE_HOST_SDK',
+ 'TARGET_ARCH', 'PERL', 'ANDROID_NDK_VERSION', 'ANDROID_LIB_PATH',
+ 'ANDROID_NDK_PLATFORM_VERSION', 'ANDROID_PLATFORM',
+ 'ANDROID_SDK', 'ANDROID_NDK', 'ANDROID_BUILD_TOOLS', 'LTO',
+ 'ANDROID_TOOLCHAIN_DIR', 'ANDROID_TOOLCHAIN', 'ANDROID_API_VERSION',
+ 'AR', 'CC', 'CXX', 'LINK', 'OBJCOPY', 'OBJDUMP',
+ 'STRIP', 'JAVA_SDK', 'NODE_JS', 'BUILD_EDITION', 'CC_PREFIX', 'CROSS',
+ 'SYSROOT', 'AUX_SYSROOT', 'TRIPLE', 'MS_SPEECH_SDK5', 'QUICKTIME_SDK',
+ )
+ for v in vars:
+ opts[v] = os.getenv(v)
+
+ if opts['FORMATS'] is not None:
+ opts['FORMATS'] = opts['FORMATS'].split()
+ else:
+ opts['FORMATS'] = []
+
+def process_arg_options(opts, args):
+ gyp_options = []
+ offset = 0
+ while offset < len(args):
+ key = args[offset]
+ if offset + 1 < len(args):
+ value = args[offset + 1]
+ else:
+ value = None
+
+ if key in ('-h', '--help'):
+ usage(0)
+ if key in ('-p', '--platform'):
+ opts['PLATFORM'] = value
+ offset += 2
+ continue
+ if key in ('--use-lto'):
+ opts['LTO'] = True
+ offset += 1
+ continue
+ if key in ('--cross'):
+ opts['CROSS'] = True
+ offset += 1
+ continue
+ if key in ('--sysroot'):
+ opts['SYSROOT'] = value
+ offset += 2
+ continue
+ if key in ('--aux-sysroot'):
+ opts['AUX_SYSROOT'] = value
+ offset += 2
+ continue
+ if key in ('--triple'):
+ opts['TRIPLE'] = value
+ offset += 2
+ continue
+ if key in ('--cc-prefix'):
+ opts['CC_PREFIX'] = value
+ offset += 2
+ continue
+ if key in ('--generator-output'):
+ opts['GENERATOR_OUTPUT'] = value
+ offset += 2
+ continue
+ if key in ('--depth'):
+ opts['DEPTH'] = value
+ offset += 2
+ continue
+ if key in ('-f', '--format'):
+ opts['FORMATS'].insert(0, value)
+ offset += 2
+ continue
+
+ # Intercept -D & -G options that config.py tries to generate
+ intercepted_options = {
+ '-Dhost_sdk': 'XCODE_HOST_SDK',
+ '-Dtarget_sdk': 'XCODE_TARGET_SDK',
+ '-Dtarget_arch': 'TARGET_ARCH',
+ '-DOS': 'OS',
+ '-Dperl': 'PERL',
+ '-Dms_speech_sdk5': 'MS_SPEECH_SDK5',
+ '-Dquicktime_sdk': 'QUICKTIME_SDK',
+ '-Gmsvs_version': 'WIN_MSVS_VERSION',
+ '-Gandroid_ndk_version': 'ANDROID_NDK_VERSION',
+ }
+ if key.startswith('-D') or key.startswith('-G'):
+ prefix, suffix = key.split('=',2)
+ if prefix in intercepted_options:
+ opts[intercepted_options[prefix]] = suffix
+ else:
+ gyp_options.append(key)
+ offset += 1
+ continue
+
+ # Unrecognised option
+ error("Unrecognised option '{}'".format(key))
+
+ opts['GYP_OPTIONS'] = gyp_options
+
+
+################################################################
+# Guess and validate platform and OS
+################################################################
+
+def validate_platform(opts):
+ platform = opts['PLATFORM']
+ if platform is None:
+ platform = guess_platform()
+ if platform is None:
+ error("Cannot guess platform; specify '--platform -'")
+
+ if not platform in KNOWN_PLATFORMS:
+ error("Unrecognised platform: '{}'".format(platform))
+
+ opts['PLATFORM'] = platform
+
+def validate_os(opts):
+ validate_platform(opts)
+
+ # Windows systems may have $OS set automatically in the
+ # environment
+ if opts['OS'] == 'Windows_NT':
+ opts['OS'] = 'win'
+
+ if opts['OS'] is None:
+ opts['OS'] = opts['PLATFORM'].split('-')[0]
+
+def host_platform(opts):
+ opts['HOST_PLATFORM'] = guess_platform()
+
+def guess_xcode_arch(target_sdk):
+ sdk, ver = re.match('^([^\d]*)(\d*)', target_sdk).groups()
+ if sdk == 'macosx':
+ return 'x86_64'
+ if sdk == 'iphoneos':
+ if int(ver) < 8:
+ return 'armv7'
+ else:
+ return 'armv7 arm64'
+ if sdk == 'iphonesimulator':
+ return 'x86_64'
+
+def validate_target_arch(opts):
+ if opts['TARGET_ARCH'] is None:
+ validate_platform(opts)
+
+ platform = opts['PLATFORM']
+ if platform == 'emscripten':
+ opts['TARGET_ARCH'] = 'js'
+ opts['UNIFORM_ARCH'] = opts['TARGET_ARCH']
+ return
+
+ platform_arch = re.search('-(x86|x86_64|arm(64|v(6(hf)?|7)))$', platform)
+ if platform_arch is not None:
+ opts['TARGET_ARCH'] = platform_arch.group(1)
+ opts['UNIFORM_ARCH'] = opts['TARGET_ARCH']
+ return
+
+ if re.match('^(ios|mac)', platform) is not None:
+ validate_xcode_sdks(opts)
+ arch = guess_xcode_arch(opts['XCODE_TARGET_SDK'])
+ if arch is not None:
+ opts['TARGET_ARCH'] = arch
+ opts['UNIFORM_ARCH'] = opts['TARGET_ARCH']
+ return
+
+ error("Couldn't guess target architecture for '{}'".format(platform))
+ else:
+ opts['UNIFORM_ARCH'] = opts['TARGET_ARCH']
+
+################################################################
+# Guess other general options
+################################################################
+
+def validate_gyp_settings(opts):
+ if opts['GENERATOR_OUTPUT'] is None:
+ validate_platform(opts)
+
+ opts['GENERATOR_OUTPUT'] = \
+ os.path.join('build-' + opts['PLATFORM'], 'livecode')
+
+ if len(opts['FORMATS']) < 1:
+ validate_os(opts)
+
+ build_os = opts['OS']
+ if build_os in ('linux', 'android', 'emscripten'):
+ format = 'make-linux'
+ elif build_os in ('mac', 'ios'):
+ format = 'xcode'
+ elif build_os in ('win'):
+ format = 'msvs'
+ opts['FORMATS'] = [format,]
+
+ if opts['DEPTH'] is None:
+ opts['DEPTH'] = '.'
+
+ if opts['BUILD_EDITION'] is None:
+ opts['BUILD_EDITION'] = 'community'
+
+def guess_java_home(platform):
+ if platform.startswith('linux'):
+ try:
+ javac_str = '/bin/javac'
+ javac_path = subprocess.check_output(['/usr/bin/env',
+ 'readlink', '-f', '/usr' + javac_str]).strip()
+ if (os.path.isfile(javac_path) and
+ javac_path.endswith(javac_str)):
+ return javac_path[:-len(javac_str)]
+ except subprocess.CalledProcessError as e:
+ print(e)
+ pass # Fall through to other ways of guessing
+
+ # More guesses
+ try:
+ if os.path.isfile('/usr/libexec/java_home'):
+ return subprocess.check_output('/usr/libexec/java_home').strip()
+ except subprocess.CalledProcessError as e:
+ print(e)
+ pass
+ for d in ('/usr/lib/jvm/default', '/usr/lib/jvm/default-java'):
+ if os.path.isdir(d):
+ return d
+
+def validate_java_tools(opts):
+ if opts['JAVA_SDK'] is None:
+ validate_platform(opts)
+ sdk = guess_java_home(opts['HOST_PLATFORM'])
+ if sdk is None:
+ error('Java SDK not found; set $JAVA_SDK')
+ opts['JAVA_SDK'] = sdk
+
+def configure_toolchain(opts):
+ ccprefix = ''
+ if opts['CC_PREFIX'] is not None:
+ ccprefix = opts['CC_PREFIX']
+ if opts['CC'] is None:
+ opts['CC'] = ccprefix + 'cc'
+ if opts['CXX'] is None:
+ opts['CXX'] = ccprefix + 'c++'
+ if opts['AR'] is None:
+ opts['AR'] = ccprefix + 'ar'
+ if opts['LINK'] is None:
+ opts['LINK'] = opts['CXX']
+ if opts['STRIP'] is None:
+ opts['STRIP'] = ccprefix + 'strip'
+ if opts['OBJCOPY'] is None:
+ opts['OBJCOPY'] = ccprefix + 'objcopy'
+ if opts['OBJDUMP'] is None:
+ opts['OBJDUMP'] = ccprefix + 'objdump'
+
+ # Enable LTO if requested
+ if opts['LTO'] is True:
+ for key in ('CC', 'CXX', 'LINK'):
+ opts[key] += ' -flto -ffunction-sections -fdata-sections -fuse-linker-plugin -fuse-ld=gold'
+
+ # If cross-compiling, link libgcc and libstdc++ statically.
+ # This is done because the cross-compilers are likely to be different
+ # versions to those available on the target system.
+ if opts['CROSS'] is True:
+ for key in ('CC', 'CXX', 'LINK'):
+ opts[key] += ' -static-libgcc -static-libstdc++'
+
+ # Append a --sysroot option for the compilers and linker
+ if opts['SYSROOT'] is not None:
+ for key in ('CC', 'CXX', 'LINK'):
+ opts[key] += ' --sysroot="' + opts['SYSROOT'] + '"'
+ opts[key] += ' -Wl,--sysroot,"' + opts['SYSROOT'] + '"'
+
+ # Configure an auxiliary sysroot, if one is specified.
+ #
+ # The -L options beginning '-L=/' are required to ensure the original
+ # sysroot gets searched before the auxiliary one. Similarly with
+ # -idirafter; these come after the sysroot include directories.
+ if opts['AUX_SYSROOT'] is not None:
+ for key in ('CC', 'CXX', 'LINK'):
+ opts[key] += ' -idirafter "' + opts['AUX_SYSROOT'] + '/usr/include"'
+ opts[key] += ' -L=/lib'
+ opts[key] += ' -L=/usr/lib'
+ if opts['TRIPLE'] is not None:
+ opts[key] += ' -L"=/lib/' + opts['TRIPLE'] + '"'
+ opts[key] += ' -L"=/usr/lib/' + opts['TRIPLE'] + '"'
+ opts[key] += ' -L"' + opts['AUX_SYSROOT'] + '/lib"'
+ opts[key] += ' -L"' + opts['AUX_SYSROOT'] + '/usr/lib"'
+ opts[key] += ' -Wl,-rpath-link,"' + opts['AUX_SYSROOT'] + '/lib"'
+ opts[key] += ' -Wl,-rpath-link,"' + opts['AUX_SYSROOT'] + '/usr/lib"'
+ if opts['TRIPLE'] is not None:
+ opts[key] += ' -idirafter "' + opts['AUX_SYSROOT'] + '/usr/include/' + opts['TRIPLE'] + '"'
+ opts[key] += ' -L"' + opts['AUX_SYSROOT'] + '/lib/' + opts['TRIPLE'] + '"'
+ opts[key] += ' -L"' + opts['AUX_SYSROOT'] + '/usr/lib/' + opts['TRIPLE'] + '"'
+ opts[key] += ' -Wl,-rpath-link,"' + opts['AUX_SYSROOT'] + '/lib/' + opts['TRIPLE'] + '"'
+ opts[key] += ' -Wl,-rpath-link,"' + opts['AUX_SYSROOT'] + '/usr/lib/' + opts['TRIPLE'] + '"'
+
+ # Add LD as an alias for LINK
+ opts['LD'] = opts['LINK']
+
+################################################################
+# Windows-specific options
+################################################################
+
+def get_program_files_x86():
+ return os.environ.get('ProgramFiles(x86)',
+ os.environ.get('ProgramFiles',
+ 'C:\\Program Files\\'))
+
+def guess_windows_perl():
+ # Check the PATH first
+ if (any(os.access(os.path.join(p, 'perl.exe'), os.X_OK)
+ for p in os.environ['PATH'].split(os.pathsep))):
+ return 'perl.exe'
+
+ for p in ('C:\\perl64\\bin', 'C:\\perl\\bin'):
+ perl = os.path.join(p, 'perl.exe')
+ if os.access(perl, os.X_OK):
+ return perl
+
+ # If this is running on a non-Windows platform, default to "perl"
+ if platform.system() != 'windows':
+ return 'perl'
+
+ error('Perl not found; set $PERL')
+
+def guess_ms_speech_sdk5():
+ d = os.path.join(get_program_files_x86(), 'Microsoft Speech SDK 5.1')
+ if not os.path.isdir(d):
+ return None
+ return d
+
+def guess_quicktime_sdk():
+ d = os.path.join(get_program_files_x86(), 'QuickTime SDK')
+ if not os.path.isdir(d):
+ return None
+ return d
+
+def validate_windows_tools(opts):
+ if opts['PERL'] is None:
+ opts['PERL'] = guess_windows_perl()
+
+ if opts['MS_SPEECH_SDK5'] is None:
+ opts['MS_SPEECH_SDK5'] = guess_ms_speech_sdk5()
+
+ if opts['QUICKTIME_SDK'] is None:
+ opts['QUICKTIME_SDK'] = guess_quicktime_sdk()
+
+ if opts['WIN_MSVS_VERSION'] is None:
+ # TODO [2017-04-11]: This should be 2017, but it is not
+ # compatible with our gyp as is.
+ opts['WIN_MSVS_VERSION'] = '2015'
+
+################################################################
+# Mac & iOS-specific options
+################################################################
+
+def validate_xcode_sdks(opts):
+ if opts['XCODE_TARGET_SDK'] is None:
+ validate_os(opts)
+ if opts['OS'] == 'mac':
+ opts['XCODE_TARGET_SDK'] = 'macosx10.9'
+ elif opts['OS'] == 'ios':
+ opts['XCODE_TARGET_SDK'] = 'iphoneos'
+
+ if opts['XCODE_HOST_SDK'] is None:
+ validate_os(opts)
+ if opts['OS'] == 'mac':
+ opts['XCODE_HOST_SDK'] = opts['XCODE_TARGET_SDK']
+ elif opts['OS'] == 'ios':
+ opts['XCODE_HOST_SDK'] = 'macosx'
+
+################################################################
+# Android-specific options
+################################################################
+
+# We suggest some symlinks for Android toolchain components in the
+# INSTALL-android.md file. This checks if a directory is present
+def guess_android_tooldir(toolchain, name):
+ if toolchain is None:
+ dir = os.path.join(os.path.expanduser('~'), 'android', 'toolchain', name)
+ else:
+ dir = os.path.join(toolchain, name)
+ if os.path.isdir(dir):
+ return dir
+ return None
+
+# Attempt to guess the Android build tools version by looking for directories
+# in the SDK's build-tools subdirectory. This is pretty fragile if someone
+# has (potentially?) multiple sets of build tools installed.
+def guess_android_build_tools(sdkdir):
+ dirs = os.listdir(os.path.join(sdkdir, 'build-tools'))
+ if len(dirs) == 1:
+ return dirs[0]
+ return None
+
+# Guess the standalone toolchain directory name.
+def guess_standalone_toolchain_dir_name(target_arch):
+ if target_arch == 'armv6' or target_arch == 'armv7':
+ return 'standalone-arm'
+ else:
+ return 'standalone-' + target_arch
+
+# Guess the triple to use for a given Android target architecture.
+def guess_android_triple(target_arch):
+ if target_arch == 'armv6':
+ return 'arm-linux-androideabi'
+ elif target_arch == 'armv7':
+ return 'armv7-linux-androideabi'
+ elif target_arch == 'arm64':
+ return 'aarch64-linux-android'
+ elif target_arch == 'x86':
+ return 'i686-linux-android'
+ elif target_arch == 'x86_64':
+ return 'x86_64-linux-android'
+ else:
+ return target_arch
+
+# Guess the value to pass with the -march flag for Android builds.
+def guess_android_march(target_arch):
+ if target_arch == 'armv7':
+ return 'armv7-a'
+ elif target_arch == 'arm64':
+ # The -march flag is not used for baseline arm64.
+ return ''
+ elif target_arch == 'x86':
+ return 'i686'
+ elif target_arch == 'x86_64':
+ # The -march flag is not used for baseline x86_64
+ return ''
+ return target_arch
+
+# Guess the prefix used on the compiler's name.
+def guess_compiler_prefix(target_arch):
+ if target_arch == 'armv7':
+ # The ARMv7 triple is different from its compiler's prefix.
+ triple = guess_android_triple('armv6')
+ else:
+ triple = guess_android_triple(target_arch)
+ if triple == target_arch:
+ return ''
+ return triple + '-'
+
+# Returns any extra C/C++ compiler flags required when targeting Android on the
+# given architecture.
+def android_extra_cflags(target_arch):
+ if target_arch == 'armv7':
+ # The first three flags are required in order to guarantee ABI compatibility.
+ # Additionally, Google recommends generating thumb instructions on Android.
+ return '-mfloat-abi=softfp -mfpu=vfpv3-d16 -Wl,--fix-cortex-a8 -mthumb'
+ elif target_arch == 'armv6':
+ # Google recommends generating thumb instructions on Android.
+ return '-mthumb'
+ return ''
+
+# Returns any extra linker flags required when targeting Android on the given
+# architecture.
+def android_extra_ldflags(target_arch):
+ if target_arch == 'armv7':
+ return '-Wl,--fix-cortex-a8'
+ return ''
+
+def validate_android_tools(opts):
+ if opts['ANDROID_NDK_VERSION'] is None:
+ opts['ANDROID_NDK_VERSION'] = 'r15'
+
+ ndk_ver = opts['ANDROID_NDK_VERSION']
+
+ toolchain_dir = opts['ANDROID_TOOLCHAIN_DIR']
+
+ if opts['ANDROID_NDK'] is None:
+ ndk = guess_android_tooldir(toolchain_dir, 'android-ndk')
+ if ndk is None:
+ error('Android NDK not found; set $ANDROID_NDK')
+ opts['ANDROID_NDK'] = ndk
+
+ if opts['ANDROID_NDK_PLATFORM_VERSION'] is None:
+ opts['ANDROID_NDK_PLATFORM_VERSION'] = '16'
+
+ if opts['ANDROID_API_VERSION'] is None:
+ opts['ANDROID_API_VERSION'] = '29'
+
+ api_ver = opts['ANDROID_API_VERSION']
+
+ if opts['ANDROID_PLATFORM'] is None:
+ opts['ANDROID_PLATFORM'] = 'android-' + api_ver
+
+ if opts['ANDROID_SDK'] is None:
+ sdk = guess_android_tooldir(toolchain_dir, 'android-sdk')
+ if sdk is None:
+ error('Android SDK not found; set $ANDROID_SDK')
+ opts['ANDROID_SDK'] = sdk
+
+ if opts['ANDROID_BUILD_TOOLS'] is None:
+ tools = guess_android_build_tools(opts['ANDROID_SDK'])
+ if tools is None:
+ error('Android build tools not found; set $ANDROID_BUILD_TOOLS')
+ opts['ANDROID_BUILD_TOOLS'] = tools
+
+ if opts['ANDROID_TOOLCHAIN'] is None:
+ dir = guess_android_tooldir(toolchain_dir, guess_standalone_toolchain_dir_name(opts['TARGET_ARCH']))
+ if dir is None:
+ error('Android toolchain not found for architecture {}; set $ANDROID_TOOLCHAIN'.format(opts['TARGET_ARCH']))
+ prefix = guess_compiler_prefix(opts['TARGET_ARCH'])
+ opts['ANDROID_TOOLCHAIN'] = os.path.join(dir,'bin',prefix)
+
+ def android_tool(name, env, extra=""):
+ if opts[env] is None:
+ tool = opts['ANDROID_TOOLCHAIN'] + name
+ if extra is not None:
+ tool += ' ' + extra
+ opts[env] = tool
+
+ target_arch = opts['TARGET_ARCH']
+ march = guess_android_march(target_arch)
+ triple = guess_android_triple(target_arch)
+ cflags = android_extra_cflags(target_arch)
+ ldflags = android_extra_ldflags(target_arch)
+
+ if opts['ANDROID_LIB_PATH'] is None:
+ dir =guess_standalone_toolchain_dir_name(opts['TARGET_ARCH'])
+ if dir is None:
+ error('Android standalone toolchain not found for architecture {}'.format(opts['TARGET_ARCH']))
+
+ opts['ANDROID_LIB_PATH'] = os.path.join(dir,triple,'lib')
+
+ # All Android builds use Clang and make a lot of noise about unused
+ # arguments (e.g. linker-specific arguments). Suppress them.
+ cflags += ' -Qunused-arguments'
+
+ if march != '':
+ march = '-march=' + march
+ android_tool('ar', 'AR')
+ android_tool('clang', 'CC',
+ '-target {} {} -integrated-as {}'.format(triple,march,cflags))
+ android_tool('clang++', 'CXX',
+ '-target {} {} -integrated-as {}'.format(triple,march,cflags))
+ android_tool('clang++', 'LINK',
+ '-target {} {} -integrated-as -fuse-ld=bfd {}'.format(triple,march,ldflags))
+ android_tool('objcopy', 'OBJCOPY')
+ android_tool('objdump', 'OBJDUMP')
+ android_tool('strip', 'STRIP')
+
+################################################################
+# Emscripten-specific options
+################################################################
+
+def validate_emscripten_tools(opts):
+ if opts['NODE_JS'] is None:
+ opts['NODE_JS'] = 'node'
+
+################################################################
+# Linux-specific options
+################################################################
+
+################################################################
+# Gyp invocation
+################################################################
+
+def core_gyp_args(opts):
+ validate_gyp_settings(opts)
+ validate_os(opts)
+
+ args = []
+ for f in opts['FORMATS']:
+ args += ['--format', f]
+
+ args += ['--depth', opts['DEPTH'],
+ '--generator-output', opts['GENERATOR_OUTPUT'],
+ '-DOS=' + opts['OS']]
+
+ if opts['PERL'] is not None:
+ args.append('-Dperl=' + opts['PERL'])
+
+ if opts['BUILD_EDITION'] == 'commercial':
+ args.append(os.path.join('..', 'livecode-commercial.gyp'))
+
+ if opts['CROSS'] is not None:
+ args.append('-Dcross_compile=1')
+
+ args.append('-Dbuild_edition=' + opts['BUILD_EDITION'])
+
+ args.append('-Duniform_arch=' + opts['UNIFORM_ARCH'])
+
+ return args
+
+def export_opts(opts, names):
+ for n in names:
+ if opts[n] is not None:
+ print (n + '=' + opts[n])
+ os.environ[n] = opts[n]
+
+def gyp_define_args(opts, names):
+ return ['-D{}={}'.format(key, opts[value])
+ for key, value in names.iteritems()
+ if opts[value] is not None]
+
+def configure_linux(opts):
+ host_platform(opts)
+ validate_target_arch(opts)
+ validate_java_tools(opts)
+
+ configure_toolchain(opts)
+ export_opts(opts, ('CC', 'CXX', 'AR', 'LINK', 'OBJCOPY', 'OBJDUMP', 'STRIP', 'LD'))
+
+ args = core_gyp_args(opts) + ['-Dtarget_arch=' + opts['TARGET_ARCH'],
+ '-Djavahome=' + opts['JAVA_SDK']]
+ exec_gyp(args + opts['GYP_OPTIONS'])
+
+def configure_emscripten(opts):
+ host_platform(opts)
+ validate_target_arch(opts)
+ validate_emscripten_tools(opts)
+
+ export_opts(opts, ('NODE_JS',))
+ args = core_gyp_args(opts) + ['-Dtarget_arch=' + opts['TARGET_ARCH']]
+ exec_gyp(args + opts['GYP_OPTIONS'])
+
+def configure_android(opts):
+ host_platform(opts)
+ validate_target_arch(opts)
+ validate_android_tools(opts)
+ validate_java_tools(opts)
+
+ export_opts(opts, ('ANDROID_BUILD_TOOLS', 'ANDROID_NDK',
+ 'ANDROID_PLATFORM', 'ANDROID_SDK',
+ 'ANDROID_NDK_VERSION', 'ANDROID_NDK_PLATFORM_VERSION',
+ 'ANDROID_API_VERSION', 'ANDROID_LIB_PATH',
+ 'JAVA_SDK', 'AR', 'CC', 'CXX', 'LINK', 'OBJCOPY',
+ 'OBJDUMP', 'STRIP'))
+ args = core_gyp_args(opts) + ['-Dtarget_arch=' + opts['TARGET_ARCH'],
+ '-Dcross_compile=1',
+ '-Gandroid_ndk_version=' + opts['ANDROID_NDK_VERSION'],
+ '-Djavahome=' + opts['JAVA_SDK']]
+ exec_gyp(args + opts['GYP_OPTIONS'])
+
+def configure_win(opts):
+ host_platform(opts)
+ validate_target_arch(opts)
+ validate_windows_tools(opts)
+
+ # Make sure we strictly enforce TARGET_ARCH being x86 or x86_64
+ if opts['TARGET_ARCH'] != 'x86' and opts['TARGET_ARCH'] != 'x86_64':
+ error("TARGET_ARCH must be x86 or x86_64")
+
+ # Map target_arch for gyp - x86_64 -> x64
+ if opts['TARGET_ARCH'] == 'x86_64':
+ opts['TARGET_ARCH'] = 'x64'
+
+ args = core_gyp_args(opts) + ['-Gmsvs_version=' + opts['WIN_MSVS_VERSION']]
+ args += gyp_define_args(opts, {'target_arch': 'TARGET_ARCH',
+ 'ms_speech_sdk5': 'MS_SPEECH_SDK5',
+ 'quicktime_sdk': 'QUICKTIME_SDK', })
+
+ if platform.system() != 'Windows':
+ args.append('-Dunix_configure=1')
+
+ exec_gyp(args + opts['GYP_OPTIONS'])
+
+def configure_mac(opts):
+ host_platform(opts)
+ validate_target_arch(opts)
+ validate_xcode_sdks(opts)
+ validate_java_tools(opts)
+ copy_workspace_settings(opts)
+
+ args = core_gyp_args(opts) + ['-Dtarget_sdk=' + opts['XCODE_TARGET_SDK'],
+ '-Dhost_sdk=' + opts['XCODE_HOST_SDK'],
+ '-Dtarget_arch=' + opts['TARGET_ARCH'],
+ '-Djavahome=' + opts['JAVA_SDK']]
+ exec_gyp(args + opts['GYP_OPTIONS'])
+
+def configure_ios(opts):
+ configure_mac(opts)
+
+def configure(args):
+ opts = {}
+ process_env_options(opts)
+ process_arg_options(opts, args)
+
+ validate_os(opts)
+ configure_procs = {
+ 'linux': configure_linux,
+ 'emscripten': configure_emscripten,
+ 'android': configure_android,
+ 'win': configure_win,
+ 'mac': configure_mac,
+ 'ios': configure_ios,
+ }
+ configure_procs[opts['OS']](opts)
+
+def copy_workspace_settings(opts):
+ validate_gyp_settings(opts)
+ if opts['BUILD_EDITION'] == 'commercial':
+ project = os.path.join(opts['GENERATOR_OUTPUT'], '..', 'livecode-commercial.xcodeproj')
+ else:
+ project = os.path.join(opts['GENERATOR_OUTPUT'], 'livecode.xcodeproj')
+
+ xcshareddata = os.path.join(project, 'project.xcworkspace', 'xcshareddata')
+
+ if not os.path.exists(xcshareddata):
+ os.makedirs(xcshareddata)
+
+ workspacesettingsdest= os.path.join(xcshareddata, 'WorkspaceSettings.xcsettings')
+ workspacesettingssource = os.path.join('config', 'WorkspaceSettings.xcsettings')
+
+ if not os.path.exists(workspacesettingsdest):
+ shutil.copyfile(workspacesettingssource, workspacesettingsdest)
+
+if __name__ == '__main__':
+ configure(sys.argv[1:])
diff --git a/config.sh b/config.sh
index 8673c71caad..ab5b22b5340 100755
--- a/config.sh
+++ b/config.sh
@@ -1,421 +1,4 @@
-#!/bin/bash
-# Copyright (C) 2015 LiveCode Ltd.
-#
-# This file is part of LiveCode.
-#
-# LiveCode is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License v3 as published by the Free
-# Software Foundation.
-#
-# LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with LiveCode. If not see .
-
-usage () {
- cat <&1
- exec gyp/gyp "$@"
-}
-
-################################################################
-# Parse command-line options
-################################################################
-
-num_save_opts=0
-
-while [[ $# > $num_save_opts ]]; do
-
- key="$1"
-
- case "$key" in
- -h|--help)
- usage 1
- ;;
- -p|--platform)
- PLATFORM="$2"
- shift
- ;;
- --generator-output)
- GENERATOR_OUTPUT="$2"
- shift
- ;;
- --depth)
- DEPTH="$2"
- shift
- ;;
- -f|--format)
- FORMATS="$2 ${FORMATS}"
- shift
- ;;
-
- # Intercept -D options that config.sh tries to generate
- -D*)
- d="${key#*=}"
- case "$key" in
- -Dhost_sdk=*) XCODE_HOST_SDK="$d" ;;
- -Dtarget_sdk=*) XCODE_TARGET_SDK="$d" ;;
- -Dtarget_arch=*) TARGET_ARCH="$d" ;;
- -DOS=*) OS="$d" ;;
- *) # Pass directly through to gyp
- set x "$@" "$key"
- let num_save_opts++
- shift
- ;;
- esac
- ;;
-
- # Intercept -G options that config.sh tries to generate
- -G*)
- d="${key#*=}"
- case "$key" in
- -Gmsvs_version=*) WIN_MSVS_VERSION="$d" ;;
- -Gandroid_ndk_version=*) ANDROID_NDK_VERSION="$d" ;;
-
- *) # Pass directly through to gyp
- set x "$@" "$key"
- let num_save_opts++
- shift
- ;;
- esac
- ;;
- *) # Unrecognised option
- echo "ERROR: Unrecognised option '$key'"
- exit 1
- ;;
- esac
-
- shift
-done
-
-################################################################
-# Guess and validate platform
-################################################################
-
-# If no platform specified, try to guess the platform
-if test -z "${PLATFORM}"; then
- PLATFORM=$(guess_platform)
- if test $? -ne 0; then
- echo "ERROR: Cannot guess platform; specify '--platform '" >&2
- exit 1
- fi
-fi
-
-# Validate platform
-case ${PLATFORM} in
- linux-x86) ;;
- linux-x86_64) ;;
- android-armv6) ;;
- mac) ;;
- ios) ;;
- win-x86) ;;
- emscripten) ;;
- *)
- echo "ERROR: Unrecognised platform: '${PLATFORM}'" >&2
- exit 1;;
-esac
-
-################################################################
-# Guess other relevant options
-################################################################
-
-# Guess generator output directory from platform
-if test -z "$GENERATOR_OUTPUT"; then
- GENERATOR_OUTPUT="build-${PLATFORM}/livecode"
-fi
-
-# Guess OS from platform
-if test -z "$OS"; then
- case ${PLATFORM} in
- linux*) OS="linux" ;;
- android*) OS="android" ;;
- mac*) OS="mac" ;;
- ios*) OS="ios" ;;
- win*) OS="win" ;;
- emscripten*) OS="emscripten" ;;
- esac
-fi
-
-# If no output type specified, guess from platform:
-if test -z "$FORMATS"; then
- case ${OS} in
- # Always use Linux-style makefiles for Android as the Android toolchain
- # is more Linux-y than Darwin-y
- linux|android|emscripten) FORMATS="make-linux" ;;
- mac|ios) FORMATS="xcode" ;;
- win) FORMATS="msvs" ;;
- esac
-fi
-
-# Default "depth"
-if test -z "$DEPTH"; then
- DEPTH=.
-fi
-
-# Default Visual Studio version
-if test -z "$WIN_MSVS_VERSION"; then
- WIN_MSVS_VERSION=2010
-fi
-
-# Default Xcode target SDK
-if test -z "$XCODE_TARGET_SDK"; then
- case ${OS} in
- mac) XCODE_TARGET_SDK="macosx10.9" ;;
- ios) XCODE_TARGET_SDK="iphoneos" ;;
- esac
-fi
-
-# Default Xcode host SDK
-if test -z "$XCODE_HOST_SDK"; then
- case ${OS} in
- mac) XCODE_HOST_SDK="${XCODE_TARGET_SDK}" ;;
- ios) XCODE_HOST_SDK="macosx" ;;
- esac
-fi
-
-# Default target architectures
-# iOS architectures are restricted to 32-bit only for iOS 5.1, 6.1 and 7.1
-if test -z "$TARGET_ARCH"; then
- case ${PLATFORM} in
- *-x86) TARGET_ARCH="x86" ;;
- *-x86_64) TARGET_ARCH="x86_64" ;;
- *-armv6) TARGET_ARCH="armv6" ;;
- emscripten) TARGET_ARCH="js" ;;
-
- mac*|ios*)
- case ${XCODE_TARGET_SDK} in
- macosx*) TARGET_ARCH="i386" ;;
- iphoneos5* | \
- iphoneos6* | \
- iphoneos7*) TARGET_ARCH="armv7" ;;
- iphoneos*) TARGET_ARCH="armv7 arm64" ;;
- iphonesimulator5* | \
- iphonesimulator6* | \
- iphonesimulator7*) TARGET_ARCH="i386" ;;
- iphonesimulator*) TARGET_ARCH="i386 x86_64" ;;
- esac
- ;;
-
- *)
- echo "Couldn't guess 'target_arch'"
- esac
-fi
-
-# Location of Perl when running Windows builds
-WIN_PERL=${WIN_PERL:-"C:/perl/bin/perl.exe"}
-
-# Android default settings and tools
-if test "${OS}" = "android" ; then
- ANDROID_NDK_VERSION=${ANDROID_NDK_VERSION:-r10d}
- ANDROID_PLATFORM=${ANDROID_PLATFORM:-android-17}
-
- # Attempt to locate an Android NDK
- if [ -z "${ANDROID_NDK}" -a "${OS}" = "android" ] ; then
- # Try the symlink we suggest in INSTALL-android.md
- if [ -d "${HOME}/android/toolchain/android-ndk" ] ; then
- ANDROID_NDK="${HOME}/android/toolchain/android-ndk"
- else
- echo >&2 "Error: Android NDK not found (set \$ANDROID_NDK)"
- exit 1
- fi
- fi
-
- # Attempt to locate an Android SDK
- if [ -z "${ANDROID_SDK}" ] ; then
- # Try the symlink we suggest in INSTALL-android.md
- if [ -d "${HOME}/android/toolchain/android-sdk" ] ; then
- ANDROID_SDK="${HOME}/android/toolchain/android-sdk"
- else
- echo >&2 "Error: Android SDK not found (set \$ANDROID_SDK)"
- exit 1
- fi
- fi
-
- # Attempt to guess the Android build tools version
- if [ -z "${ANDROID_BUILD_TOOLS}" ] ; then
- # Check for a sub-folder in the appropriate place
- # Possibly fragile - are there ever multiple sub-folders?
- if [ ! "$(echo \"${ANDROID_SDK}/build-tools/\"*)" = "${ANDROID_SDK}/build-tools/*" ] ; then
- ANDROID_BUILD_TOOLS=$(basename $(echo "${ANDROID_SDK}/build-tools/"*))
- else
- echo >&2 "Error: Android build tools not found (set \$ANDROID_BUILD_TOOLS)"
- exit 1
- fi
- fi
-
- if [ -z "${ANDROID_TOOLCHAIN}" ] ; then
- # Try the folder we suggest in INSTALL-android.md
- if [ -d "${HOME}/android/toolchain/standalone" ] ; then
- ANDROID_TOOLCHAIN="${HOME}/android/toolchain/standalone/bin/arm-linux-androideabi-"
- else
- echo >&2 "Error: Android toolchain not found (set \$ANDROID_TOOLCHAIN)"
- exit 1
- fi
- fi
-
- ANDROID_AR=${AR:-${ANDROID_TOOLCHAIN}ar}
- ANDROID_CC=${CC:-${ANDROID_TOOLCHAIN}clang -target arm-linux-androideabi -march=armv6 -integrated-as}
- ANDROID_CXX=${CXX:-${ANDROID_TOOLCHAIN}clang++ -target arm-linux-androideabi -march=armv6 -integrated-as}
- ANDROID_LINK=${LINK:-${ANDROID_TOOLCHAIN}clang++ -target arm-linux-androideabi -march=armv6 -integrated-as -fuse-ld=bfd}
- ANDROID_OBJCOPY=${OBJCOPY:-${ANDROID_TOOLCHAIN}objcopy}
- ANDROID_OBJDUMP=${OBJDUMP:-${ANDROID_TOOLCHAIN}objdump}
- ANDROID_STRIP=${STRIP:-${ANDROID_TOOLCHAIN}strip}
-
- if [ -z "${JAVA_SDK}" ] ; then
- # Utility used to locate Java on OSX systems
- if [ -x /usr/libexec/java_home ] ; then
- ANDROID_JAVA_SDK="$(/usr/libexec/java_home)"
- elif [ -d /usr/lib/jvm/default ] ; then
- ANDROID_JAVA_SDK=/usr/lib/jvm/default
- elif [ -d /usr/lib/jvm/default-java ] ; then
- ANDROID_JAVA_SDK=/usr/lib/jvm/default-java
- else
- echo >&2 "Error: no Java SDK found - set \$JAVA_SDK"
- exit 1
- fi
- else
- ANDROID_JAVA_SDK="${JAVA_SDK}"
- fi
-
-fi # End of Android defaults & tools
-
-
-# Emscripten default settings and tools
-if test "${OS}" = "emscripten" ; then
- NODE_JS=${NODE_JS:-node}
-fi
-
-
-# Building on Travis
-if [ "${TRAVIS}" = "true" ] ; then
- DISABLE_REVVIDEOGRABBER=-Denable_revvideograbber=0
-fi
-
-
-################################################################
-# Invoke gyp
-################################################################
-
-format_args="$(for f in ${FORMATS}; do echo --format ${f} ; done)"
-
-if test "${OS}" = "win" ; then
- basic_args="${format_args} --depth ${DEPTH} --generator-output ${GENERATOR_OUTPUT}"
-else
- basic_args="${format_args} --depth ${DEPTH} --generator-output ${GENERATOR_OUTPUT} -G default_target=default"
-fi
-
-if [ "${BUILD_EDITION}" == "commercial" ] ; then
- basic_args="${basic_args} ../livecode-commercial.gyp"
-fi
-
-case ${OS} in
- linux)
- invoke_gyp $basic_args "-DOS=${OS}" "-Dtarget_arch=${TARGET_ARCH}" "$@"
- ;;
- emscripten)
- export NODE_JS
- invoke_gyp $basic_args "-DOS=${OS}" "-Dtarget_arch=${TARGET_ARCH}" "$@"
- ;;
- android)
- export ANDROID_BUILD_TOOLS
- export ANDROID_NDK
- export ANDROID_PLATFORM
- export ANDROID_SDK
-
- export JAVA_SDK="${ANDROID_JAVA_SDK}"
-
- export AR="${ANDROID_AR}"
- export CC="${ANDROID_CC}"
- export CXX="${ANDROID_CXX}"
- export LINK="${ANDROID_LINK}"
- export OBJCOPY="${ANDROID_OBJCOPY}"
- export OBJDUMP="${ANDROID_OBJDUMP}"
- export STRIP="${ANDROID_STRIP}"
- invoke_gyp $basic_args "-DOS=${OS}" "-Dtarget_arch=${TARGET_ARCH}" \
- -Dcross_compile=1 \
- "-Gandroid_ndk_version=${ANDROID_NDK_VERSION}" "$@"
- ;;
- win)
- invoke_gyp $basic_args "-Gmsvs_version=${WIN_MSVS_VERSION}" \
- "-Dunix_configure=1" \
- "-Dperl=${WIN_PERL}" "$@"
- ;;
- mac|ios)
- invoke_gyp $basic_args "-DOS=${OS}" \
- "-Dtarget_sdk=${XCODE_TARGET_SDK}" \
- "-Dhost_sdk=${XCODE_HOST_SDK}" \
- "-Dtarget_arch=${TARGET_ARCH}" "$@" \
- ${DISABLE_REVVIDEOGRABBER}
- ;;
- *)
- echo "ERROR: Bad configuration for generating project files"
- exit 1 ;;
-esac
+#!/bin/sh
+set -e
+base=$(dirname "$0")
+exec python "${base}/config.py" "$@"
diff --git a/config/WorkspaceSettings.xcsettings b/config/WorkspaceSettings.xcsettings
new file mode 100644
index 00000000000..f60c042dcf9
--- /dev/null
+++ b/config/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+
+
+
+
+ BuildSystemType
+ Original
+
+
\ No newline at end of file
diff --git a/config/android-settings.gypi b/config/android-settings.gypi
old mode 100644
new mode 100755
index fb36b11d089..702cfd147c5
--- a/config/android-settings.gypi
+++ b/config/android-settings.gypi
@@ -2,6 +2,7 @@
'variables':
{
'c++_std': '(ios_external_symbols)',
'>(ios_external_symbol_list)',
+ '>(ios_external_copy_to)',
],
},
],
@@ -190,6 +192,10 @@
[
'-Wall',
'-Wextra',
+
+ '-Wno-conversion',
+ '-Wno-shorten-64-to-32',
+
'-Werror=declaration-after-statement',
'-Werror=delete-non-virtual-dtor',
'-Werror=overloaded-virtual',
@@ -210,6 +216,7 @@
'WARNING_CFLAGS':
[
'-Wno-return-type',
+ '-Wno-implicit-function-declaration',
],
},
},
diff --git a/config/java.gypi b/config/java.gypi
index 44d4081c3fd..b05cd81736a 100644
--- a/config/java.gypi
+++ b/config/java.gypi
@@ -65,11 +65,12 @@
[
'<(javac_wrapper_path)',
'<(javac_path)',
- '1.5',
+ '1.7',
'-d', '<(PRODUCT_DIR)/>(java_classes_dir_name)',
'-implicit:none',
'-classpath', '>(java_classpath_param)',
'-sourcepath', '<(java_source_path):<(INTERMEDIATE_DIR)/src/java',
+ '-encoding utf8',
'<(RULE_INPUT_PATH)',
],
},
diff --git a/config/linux-settings.gypi b/config/linux-settings.gypi
index 29a64ebc96b..4df563a3448 100644
--- a/config/linux-settings.gypi
+++ b/config/linux-settings.gypi
@@ -29,15 +29,6 @@
# need to be compiled with the correct compilation flags
'target_conditions':
[
- [
- '_type == "loadable_module" or _type == "shared_library" or (_type == "static_library" and library_for_module != 0)',
- {
- 'cflags':
- [
- '-fPIC',
- ],
- },
- ],
[
'server_mode == 0',
{
@@ -67,16 +58,19 @@
[
'-Wall',
'-Wextra',
+ '-Wno-deprecated-register', # Fix when we move to C++17
'-Wno-unused-parameter', # Just contributes build noise
'-Werror=return-type',
'-Werror=uninitialized',
'-Wno-error=maybe-uninitialized',
'-Werror=conversion-null',
+ '-Werror=empty-body',
],
'cflags_cc':
[
'-Werror=delete-non-virtual-dtor',
+ '-Werror=overloaded-virtual',
],
},
{
@@ -91,17 +85,13 @@
[
'-Werror=declaration-after-statement', # Ensure compliance with C89
],
-
- 'cflags_cc':
- [
- '-Werror=overloaded-virtual',
- ],
},
],
],
'cflags':
[
+ '-fPIC',
'-fstrict-aliasing',
'-fvisibility=hidden',
],
@@ -117,7 +107,6 @@
'-std=<(c++_std)',
'-fno-exceptions',
'-fno-rtti',
- '-fcheck-new',
],
'configurations':
diff --git a/config/mac.gypi b/config/mac.gypi
index 9822e1502a9..d1c62b44870 100644
--- a/config/mac.gypi
+++ b/config/mac.gypi
@@ -24,12 +24,13 @@
'SHARED_PRECOMPS_DIR': '$(OBJROOT)/Precompiled/$(CURRENT_ARCH)',
'GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS': 'NO',
'ALWAYS_SEARCH_USER_PATHS': 'NO',
- 'MACOSX_DEPLOYMENT_TARGET': '10.6',
+ 'MACOSX_DEPLOYMENT_TARGET': '10.9',
'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',
'COPY_PHASE_STRIP': 'NO',
'STRIP_INSTALLED_PRODUCT': 'NO',
'CLANG_LINK_OBJC_RUNTIME': 'NO',
- 'CLANG_CXX_LANGUAGE_STANDARD': 'c++0x',
+ 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
+ 'CLANG_CXX_LIBRARY': 'libc++'
},
'target_defaults':
@@ -46,6 +47,7 @@
'debug_info_suffix': '.dSYM',
'silence_warnings': 0,
+ 'travis': '&2 Error: invalid target arch %TARGET_ARCH%
+ EXIT /B 1
+)
+
REM Note: to test whether a directory exists in batch script, you need to check
REM whether a file within that directory exists. Easiest way to do this is to
REM add the "*" wildcard after the directory
-REM Attempt to locate a copy of Perl
-WHERE /Q perl 1>NUL 2>NUL
-IF %ERRORLEVEL% NEQ 0 (
- IF EXIST C:\perl64\bin\perl.exe (
- SET extra_options=%extra_options% -Dperl="C:/perl64/bin/perl.exe"
- ) ELSE IF EXIST C:\perl\bin\perl.exe (
- SET extra_options=%extra_options% -Dperl="C:/perl/bin/perl.exe"
- ) ELSE (
- ECHO >&2 Error: could not locate a copy of perl
- PAUSE
- EXIT 1
- )
-)
-
REM Attempt to locate a copy of Python
WHERE /Q python 1>NUL 2>NUL
IF %ERRORLEVEL% NEQ 0 (
@@ -40,21 +44,12 @@ IF %ERRORLEVEL% NEQ 0 (
) ELSE (
ECHO >&2 Error: could not locate a copy of python
PAUSE
- EXIT 1
+ EXIT /B 1
)
) ELSE (
SET python=python
)
-REM Attempt to locate the QuickTime SDK
-IF EXIST "%programfiles(x86)%\QuickTime SDK\*" (
- SET extra_options=%extra_options% -Dquicktime_sdk="%programfiles(x86)%/QuickTime SDK"
-) ELSE (
- ECHO >&2 Error: could not locate the QuickTime SDK
- PAUSE
- EXIT 1
-)
-
REM Attempt to locate the Microsoft Speech SDK v5.1
IF EXIST "%programfiles(x86)%\Microsoft Speech SDK 5.1\*" (
SET extra_options=%extra_options% -Dms_speech_sdk5="%programfiles(x86)%/Microsoft Speech SDK 5.1"
@@ -63,26 +58,13 @@ IF EXIST "%programfiles(x86)%\Microsoft Speech SDK 5.1\*" (
SET warnings=1
)
-REM Attempt to locate the Microsoft Speech SDK v4
-IF EXIST "%programfiles(x86)%\Microsoft Speech SDK\*" (
- SET extra_options=%extra_options% -Dms_speech_sdk4="%programfiles(x86)%/Microsoft Speech SDK"
-) ELSE (
- ECHO >&2 Warning: could not locate the Microsoft Speech SDK v4; revSpeech will not build
- SET warnings=1
-)
-
REM Pause so any warnings can be seen
IF %warnings% NEQ 0 PAUSE
-REM Community or commercial?
-IF /I %BUILD_EDITION% == commercial (
- SET gypfile="../livecode-commercial.gyp"
-)
-
REM Run the configure step
-%python% gyp\gyp_main.py --format msvs --depth . --generator-output build-win-x86/livecode -Gmsvs_version=2010 %extra_options% %gypfile%
+%python% config.py --platform win-%TARGET_ARCH% %extra_options% %gypfile%
PAUSE
REM Pause if there was an error so that the user gets a chance to see it
IF %ERRORLEVEL% NEQ 0 PAUSE
-EXIT %ERRORLEVEL%
+EXIT /B %ERRORLEVEL%
diff --git a/docs/cheat-sheet/cheat-sheet.livecodescript b/docs/cheat-sheet/cheat-sheet.livecodescript
new file mode 100644
index 00000000000..1829c69cee2
--- /dev/null
+++ b/docs/cheat-sheet/cheat-sheet.livecodescript
@@ -0,0 +1,946 @@
+script "Cheat Sheet"
+/*
+Currently this cannot be run from the command line as it requires
+the ability to colorize scripts.
+*/
+on startup
+ send "CreateCheatSheetMain" to me in 0
+end startup
+
+private function getCommandLineInfo
+ local tArg, tArgs, tInArgs
+ put false into tInArgs
+
+ repeat for each element tArg in the commandArguments
+ if tInArgs then
+ put tArg into tArgs[1 + the number of elements in tArgs]
+ else
+ if tArg ends with ".livecodescript" then
+ put true into tInArgs
+ end if
+ end if
+ end repeat
+
+ return tArgs
+end getCommandLineInfo
+
+constant kLanguageArgs = "livecode,livecode_builder,python,javascript"
+constant kSourceLanguages = "livecode_builder,python,javascript"
+constant kTargetLanguages = "livecode,livecode_builder"
+private function ProcessArgs pArgs
+ local tArgs
+ repeat with x = 1 to the number of elements in pArgs
+ switch pArgs[x]
+ case "--from"
+ case "--to"
+ case"--language"
+ local tLanguage
+ put pArgs[x + 1] into tLanguage
+ if tLanguage is not among the items of kLanguageArgs then
+ return merge("invalid language [[tLanguage]]")
+ end if
+ put tLanguage into tArgs[char 3 to -1 of pArgs[x]]
+ case "--folder"
+ put pArgs[x+1] into tArgs["folder"]
+ case "--markdown"
+ put true into tArgs["markdown"]
+ break
+ default
+ if pArgs[x] begins with "--" then
+ return merge("invalid argument [[pArgs[x]]]")
+ end if
+ end switch
+ end repeat
+ if (pArgs["from"] is empty) is not (pArgs["to"] is empty) then
+ if pArgs["from"] is empty then
+ return "missing source language - use --from"
+ else
+ return "missing target language - use --to"
+ end if
+ else if pArgs["language"] is not empty and \
+ pArgs["from"] is not empty then
+ return "--language and --from / --to forms mutually exclusive"
+ end if
+ return tArgs
+end ProcessArgs
+
+local sArray
+command CreateCheatSheetMain
+ put CheatSheetArray() into sArray
+ if sArray is not an array then
+ write sArray & return to stderr
+ quit 1
+ end if
+
+ local tArgs
+ put getCommandLineInfo() into tArgs
+
+ local tProcessedArgs
+ put ProcessArgs(tArgs) into tProcessedArgs
+ if tProcessedArgs is not an array then
+ write tProcessedArgs & return to stderr
+ quit 1
+ end if
+
+ if tProcessedArgs["folder"] is empty then
+ write "must specify output folder" & return to stderr
+ quit 1
+ end if
+
+ if tArgs["language"] is empty and tArgs["from"] is empty then
+ CreateAllCheatSheets tArgs["folder"], tArgs["markdown"]
+ else if tArgs["language"] is not empty then
+ CreateCheatSheet tArgs["language"], tArgs["folder"], tArgs["markdown"]
+ else
+ CreateCheatSheetFrom tArgs["from"], tArgs["to"], tArgs["folder"], tArgs["markdown"]
+ end if
+end CreateCheatSheetMain
+
+local sConfigured, sTargetStack
+private command ConfigureStack
+ if sConfigured then
+ exit ConfigureStack
+ end if
+ put true into sConfigured
+ lock screen
+ set the name of the templateStack to "Cheat Sheet Stack"
+ create stack
+ put it into sTargetStack
+ set the width of sTargetStack to 595
+ set the height of sTargetStack to 842
+ set the topleft of sTargetStack to 200,200
+ unlock screen
+ set the defaultStack to "Cheat Sheet Stack"
+end ConfigureStack
+
+command ClearAll
+ if exists(sTargetStack) then
+ delete stack sTargetStack
+ end if
+ put false into sConfigured
+end ClearAll
+
+/**
+Create all available cheat sheets
+
+Parameters:
+pOutputFolder: The location to create the cheat sheets
+
+Description:
+This command creates cheat sheets for all languages for which cheat
+sheets are available and outputs PDFs in .
+*/
+command CreateAllCheatSheets pOutputFolder, pMarkdown
+ -- First generate each combination of something -> lcs or lcb
+ repeat for each item tFrom in kSourceLanguages
+ repeat for each item tTo in kTargetLanguages
+ if tFrom is tTo then next repeat
+ CreateCheatSheetFrom tFrom, tTo, pOutputFolder, pMarkdown
+ end repeat
+ end repeat
+
+ -- Then do single cheat sheets for lcs or lcb
+ repeat for each item tItem in kTargetLanguages
+ CreateCheatSheet tItem, pOutputFolder, pMarkdown
+ end repeat
+end CreateAllCheatSheets
+
+/**
+Create a cheat sheet for the given language
+
+Parameters:
+pLanguage (enum):
+- "livecode": Create a cheat sheet for LiveCode
+- "livecode_builder": Create a cheat sheet for LiveCode
+- "python": Create a cheat sheet for Python to LiveCode transition
+- "javascript": Create a cheat sheet for JavaScript to LiveCode transition
+
+pOutputFolder: The location to create the cheat sheet
+
+Description:
+This command creates a cheat sheet for the given language and outputs as
+a PDF in with filename "cheat-sheet-''.pdf".
+*/
+command CreateCheatSheet pLanguage, pOutputFolder, pMarkdown
+ put CheatSheetArray() into sArray
+ if sArray is not an array then
+ throw sArray
+ end if
+ if pMarkdown then
+ BuildCheatSheetMarkdown pLanguage, "", pOutputFolder
+ else
+ ConfigureStack
+ BuildCheatSheet pLanguage, "", pOutputFolder
+ ClearAll
+ end if
+end CreateCheatSheet
+
+command CreateCheatSheetFrom pFromLanguage, pToLanguage, pOutputFolder, pMarkdown
+ put CheatSheetArray() into sArray
+ if sArray is not an array then
+ throw sArray
+ end if
+ if pMarkdown then
+ BuildCheatSheetMarkdown pFromLanguage, pToLanguage, pOutputFolder
+ else
+ ConfigureStack
+ BuildCheatSheet pFromLanguage, pToLanguage, pOutputFolder
+ ClearAll
+ end if
+end CreateCheatSheetFrom
+
+private command CreatePDF pNumCards, pOutputFile
+ local tPDFPath
+ ## Path to the pdf file we want to create
+ put pOutputFile into tPDFPath
+
+ open printing to pdf tPDFPath
+ if the result is "Cancel" then
+ ## The user has cancelled printing
+ exit CreatePDF
+ else
+ repeat with x = 1 to pNumCards
+ print card x of this stack into 0,0, \
+ the width of this stack, the height of this stack
+ if x is not pNumCards then
+ print break
+ end if
+ end repeat
+
+ end if
+ close printing
+end CreatePDF
+
+constant kTitleTextSize = 16
+command BuildCheatSheet pFromLanguage, pToLanguage, pOutputFolder
+ lock screen
+ set the style of the templatefield to "transparent"
+ set the lockText of the templatefield to true
+ set the traversalOn of the templatefield to false
+ local tTitle, tFilename, tFromDisplayName
+ put LanguageToDisplayName(pFromLanguage) into tFromDisplayName
+ if pToLanguage is empty then
+ put merge("[[tFromDisplayName]] Cheat Sheet") into tTitle
+ put merge("cheat-sheet-[[pFromLanguage]].pdf") into tFilename
+ else
+ local tToDisplayName
+ put LanguageToDisplayName(pToLanguage) into tToDisplayName
+ put merge("[[tFromDisplayName]] - [[tToDisplayName]] Cheat Sheet") into tTitle
+ put merge("cheat-sheet-[[pFromLanguage]]-[[pToLanguage]].pdf") into tFilename
+ end if
+
+ local tTitleHeight, tTitleGroup
+ create group "Title" in this card of sTargetStack
+ put it into tTitleGroup
+ set the backgroundBehavior of tTitleGroup to true
+ create field "title" in tTitleGroup
+ set the textAlign of it to "center"
+ set the text of it to tTitle
+ set the width of it to the width of sTargetStack
+ set the topleft of it to 0,0
+ set the textSize of it to kTitleTextSize
+ set the height of it to the formattedHeight of it
+ put the height of it into tTitleHeight
+
+ local tNumCards
+ if pToLanguage is empty then
+ BuildCheatSheetForLiveCode pFromLanguage, tTitleHeight
+ else
+ BuildCheatSheetForLanguage pFromLanguage, pToLanguage, tTitleHeight
+ end if
+ put the result into tNumCards
+ CreatePDF tNumCards, pOutputFolder & slash & tFilename
+ unlock screen
+end BuildCheatSheet
+
+command BuildCheatSheetMarkdown pFromLanguage, pToLanguage, pOutputFolder
+ local tTitle, tFilename, tFromDisplayName
+ put LanguageToDisplayName(pFromLanguage) into tFromDisplayName
+ if pToLanguage is empty then
+ put merge("[[tFromDisplayName]] Cheat Sheet") into tTitle
+ put merge("[[tFromDisplayName]] Cheat Sheet.md") into tFilename
+ else
+ local tToDisplayName
+ put LanguageToDisplayName(pToLanguage) into tToDisplayName
+ put merge("[[tFromDisplayName]] - [[tToDisplayName]] Cheat Sheet") into tTitle
+ put merge("[[tFromDisplayName]] - [[tToDisplayName]] Cheat Sheet.md") into tFilename
+ end if
+
+ local tMarkdown
+ put "#" && tTitle & return into tMarkdown
+
+ if pToLanguage is empty then
+ put BuildCheatSheetMarkdownForLiveCode(pFromLanguage) after tMarkdown
+ else
+ put BuildCheatSheetMarkdownForLanguage(pFromLanguage, pToLanguage) after tMarkdown
+ end if
+
+ put textEncode(tMarkdown, "utf-8") into url("binfile:" & pOutputFolder & slash & tFilename)
+end BuildCheatSheetMarkdown
+
+private function LanguageToKey pLanguage
+ switch pLanguage
+ case "python"
+ return "py"
+ case "javascript"
+ return "js"
+ case "livecode"
+ return "lc"
+ case "livecode_builder"
+ return "lcb"
+ end switch
+end LanguageToKey
+
+private function LanguageToHighlightJS pLanguage
+ switch pLanguage
+ case "python"
+ return "python"
+ case "javascript"
+ return "javascript"
+ case "livecode"
+ return "livecode"
+ case "livecode_builder"
+ return "livecodebuilder"
+ end switch
+end LanguageToHighlightJS
+
+private function LanguageToDisplayName pLanguage
+ switch pLanguage
+ case "python"
+ return "Python"
+ case "javascript"
+ return "JavaScript"
+ case "livecode"
+ return "LiveCode"
+ case "livecode_builder"
+ return "LiveCode Builder"
+ end switch
+end LanguageToDisplayName
+
+command BuildCheatSheetForLanguage pFromLanguage, pToLanguage, pTitleBottom
+ local tContent, tColumns, tColNum, tKeys
+ local tCurCard, tTop, tToFit
+ put 1 into tCurCard
+ put pTitleBottom into tTop
+
+ repeat for each key tKey in sArray["content"]
+ BuildRowForLanguage sArray["content"][tKey], pFromLanguage, pToLanguage
+ end repeat
+ put the keys of sArray["content"] into tToFit
+ sort tToFit ascending numeric
+ repeat while tToFit is not empty
+ PositionRowsForLanguage pTitleBottom, tTop, sArray["content"], tToFit, \
+ pFromLanguage, pToLanguage, tCurCard
+ end repeat
+ return tCurCard
+end BuildCheatSheetForLanguage
+
+function BuildCheatSheetMarkdownForLanguage pFromLanguage, pToLanguage
+ local tMarkdown
+ repeat for each element tContent in sArray["content"]
+ local tRowMarkdown
+ put BuildRowMarkdownForLanguage(tContent, pFromLanguage, pToLanguage) \
+ into tRowMarkdown
+ if tRowMarkdown is empty then
+ next repeat
+ end if
+ put tRowMarkdown & return after tMarkdown
+ end repeat
+ return tMarkdown
+end BuildCheatSheetMarkdownForLanguage
+
+constant kNumCols = 2
+constant kMargin = 12
+constant kTitlePadding = -8
+constant kPadding = 5
+constant kSectionTitleTextSize = 14
+constant kCodeTextSize = 13
+constant kTextSize = 13
+command BuildRowForLanguage pContent, pFromLanguage, pToLanguage
+ local tFromCodeText, tToCodeText
+ put pContent[LanguageToKey(pFromLanguage)] into tFromCodeText
+ put pContent[LanguageToKey(pToLanguage)] into tToCodeText
+
+ -- Skip the row if no equivalent section
+ if tFromCodeText is empty or tToCodeText is empty then
+ exit BuildRowForLanguage
+ end if
+
+ local tColWidth, tWidth
+ put the width of sTargetStack into tWidth
+ put (tWidth - (kNumCols + 1)*kMargin) / kNumCols into tColWidth
+
+ local tGroup, tTitle, tFromCode, tToCode, tText
+ create group pContent["title"]
+ put it into tGroup
+
+ create field "title" in tGroup
+ put it into tTitle
+ set the width of tTitle to tWidth
+ set the text of tTitle to pContent["title"]
+ set the textSize of tTitle to kSectionTitleTextSize
+ set the textStyle of tTitle to "underline"
+ set the textAlign of tTitle to "center"
+
+ create field "text" in tGroup
+ put it into tText
+ set the width of tText to tWidth
+ set the text of tText to pContent["text"]
+ set the textSize of tText to kTextSize
+ set the textAlign of tText to "left"
+
+ if pContent["text"] is empty then
+ set the height of tText to 0
+ set the bottom of tText to the bottom of tTitle
+ hide tText
+ else
+ set the height of tText to the formattedHeight of tText
+ set the top of tText to the bottom of tTitle + kTitlePadding
+ end if
+
+ create field "from" in tGroup
+ put it into tFromCode
+ set the width of tFromCode to tColWidth
+ set the text of tFromCode to tFromCodeText
+ set the textSize of tFromCode to kCodeTextSize
+ set the left of tFromCode to kMargin
+ if pFromLanguage is "livecode" then
+ _internal script colorize char 1 to the number \
+ of chars in tFromCodeText of tFromCode
+ end if
+ set the height of tFromCode to the formattedHeight of tFromCode
+ set the top of tFromCode to the bottom of tText + kPadding
+
+ create field "to" in tGroup
+ put it into tToCode
+ set the width of tToCode to tColWidth
+ set the text of tToCode to tToCodeText
+ set the textSize of tToCode to kCodeTextSize
+ set the left of tToCode to kMargin*2 + tColWidth
+
+ if pToLanguage is "livecode" then
+ _internal script colorize char 1 to the number \
+ of chars in tToCodeText of tToCode
+ end if
+ set the height of tToCode to the formattedHeight of tToCode
+ set the top of tToCode to the bottom of tText + kPadding
+end BuildRowForLanguage
+
+private function escapeCode pCode
+ replace "<" with "<" in pCode
+ replace ">" with ">" in pCode
+ return pCode
+end escapeCode
+
+function BuildRowMarkdownForLanguage pContent, pFromLanguage, pToLanguage
+ local tFromCodeText, tToCodeText
+ put pContent[LanguageToKey(pFromLanguage)] into tFromCodeText
+ put pContent[LanguageToKey(pToLanguage)] into tToCodeText
+
+ -- Skip the row if no equivalent section
+ if tFromCodeText is empty or tToCodeText is empty then
+ return empty
+ end if
+
+ local tMarkdown
+ put "##" && pContent["title"] & return into tMarkdown
+
+ if pContent["text"] is not empty then
+ put pContent["text"] & return & return after tMarkdown
+ end if
+
+ put "" after tMarkdown
+ put "" && LanguageToDisplayName(pFromLanguage) && " " && \
+ LanguageToDisplayName(pToLanguage) && " " & return after tMarkdown
+ put "" & escapeCode(tFromCodeText) & " " & return after tMarkdown
+ put "" & escapeCode(tToCodeText) & " " & return after tMarkdown
+ put "
" & return after tMarkdown
+ /*
+ put "|" && LanguageToDisplayName(pFromLanguage) && "|" && \
+ LanguageToDisplayName(pToLanguage) && "|" & return after tMarkdown
+ put "|----------------|------------------|" & return after tMarkdown
+ repeat with x = 1 to max(the number of lines in tFromCodeText, \
+ the number of lines in tToCodeText)
+ put "|" && "`" & line x of tFromCodeText & "`" && "|" && \
+ "`" & line x of tToCodeText & "`" && "|" & return \
+ after tMarkdown
+ end repeat
+ */
+ return tMarkdown
+end BuildRowMarkdownForLanguage
+
+function RowHeight pGroupName
+ local tCodeHeight
+ if there is a field "code" of group pGroupName then
+ put the height of field "code" of group pGroupName into tCodeHeight
+ else
+ put max(the height of field "from" of group pGroupName, \
+ the height of field "to" of group pGroupName) into tCodeHeight
+ end if
+
+ local tTextHeight
+ if there is a field "text" of group pGroupName then
+ if the visible of field "text" of group pGroupName then
+ put the height of field "text" of group pGroupName + \
+ kPadding into tTextHeight
+ end if
+ end if
+
+ return the height of field "title" of group pGroupName + \
+ tTextHeight + tCodeHeight + kPadding + kTitlePadding
+end RowHeight
+
+command PositionRowsForLanguage pTitleBottom, @xContentBottom, pContent, @xToFit, \
+ pFromLanguage, pToLanguage, @xCurCard
+ local tCurGroup, tLines, tPositioned
+ put false into tPositioned
+ put xToFit into tLines
+ repeat for each line tLine in tLines
+ put pContent[tLine]["title"] into tCurGroup
+ if there is not a group tCurGroup then
+ delete line (lineoffset(tLine, xToFit)) of xToFit
+ next repeat
+ end if
+
+ local tRowHeight
+ put RowHeight(tCurGroup) into tRowHeight
+ if tRowHeight + xContentBottom > the height of sTargetStack then
+ next repeat
+ end if
+
+ set the top of group tCurGroup to xContentBottom
+ set the left of group tCurGroup to 0
+ add tRowHeight to xContentBottom
+ delete line (lineoffset(tLine, xToFit)) of xToFit
+ put true into tPositioned
+ end repeat
+
+ if tPositioned then
+ exit PositionRowsForLanguage
+ end if
+
+ // If we get here we need a new card
+ repeat for each line tLine in xToFit
+ delete group pContent[tLine]["title"]
+ end repeat
+ create card
+ add 1 to xCurCard
+ put pTitleBottom into xContentBottom
+ repeat for each line tLine in xToFit
+ BuildRowForLanguage pContent[tLine], pFromLanguage, pToLanguage
+ end repeat
+end PositionRowsForLanguage
+
+command BuildCheatSheetForLiveCode pLanguage, pTitleHeight
+ local tCurCard, tColNum, tTop, tToFit
+ put 1 into tCurCard
+ put the keys of sArray["content"] into tToFit
+ sort tToFit ascending numeric
+
+ local tColWidth, tWidth
+ put the width of sTargetStack into tWidth
+ put (tWidth - (kNumCols + 1)*kMargin) / kNumCols into tColWidth
+
+ repeat for each key tKey in sArray["content"]
+ BuildGroupForTarget pLanguage, sArray["content"][tKey], tColWidth
+ end repeat
+ put pTitleHeight into tTop
+ put 1 into tColNum
+ repeat while tToFit is not empty
+ repeat while tColNum <= kNumCols
+ PositionRowsInColumn tColNum, tColWidth, pTitleHeight, tTop, sArray["content"], tToFit
+ end repeat
+ if tToFit is empty then
+ exit repeat
+ end if
+ // If we get here we need a new card
+ repeat for each line tLine in tToFit
+ delete group sArray["content"][tLine]["title"]
+ end repeat
+ create card in sTargetStack
+ add 1 to tCurCard
+ put 1 into tColNum
+ repeat for each line tLine in tToFit
+ BuildGroupForTarget pLanguage, sArray["content"][tLine], tColWidth
+ end repeat
+ end repeat
+ return tCurCard
+end BuildCheatSheetForLiveCode
+
+function BuildCheatSheetMarkdownForLiveCode pLanguage
+ local tMarkdown
+ repeat for each element tContent in sArray["content"]
+ local tRowMarkdown
+ put BuildGroupMarkdownForTarget(tContent, pLanguage) \
+ into tRowMarkdown
+ if tRowMarkdown is empty then
+ next repeat
+ end if
+ put tRowMarkdown & return after tMarkdown
+ end repeat
+ return tMarkdown
+end BuildCheatSheetMarkdownForLiveCode
+
+function BuildGroupMarkdownForTarget pContent, pLanguage
+ local tCodeText
+ put pContent[LanguageToKey(pLanguage)] into tCodeText
+
+ -- Skip the row if no equivalent section
+ if tCodeText is empty then
+ return empty
+ end if
+
+ local tMarkdown
+ put "##" && pContent["title"] & return into tMarkdown
+
+ if pContent["text"] is not empty then
+ put pContent["text"] & return after tMarkdown
+ end if
+
+ put "```" & return after tMarkdown
+ put tCodeText & return after tMarkdown
+ put "```" & return after tMarkdown
+ return tMarkdown
+end BuildGroupMarkdownForTarget
+
+command BuildGroupForTarget pLanguage, pContent, pWidth
+ local tCodeText
+ put pContent[LanguageToKey(pLanguage)] into tCodeText
+
+ -- Skip the section if empty
+ if tCodeText is empty then
+ exit BuildGroupForTarget
+ end if
+
+ local tGroup, tTitle, tCode, tText
+ create group pContent["title"] in this card of sTargetStack
+ put it into tGroup
+
+ create field "title" in tGroup
+ put it into tTitle
+ set the width of tTitle to pWidth
+ set the text of tTitle to pContent["title"]
+ set the textSize of tTitle to kSectionTitleTextSize
+ set the textStyle of tTitle to "underline"
+ set the textAlign of tTitle to "center"
+
+ create field "text" in tGroup
+ put it into tText
+ set the width of tText to pWidth
+ set the text of tText to pContent["text"]
+ set the textSize of tText to kTextSize
+ set the textAlign of tText to "left"
+
+ if pContent["text"] is empty then
+ set the height of tText to 0
+ set the bottom of tText to the bottom of tTitle
+ hide tText
+ else
+ set the height of tText to the formattedHeight of tText
+ set the top of tText to the bottom of tTitle + kTitlePadding
+ end if
+
+ create field "code" in tGroup
+ put it into tCode
+ set the width of tCode to pWidth
+ set the text of tCode to tCodeText
+ set the textSize of tCode to kCodeTextSize
+
+ if pLanguage is "livecode" then
+ _internal script colorize char 1 to the number \
+ of chars in pContent[LanguageToKey("livecode")] of tCode
+ end if
+ set the height of tCode to the formattedHeight of tCode
+ set the loc of tCode to the loc of tTitle
+ set the top of tCode to the bottom of tText + kPadding
+end BuildGroupForTarget
+
+command PositionRowsInColumn @xCol, pColWidth, pTitleBottom, @xContentBottom, pContent, @xToFit
+ local tLastBottom, tLeft
+ put xCol*kMargin + (xCol - 1)*pColWidth into tLeft
+
+ local tCurGroup, tLines, tPositioned
+ put false into tPositioned
+ put xToFit into tLines
+ repeat for each line tLine in tLines
+ put pContent[tLine]["title"] into tCurGroup
+ if there is not a group tCurGroup then
+ delete line (lineoffset(tLine, xToFit)) of xToFit
+ next repeat
+ end if
+
+ local tRowHeight
+ put RowHeight(tCurGroup) into tRowHeight
+ if tRowHeight + xContentBottom > the height of sTargetStack then
+ next repeat
+ end if
+
+ set the top of group tCurGroup to xContentBottom
+ set the left of group tCurGroup to tLeft
+ add tRowHeight to xContentBottom
+ delete line (lineoffset(tLine, xToFit)) of xToFit
+ put true into tPositioned
+ end repeat
+
+ if tPositioned then
+ exit PositionRowsInColumn
+ end if
+
+ // If we get here we need a new column
+ add 1 to xCol
+ put pTitleBottom into xContentBottom
+end PositionRowsInColumn
+
+function CheatSheetArray
+ local tPath
+ put the effective filename of me into tPath
+ set the itemdelimiter to slash
+ put "cheat-sheet.yml" into item -1 of tPath
+
+ local tYAML
+ put textDecode(url("binfile:" & tPath), "utf8") into tYAML
+
+ YAMLToArray tYAML
+ if the result is not empty then
+ return the result
+ end if
+ return it
+end CheatSheetArray
+
+## YAMLToArray by Monte Goulding
+
+constant kMultiLineModeNone = 0
+constant kMultiLineModeLiteral = 1
+constant kMultiLineModeFolded = 2
+
+command YAMLToArray pYaml
+ local tInDocument = true
+ local tPath
+ local tArray
+ local tPathLists
+ local tReferences
+ local tMultiLineMode
+ put kMultiLineModeNone into tMultiLineMode
+
+ local tMultiLine
+ repeat for each line tLine in pYaml
+ -- ignore directives
+ if tLine begins with "%" then
+ next repeat
+ end if
+
+ if tLine begins with "---" then
+ put true into tInDocument
+ next repeat
+ end if
+
+ if not tInDocument then
+ next repeat
+ end if
+
+ if tLine begins with "..." then
+ if tMultiLineMode is not kMultiLineModeNone then
+ __ClearQuotes tMultiLine
+ put tMultiLine into tArray[tPath]
+ put kMultiLineModeNone into tMultiLineMode
+ end if
+ put false into tInDocument
+ next repeat
+ end if
+
+ local tPathElement, tListItem
+ put __PathElement(tLine, tListItem, tPathLists) into tPathElement
+
+ -- remain in multiline until indent is lower
+ if tMultiLineMode is not kMultiLineModeNone then
+ if tPathElement < the number of elements of tPath + 1 and tLine is not empty then
+ __ClearQuotes tMultiLine
+ put tMultiLine into tArray[tPath]
+ put kMultiLineModeNone into tMultiLineMode
+ else
+ -- add back any stripped literal indents
+ if tPathElement > the number of elements of tPath + 1 then
+ repeat for tPathElement - (the number of elements of tPath + 1)
+ put " " before tLine
+ end repeat
+ end if
+
+ -- empty lines and indented lines are literal even in folded mode
+ if tMultiLineMode is kMultiLineModeLiteral then
+ if tMultiLine is not empty then
+ put return after tMultiLine
+ end if
+ put tLine after tMultiLine
+ else
+ if tLine is empty then
+ put return after tMultiLine
+ else if char 1 of tLine is space or \
+ the last line of tMultiLine is empty or \
+ the last line of tMultiLine begins with space then
+ if tMultiLine is not empty then
+ put return after tMultiLine
+ end if
+ put tLine after tMultiLine
+ else
+ if tMultiLine is not empty then
+ put space after tMultiLine
+ end if
+ put tLine after tMultiLine
+ end if
+ end if
+
+ next repeat
+ end if
+ else
+ -- comment lines
+ split tLine by "#"
+ put tLine[1] into tLine
+ end if
+
+ -- empty lines
+ if tLine is empty then
+ next repeat
+ end if
+
+ local tElements
+ put the number of elements of tPath into tElements
+ if tPathLists[tPathElement] and \
+ tListItem and \
+ tPath[tPathElement] is an integer then
+ add 1 to tPath[tPathElement]
+ repeat with tIndex = tElements down to tPathElement + 1
+ delete variable tPath[tIndex]
+ delete variable tPathLists[tIndex]
+ end repeat
+ add 1 to tPathElement
+ else
+ if tPathElement < tElements then
+ repeat with tIndex = tElements down to tPathElement + 1
+ delete variable tPath[tIndex]
+ delete variable tPathLists[tIndex]
+ end repeat
+ else if tPathElement > tElements + 1 then
+ return "invalid YAML" for error
+ end if
+
+ put tListItem into tPathLists[tPathElement]
+ if tListItem then
+ put 1 into tPath[tPathElement]
+ add 1 to tPathElement
+ end if
+ end if
+
+ -- handle line with just list marker
+ if the number of words of tLine is 0 then
+ next repeat
+ end if
+
+ -- map
+ if tLine contains ":" then
+ set the itemDelimiter to ":"
+ local tKey
+ put item 1 of tLine into tKey
+ delete item 1 of tLine
+ __ClearQuotes tKey
+
+ if tKey is empty then
+ return "invalid YAML" for error
+ end if
+
+ put false into tPathLists[tPathElement]
+ put tKey into tPath[tPathElement]
+
+ -- clean whitespace
+ put word 1 to -1 of tLine into tLine
+
+ if tLine is not empty then
+ -- referenced element
+ local tRef
+ if tLine begins with "&" then
+ put word 1 of tLine into tRef
+ put "*" into char 1 of tRef
+ delete word 1 of tLine
+ else
+ put empty into tRef
+ end if
+
+ -- check for referenced element
+ if word 1 of tLine is among the keys of tReferences then
+ put tArray[tReferences[word 1 of tLine]] into tLine
+ end if
+
+ -- store referenced element
+ if tRef is not empty then
+ put tPath into tReferences[tRef]
+ end if
+
+ -- ignore explicit typing
+ if tLine begins with "!" then
+ delete word 1 of tLine
+ end if
+
+ if tLine is "|" then
+ put kMultiLineModeLiteral into tMultiLineMode
+ put empty into tMultiLine
+ else if tLine is ">" then
+ put kMultiLineModeFolded into tMultiLineMode
+ put empty into tMultiLine
+ else
+ __ClearQuotes tLine
+ put tLine into tArray[tPath]
+ end if
+ end if
+
+ else
+ put word 1 to -1 of tLine into tArray[tPath]
+ end if
+ end repeat
+
+ if tMultiLineMode is not kMultiLineModeNone then
+ __ClearQuotes tMultiLine
+ put tMultiLine into tArray[tPath]
+ end if
+
+ return tArray for value
+end YAMLToArray
+
+private command __ClearQuotes @xLine
+ if xLine begins with quote and xLine ends with quote then
+ put format( char 2 to -2 of xLine) into xLine
+ else if xLine begins with "'" and xLine ends with "'" then
+ put char 2 to -2 of xLine into xLine
+ end if
+end __ClearQuotes
+
+private function __PathElement @xLine, @rListItem, pPathLists
+ local tPathElement = 1
+
+ if xLine begins with "- " then
+ put true into rListItem
+ delete char 1 to 2 of xLine
+ return tPathElement
+ end if
+
+ put false into rListItem
+ repeat
+ if xLine begins with " " then
+ add 1 to tPathElement
+ if pPathLists[tPathElement] then
+ add 1 to tPathElement
+ end if
+ else if xLine begins with " - " then
+ -- list
+ add 1 to tPathElement
+ put true into rListItem
+ else
+ if xLine begins with " " then
+ add 1 to tPathElement
+ delete char 1 to 2 of xLine
+ end if
+ return tPathElement
+ end if
+ delete char 1 to 4 of xLine
+ end repeat
+end __PathElement
diff --git a/docs/cheat-sheet/cheat-sheet.yml b/docs/cheat-sheet/cheat-sheet.yml
new file mode 100644
index 00000000000..8426251935f
--- /dev/null
+++ b/docs/cheat-sheet/cheat-sheet.yml
@@ -0,0 +1,567 @@
+# This YAML is used to generate cheat sheets for either the LiveCode
+# language, or for transitioning between an alternative scripting
+# language and LiveCode.
+# Each element of the content array must have a title element, which is
+# used for the relevant section, and an lc element which contains the
+# relevant LiveCode script. Each element containing both lc and another
+# language (currently either py for Python or js for Javascript) will
+# place the code side by side in the generated cheat sheet PDF, under
+# the heading given in the title.
+# If there is a text element, this text will precede the code for the
+# section.
+content:
+ - title: "Comments"
+ text: |
+ Comments allow you to add explanations and annotations to your code.
+ lc: |
+ -- these
+ # are
+ // all
+ /* commented
+ out */
+ lcb: |
+ -- these
+ // are
+ /* commented
+ out */
+ py: |
+ # this is commented out
+ js: |
+ // These
+ /* are
+ commented
+ out */
+ - title: "Literals"
+ text: |
+ A literal is a notation for creating a particular type of value.
+ lcb: |
+ "string literal"
+ ["list", "of", "literals"]
+ {"array": "literal"}
+ py: |
+ "string literal"
+ 'string literal'
+ ["list", "of", "literals"]
+ {"dictionary": "literal"}
+ js: |
+ "string literal"
+ 'string literal'
+ ["array", "of", "literals"]
+ {"object": "literal"}
+ - title: "Variables"
+ text: |
+ Variables are used to to store information, the stored value can be changed or accessed when you need it.
+ lc: |
+ local tVar
+ put "str" into tVar
+ put 1 into tVar
+
+ put "val" into tVar["key"]
+ lcb: |
+ variable tVar
+ put "str" into tVar
+ put 1 into tVar
+
+ variable tArr as Array
+ put "val" into tArr["key"]
+ py: |
+
+ var = "str"
+ var = 1
+
+ var["key"] = "val"
+ js: |
+ var myVar;
+ myVar = "str";
+ myVar = 1;
+
+ var arr = {};
+ arr["key"] = "val";
+ - title: "Constants"
+ text: |
+ Constants store a value that is defined at the point of declaration and never changes.
+ lc: |
+ constant kFoo = 15
+ lcb: |
+ constant kFoo is 15
+ js: |
+ const FOO = 15;
+ - title: "Control Structures"
+ text: |
+ Control structures are used to control what code is executed and how many times.
+ lc: |
+ repeat for each char tChar in tVar
+ end repeat
+
+ repeat 10
+ end repeat
+
+ repeat with x = 1 to 10
+ end repeat
+
+ repeat while x > 1
+ subtract 1 from x
+ end repeat
+
+ if true then ... else ...
+
+ if tVar then
+ else if tOther then
+ else
+ end if
+
+ switch tVar
+ case "a"
+ break
+ default
+ break
+ end switch
+ lcb: |
+ repeat for each char tChar in tVar
+ end repeat
+
+ repeat 10 times
+ end repeat
+
+ repeat with tX from 1 up to 10
+ end repeat
+
+ repeat while tX > 1
+ subtract 1 from tX
+ end repeat
+
+ if tVar then
+ else if tOther then
+ else
+ end if
+ py: |
+ for x in tVar:
+ # do things
+
+ for x in range(10):
+ # do things
+
+ while x > 1:
+ x -= 1
+
+ if tVar:
+ elif tOther:
+ else:
+ js: |
+ for (var i=0; i < text.length; i++) {
+ char = text.charAt(i);
+ }
+
+ for (var i=0; i < 10; i++) {
+ }
+
+ while (x > 1) {
+ x--;
+ }
+
+ if (value) {
+ } else if (other) {
+ } else {
+ }
+
+ switch (value) {
+ case "a":
+ break;
+ default:
+ break;
+ }
+ - title: "Operators"
+ text: |
+ Operators are ways of combining values such as boolean values, numbers or strings, to produce other values.
+ lc: |
+ // Logical
+ true and false is false
+ true or false is true
+ not false is true
+
+ // String
+ "foo" & "bar" is "foobar"
+ "foo" && "bar" is "foo bar"
+ "string" begins with "st"
+ "string" ends with "g"
+
+ // Chunks
+ char 5 of "string" is "n"
+ item 3 of "a,b,c" is "c"
+ word 1 of "hi there" is "hi"
+ line 2 of "a" & return & "b" is "b"
+
+ // Compound chunks
+ char 1 of item 1 of line 1 of "a,b,c" is "a"
+ lcb: |
+ // Logical
+ true and false is false
+ true or false is true
+ not false is true
+
+ // String
+ "foo" & "bar" is "foobar"
+ "foo" && "bar" is "foo bar"
+ "string" begins with "st"
+ "string" ends with "g"
+
+ // Chunks
+ char 5 of "string" is "n"
+
+ split "a,b,c" by "," into tItems
+ tItems[3] is "c"
+
+ split "hi there" by " " into tWords
+ tWords[1] is "hi"
+
+ split "a\nb" by "\n" into tLines
+ tLines[2] is "b"
+
+ split "a,b,c" by "\n" into tLines
+ split tLines by "," into tItems
+ char 1 of tItems[1] is "a"
+ py: |
+ # Logical
+ true and false == false
+ true or false == true
+ !false == true
+
+ # String
+ "foo" + "bar" == "foobar"
+ strs = ['foo','bar']
+ ' '.join(strs) == "foo bar"
+ "string".startswith("st")
+ "string".endswith("g")
+
+ # Chunks
+ "string"[4:5] == "n"
+
+ items = "a,b,c".split(",")
+ items[2] == "c"
+
+ words = "hi there".split(" ")
+ words[0] == "hi"
+
+ lines = "a\nb".split("\n")
+ lines[1] == "b"
+
+ lines = "a,b,c".split("\n")
+ items = lines[1].split(",")
+ items[1][0:1] == "a"
+ js: |
+ // Logical
+ true && false == false
+ true || false == true
+ !false == true
+
+ // String
+ "foo" + "bar" == "foobar"
+ var strs = ['foo','bar'];
+ strs.join(" ") == "foo bar"
+
+ "string".startsWith("st");
+ "string".endsWith("g");
+
+ // Chunks
+ "string".charAt(4) == "n"
+
+ var items = "a,b,c".split(",");
+ items[2] == "c"
+
+ var words = "hi there".split(" ");
+ words[0] == "hi"
+
+ var lines = "a\nb".split("\n");
+ lines[2] == "b"
+
+ var lines = "a,b,c".split("\n")
+ var items = lines[1].split(",")
+ items[1].charAt(0) == "a"
+ - title: "String Processing"
+ text: |
+ These examples show how string values can be manipulated.
+ lc: |
+ // General
+ put "a" before tVar
+ delete char 1 of tVar
+ replace "_" with "-" in tVar
+
+ // Regex
+ matchText("1", "([0-9])", tN) is true
+ tN is 1
+
+ filter lines of tVar with regex pattern tPattern
+ lcb: |
+ // General
+ put "a" before tVar
+ delete char 1 of tVar
+ replace "_" with "-" in tVar
+ py: |
+ # General
+ var = 'a' + var
+ var = var[1:]
+ var.replace("_", "-")
+
+ # Regex
+ found = re.match('([0-9])', '1')
+ num = tMatch.group(1)
+
+ for line in var:
+ if re.match(pattern, line):
+ filtered.push(line)
+ var = '\n'.join(filtered)
+ js: |
+ # General
+ str = 'a' + str;
+ str = str.slice(1);
+ str = str.replace("_", "-")
+
+ # Regex
+ var found = /[0-9]/.exec("1");
+ var num = found[1];
+
+ str.split("\n").filter(function(elem) {
+ return pattern.exec(elem) != NULL;
+ });
+ - title: "Array Processing"
+ text: |
+ These examples show how array values can be manipulated.
+ lc: |
+ // Split / combine
+ put "a,b,c" into tVar
+ split tVar by ","
+ tVar[2] is "b"
+ combine tVar with ","
+ tVar is "a,b,c"
+
+ // Iteration
+ repeat for each key tKey in tArray
+ -- Do something with tArray[tKey]
+ end repeat
+
+ repeat for each element tElement in tArray
+ end repeat
+
+ // Length
+ the number of elements in tArray
+ lcb: |
+ // Split / combine
+ put "a,b,c" into tVar
+ split tVar by ","
+ tVar[2] is "b"
+ combine tVar with ","
+ tVar is "a,b,c"
+
+ // Iteration
+ repeat for each key tKey in tArray
+ -- Do something with tArray[tKey]
+ end repeat
+
+ repeat for each element tElement in tArray
+ end repeat
+
+ // Length
+ the number of elements in tArray
+ py: |
+ # Split / combine
+ var = "a,b,c".split(",")
+ var[1] is "b"
+ ','.join(var)
+ var == "a,b,c"
+
+ # Iteration
+ for key in array:
+ # do something with array[key]
+
+ # Length
+ len(array)
+ js: |
+ # Split / combine
+ var list = "a,b,c".split(",")
+ list[1] is "b"
+ list = list.join(",");
+ list == "a,b,c"
+
+ for (var key in array) {
+ # Do something with array[key];
+ }
+
+ # Length
+ array.length();
+ - title: "Sorting"
+ text: |
+ These examples show how to sort items and lists.
+ lc: |
+ local tList
+ put "5,2,3,1,4" into tList
+ sort items of tList ascending numeric
+ -> tList is "1,2,3,4,5"
+ sort items of tList descending numeric
+ -> tList is "5,4,3,2,1"
+
+ local tData
+ put "6,1:8,3:2,2" into tData
+ set the lineDelimiter to ":"
+ sort lines of tData ascending numeric by item 2 of each
+ -> tData is "6,1:2,2:8,3"
+ lcb: |
+ variable tList
+ put [5,2,3,1,4] into tList
+ sort tList in ascending numeric order
+ -> tList is [1,2,3,4,5]
+ sort tList in descending numeric order
+ -> tList is [5,4,3,2,1]
+
+ public handler DoSort(in pLeft, in pRight) returns Integer
+ return pLeft[2] - pRight[2]
+ end handler
+
+ variable tData as List
+ put [[6, 1], [8, 3], [2, 2]] into tData
+ sort tData using handler DoSort
+ -> tData is [[6, 1], [2, 2], [8, 3]]
+ py: |
+ list = [5, 2, 3, 1, 4]
+ sorted(list) == [1, 2, 3, 4, 5]
+ sorted(list, reverse=True) == [5, 4, 3, 2, 1]
+
+ data = [(6, 1), (8, 3), (2, 2)]
+ sorted(data, key=itemgetter(2)) == [(6, 1), (2, 2), (8, 3)]
+ js: |
+ var list = [5, 2, 3, 1, 4]
+ list.sort();
+ -> list == [1, 2, 3, 4, 5]
+ list.reverse();
+ -> list == [5, 4, 3, 2, 1]
+
+ var data = [[6, 1], [8, 3], [2, 2]];
+ data.sort(function(a,b) {
+ return a[2] - b[2]
+ });
+ -> data == [[6, 1], [2, 2], [8, 3]]
+ - title: "Files & Processes"
+ text: |
+ These examples show how to read from and write to files and processes.
+ lc: |
+ get url("file:/" & tPath)
+ put "" into url("file:/" & tPath)
+
+ open process tProc
+ read from process tProc for 5
+ close process tProc
+ lcb: |
+ get the contents of file tPath
+ set the contents of file tPath to ""
+ py: |
+ open(tPath).read()
+ open(tPath).write("")
+
+ process = subprocess.Popen([tProc], stdout=subprocess.PIPE)
+ while True:
+ process.wait()
+ data = process.stdout.read(5)
+ if data:
+ break
+ - title: "User Input / Notification"
+ text: |
+ These examples show how to pop up information dialogs, or prompts for user input.
+ lc: |
+ ask "What is your name?"
+ put it into tName
+
+ answer "Something"
+ py: |
+ dlg = wx.TextEntryDialog(None, "What is your name?", defaultValue=default_value)
+ dlg.ShowModal()
+ name = dlg.GetValue()
+ dlg.Destroy()
+
+ dlg = wx.MessageDialog(None, "Something", caption, wx.OK)
+ result = dlg.ShowModal()
+ dlg.Destroy()
+ js: |
+ var name = prompt("What is your name?");
+
+ alert("Something");
+ - title: "Custom Handlers"
+ text: |
+ A custom handler is a function or command that you define yourself.
+ lc: |
+ function foo pParam
+ end foo
+ // get foo(tVar)
+
+ command bar pParam
+ end bar
+ // bar 5
+ lcb: |
+ handler foo(in pParam)
+ end foo
+ // get foo(tVar)
+ // foo 5
+ py: |
+ def foo(param):
+ # return something
+ # foo(var)
+ js: |
+ function foo(param) {
+ }
+ // foo(value)
+ - title: "Event Handlers"
+ text: |
+ An event handler is a hander that is triggered when an event occurs, such as the use of the mouse or keyboard.
+ lc: |
+ // Mouse
+ on mouseUp pButton
+ end mouseUp
+
+ on mouseDown pButton
+ end mouseDown
+
+ on mouseMove
+ end mouseMove
+
+ // Keyboard
+ on keyDown pKey
+ end keyDown
+
+ on keyUp pKey
+ end keyUp
+ lcb: |
+ // Mouse
+ handler OnMouseUp()
+ get the click button
+ end handler
+
+ handler OnMouseDown()
+ get the click button
+ end handler
+
+ handler OnMouseMove()
+ end handler
+
+ // Keyboard
+ handler OnKeyPress(in pText)
+ end handler
+ js: |
+ # Mouse
+ function handleMouseUp {
+ }
+
+
+ function handleMouseDown {
+ }
+
+
+ function handleMouseMove {
+ }
+
+
+ # Keyboard
+ function handleKeyUp {
+ }
+
+
+ function handleKeyDown {
+ }
+
\ No newline at end of file
diff --git a/docs/contributing_to_docs.md b/docs/contributing_to_docs.md
index 8b2b46170b6..8628c3b97ba 100644
--- a/docs/contributing_to_docs.md
+++ b/docs/contributing_to_docs.md
@@ -10,9 +10,10 @@ instructive example? Or can you explain a concept better than it is
currently explained? Please consider submitting your proposed changes
directly to the LiveCode repo on GitHub.
-If your changes constitute a substantial rewrite of a dictionary entry,
-please familiarize yourself with the
-[documentation format specification](guides/LiveCode Documentation Format Reference.md).
+Please consult the [documentation style guide](development/docs_style_guide.md)
+and the [documentation format specification](guides/LiveCode%20Documentation%20Format%20Reference.md)
+for information on the standards and structure we aim to maintain in our
+documentation.
# Documentation Objectives
@@ -28,7 +29,7 @@ documentation of all LiveCode syntax. The most basic form of
incompleteness is a completely missing dictionary entry. If you intend
to write a missing dictionary entry, please bear these documentation
objectives in mind and consult the
-[documentation format specification](guides/LiveCode Documentation Format Reference.md),
+[documentation format specification](guides/LiveCode%20Documentation%20Format%20Reference.md).
The dictionary ought to contain *all* the relevant information about a
particular piece of LiveCode syntax. Every syntax variant should be
@@ -49,7 +50,7 @@ prior to major developments in both our software and the hardware it
runs on.
Secondly, dictionary Syntax elements must be correct. The
-[documentation format specification](guides/LiveCode Documentation Format Reference.md)
+[documentation format specification](guides/LiveCode%20Documentation%20Format%20Reference.md)
contains a description of the Syntax element.
Thirdly, the dictionary files must be formatted correctly. This means
@@ -154,19 +155,19 @@ website, without having to download any software or use the command line.
### Making your dictionary change
-**Navigate to the file you want to modify in the [dictionary folder of the develop branch](https://github.com/livecode/livecode/blob/develop/docs/dictionary).**
+**Navigate to the file you want to modify in the [dictionary folder of the develop-9.0 branch](https://github.com/livecode/livecode/blob/develop-9.0/docs/dictionary).**
For example, the accept command is at:
-https://github.com/livecode/livecode/blob/develop/docs/dictionary/command/accept.lcdoc
+https://github.com/livecode/livecode/blob/develop-9.0/docs/dictionary/command/accept.lcdoc
Either go directly to the community docs branch URL
-(https://github.com/livecode/livecode/tree/develop) or if you are
-on the main LiveCode repository page, select 'develop' from the
+(https://github.com/livecode/livecode/tree/develop-9.0) or if you are
+on the main LiveCode repository page, select 'develop-9.0' from the
branch dropdown menu:

-You should see that the develop branch is selected both in the
+You should see that the develop-9.0 branch is selected both in the
label of the dropdown and the url of your browser.

@@ -239,7 +240,7 @@ and description
>*Note:* Please ensure the pull request has the correct base branch and
comparison branch. The base fork should be `livecode/livecode`, with
-base branch `develop`, and the head fork should be
+base branch `develop-9.0`, and the head fork should be
`/livecode` with compare branch something like `patch-1`
(unless you have renamed it).
@@ -264,7 +265,7 @@ Requests' menu item at the top of the GitHub website.
**Sign the CLA if you haven't already**
-Go to the list of pull requests and click on the the link to your pull request.
+Go to the list of pull requests and click on the link to your pull request.
If you have not signed the Contributor's Agreement, livecode-vulcan will have commented (or will soon!)
to ask you to:
1. Sign the LiveCode CLA
@@ -407,7 +408,7 @@ Click commit to
Then click "Submit pull request"
-Make sure the target branch is livecode/develop
+Make sure the target branch is livecode/develop-9.0
Check the pull request has appeared in
https://github.com/livecode/livecode/pulls
@@ -436,13 +437,13 @@ make sure your name and email address are set up
`git config --global user.email ""`
-checkout the `develop` branch
+checkout the `develop-9.0` branch
-`git checkout develop`
+`git checkout develop-9.0`
ensure it is up to date
-`git pull upstream develop`
+`git pull upstream develop-9.0`
create a new branch for your docs changes, for example
@@ -480,7 +481,7 @@ Navigate to your fork on the Git website, `https://github.com//l
You should see a link to the recently pushed branch, and an invitation to submit a pull request.
Click this.
-Ensure the base fork is livecode/livecode, and the base is develop.
+Ensure the base fork is livecode/livecode, and the base is develop-9.0.
Click create pull request.
diff --git a/docs/development/C++-features.md b/docs/development/C++-features.md
new file mode 100644
index 00000000000..63621457a4c
--- /dev/null
+++ b/docs/development/C++-features.md
@@ -0,0 +1,1229 @@
+# C++ Feature Guidelines for LiveCode
+
+This file documents the usage of C++ language and library features within the
+LiveCode engine and ancillary projects (externals, etc). It covers technical
+aspects rather than matters that are purely of coding style (for that, see
+CONTRIBUTING.md instead).
+
+The LiveCode codebase dates back to the early 1990s as MetaCard and was
+originally written in C. Over its lifetime, it supported a large number of Unix
+and Unix-like operating systems (e.g. SunOS, IRIX, AIX) as well as Windows (both
+16-bit Windows 3.1 as well as 32-bit Windows 95+) and "classic" (pre-OSX) MacOS
+in addition to the currently supported platforms (modern versions of Windows,
+OSX, Linux, Android and iOS as well as browser-based HTML5+JavaScript). Because
+of this wide variety of operating environments, both past and present, the
+adoption of C++ language features (as well as library facilities) has been very
+conservative in order to compile and run on the numerous supported platforms.
+
+The following is a list of major C++ language features (by C++ standard
+revision) and whether they are permitted in the LiveCode codebase or not. If a
+feature is prohibited, a rationale is provided in order that the reason for
+avoiding the feature is understood. The subsequent section details which
+compilers LiveCode is built with and which C++ language features those
+compilers provide.
+
+## Core language features
+
+### C++98 and C++03
+
+C++98 is the first standard governing the C++ language and C++03 is a set of
+minor revisions to correct defects in the original standard. All of the
+compilers used in the LiveCode build process support these standards. Despite
+this, some features from these revisions are prohibited but for reasons other
+than compiler support.
+
+Generally speaking, any features of the language or library that require runtime
+support should not be used for reasons of compatibility. More details are given
+in the descriptions of the individual features. (Because most features are
+permitted, only prohibitions or features that are permitted with caveats are
+listed here). Anything that also requires a C++ ABI with system libraries should
+also be avoided.
+
+#### Exceptions: PARTIALLY PROHIBITED
+
+The only exception that should normally be thrown or caught within
+LiveCode source code is `std::bad_alloc` for memory allocation
+failures.
+
+Catch exceptions thrown by third party C++ libraries used by LiveCode
+and translate them to LiveCode's internal error handling mechanisms.
+
+**Rationale:**
+
+> Correctness.
+>
+> The age of the codebase (as well as its C origins) mean that the vast majority
+> of the code in the engine is not exception-safe (i.e it will leak resources
+> and/or fail to clean up properly as the exception propagates). Because writing
+> good exception-safe code is hard enough already, use the engine's existing
+> error handling mechanisms wherever possible.
+
+**Timescale:**
+> Indefinite. Making the engine exception-safe is a huge undertaking and is not
+> currently being contemplated. Even if it were done, exceptions can be tricky
+> to use correctly so any use would need to be carefully discussed and
+> considered before being accepted.
+
+#### `dynamic_cast` and RTTI (`typeid`, `typeinfo`): PARTIALLY PROHIBITED
+
+Use `dynamic_cast` when casting within a type hierarchy. This ensures
+early error detection when an instance is cast to an incompatible
+type.
+
+Other uses of RTTI are currently prohibited.
+
+**Rationale:**
+> Correctness, style and ABI dependencies.
+>
+> There are few good uses of RTTI features that wouldn't be better done using
+> virtual methods or other mechanisms. The performance consequences of using
+> `dynamic_cast` vary between platforms though the penalties are not as large as
+> they have been on some historical systems.
+>
+> In addition to the "correctness" of using these features, RTTI (including
+> `dynamic_cast`) introduces C++ ABI dependencies on the layout of class vtables
+> and typeinfo structures.
+
+**Timescale:**
+> Indefinite. Improved C++ implementations are gradually reducing the
+> cost of using RTTI features, and newer C++ standards are introducing
+> library features that make use of RTTI. It may make sense to use
+> RTTI features beyond `dynamic_cast` in the future.
+
+#### C++ standard template library: PROHIBITED
+
+**Note:**
+> This is the entirety of the C++ standard library in C++98/03 (i.e everything
+> in the `std` namespace. This explicitly excludes global `operator new` and
+> cousins (`new[]`, `delete`, `delete[]`) as they are in the global namespace,
+> not `std`.
+>
+> There are some features in the C++ standard library in more modern language
+> revisions that *are* permitted, but these are documented separately in a
+> section on the C++ standard library.
+
+**Rationale:**
+> Primarily C++ ABI issues but also performance characteristics.
+>
+> Many parts of the STL pull in symbols that are provided in a system library
+> rather than being inlined in templates. This introduces a large, complex C++
+> ABI dependency which would vastly complicate the LiveCode build and testing
+> process.
+>
+> Additionally, the performance characteristics of the various STL containers
+> were not specified until C++11 or newer so cannot be relied upon.
+
+### C++11
+
+C++11 (previously named C++0x then C++1x) was the first major revision to the
+C++ standard. It introduced a large number of new features, both as part of the
+core language and in the standard library.
+
+The limitations in this section generally stem from compiler support issues:
+only those features implemented by all compilers used in the LiveCode build
+process may be used outside platform-specific code. (Use within platform-
+specific code of a feature supported by all compilers for that platform is
+permissible but requires careful consideration before use).
+
+If a feature in this list is not supported but will be permitted once supported,
+no special annotation is used. If it would be prohibited even if it were
+supported, this is specifically called out and a rationale for the prohibition
+is supplied.
+
+#### RValue references: PERMITTED
+
+References with move semantics (rather than copy semantics). Named for their
+position on the right-hand side of an assignment expression, e.g.
+`FooClass foo = getFoo();` calls `foo.FooClass::operator=(foo&&)` with the
+return value from `Foo getFoo()`.
+
+#### Reference qualifiers on member functions: NOT SUPPORTED
+
+Overloading member functions based on reference type (lvalue vs rvalue):
+`Foo getFoo() const &; Foo getFoo() &&;` will call the former to copy the Foo in
+most cases but the latter to move the Foo in rvalue context. This is used
+alongside rvalue references to permit copy-vs-move optimisations of certain
+common patterns.
+
+**Requires:**
+> MSVC: 2015
+> GCC: 4.8.1
+> Clang: 2.9
+
+#### Non-static data initialisers: NOT SUPPORTED
+
+Avoids repetition of information when defining classes with multiple
+constructors. For example:
+````
+class Foo
+{
+ int m_Bar = 42;
+ ...
+};
+````
+will initialise `m_Bar` to 42 in any constructor that doesn't explicitly
+initialise that member to something else.
+
+**Requires:**
+> MSVC: 2013
+> GCC: 4.7
+> Clang: 3.0
+
+#### Variadic templates: NOT SUPPORTED
+
+Allows the definition of templates with a variable number of template
+parameters. For example:
+````
+template
+auto CallFunctionWithArgs(Functor f, Args... args)
+{
+ return f(args...);
+}
+````
+
+**Requires:**
+> MSVC: 2013
+> GCC: 4.3
+> Clang: 2.9
+
+#### Initialiser lists: NOT SUPPORTED
+
+Used when initialising an aggregate (struct, class) with multiple elements of
+same type. Usually used for initialising arrays with multiple elements:
+````
+std::vector t_array = { 1, 1, 2, 3, 5, 8, 13, 21, 34, 55 };
+````
+
+**Requires:**
+> MSVC: 2013
+> GCC: 4.4
+> Clang: 3.1
+
+#### Static assertions: PERMITTED
+
+Used to test compile-time conditions, e.g.:
+````
+static_assert(sizeof(int) == 4, "Expected int to be 4 bytes");
+````
+
+#### `auto` type specifier: PERMITTED
+
+Allows inference of types for variables, leading to shorter/less redundant code.
+Especially useful when writing templates where the compiler can deduce a type
+but the author cannot, e.g.:
+````
+template
+void callBarThenQuux(T& t)
+{
+ auto t_bar = t.Bar();
+ t.quux(t_bar);
+}
+````
+
+This can also be used when writing functions:
+````
+template
+auto callFooWith42(T& t)
+{
+ return t.Foo(42);
+}
+````
+
+#### Trailing return types: PERMITTED
+
+This is an extension of the `auto` type specifier that allows an explicit (but
+deduced) type to be given. Similarly, most useful when writing templates:
+````
+template
+auto addThings(T t, U u) -> decltype(t + u)
+{
+ return t + u;
+}
+````
+This notation says that the return type is the type that is the return type of
+the expression `(t + u)`.
+
+#### Lambda expressions: PERMITTED
+
+Lambda expressions are a convenient way to define functions inline and come in
+two forms: capturing and non-capturing. As an example, consider a method `apply`
+that applies a given function to each element of an array. One use of a non-
+capturing lambda would be:
+````
+Array t_array = ...;
+auto increment = [](array_element_t& element) { element++; };
+t_array.apply(increment);
+````
+while a capturing lambda might be used to do:
+````
+Array t_array = ...;
+int sum = 0;
+auto sum = [&sum](array_element_t& element) { sum += element; };
+t_array.apply(sum);
+````
+
+#### `decltype` expression: PERMITTED
+
+The `decltype` keyword returns the type of an expression. This could be the name
+of a variable (e.g. `decltype(t_foo)`) or a more complex expression (e.g.
+`decltype(t_foo.Bar(t_baz) + t_quux)`). It can be used anywhere a type can be
+used:
+````
+int t_foo = 42;
+long t_bar = 0;
+decltype(t_foo + t_bar) t_baz = t_foo + t_bar;
+````
+
+#### `>>` inside template parameter lists: PERMITTED
+
+In previous versions of C++, instantiating a template with a type that is also
+a template (e.g. `Foo>`) would cause the final `>>` to be interpreted
+as a right-shift operator rather than terminating the template parameters. As of
+C++11, preference is now given to the template meaning. Consequently, all uses
+of the right-shift operator in a template parameter list should be parenthesised
+in order to get the operator meaning (`Quux<(42 >> 3)>`).
+
+#### Default template arguments for template functions: NOT SUPPORTED
+
+Previously, template functions could not have default values for the template's
+arguments; this restriction has been lifted in C++11:
+````
+template
+U addOne(T t)
+{
+ return U(t) + 1;
+}
+````
+
+**Requires:**
+> MSVC: 2013
+> GCC: 4.3
+> Clang: 2.9
+
+#### SFINAE in expressions: NOT SUPPORTED
+
+C++ makes available a technique called "SFINAE" (Substitution Failure Is Not An
+Error) whereby errors encountered when substituting template parameters are not
+considered errors. This has been extended to certain expressions, too (in
+particular, `sizeof`, `decltype` and `noexcept` expressions). By way of example:
+````
+template
+auto addIfPossible(T t1, T t2) -> decltype(t1 + t2)
+{
+ return t1 + t2;
+}
+
+template
+T addIfPossible(T t1, ...)
+{
+ return t1;
+}
+````
+will, when used as `addIfPossible(Foo(), Foo())`, call the first form when `Foo`
+has an appropriate `operator+` defined and the second form otherwise (as it is
+the only overload that is valid).
+
+**Requires:**
+> MSVC: (Not yet implemented)
+> GCC: 4.4
+> Clang: 2.9
+
+#### Alias templates: NOT SUPPORTED
+
+There is no way in C++ to make a template typedef so C++11 introduces a template
+using expression, which has the same effect:
+````
+template
+using Foo = Bar;
+````
+introduces the template `Foo` as an alias for `Bar`. This can
+also be used in place of a normal typedef (i.e without the template):
+`using uint = unsigned int;`
+
+**Requires:**
+> MSVC: 2013
+> GCC: 4.7
+> Clang: 3.0
+
+#### Extern templates: PERMITTED
+
+C++ has always provided a syntax to explicitly instantiate a template for a
+given set of template parameters (`template Foo;`) but didn't provide
+the complement: a way to suppress a given instantiation in the current
+compilation unit (usually because it is explicitly instantiated elsewhere).
+Extern template declarations are the new mechanism to do this:
+````
+extern template Foo;
+````
+
+#### `nullptr` constant: PERMITTED
+
+The `NULL` macro in C++ poses a number of problems. Because of the stricter type
+checking, it cannot be defined as `((void*)0)` as is recommended in C so is
+instead usually defined as `0`. Unfortunately, `0` is an integer which can cause
+unexpected behaviour. The resolution to this is to introduce the `nullptr`
+constant, which has pointer type:
+````
+void foo(int);
+void foo(void*);
+
+void foo(NULL); // Calls the int overload
+void foo(nullptr); // Calls the void* overload
+````
+
+There is also a corresponding type made available in the standard library
+(`nullptr_t`) which is the type of this constant (it is a different type from
+any other pointer type). This type can also be accessed as `decltype(nullptr)`.
+
+#### Strongly-typed enums: PERMITTED
+
+In C++98, the underlying type of an `enum` is determined by the members of the
+enum and is the smallest type that can represent all member values. This means
+that it is not possible to forward-declare enums as the underlying type cannot
+be known until the enum is fully defined. C++11 adds a way of declaring the
+underlying type of an enum, both for explicitness and to allow forward
+declarations:
+````
+enum Foo : uint32_t;
+
+enum Bar : int8_t { ... };
+````
+
+Another pitfall of enums is that the names of the members are injected into the
+outer scope and can conflict with other symbols in that scope. C++11 adds a
+mechanism to prevent this (as well as various other generally undesirable
+features of enums like the existence of arithmetic operators on the enum):
+````
+enum class Quux { Wibble = 42 };
+
+Quux q = Quux::Wibble;
+````
+(if the arithmetic operators are desired, they can be manually defined as, e.g.
+`operator+(Quux, Quux)` in the scope enclosing the enum).
+
+Both features can be combined: `enum class Quux : uint16_t {...};`.
+
+**Note:**
+> MSVC versions before 2012 don't support the `enum class` syntax nor the
+> forward declaration of enums but do support the other enum-related
+> enhancements.
+
+#### Attributes: NOT SUPPORTED
+
+C++ compilers have long supported various syntaxes for applying attributes to
+declarations but the mechanisms have been non-standard. MSVC uses `declspec(x)`
+while GCC and Clang use `__attribute__((x))`. This has now been standardised as
+`[[x]]` (e.g. `[[warn_unused_result]] bool operationThatMightFail(Foo&);`).
+
+Particular attributes are discussed individually. Except for those defined by a
+C++ standard, attributes should be protected by an appropriate check:
+````
+#ifdef __GNUC__
+# define WARN_UNUSED_RESULT [[gnu::warn_unused_result]]
+#else
+# define WARN_UNUSED RESULT
+#endif
+````
+
+**Requires:**
+> MSVC: 2015
+> GCC: 4.8
+> Clang: 3.3
+
+#### `constexpr`: NOT SUPPORTED
+
+Certain contexts in C++ require constant expressions (e.g. the size of an array)
+but there is no way to use function calls in those expressions in C++98. C++11
+adds a keyword that marks a function as being evaluatable at compile time:
+````
+constexpr size_t doubleSize(size_t x)
+{
+ return 2*x;
+}
+
+int someArray[doubleSize(42)];
+````
+
+In C++11, `constexpr` functions must consist of a single return statement
+(though the expression within that statement may be of arbitrary complexity and
+may even be recursive). C++14 relaxes this restriction (see the C++14 section
+for support for this feature).
+
+Generally speaking, `constexpr` should be added to any function that might be
+evaluatable at compile time; this would be any function that is a pure function
+of its arguments (i.e does not depend on statics, globals, members, etc). It can
+also be used for constructors that simply perform simple initialisations of an
+object's members using constants or (`constexpr` functions of) the constructor's
+parameters.
+
+**Requires:**
+> MSVC: 2015
+> GCC: 4.8
+> Clang: 3.1
+
+#### Explicit alignment: NOT SUPPORTED
+
+C++11 adds the ability to query and set the alignment of types and values using
+the `alignof(...)` and `alignas(...)` storage specifiers. For example:
+````
+using double_bytes = char[sizeof(double)] alignas(alignof(double));
+````
+(though `alignas(alignof(type))` can be shortened to `alignas(type)`).
+
+**Requires:**
+> MSVC: 2015
+> GCC: 4.8
+> Clang: 3.3
+
+#### Delegating constructors: NOT SUPPORTED
+
+C++11 allows constructors of a class to call other constructors of that class
+as part of its initialisation:
+````
+class Foo
+{
+ Bar* m_barptr;
+
+ Foo() : Foo(nullptr) {}
+ Foo(Bar* ptr) : m_barptr(ptr) {}
+ Foo(const Foo& foo) : Foo(foo.m_barptr) {}
+};
+````
+
+**Requires:**
+> MSVC: 2013
+> GCC: 4.7
+> Clang: 3.0
+
+#### Inheriting constructors: NOT SUPPORTED
+
+Allows the import of (all of) a base class' constructors into the scope of a
+derived class. For example:
+````
+template
+class Augmenter : public T
+{
+ void someAugmentationMethod();
+ using T::T;
+};
+````
+
+**Requires:**
+> MSVC: 2015
+> GCC: 4.8
+> Clang: 3.3
+
+#### `explicit` conversion operators: NOT SUPPORTED
+
+Constructors of classes in C++ have the `explicit` keyword added to prevent them
+from being used in implicit conversions. For example, the `std::string` class
+has a `string(size_t)` constructor which, if it didn't have an `explicit`
+attached, would allow the following:
+````
+void foo(const std::string&);
+foo(42);
+````
+
+However, type conversion operators have many of the same problems as conversion
+constructors but did not support `explicit` before C++11. This is particularly
+evident in classes with an `operator bool`: without `explicit`, objects of the
+class can be used in integer expressions as `bool` is an integer type!
+
+As with conversion constructors, conversion operators should always be
+`explicit` unless there is a particular reason to leave it off.
+
+**Requires:**
+> MSVC: 2013
+> GCC: 4.5
+> Clang: 3.0
+
+#### `char16_t` and `char32_t` types: NOT SUPPORTED
+
+These types are explicitly defined to be UTF-16 and UTF-32 codeunits,
+respectively, but are otherwise similar to `char`.
+
+**Requires:**
+> MSVC: 2015
+> GCC: 4.4
+> Clang: 2.9
+
+#### Unicode string literals: NOT SUPPORTED
+
+These are string literals with types `const char[]`, `const char16_t[]` and
+`const char32_t[]` where all elements are the appropriate UTF-8, UTF-16 and
+UTF-32 codeunits, respectively:
+````
+const char* utf8_string = u8"Hello!";
+const char16_t* utf16_string = u"Hello!";
+const char32_t* utf32_string = U"Hello!";
+````
+
+**Requires:**
+> MSVC: 2015
+> GCC: 4.5
+> Clang: 3.0
+
+#### Raw string literals: NOT SUPPORTED
+
+These are string literals with user-defined delimiters in which escape
+characters are not interpreted:
+````7
+// Content of regex is:
+// s/"/'/g
+const char* regex = R"some_delim(s/"/'/g)some_delim";
+````
+
+**Requires:**
+> MSVC: 2015
+> GCC: 4.5
+> Clang: 3.0
+
+#### Unicode escapes in literals: NOT SUPPORTED
+
+These are escape sequences allowing the specification of Unicode codepoints
+within UTF-8, UTF-16 and UTF-32 string literals. There are two forms of escape:
+`\uXXXX` for specifying codepoints within the Basic Multilingual Plane (BMP) and
+`\UXXXXXXXX` for specifying codepoints outside the BMP.
+
+**Requires:**
+> MSVC: 2015
+> GCC: 4.5
+> Clang: 3.1
+
+#### User-defined literals: NOT SUPPORTED
+
+C++ supports a number of suffixes for literals (for example `3.14f` has type
+`float` and `42ULL` has type `unsigned long long`) but these have previously
+always been implemented by the compiler. C++11 adds a mechanism for adding
+new suffixes:
+````
+unsigned int operator ""_mysuffix(const char*);
+unsigned int foo = "wibble"_mysuffix;
+````
+
+**Requires:**
+> MSVC: 2015
+> GCC: 4.7
+> Clang: 3.1
+
+#### Standard-layout types: NOT SUPPORTED
+
+"Plain Old Data" (POD) is a term used in C++ to specify that a type has the
+same layout and meaning as an equivalent type in C. This means that it cannot
+have virtual methods, data members with different access types (`public`,
+`private`, `protected`) or other features that may affect class layout.
+
+In C++98, the definition of POD was very strict and prohibited the type from
+having constructors, destructors, assignment operators, base classes, etc. In
+C++11, this requirement has been relaxed (as long as the base classes are
+themselves POD and the constructors (etc) are "trivial" (i.e do nothing other
+than directly assign data members)):
+````
+// Plain old data in C++11, non-POD in C++98
+struct Pod11
+{
+ int m_foo;
+ void* m_bar;
+
+ Pod11() :
+ m_foo(0), m_bar(nullptr) {}
+};
+````
+
+**Requires:**:
+> MSVC: 2012
+> GCC: 4.5
+> Clang: 3.0
+
+#### `default`ed/`delete`d functions: NOT SUPPORTED
+
+It is often suggested that one should follow the "rule of six" when designing
+classes in C++: if any of the default constructor, copy constructor, move
+constructor, copy assignment operator, move assignment operator or destructor
+are customised for a class, the rest should be too (as failing to do so suggests
+an invariant of the class is not being enforced).
+
+Sometimes, however, the default that would have been generated is correct. In
+order to prevent repetition, there is a syntax for explicitly requesting that
+the default be used:
+````
+class Foo
+{
+ Foo() = default;
+};
+````
+
+On the other hand, sometimes the opposite is desired: a method (or overload)
+should explicitly not be provided:
+````
+class Bar
+{
+ // No default constructor!
+ Bar(const Foo&);
+ Bar() = delete;
+};
+````
+
+**Requires:**:
+> MSVC: 2013
+> GCC: 4.4
+> Clang: 3.0
+
+#### Extended friend declarations: PERMITTED
+
+This change subtly alters the name lookup rules for `friend` declarations,
+turning the following invalid C++98 code into valid code in C++11:
+````
+class C;
+namespace Foo
+{
+ class Bar
+ {
+ // Only checks the parent (not grandparent or further ancestor) scopes
+ // in C++98; checks all ancestor scopes in C++11.
+ friend C;
+ };
+}
+````
+
+#### Extended `sizeof`: NOT SUPPORTED
+
+In C++98, `sizeof` cannot be used on non-static data members of a class without
+an object. C++11 removes this restriction:
+````
+class Foo
+{
+ int m_Bar;
+};
+
+Foo foo;
+int foobar1 = sizeof(foo.m_Bar); // Valid in both C++98 and C++11
+int foobar2 = sizeof(Foo::m_Bar); // Only valid in C++11
+````
+
+**Requires:**:
+> MSVC: 2015
+> GCC: 4.4
+> Clang: 3.1
+
+#### Inline namespaces: NOT SUPPORTED
+
+This feature allows the entirety of a given namespace to be made visible in
+the parent namespace as if they were defined in that namespace. This is subtly
+different to using `using namespace Foo` directive: templates, for example, can
+only be specialised in the namespace they were defined in; the `using` directive
+only makes the symbols visible while the `inline namespace` acts as if it were
+just another member of the parent namespace:
+````
+namespace Foo
+{
+ namespace Bar
+ {
+ template class Quux;
+ }
+
+ // Error: cannot specialise template outside its original namespace
+ using namespace Bar1;
+ template <> class Quux;
+
+ inline namespace Baz
+ {
+ template class Wibble;
+ }
+
+ // Okay: Wibble can be specialised inside Foo as namespace Baz is inline
+ template <> class Wibble;
+}
+````
+
+A secondary use is that compilers mangle the names in the inline namespace as
+being within that namespace rather than the parent, allowing inline namespaces
+to be used as part of ABI versioning:
+````
+namespace Foo
+{
+ namespace Bar_v1
+ {
+ // Visible as and mangled as Foo::Bar_v1::Quux
+ class Quux;
+ }
+
+ inline namespace Bar_v2
+ {
+ // Visible as Foo::Quux but mangled as Foo::Bar_v2::Quux
+ class Quux;
+ }
+}
+````
+
+**Requires:**:
+> MSVC: 2015
+> GCC: 4.4
+> Clang: 2.9
+
+#### Unrestricted unions: NOT SUPPORTED
+
+In C++98, unions cannot contain any types that have non-trivial constructors or
+destructors as the compiler cannot automatically generate an appropriate
+constructor or destructor for the union. C++11 removes this restriction with the
+caveat that the constructor and destructor for the union need to be defined. It
+should be noted that it is still tricky to use these types of objects in a union
+as there is no way to determine which type the union currently holds:
+````
+class Foo
+{
+ ~Foo();
+};
+
+class Bar
+{
+ ~Bar();
+};
+
+union Quux
+{
+ Foo foo;
+ Bar bar;
+ int baz;
+
+ ~Quux()
+ {
+ // Should this call foo.~Foo(), bar.~Bar() or do nothing?
+ // ??????
+ }
+};
+````
+
+**Requires:**:
+> MSVC: 2015
+> GCC: 4.6
+> Clang: 3.1
+
+#### Local types as template arguments: PERMITTED
+
+In C++98, any types used as template arguments must have class or namespace
+scope; they couldn't use types defined at function scope. C++11 relaxes this
+requirement:
+````
+template void frob(T&);
+
+void Foo()
+{
+ class Wibble {};
+ Wibble wobble;
+
+ // Invalid in C++98, fine in C++11
+ frob(wobble);
+}
+````
+
+#### Range-based for loop: NOT SUPPORTED
+
+C++11 adds a new way of iterating over the contents of arrays and objects that
+define iterators:
+````
+template
+T sumVector(const std::vector& p_vec)
+{
+ T t_sum = 0;
+ for (const T& t_element : p_vec)
+ t_sum += t_element;
+ return t_sum;
+}
+````
+
+This can be used on any objects that either have `begin()` and `end()` member
+functions or have `begin(X)` and `end(X)` non-member functions defined. It can
+also be combined with automatic type deduction, which makes writing mutators for
+generic containers much easier:
+````
+template
+void incrementContainer(T& p_container)
+{
+ for (auto& t_element : p_container)
+ t_element++;
+}
+````
+
+**Requires:**:
+> MSVC: 2012
+> GCC: 4.6
+> Clang: 3.0
+
+#### `override` and `final`: PARTIALLY SUPPORTED
+
+When defining virtual methods, it is really easy to accidentally create a new
+overload rather than overriding the original method. Using the `override`
+keyword indicates that a method declaration is supposed to be an override and
+an error should be emitted if it isn't. The `final` keyword is similar, but
+prohibits any further overrides in derived classes. `final` may be used either
+on individual methods or for whole classes:
+````
+class Base
+{
+ virtual void Foo(int);
+};
+
+class Derived1 :
+ public Base
+{
+ // Is this supposed to be an override or is it a deliberate overload?
+ virtual void Foo(float);
+};
+
+class Derived2 :
+ public Base
+{
+ // Error: this declaration doesn't represent an override
+ void Foo(float) override;
+};
+
+class NoDerivedClasses final :
+ public Base
+{
+ void Foo(int) final;
+};
+````
+
+**Note:**
+> MSVC 2010 supports the `override` keyword but not `final`.
+
+**Requires:**:
+> MSVC: 2012
+> GCC: 4.7
+> Clang: 3.0
+
+#### `noexcept`: NOT SUPPORTED
+
+C++ has the (little-used) ability to add exception specifications to functions:
+````
+// Can throw std::bad_alloc exceptions
+void Foo() throw (std::bad_alloc);
+
+// Can't throw anything
+void Bar() throw ();
+````
+
+In addition to being tedious to write, they impose a run-time overhead as any
+exceptions propagating out of a function with an exception specification need
+to be checked against that specification and another exception thrown if an
+unexpected exception type was encountered.
+
+C++11 adds a different approach: the `noexcept` keyword. Functions declared as
+`noexcept` can be assumed to not throw and optimisations can be made on that
+assumption:
+````
+void Quux() noexcept;
+````
+
+The `noexcept` keyword can optionally take a boolean expression that can be
+used to disable the keyword if false. It can also be used on an expression to
+return true if all function calls in that expression are `noexcept` and false
+otherwise. Combined, this is useful for conditionally enabling `noexcept` on
+templates:
+````
+template
+T add(T t1, T t2) noexcept(noexcept(t1 + t2));
+````
+
+**Requires:**:
+> MSVC: 2015
+> GCC: 4.6
+> Clang: 3.0
+
+#### Thread-local storage: NOT SUPPORTED, PROHIBITED
+
+Instead of using platform-specific solutions (like the pthreads API for thread-
+local storage), C++11 adds a new storage specifier for variables:
+`thread_local`. Any variable declared with this value is implemented per-thread
+and can be used like any other variable. Note that the specifier only makes
+sense on global and static variables as stack-allocated variables are not
+visible to other threads anyway.
+````
+class Foo
+{
+ // Like static s_bar, but per-thread instead of shared
+ thread_local tls_bar;
+};
+````
+
+**Note:**
+> There is not currently a prefix defined for `thread_local` variables in the
+> LiveCode engine coding style. Neither `s_` nor `g_` should be used as the
+> prefix as it obscures the semantics of the variable. When compiler support is
+> available (and a decision to permit their use is made), a prefix will be
+> defined.
+
+**Rationale:**
+> Uncertain run-time support.
+>
+> Although support is available in the appropriate compilers, not all platforms
+> are known to provide the requisite run-time support for thread-local storage
+> via this mechanism (some iOS versions apparently raise run-time errors when it
+> is used but this has not yet been verified). Until support can be confirmed on
+> all platforms, the use of `thread_local` as a storage specifier is prohibited,
+> even when supported by all compilers.
+
+**Requires:**:
+> MSVC: 2015
+> GCC: 4.8
+> Clang: 3.3
+
+### C++14
+
+This section is under construction.
+
+### C++1z (C++17)
+
+This section is under construction.
+
+## C++ Standard Library
+
+Note that some PROHIBITED headers may be included as an implementation detail of
+other PERMITTED headers; use of any symbols thus included remain PROHIBITED.
+
+**TODO:** determine which parts of the library are supplied by which compiler
+versions.
+
+### Language support library
+
+#### Types (``): PERMITTED
+
+#### Implementation properties (``, ``, ``): PERMITTED
+
+#### Integer types (``): PERMITTED
+
+#### Start and termination (``): PERMITTED
+
+#### Dynamic memory management (``): PERMITTED
+
+#### Type identification (``): PROHIBITED
+
+**Rationale:**
+> Use of RTTI language features other than `dynamic_cast` is prohibited.
+>
+> Without the RTTI language features, use of the `` header
+> (particularly for the `std::typeinfo` type) is not useful.
+
+#### Exception handling (``): PERMITTED
+
+#### Initialiser lists (``): PERMITTED
+
+#### Other runtime support: PARTIALLY PROHIBITED
+
+**Permitted:**
+> ``, ``, ``, ``, ``
+
+**Prohibited:**
+> ``, ``
+
+**Rationale:**
+> Run-time requirements (with exceptions for compatibility).
+>
+> The ``, ``, `` and `` headers require run-
+> time support. Because signals and use of some features in `` are
+> necessary for correct behaviour of the LiveCode engine and/or interfacing with
+> external code.
+
+### Diagnostics library
+
+#### Exception classes (``): PERMITTED
+
+#### Assertions (``): PERMITTED
+
+#### Error numbers (``): PERMITTED
+
+#### System error support (``): PERMITTED
+
+### General utilities library
+
+#### Utility components (``): PERMITTED
+
+#### Tuples (``): PERMITTED
+
+#### Fixed-size sequences of bits (``): PERMITTED
+
+#### Memory (``, ``, ``): PERMITTED
+
+#### Function objects (``): PERMITTED
+
+#### Type traits (``): PERMITTED
+
+#### Compile-time rational arithmetic (``): PERMITTED
+
+#### Time utilities (``, ``): PROHIBITED
+
+**Rationale:**
+> Requires run-time support.
+
+#### Scoped allocators (``): PROHIBITED
+
+**Rationale:**
+> Only (currently) used in the STL for container classes.
+>
+> There's no reason that scoped allocator types couldn't be used in the LiveCode
+> engine except that they use the allocator-as-a-type model, which does not
+> match the memory allocation patterns used within the LiveCode engine.
+
+#### Type indexes (``): PROHIBITED
+
+**Rationale:**
+> Only useful alongside prohibited RTTI language features.
+
+### Strings library
+
+#### Character traits and string classes (``): PROHIBITED
+
+**Rationale:**
+> Runtime support requirements.
+>
+> The string classes provided by the STL (including `std::string`) are complex
+> and often use large run-time support libraries.
+
+#### Null-terminated sequence utilities (``, ``, ``, ``, ``, ``): PARTIALLY PROHIBITED
+
+**Permitted:**
+> ``, ``
+
+**Prohibited:**
+> ``, ``, ``, ``
+
+**Rationale:**
+> Run-time support and an alternative being available.
+>
+> For character classification, the support functions provided by libICU (via
+> libFoundation) should be used instead of through these headers.
+
+### Localisation library
+
+#### Locales (``): PROHIBITED
+
+**Rationale:**
+> Run-time support requirements.
+
+#### Standard code conversion facets (``): PROHIBITED
+
+**Rationale:**
+> Run-time support requirements.
+
+#### C library locales (``): PROHIBITED
+
+**Rationale:**
+> Run-time support requirements.
+
+### Containers library
+
+#### Sequence containers (``, ``, ``, ``, ``): PROHIBITED
+
+#### Associative containers (``, ``): PROHIBITED
+
+#### Unordered associative containers (``, ``): PROHIBITED
+
+#### Container adaptors (``, ``): PROHIBITED
+
+### Iterators library
+
+#### Iterator traits and adaptors (``): PERMITTED
+
+### Algorithms library
+
+#### Sequence, sorting and related operations (``): PERMITTED
+
+#### C library algorithms (``): PERMITTED
+
+### Numerics library
+
+#### Floating-point environment (``): PERMITTED
+
+#### Complex numbers (``): PERMITTED
+
+#### Random number generation (``): PROHIBITED
+
+**Rationale:**
+> Run-time support requirements.
+
+#### Numeric arrays (``): PROHIBITED
+
+**Rationale:**
+> TODO
+
+#### Generalised numeric operations (``): PROHIBITED
+
+**Rationale:**
+> TODO
+
+### Input/output library
+
+All prohibited headers in this section are due to run-time support requirements.
+
+#### Forward declarations (``): PROHIBITED
+
+#### Standard iostream objects (``): PROHIBITED
+
+#### Iostreams base classes (``): PROHIBITED
+
+#### Stream buffers (``): PROHIBITED
+
+#### Formatting and manipulators (``, ``, ``): PROHIBITED
+
+#### String streams (``): PROHIBITED
+
+#### File streams (``, ``, ``): PROHIBITED
+
+### Regular expressions library
+
+#### Regular expressions (``): PROHIBITED
+
+**Rationale:**
+> Run-time support requirements.
+
+### Atomic operations library
+
+#### Atomic types and operations (``): PERMITTED
+
+### Thread support library
+
+All prohibited headers in this section are due to run-time support requirements.
+
+#### Threads (``): PROHIBITED
+
+#### Mutual exclusion (``): PROHIBITED
+
+#### Condition variables (``): PROHIBITED
+
+#### Futures (``): PROHIBITED
+
+## Appendix: supported compiler versions
+
+The LiveCode project supports a number of different operating operating systems
+and therefore a wide range of compilers. The set of compilers used by the
+LiveCode build servers are currently:
+
+- Windows: MSVC 2010
+- Linux: GCC 4.7
+- iOS: Clang (version is kept up-to-date with latest non-Beta Xcode release)
+- OSX: Clang (version is kept up-to-date with latest non-Beta Xcode release)
+- Android: Clang 3.5
+
+Generally speaking, newer versions of compilers can be used to build LiveCode
+but older versions cannot (as they do not implement the set of required C++
+features used by the engine).
+
+## Appendix: C vs C++
+
+Wherever possible, C++ should be used in preference to C. If use of C is
+necessary, the code has to be written in C89 style as not all platforms have
+a native C compiler that is compatible with C99 (in particular, the C compiler
+supplied as part of MSVC doesn't understand most C99 extensions). Often, it is
+possible to compile C99 code in C++ mode, which is supported by all compilers.
+
+There are some features of C that are not present in C++, but many of these can
+be worked around with careful use of headers in the C standard library; for
+example, include `stdbool.h` and use the `bool` typedef instead of the raw
+`_Bool` built-in type.
+
+**Note:**
+> One particular "gotcha" is that the MSVC C compiler does not support C++-style
+> variable declarations: all variables must be declared at the beginning of a
+> block before any other statements. It also does not support declaration of
+> variables inside the condition of a `for` loop.
diff --git a/docs/development/C++-style.md b/docs/development/C++-style.md
new file mode 100644
index 00000000000..b4672f019b3
--- /dev/null
+++ b/docs/development/C++-style.md
@@ -0,0 +1,271 @@
+# C++ Coding Guidelines for LiveCode
+
+This file describes some key C++ coding style guidelines for
+contribution to the LiveCode source code. In the past, C++ was used
+as an improved version of C, and didn't use the whole of the
+language's feature set. Since the introduction of C++11 support to
+the LiveCode build toolchain, some more advanced features of C++ are
+recommended to be used when developing LiveCode.
+
+See also [C++ Feature Usage Guidelines for LiveCode](C++-features.md).
+
+## Naming things
+
+* Variable and function names should be descriptive. Don't be scared
+ of verbosity (but don't go too overboard on symbol lengths).
+
+* Variable names must be lowercase, with words separated by
+ underscores (`_`). They should be prefixed to indicate scope:
+
+ * `t_`: local variables
+ * `p_`: in parameters
+ * `r_`: out parameters
+ * `x_`: in-out parameters
+ * `m_`: `class` or `struct` instance member variables
+ * `s_`: `class`, function, or file-local static variables
+ * `g_`: global variables
+
+ Good: `static RegExp s_regexp_cache[10];`
+
+ Bad: `int x, y, w, h;`
+
+* Constant names, including `enum` members, should be title case and
+ prefixed with `kMC` and the module name.
+
+ Good:
+
+ const MCByteOrder kMCByteOrderHost = kMCByteOrderBigEndian;`
+
+ Bad:
+
+ const int MAX_LENGTH = 20;
+
+* Function names should generally be title case. Public (exported)
+ functions should have names prefixed with `MC` and the module name.
+
+ Good:
+
+ hash_t MCHashPointer(void *p_pointer);
+
+## Comments
+
+* Whenever adding a function, add a comment that explains precisely:
+
+ * what the function does, under what conditions it succeeds, and
+ how it behaves when it fails
+ * what the function expects as inputs, and what outputs it generates
+
+## Coding practice
+
+### Type definitions
+
+* Types declared with `struct` must be Plain Old Data (POD).
+
+* All composite types should have a default constructor.
+
+* All constructors should initialise all fields, preferably in an
+ initialiser list rather than in the constructor body.
+
+* Use a bit field when declaring boolean values in a `struct` or
+ `class`:
+
+ bool m_bool_member : 1
+
+* Avoid including minimum, maximum or default members in an `enum`.
+ Consider:
+
+ * declaring typed constants alongside the enumeration
+ * overloading `std::begin()` and `std::end()` for the enumeration
+
+### Lifetime handling
+
+* Use "managed lifetime" types wherever possible. If
+ `std::unique_ptr` or `std::shared_ptr` are not suitable, use the
+ `MCAuto` types from `foundation-auto.h`.
+
+ Good (automatic cleanup):
+
+ MCAutoStringRef t_unicode;
+ if (!MCStringUnicodeCopy(p_input, &t_unicode));
+ return false;
+ return MCDoSomethingWithUnicode(*t_unicode);
+
+ Bad (explicit cleanup):
+
+ MCStringRef t_unicode;
+ if (!MCStringUnicodeCopy(p_input, t_unicode))
+ return false;
+ auto t_result = MCDoSomethingWithUnicode(*t_unicode);
+ MCValueRelease(t_unicode);
+ return t_result;
+
+* When class instances "own" instances of other types, use
+ "managed lifetime" types as the class members.
+
+* As a rule, avoid writing code that requires explicit `delete`,
+ `delete[]`, `free()`, `MCValueRelease()`, `MCMemoryDeallocate()`,
+ etc. If possible, also avoid explicit allocation
+
+* Always check the success of memory allocations. If the calling code
+ can't handle memory allocation failure, prefix the allocating
+ statement with `/*UNCHECKED*/`.
+
+* When using the [`new` operator](http://en.cppreference.com/w/cpp/memory/new/operator_new),
+ always either use non-allocating placement allocation ("placement new"), or
+ specify [`std::nothrow`](http://en.cppreference.com/w/cpp/memory/new/nothrow):
+
+ int *t_array = new (nothrow) int[10];
+
+### Local variables
+
+* Always initialise local variables at the point of declaration.
+
+ * Initialise POD types using `=`:
+
+ bool t_success = true;
+
+ * Initialise non-POD types using construction syntax:
+
+ MCSpan(p_pointer, p_length);
+
+ * In the absence of another suitable value, initialise:
+ * pointers to `nullptr`
+ * `bool` values to `true` or `false`
+ * numbers to `0`
+
+* Use the `auto` type specifier when:
+
+ 1) the full type is irrelevant
+ 2) the full type is explicitly stated on the line
+ 3) writing templated code (e.g. implementing `min()`/`max()`)
+
+### Control flow
+
+* Functions must not modify "out" parameters until immediately before
+ returning, and only on success.
+
+* `goto` is usually only acceptable for cleaning up on errors; try to
+ use managed lifetime types instead.
+
+* When disabling code with an always-false condition, prefix the
+ condition with `/* DISABLES CODE */`:
+
+ if (/* DISABLES CODE */ (false))
+ {
+ /* statements */
+ }
+
+### Miscellaneous
+
+* Declare all compile time constants as fully `const`. This is
+ particularly important for data or lookup tables.
+
+* Only pass `bool` values to conditions (e.g. `if`, `while`, etc.) Do
+ not assume that `nullptr` or `0` are false.
+
+* Never use C-style casts. Use:
+
+ 1) Construction, if possible
+ 2) `reinterpret_cast` for bit-casts (e.g. converting a pointer to an
+ integer or _vice versa_).
+ 3) `dynamic_cast` to cast a `class` to or from a derived `class`.
+ 4) `static_cast` for other types of type cast
+
+ Avoid using `const_cast`.
+
+* Never pass a pointer and length as separate arguments to a
+ function. Use an `MCSpan` instead.
+
+* Avoid using preprocessor macros to abbreviate code; use `inline`
+ functions or templates instead.
+
+* Avoid using the ternary `/*condition*/ ? /*if_true*/ : /*if_false*/`
+ operator. You may need to use one when initialising a `const`
+ value. However, when the condition or the true/false values require
+ large expressions, or when there are more than two possible values,
+ an immediately-invoked function expression can do the job more
+ clearly:
+
+ const auto&& t_value = [&, this]() {
+ if (/*condition*/)
+ {
+ return /* compute value if true */;
+ }
+ else
+ {
+ return /* compute value if false */;
+ })();
+
+* When writing lambda expressions, try to avoid return type
+ specification; use inference or, if necessary, cast or construct a
+ value in the `return` statement.
+
+ auto t_valid_handle =
+ [](const ObjectHandle& p_obj) { return bool{p_obj}; }
+
+## Code layout, indentation and whitespace
+
+* Use spaces for indentation and alignment, with 4 spaces per level of
+ indentation.
+
+* Avoid lines over 80 characters in length. When wrapping
+ expressions, across multiple lines, try to place a line break after
+ a binary logical operator (`&&`, `||`) or after a comma.
+
+* Use only one statement per line.
+
+* Use single blank lines to separate areas of code within a function,
+ and to separate function and type definitions.
+
+* All curly braces should be on a line on their own, indented to match
+ the level of the construct they relate to.
+
+ Good:
+
+ if (/* condition */)
+ {
+ /* statements */
+ }
+
+ Bad:
+
+ if (/* condition */) {
+ /* statements */
+ }
+
+* Use a single space after the `for`, `while`, `if` and `switch`
+ keywords, as in the example above.
+
+* Do not insert a space between a function or macro name and its
+ parameter list.
+
+ Good:
+
+ void main(int argc, char**argv);
+
+ Bad:
+
+ void main (int argc, char **argv);
+
+* Place a space or newline after each comma, as in the example above.
+
+* Place a space before and after binary operator.
+
+ Good:
+
+ bool t_okay = (t_left == t_right);
+
+ Bad:
+
+ double t_area = 2*acos(0.0)*t_radius*t_radius;
+
+* When using preprocessor macros, ensure that the `#define`d identifier
+ has a value.
+
+ Good:
+
+ #define FEATURE_PLATFORM_PLAYER (1)
+
+ Bad:
+
+ #define FEATURE_PLATFORM_PLAYER
diff --git a/docs/development/build-android.md b/docs/development/build-android.md
new file mode 100644
index 00000000000..cb3032cb298
--- /dev/null
+++ b/docs/development/build-android.md
@@ -0,0 +1,173 @@
+# Compiling LiveCode for Android
+
+
+
+Copyright © 2015-2017 LiveCode Ltd., Edinburgh, UK
+
+## Dependencies
+
+### Host system
+
+We recommend performing Android builds on a Linux system. It is also possible to build for Android on Mac OS X.
+
+The main non-standard dependency needed for building LiveCode is a Java Development Kit (JDK). At least JDK 7 is required.
+
+### Installing the Android SDK and NDK
+
+LiveCode requires both the Android Software Development Kit (SDK) and Native Development Kit (NDK). You can download both from the [Android Developers site](https://developer.android.com/sdk/index.html).
+
+Extract both the NDK and SDK to a suitable directory, e.g. `~/android/toolchain`. For example, for the following values of ``
+
+- mac: `darwin`
+- linux: `linux`
+- windows: `windows`
+
+you would run:
+
+````bash
+mkdir -p ~/android/toolchain/android-sdk-
+cd ~/android/toolchain
+
+wget https://dl.google.com/android/repository/android-ndk-r15--x86_64.zip
+wget https://dl.google.com/android/repository/tools_r25.2.3-.zip
+
+unzip android-ndk-r15--x86_64.zip
+
+pushd android-sdk-
+unzip ../tools_r25.2.3-.zip
+popd
+````
+
+Update the SDK:
+
+ android-sdk-/tools/android update sdk --no-ui
+
+(This command will download and install every Android SDK and will take some time).
+
+### Creating the toolchains
+
+Create a standalone toolchain (this simplifies setting up the build environment):
+
+````bash
+for arch in arm arm64 x86 x86_64; do
+ android-ndk-r15/build/tools/make_standalone_toolchain.py \
+ --arch ${arch} --api 21 --deprecated-headers \
+ --install-dir ${HOME}/android/toolchain/standalone-${arch}
+done
+
+**Note:** If you are only interested in building one particular flavour
+of Android engines, leave out the architectures you're not interested in
+from the above commands.
+
+### Final toolchain setup
+
+Add a couple of symlinks to allow the engine configuration script to find the Android toolchain:
+
+````bash
+ln -s android-ndk-r15 android-ndk
+ln -s android-sdk- android-sdk
+````
+
+## Configuring LiveCode
+
+### Build environment
+
+The Android build expects a number of environment variables to be set. If the environment variables aren't set, the build process will attempt to guess sensible defaults. If you've set up the directory structure as described above, the make command should detect everything automatically and these variables shouldn't be necessary.
+
+The following script will set up the environment variables correctly. You may need to edit it depending on where your JDK and toolchain are installed:
+
+````bash
+ANDROID_TOOLCHAIN_DIR=${HOME}/android/toolchain # Edit me!
+
+# Java SDK
+JAVA_SDK=/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home
+
+# Android platform information
+ANDROID_NDK_VERSION=r15
+ANDROID_NDK_PLATFORM_VERSION=16
+ANDROID_API_VERSION=29
+ANDROID_PLATFORM=android-${ANDROID_API_VERSION}
+ANDROID_NDK=${ANDROID_TOOLCHAIN_DIR}/android-ndk-${ANDROID_NDK_VERSION}
+ANDROID_SDK=${ANDROID_TOOLCHAIN_DIR}/android-sdk
+ANDROID_BUILD_TOOLS=28.0.3
+
+export JAVA_SDK ANDROID_TOOLCHAIN_DIR
+export ANDROID_NDK_PLATFORM_VERSION ANDROID_API_VERSION
+export ANDROID_PLATFORM ANDROID_NDK ANDROID_SDK ANDROID_BUILD_TOOLS
+````
+
+### Generating makefiles
+
+The gyp-based build system generates a set of makefiles which are used to control the build process.
+
+To generate makefiles in a `build-android-armv6`, simply run:
+
+ make config-android
+
+To provide detailed configuration options, you can use the `config.sh` script. For more information, run:
+
+ ./config.sh --help
+
+## Compiling LiveCode
+
+Normally, it'll be enough just to use the top-level makefile:
+
+ make -k compile-android
+
+Otherwise, you'll need to build a target in the gyp-generated makefiles:
+
+ make -C build-android-armv6/livecode development
+
+## Standard build environment
+
+**Note:** The following information is provided for reference purposes. It should be possible to build LiveCode for Android on any modern Linux desktop distribution or recent version of Mac OS.
+
+The Linux build environment used for compiling LiveCode for Android is based on Debian Jessie x86-64, with the following additional packages installed:
+
+* git
+* bzip2
+* p7zip-full
+* zip
+* python
+* build-essential
+* openjdk-7-jdk
+* flex
+* bison
+
+## Debugging & Profiling with Android Studio
+
+* Build a debug build of the android engine
+* Inside android-XXX-bin, create a symlink librevandroid.so -> Standalone-Community
+(or Standalone-Commercial; whichever you're using)
+* Build your standalone
+* Start Android Studio and select "Profile or Debug APK" on the main menu.
+* Select the APK you built
+* Studio will show you the contents of your APK and there will be a banner
+ along the top about being unable to find debug symbols. Click it and navigate
+ to the folder where you created the librevandroid.so symlink.
+* Set the paths to the source folders in the panel that appears if you want to
+do debugging rather than profiling
+* On the top right of the Android Studio toolbar, there are icons for running,
+debugging and profiling. Select the one you want.
+* If Android Studio complains about the SDK not being set, select the top-level
+project in the left-hand tree view, right-click and go to Module Settings. Hunt
+through those menus for SDK/API selections and make sure they're set properly
+(they may default to "Java 1.8" rather than an Android SDK).
+* If Android Studio complains about the app not having a default activity, quit
+Studio and restart it. Keep doing this until it stops being stupid.
+* If you selected "Profile", you'll see the profiler on the bottom of the
+window. Click the "CPU" portion of the graphs. To do a trace, select
+"Sample C++ methods" from the drop down and hit Record. Perform the action you
+want to profile then click "Stop".
+* If profiling says "Advanced profiling not available", you will likely need to
+play around with MinimumSDK settings and the like when building the app. In
+particular, make sure your device is at least API26 and that the minimum API
+level is set to API26 too.
+* The threads of interest are the one at the top of the list (the main Android
+thread) and one further down called "Thread-2" - this is the engine thread.
+
+> **Note:** When you import an APK into Android Studio, the IDE creates a new
+> project in your home directory under ApkProjects/, and makes a local copy of
+> the target APK there. This means that if you rebuild or update the original
+> APK, you need to manually import the updated version into Android Studio
+> again.
diff --git a/docs/development/build-emscripten.md b/docs/development/build-emscripten.md
new file mode 100644
index 00000000000..74f062406d3
--- /dev/null
+++ b/docs/development/build-emscripten.md
@@ -0,0 +1,67 @@
+# Compiling LiveCode to JavaScript for HTML5
+
+
+
+Copyright © 2015 LiveCode Ltd., Edinburgh, UK
+
+**Warning**: Emscripten (HTML5) platform support for LiveCode is experimental and not recommended for production use.
+
+## Dependencies
+
+You will need a 64-bit Linux machine or VM with at least 4 GB of RAM
+(8 GB is recommended).
+
+### Emscripten SDK
+
+Unsurprisingly, the Emscripten SDK must be installed in order to build
+an Emscripten engine.
+
+1. Download the portable Emscripten SDK from . Put it in `/opt/emsdk_portable`, for example.
+
+2. Check which SDKs are available by running:
+
+ /opt/emsdk_portable/emsdk list
+
+3. Install and activate SDK 1.35.23 by running:
+
+ /opt/emsdk_portable/emsdk install sdk-1.35.23-32bit
+ /opt/emsdk_portable/emsdk activate sdk-1.35.23-32bit
+
+ This will take a really long time and use an insane amount of RAM.
+
+## Build environment
+
+Before building for Emscripten, source the Emscripten SDK script that sets up the environment correctly. You need to source it with the `.` or `source` command rather than just running it.
+
+ source /opt/emsdk_portable/emsdk_env.sh
+
+## Configuring LiveCode
+
+To configure LiveCode, run:
+
+ make config-emscripten
+
+This will generate make control files in the `build-emscripten` directory. You can also run `config.sh` directly.
+
+## Compiling LiveCode
+
+To compile LiveCode, run:
+
+ make compile-emscripten
+
+This will generate outputs in the `emscripten-bin` directory.
+
+## Running LiveCode
+
+**Note**: See also the "HTML5 Deployment" guide, available in the in-IDE dictionary.
+
+Use the desktop build of the LiveCode IDE to run the standalone builder and create an "HTML5" standalone.
+
+Once you've created a standalone, you can open the HTML file in a web browser to try out the engine.
+
+Some web browsers (including Google Chrome) have JavaScript security policies that won't allow you to run the engine from a local filesystem. For these browsers, you will need to run a local web server. You can use the following steps to launch a local-only webserver listening on port 8080:
+
+ cd /path/to/my/standalone
+ python -m SimpleHTTPServer 8080
+
+You can then load http://localhost:8080/ in a web browser to view your standalone HTML5 engine.
diff --git a/docs/development/build-linux.md b/docs/development/build-linux.md
new file mode 100644
index 00000000000..40e288c38e6
--- /dev/null
+++ b/docs/development/build-linux.md
@@ -0,0 +1,86 @@
+# Compiling LiveCode for Linux
+
+
+
+Copyright © 2015 LiveCode Ltd., Edinburgh, UK
+
+## Dependencies
+
+LiveCode has several dependencies that are needed in order to build it on Linux. In general, it is enough to install the tools and libraries that would be typically used to compile a GNOME application written in C++.
+
+Obviously, the exact packages required vary depending on which Linux distribution you use, and how recent it is. For examples of the packages you may need, please see the "Standard build environments" section later in this document.
+
+## Build environment
+
+The LiveCode build obeys all of the standard make environment variables, including:
+
+* `CC`: C compiler command
+* `CXX`: C++ compiler command
+
+There are some additional environment variables that it understands:
+
+* `CXX_STD`: which version of the C++ standard to use (`c++11` is recommended)
+
+## Configuring LiveCode
+
+To configure LiveCode, simply run:
+
+ make config-linux
+
+This will generate make control files in the `build-linux-` directory. For example, if you are compiling on an x86-64 system, this will create a `build-linux-x86_64` directory.
+
+To provide detailed configuration options, you can use the `config.sh` script. For more information, run:
+
+ ./config.sh --help
+
+## Compiling LiveCode
+
+Usually, you can just run:
+
+ make -k
+
+However, if you wish to compile something more specific than "everything", you'll need to run the top level Makefile generated by gyp. For example:
+
+ make -C build-linux-x86_64/livecode development
+
+## Standard build environments
+
+**Note:** The following information is provided for reference purposes. It should be possible to build and run LiveCode on any modern Linux desktop distribution.
+
+The x86-64 and x86 Linux build environments used for compiling
+LiveCode are based on Debian Wheezy.
+
+The following additional packages should be installed before building:
+
+* build-essential
+* automake
+* libtool
+* gawk
+* git
+* curl
+* flex
+* bison
+* libx11-dev
+* libxext-dev
+* libxrender-dev
+* libxft-dev
+* libxinerama-dev
+* libxv-dev
+* libxcursor-dev
+* libfreetype6-dev
+* libpopt-dev
+* libesd0-dev
+* liblcms-dev
+* pkg-config
+* libgtk2.0-dev
+* zip
+
+
+Use
+
+ sudo apt-get install build-essential automake libtool gawk git curl flex &&
+ sudo apt-get install bison libx11-dev libxext-dev libxrender-dev libxft-dev &&
+ sudo apt-get install libxinerama-dev libxv-dev libxcursor-dev libfreetype6-dev &&
+ sudo apt-get install libpopt-dev libesd0-dev liblcms2-dev pkg-config libgtk2.0-dev zip
+
+or equivalent in order to assure all the necessary dependencies are installed on your machine.
\ No newline at end of file
diff --git a/docs/development/build-mac.md b/docs/development/build-mac.md
new file mode 100644
index 00000000000..23629e0b7be
--- /dev/null
+++ b/docs/development/build-mac.md
@@ -0,0 +1,99 @@
+# Compiling LiveCode for Mac OS X and iOS
+
+
+
+Copyright © 2015-2016 LiveCode Ltd., Edinburgh, UK
+
+## Dependencies
+
+### Required dependencies
+
+You must install Xcode. This will allow you to build LiveCode for:
+
+* iPhone OS
+* iPhoneSimulator
+
+You will not be able to compile the OS X desktop version of LiveCode
+unless you install some older OS X SDKs; see the next section for details.
+
+### Optional dependencies
+
+By default, LiveCode is compiled for a large number of versions of iPhoneSimulator, and requires quite a lot of Apple SDKs to be installed.
+
+Create a directory on your hard disk (say, `/Applications/Xcode-Dev/`).
+
+Download and install each of the following versions of Xcode, placing their app bundles into the specified paths:
+
+| Xcode version | App path |
+| ------------- | --------------------------------------- |
+| 8.3 | /Applications/Xcode-Dev/Xcode_8_3.app |
+| 8.2 | /Applications/Xcode-Dev/Xcode_8_2.app |
+| 7.2.1 | /Applications/Xcode-Dev/Xcode_7_2_1.app |
+| 6.2 [1] | /Applications/Xcode-Dev/Xcode_6_2.app |
+
+Notes:
+1. Required for OS X build
+
+Make sure you run and verify each of the versions of Xcode. Download and install any extra SDKs you need using the "Xcode → Preferences → Downloads" window.
+
+Make `/Applications/Xcode-Dev/Xcode.app` a symlink to the latest version of Xcode available. For example, run:
+```
+ cd /Applications/Xcode-Dev
+ ln -s Xcode_V_V_V.app Xcode.app
+```
+Where `Xcode_V_V_V.app` is the latest version of Xcode that you have installed on your machine.
+
+Before proceeding to the next step, make sure to run Xcode at least once and get to the starting screen. Not doing this might break your Xcode installation and result in an error complaining that it ***could not find the default platform***
+
+After checking out the LiveCode git repository, you need to run a tool to finalize the Xcode setup and to make sure all of the necessary SDKs are installed. If LiveCode is checked out to `~/git/livecode`, run:
+```
+ cd /Applications/Xcode-Dev/
+ sh ~/git/livecode/tools/setup_xcode_sdks.sh
+```
+If you want the setup tool to copy the required SDKs out of the Xcode
+app bundles (so that you can safely delete all but the latest Xcode to
+save disk space), you can run:
+```
+ sh ~/git/livecode/tools/setup_xcode_sdks.sh --cache
+```
+## Configuring LiveCode
+
+### Build environment
+
+If you have installed the `Xcode.app` to a non-standard location, or you wish to switch between multiple versions of Xcode, you will need to set the `XCODEBUILD` environment variable. For example:
+
+ export XCODEBUILD=/Applications/Xcode-Dev/Xcode.app/Contents/Developer/usr/bin/xcodebuild
+
+### Generating Xcode project files
+
+To generate Xcode project files for OS X desktop builds, run:
+
+ make config-mac
+
+This will generate project files in the `build-mac` directory. You can open and use these in Xcode.
+
+To generate Xcode project files for iOS, run:
+
+ make config-ios
+
+This will generate several build directories with Xcode project files: one for each version of iPhoneOS or iPhoneSimulator.
+
+If you want to just build for the newest supported version of the iPhoneOS SDK, you can simply run:
+
+ make config-ios-iphoneos
+
+To provide detailed configuration options, you can use the `config.sh` script. For more information, run:
+
+ ./config.sh --help
+
+## Compiling LiveCode
+
+You can open the generated project files in Xcode and compile from there using the normal Xcode build procedure.
+
+You can also compile the engine from the command line using make, for example:
+
+ make compile-mac
+
+The same applies for the iPhoneOS and iPhoneSimulator builds. For example, you can compile for the newest supported version of the iPhoneSimulator SDK using:
+
+ make compile-ios-iphonesimulator
diff --git a/docs/development/build-win.md b/docs/development/build-win.md
new file mode 100644
index 00000000000..3e2812fffcd
--- /dev/null
+++ b/docs/development/build-win.md
@@ -0,0 +1,131 @@
+# Compiling LiveCode for Windows
+
+
+
+Copyright © 2015-2019 LiveCode Ltd., Edinburgh, UK
+
+## Dependencies
+
+The Windows build scripts currently don't have any ability to auto-discover tools, so you need to **install all of the build dependencies to their default locations**.
+
+### git
+
+You will need to install [git for Windows](https://git-scm.com/download/win) in order to obtain the LiveCode source code from GitHub.
+
+### Microsoft Visual Studio
+
+You need a set of Visual Studio build tools and SDKS. You can use either:
+
+- [Microsoft Visual Studio 2017 Build Tools](https://visualstudio.microsoft.com/downloads/?q=build+tools+2017#other),
+ which contains _only_ the compilers and libraries, without any user
+ interface; select everything in the installer
+
+
+- An appropriate edition of the
+ [Microsoft Visual Studio 2017](https://visualstudio.microsoft.com/downloads/) IDE
+
+In addition, you should install
+[Microsoft Speech SDK 5.1](https://www.microsoft.com/en-gb/download/details.aspx?id=10121)
+in order to allow you to compile the `revspeech` external.
+
+Note : If Using Microsoft Visual Studio 2017, you will need to add C++ support and
+support for the Windows 8.1 SDK to your Visual Studio installation as these features are currently
+not installed by default with Visual Studio 2017 and are necessary for building LiveCode.
+
+#### Configure for C++ development
+
+Select **Desktop development** with C++ as the install option.
+
+
+
+#### Add Windows 8.1 SDK and Visual C++ MFC for x86 and x64
+
+
+
+#### Set up for Visual C++
+
+When Visual Studio launches you will be prompted to log in and then decide how you want the environment configured. Select **Visual C++**.
+
+
+
+### Cygwin
+
+The build currently requires the use of some tools from the Cygwin distribution of GNU and other open source tools.
+
+You need to [install Cygwin](https://cygwin.com/install.html), along with the following additional packages:
+
+* make
+* bash
+* bison
+* flex
+* curl
+* zip
+* unzip
+
+When you get to the Select Packages screen in the Cygwin installer do the following:
+
+1. Change the View to Full.
+2. Search for each additional package listed on the LiveCode web page.
+3. Click on Skip to mark it for installation.
+
+
+### Other tools
+
+The build process also requires:
+
+* [ActiveState Perl](https://www.activestate.com/activeperl/downloads) Community Edition
+* [Python 2.7](https://www.python.org/) (Python 3 isn't supported)
+
+#### Perl install note: Add Perl to the PATH environment variable
+
+The option to add Perl to PATH will be checked by default. Leave it checked.
+
+
+
+#### Python install note: Add Python 2.7 to `PATH`
+
+With the Python 2.7 installer you have to customize the installation so that the Python.exe is added to `PATH`. Scroll to the bottom of the list of customizations and activate **Add python.exe to Path**.
+
+
+
+## Configuring LiveCode
+
+Once you have checked out the source code from git, you can run:
+
+````
+cmd /C configure.bat
+````
+
+(Or just run `configure.bat` by double-clicking on it from Windows Explorer)
+
+This will generate a set of Visual Studio project files in the `build-win-x86/livecode` directory.
+
+### Set the LiveCode-all Debugging Command
+
+In order to debug the IDE you need to configure the Debugging Command for LiveCode-all.
+
+```
+$(TargetDir)\LiveCode-Community.exe
+```
+
+
+
+## Compiling LiveCode
+
+If you installed the Visual Studio IDE, you can open the
+`build-win-x86/livecode/livecode.sln` solution file in Visual Studio,
+and build LiveCode from there.
+
+If you installed the Visual Studio build tools, you can run:
+
+````
+cd build-win-x86
+set BUILD_PLATFORM=win-x86
+cmd /C ..\make.cmd
+````
+
+## Build LiveCode-all
+
+Build the LiveCode-all project to compile the engine and run the IDE.
+
+
diff --git a/docs/development/docs_style_guide.md b/docs/development/docs_style_guide.md
new file mode 100644
index 00000000000..25c40484ec6
--- /dev/null
+++ b/docs/development/docs_style_guide.md
@@ -0,0 +1,513 @@
+# LiveCode Documentation Style Guide A-Z
+
+## A
+
+### Abbreviations and acronyms
+
+The first time you use an abbreviation or acronym explain it in full
+on each page unless it's well known, eg MP3, PNG etc. Then refer to
+it by initials.
+
+Your acronym is well known if you believe that 80% of LiveCode users
+will understand, and commonly use, the term.
+
+Don't use full stops in abbreviations - GIF, not G.I.F.
+
+Don't use an acronym if you're not going to use it again later in the
+text.
+
+### Active voice
+
+Use the active rather than passive voice. This will help us write
+concise, clear documentation.
+
+### Addressing the user
+
+Address the user as 'you' where possible. Documentation often makes a
+direct appeal to LiveCode users to take action, eg 'Deploy your stack
+to your phone' or 'Store your content in a database'.
+
+### Americanisms
+
+LiveCode originated as a piece of software designed and developed in
+the USA. However, it is now developed and maintained in Scotland, UK.
+Please:
+
+* use American English spelling ('color', not 'colour')
+
+* use British English grammar ('really good', not 'real good')
+
+### Ampersand
+
+Use 'and' rather than an '&', unless it's part of syntax.
+
+## B
+
+### Billions
+
+Don't use 'billion'. There are two distinct definitions of 'billion'
+which differ by a factor of a thousand.
+
+If possible, use scientific notation, or a smaller number.
+
+See also 'Millions'.
+
+### Brackets
+
+Use (round brackets), not [square brackets] in documentation text.
+
+Don't use round brackets to refer to something that could either be
+singular or plural, eg 'Copy the object(s) to a new stack.'
+
+Always use the plural instead as this will cover each possibility, eg
+'Copy the objects to a new stack.'
+
+### Bullets and steps
+
+#### Bullet points
+
+You can use bullet points to make text easier to read. Make sure that:
+
+* you always use a lead-in line
+* the bullets make sense running on from the lead-in line
+* you use lower case at the start of the bullet
+* you don't use more than one sentence per bullet point - use commas,
+ dashes or semicolons to expand on an item
+* you don't put 'or', 'and' after the bullets
+* if you add links they appear within the text and not as the whole
+ bullet
+* there is no full stop after the last bullet point
+
+#### Steps
+
+Use numbered steps instead of bullet points to guide a user through a
+process. You don't need a lead-in line and you can use links and
+downloads (with appropriate Markdown) in steps. Each step ends in a
+full stop because each step should be a complete sentence.
+
+## C
+
+### Capitalisation
+
+DON'T USE BLOCK CAPITALS FOR LARGE AMOUNTS OF TEXT AS IT'S QUITE HARD
+TO READ.
+
+### Contractions
+
+Use contractions, eg 'they've', 'we'll'. Avoid using 'should've',
+'could've', 'would've' etc - these are hard to read.
+
+### Dates
+
+Use upper case for months, eg 'January', 'February'.
+
+Don't use a comma between the month and year, eg '14 June 2012'
+
+When space is an issue, eg tables, titles etc, you can use truncated
+months, eg 'Jan, Feb, Mar, Aug, Sept, Oct, Nov, Dec'.
+
+Use 'to' in date ranges - not hyphens, en rules or em dashes. For
+example:
+
+* 'Monday to Friday, 9am to 5pm' (put different days on a new line,
+ don't separate with a comma etc)
+
+* 10 November to 21 December
+
+Don't use 'quarter' for dates; use the months, for example: 'Jan to
+Mar 2013'.
+
+## E
+
+### eg, etc and ie
+
+Don't use full stops after or between these notations.
+
+You can use the long form ('for example' instead of 'eg',
+'specifically' instead of 'ie' etc) if you like. Some people are not
+familiar with abbreviations such as eg, so consider your audience
+before abbreviating.
+
+### email
+
+One word.
+
+### Email addresses
+
+Write email addresses in full, in lower case and as active links.
+Don't include any other words as part of the link. Don't label email
+addresses ie don't write 'Email: name@example.org'.
+
+### etc
+
+See 'eg, etc and ie'.
+
+## F
+
+### FAQs (frequently asked questions)
+
+Don't use FAQs in LiveCode documentation. If you write content by
+starting with user needs, you won't need to use FAQs.
+
+## H
+
+### homepage
+
+Lower case.
+
+### Hyphenation
+
+Hyphenate:
+
+* 're-' words starting with 'e', eg 're-evaluate'
+* co-ordinate
+* co-operate
+
+Don't hyphenate:
+
+* reuse
+* reinvent
+* reorder
+* reopen
+* email
+
+Don't use a hyphen unless it's confusing without it. For example, a
+little used-car is different from a little-used car.
+
+Use 'to' for time and date ranges, not hyphens.
+
+## I
+
+### ie
+
+See 'eg, etc and ie'
+
+### internet
+
+Lower case
+
+### Italics
+
+Don't use italics. Use 'single quotation marks' if referring to a
+document, book, or standard.
+
+## L
+
+### Links
+
+Front-load your link text with the relevant terms and make them active
+and specific.
+
+### Lists
+
+Lists should be bulleted to make them easier to read. See 'bullets
+and steps'.
+
+Very long lists can be written as a paragraph with a lead-in sentence
+if it looks better. Eg 'The following countries are in the EU: Spain,
+France, Italy...'
+
+## M
+
+### Mathematical content
+
+Use a minus sign for negative numbers: '−6'
+
+Ratios have no space either side of the colon: '5:12'
+
+One space each side of symbols: +, −, ×, ÷ and =, eg '2 + 2 = 4'
+
+Use the minus sign for subtraction. Use the correct symbol for the
+multiplication sign (−×) not the letter x.
+
+Write out and hyphenate fractions: two-thirds, three-quarters
+
+Write out decimal fractions as numerals. Use the same number format
+for a sequence: 0.75 and 0.45
+
+### Measurements
+
+Use SI units (not Imperial units).
+
+Use numerals and spell out measurements at first mention.
+
+Don't use a space between the numeral and abbreviated measurement:
+'3,500kg' not '3,500 kg'.
+
+Abbreviating kilograms to kg is fine.
+
+If the measurement is more than one word, eg 'kilometres per hour',
+then spell it out the first time it is used with the abbreviation.
+From then on, abbreviate. If it is only mentioned once, don't
+abbreviate.
+
+Use Celsius for temperature, eg 37℃.
+
+### Metaphors
+
+See 'words to avoid'.
+
+### Millions
+
+Always use million in money, eg '£138 million'. Use millions in
+phrases, eg 'millions of people'.
+
+However, don't use '£0.xx million' for amounts less than £1 million.
+
+See also 'Billions'.
+
+### Money
+
+Use the £ and $ symbols: '£75', '$90'.
+
+Don't use decimals unless pence are included. For example, use
+'£75.50' but not '$75.00'.
+
+Write out 'pence' and 'cents' in full eg 'the user is charged 4 cents
+per MB of transfer'.
+
+Currencies are lower case.
+
+### Months
+
+See 'Dates'.
+
+## N
+
+### Numbers
+
+Use 'one' unless you're talking about a step, a point in a list, or another situation where using the numeral makes more sense. For example, like:
+
+> in point 1 of the design instructions'
+
+or this:
+
+> You'll see 5 examples of good LiveCode design practice
+>
+> There will be:
+>
+> * 4 examples from mobile app development
+> * 1 example from desktop app development
+
+Write all other numbers in numerals (including 2 to 9) except where
+it's part of a common expression and it would look strange, eg 'one or
+two of them'. Use common sense!
+
+If a number starts a sentence, write it out in full ('Thirty-four
+widgets are included in this package') except where it starts a title
+or subheading.
+
+For numerals over 999, insert a comma for clarity. 'It was over 9,000'.
+
+Spell out common fractions, such as one-half.
+
+Use a % sign for percentages, eg 50%.
+
+Use a 0 where there's no digit before the decimal point.
+
+Use '500 to 900' and not '500–900' (except in tables).
+
+Use MB not kB for anything over 1MB, eg 4MB not 4096kB. For under
+1MB, use kB, eg 569kB not 0.55MB.
+
+Keep it as accurate as possible, up to 2 decimal places. For example:
+'4.03MB'.
+
+When using units of bits (b) or bytes (B), SI prefixes should be
+factors of 1024. For all other units, SI prefixes should be factors
+of 1000 (as normal).
+
+#### Ordinal numbers
+
+Spell out first to ninth. After that, use 10th etc.
+
+In tables, use numerals throughout.
+
+## O
+
+### online
+
+One word.
+
+### online services
+
+Lower case unless part of a proper noun.
+
+## P
+
+### Per cent
+
+Use per cent not percent. Percentage is 1 word. Always use % with a
+number.
+
+### plain English
+
+All content in LiveCode documentation should be written in plain
+English. You should also make sure you use language your audience
+will understand.
+
+See also 'Americanisms'.
+
+## Q
+
+### Quotes and speech marks
+
+In long passages of speech, open quotes for every new paragraph, but
+close quotes only at the end of the final paragraph.
+
+#### Single quotes
+
+Use single quotes:
+
+* in headlines
+* for unusual terms
+* when referring to words or publications, for example: 'Download the
+ 'LiveCode Builder Reference Manual' (PDF, 360KB)'
+
+#### Double quotes
+
+Use double quotes in body text for direct quotations.
+
+#### Block quotes
+
+Use the block quote Markdown for quotes longer than a few sentences.
+
+## R
+
+### References
+
+References should be easy to understand by anyone, not just
+specialists.
+
+They should follow the style guide. When writing a reference:
+
+* don't use italics
+* use single quote marks around titles
+* write out abbreviations in full, for example 'page' not 'p', and
+ 'IEEE Transactions on Computers' not 'IEEE Trans. Comp.'
+* use plain English, for example use 'and others' not 'et al'
+* don't use full stops after initials or at the end of the reference
+
+If the reference is available online, make the title a link and
+include the date you accessed the online version.
+
+## S
+
+### Scrum
+
+Upper case when referring to the framework and method for developing
+products, otherwise use lower case.
+
+### seasons
+
+spring, summer, autumn and winter are lowercase.
+
+### Sentence length
+
+Don't use long sentences. Check any sentences with more than 25 words
+to see if you can split them to make them clearer.
+
+### spaces
+
+Use only one space after a full stop, not 2.
+
+### Speech marks
+
+See 'Quotes and speech marks'.
+
+### steps
+
+See 'Bullets and steps'.
+
+### Summaries
+
+Summaries should:
+
+* be 140 characters or less
+* end with a full stop
+* not repeat the title or body text
+* be clear and specific
+
+### Synonyms
+
+Avoid using synonyms when referring to LiveCode syntax. Always use the
+canonical form specified in dictionary entries. For example, use 'field'
+not 'fld', 'backgroundColor' not 'backColor' or 'secondColor'.
+
+## T
+
+### technical terms
+
+Where you need to use technical terms, you can. They're not
+jargon. You just need to explain what they mean the first time you use
+them.
+
+### Temperature
+
+Use Celsius, e.g. 37℃.
+
+### Times
+
+* use 'to' in time ranges, not hyphens, en rules or em dashes. For example, '10am to 11am' not '10–11am'.
+* 5:30pm (not 1730hrs)
+* midnight, not 00:00
+* midday, not 12 noon, noon or 12pm
+* 6 hours 30 minutes
+
+### Titles
+
+Titles should:
+
+* be 65 characters or less
+* be unique, clear and descriptive
+* be front-loaded and optimised for search
+* use a colon to break up longer titles
+* not contain dashes or slashes
+* not have a full stop at the end
+* not use acronyms unless they are well-known, eg DVD
+
+## W
+
+### webpage
+
+One word, lower case.
+
+### Wi-Fi
+
+Upper case and hyphenated (trade mark).
+
+### Word document
+
+Upper case, because it's a brand name.
+
+### Words to avoid
+
+Plain English is mandatory for all LiveCode documentation, so please
+avoid using these words:
+
+* deliver (pizzas, post and services are delivered, not abstract
+ concepts like 'improvements' or 'priorities')
+* facilitate (instead, say something specific about how you're
+ helping)
+* focusing
+* impact (don't use this as a synonym for 'have an effect on' or
+ 'influence')
+* initiate
+* key (unless it unlocks something. A subject/thing isn't 'key' -
+ it's probably 'important')
+* monolithic
+* progress (as a verb - what are you actually doing?)
+* promote (unless you're talking about an ad campaign or some other
+ marketing promotion)
+* robust
+* streamline
+* utilise
+
+Avoid using metaphors - they don't say what you actually mean and lead
+to slower comprehension of your content. For example:
+
+* going forward (it's unlikely that we are giving travel directions)
+* in order to (superfluous - don't use it)
+
+With all of these words you can generally replace them by breaking the
+term into what you're actually doing. Be open and specific.
diff --git a/docs/development/images/add-perl-to-the-path-environment-variable.png b/docs/development/images/add-perl-to-the-path-environment-variable.png
new file mode 100644
index 00000000000..f35de1d029f
Binary files /dev/null and b/docs/development/images/add-perl-to-the-path-environment-variable.png differ
diff --git a/docs/development/images/add-python-27-to-path.png b/docs/development/images/add-python-27-to-path.png
new file mode 100644
index 00000000000..0aec0c52664
Binary files /dev/null and b/docs/development/images/add-python-27-to-path.png differ
diff --git a/docs/development/images/add-windows-81-sdk-and-visual-c-mfc-for-x86-and-x64.png b/docs/development/images/add-windows-81-sdk-and-visual-c-mfc-for-x86-and-x64.png
new file mode 100644
index 00000000000..0782f7d3cad
Binary files /dev/null and b/docs/development/images/add-windows-81-sdk-and-visual-c-mfc-for-x86-and-x64.png differ
diff --git a/docs/development/images/build-livecode-all.png b/docs/development/images/build-livecode-all.png
new file mode 100644
index 00000000000..38c5cb0a99d
Binary files /dev/null and b/docs/development/images/build-livecode-all.png differ
diff --git a/docs/development/images/configure-for-c-development.png b/docs/development/images/configure-for-c-development.png
new file mode 100644
index 00000000000..bf2d6437214
Binary files /dev/null and b/docs/development/images/configure-for-c-development.png differ
diff --git a/docs/development/images/install-cygwin-with-additional-packages.png b/docs/development/images/install-cygwin-with-additional-packages.png
new file mode 100644
index 00000000000..140fd708edd
Binary files /dev/null and b/docs/development/images/install-cygwin-with-additional-packages.png differ
diff --git a/docs/development/images/set-the-livecode-all-debugging-command.png b/docs/development/images/set-the-livecode-all-debugging-command.png
new file mode 100644
index 00000000000..289e540d668
Binary files /dev/null and b/docs/development/images/set-the-livecode-all-debugging-command.png differ
diff --git a/docs/development/images/set-up-for-visual-c-.png b/docs/development/images/set-up-for-visual-c-.png
new file mode 100644
index 00000000000..a5ed4af2a9d
Binary files /dev/null and b/docs/development/images/set-up-for-visual-c-.png differ
diff --git a/docs/development/platform-id.md b/docs/development/platform-id.md
new file mode 100644
index 00000000000..b6fe029c8f1
--- /dev/null
+++ b/docs/development/platform-id.md
@@ -0,0 +1,131 @@
+# Platform Identification Triples
+
+LiveCode is built for and supports multiple different platforms with a variety of
+architecture and toolchain/sdk versions. In order to identify specific builds
+uniquely a standard triple format is used:
+```
+ -[-]
+```
+For example, the triple describing 32-bit linux would be x86-linux; and the
+triple describing 64-bit macOS built against the 10.9 SDK would be
+x86_64-mac-macos10.9
+
+*Note:* All triples should be written, generated and manipulated as lowercase as
+they will be used as parts of names of files and folders on disk on platforms
+with case-sensitive filenames.
+
+The specific architectures, platforms and options that are supported are
+outlined in this document.
+
+## Architectures
+
+A universal set of names for architectures are used, however only a subset are
+valid for any specific platform/options combination and for each platform there
+is a mapping to a specific ABI/processor configuration for it.
+
+The following architecture identifiers are available:
+
+- x86
+- x86_64
+- armv6
+- armv7
+- arm64
+- universal
+- js
+
+The x86 architecture is currently supported for linux, mac, win32 and
+ios-iphonesimulator. It maps to the default 32-bit x86 ABI and processor
+configuration for the target.
+
+The x86_64 architecture is currently supported for linux, mac and
+ios-iphonesimulator targets. It maps to the default 64-bit x86-64 ABI and
+processor configuration for the target.
+
+The armv6 architecture is currently supported for android. It maps to
+the (linux) armeabi ABI and processor configuration.
+
+The armv7 architecture is currently supported for android and ios-iphoneos. It
+maps to the (linux) armeabi_v7a ABI and processor configuration on android, and
+to the armv7 ABI and processor configuration on ios-iphoneos.
+
+The armv64 architecture is currently supported for ios-iphoneos. It maps to
+the arm64 ABI and processor configuration.
+
+The universal architecture is currently supported for mac and ios. It describes
+'fat' builds containing multiple architecture slices. It maps as follows:
+
+- mac: x86 and x86_64
+- ios-iphonesimulator: x86 and x86_64
+- ios-iphoneos: armv7 and arm64
+
+The js architecture is only supported for emscripten.
+
+## Platforms
+
+The following platform identifiers are available:
+
+- linux
+- mac
+- win32
+- android
+- ios
+- emscripten
+
+## Options
+
+For some platforms the architecture and platform pair is not enough to
+describe the specific target a native code component has been built for.
+In this case a third options section will be present. The options available are
+specific to a particular platform.
+
+### Windows (win32)
+
+Components built using different versions of msvc or different crt modes are
+incompatible and thus must be explictly expressed.
+
+The options section has the form:
+```
+ msvc_
+```
+Where X is the 100 * the compiler version, and Y is the CRT mode which is one of:
+
+- mtd: built against the static debug CRT
+- mt: built against the static release CRT
+- mdd: built against the dynamic debug CRT
+- md: built against the dynamic release CRT
+
+For example, a build using the X86 VC2015 compiler for static release CRT would be
+`x86-win32-msvc140_mt`.
+
+### Mac (mac)
+
+Components built using different SDK versions are incompatible and thus must
+be explicitly expressed.
+
+The options section is the lowercase version of the SDK identifier used to build
+the component:
+```
+ macosx. (for SDK versions < 10.12)
+ macos. (for SDK versions >= 10.12)
+```
+Where N is the major version of the SDK and M is the minor version of the SDK.
+
+For example, a build using the x86 compiler in the 10.9 SDK would be
+`x86-mac-macosx10.9`.
+
+### iOS (ios)
+
+Components built using different iOS SDKs are incompatible and thus must be
+explicitly expressed. Indeed, the difference between the iOS simulator builds
+and iOS device builds are expressed in terms of the SDK.
+
+The options section is the lowercase version of the SDK identifier used to
+build the component:
+```
+ iphonesimulator.
+ iphoneos.
+```
+Where N is the major version of the SDK and M is the minor version of the SDK.
+
+For example, a universal build for the iOS simulator against the 8.3 SDK would
+be `universal-ios-iphonesimulator8.3`.
diff --git a/docs/release_branching_policy.md b/docs/development/release_branching_policy.md
similarity index 100%
rename from docs/release_branching_policy.md
rename to docs/development/release_branching_policy.md
diff --git a/docs/development/testing.md b/docs/development/testing.md
new file mode 100644
index 00000000000..9cf06a10d8b
--- /dev/null
+++ b/docs/development/testing.md
@@ -0,0 +1,279 @@
+# How to test LiveCode
+
+Tests are small programs that check that a particular, specific function works correctly. They are run automatically to check whether LiveCode works properly. They're really useful for ensuring that changes to one part of LiveCode don't break other things!
+
+The main LiveCode engine repository contains the following sets of tests ("test suites"):
+
+* **LiveCode Script tests:** script-only stacks that are run using the LiveCode standalone engine. They test features of the LiveCode Script language.
+* **LiveCode Builder tests:** LCB modules that are run using the **lc-run** tool. They test features of the LCB core language and standard library.
+* **LiveCode Builder Compiler Frontend tests:** Fragments of LCB code which are run through the compiler and check that the compile succeeds, or emits the correct warnings or errors.
+* **LiveCode Script parser tests:** Fragments of LCS code which are run through the parser and check that the compile succeeds, or emits the correct warnings or errors.
+* **C++ tests:** low-level tests written in C++ using [Google Test](https://github.com/google/googletest). These perform low-level checks for things that can't be tested any other way.
+
+## Running the Tests
+
+This assumes that you've already got the LiveCode source code and that you've successfully compiled it. See the [installation instructions](../README.md) for more details.
+
+### Running tests on Mac OS X and Linux
+
+From the top directory of the livecode git repository working tree, run `make check`. This will run all the test suites.
+
+### Running tests on Windows
+
+Open the `livecode.sln` solution file in Visual Studio, and build the "check" project. This will run the C++-based tests.
+
+There's not currently a convenient way to run the LiveCode Script and LiveCode Builder tests on Windows.
+
+### Running tests on Emscripten
+
+To run the C++ tests, run `make check-emscripten` from the top of the livecode git repository working tree.
+
+To run the LiveCode Script tests:
+
+1) Run `tools/emscripten_testgen.sh`. This generates an HTML5 standalone in the `_tests/emscripten` directory.
+
+2) Open `_tests/emscripten/tests.html` in a web browser.
+
+The tests are run automatically as the web page loads, and the TAP log
+output is shown in the browser.
+
+## Writing Tests
+
+If at all possible, please add tests whenever make a change to LiveCode -- whether it's a feature added, a bug fixed, or a behaviour tweaked.
+
+### LiveCode Script
+
+Script-only stack-based tests live in the `tests/lcs` directory and its subdirectories.
+
+Each group of related tests lives in a suitably-named `.livecodescript` file. For example, tests related to desktop clipboard integration are located in `tests/lcs/core/engine/clipboard.livecodescript`. When you add a new script-only stack file, it'll get picked up by the test suite automatically; there's no need to add it to a list anywhere.
+
+Each script-only stack contains a set of test commands, with names beginning with `Test`. Each test command gets run in a fresh copy of LiveCode. A test command might look like:
+
+````
+on TestMyFeature
+ -- Test actions and assertions go here
+end TestMyFeature
+````
+
+Before running each test command, the test framework inserts a test library stack, called `TestLibrary`, into the backscripts. This provides a set of useful utility handlers that can be used when writing test commands. Currently, the following are available:
+
+* `TestDiagnostic pMessage`: Write *pMessage* to the test log as a message.
+* `TestAssert pDescription, pExpectTrue`: Make a test assertion. The test is recorded as a failure if *pExpectTrue* is false. *pDescription* should be a short string that describes the test (e.g. "clipboard is clear").
+* `TestSkip pDescription, pReasonSkipped`: Record a test as having been skipped. *pReasonSkipped* should be a short explanation of why the test was skipped (e.g. "not supported on Windows").
+* `TestSkipIf pRequirement, pOptions`: Skip a test if the requirements
+are met. `pOptions` varies depending on the `pRequirement` enum (if no
+options are explicitly specified then no options are available for that
+particular `pRequirement`. The following requirements are implemented:
+ - `ide` - the IDE repo is available
+ - `lcb` - LCB compilation supported
+ - `docs` - the docs are available
+ - `standalone` - the test is running in the standalone test runner
+ - `securityPermissions` - Option `set` to skip if a test should not
+ set the `securityPermissions`
+ - `platform` - options are comma delimited platform strings
+ - `processor` - options are comma delimited processor strings
+ - `stack` - options are comma delimited stack names to test if they
+ are available
+ - `environment` - options are comma delimited environment strings
+ - `clipboard` - access to the clipboard is available
+ - `wait` - the `wait` command is available and works as expected
+ - `security` - the security module is available
+ - `write` - write access to the filesystem is available
+ - `ui` - the test is running in a graphical environment (as opposed
+ to the command line)
+ - `desktop` - the test is running on a desktop computer
+ - `mobile` - the test is running on a mobile device
+ - `external` - an external module can be loaded/used. Options are a
+ comma delimited list of external module names
+ - `database` - an database module can be loaded/used. Options are a
+ comma delimited list of external module names
+ - `jvm` - the Java Virtual Machine is available
+* `TestSkipIfNot pRequirement, pOptions`: Skip a test if the
+requirements are not met. Requirements and options are the same as for
+`TestSkipIf`.
+* `TestAssertBroken pDescription, pExpectTrue, pReasonBroken`: The same as `TestAssert`, but marking the test as "expected to fail". *pReasonBroken* should be a short explanation of why the test is currently expected to fail; it should almost always be a reference to a bug report, e.g. "bug 54321".
+* `TestAssertThrow pDescription, pHandlerName, pTarget, pExpectedError, pParam`: Assert that a given handler triggers the expected error message. *pHandlerName* is the name of the handler containing the script expected to cause an error; it is dispatched to *pTarget* with *pParam* as a parameter within a try/catch structure. *pExpectedError* is the expected script execution error name in the enumeration in engine/src/executionerrors.h - e.g. `"EE_PROPERTY_CANTSET"`.
+* `TestAssertDoesNotThrow pDescription, pHandlerName, pTarget, pParam`: Assert that a given handler does not trigger any exceptions. *pHandlerName* is the name of the handler containing the script expected to cause an error; it is dispatched to *pTarget* with *pParam* as a parameter within a try/catch structure.
+* `TestGetEngineRepositoryPath`: A function that returns the path to the main LiveCode engine repository.
+* `TestGetIDERepositoryPath`: A function that returns the path to the LiveCode IDE repository.
+* `TestLoadExtension pName`: Attempt to load the extension with name `pName`, eg `TestLoadExtension "json"` will load the JSON library extension.
+* `TestLoadAllExtensions`: Attempt to load all available extensions.
+* `TestRepeat pDesc, pHandler, pTarget, pTimeOut, pParamsArray`: Repeatedly check the result of a handler for a test. The test is recorded as a success if the result is ever true before the given time runs out, or a failure otherwise.
+ - `pHandlerName` is the name of the handler which returns a result.
+ - `pTarget` is the object to which `pHandlerName` should be dispatched.
+ - `pTimeOut` is the amount of milliseconds to continue testing the result of the handler.
+ - `pParamsArray` is an array of parameters, keyed by the 1-based index of the required parameter to be passed to the handler.
+* `TestAssertErrorDialog pDescription, pErrorCode`: Assert that this test triggers an errorDialog message with the given error.
+* `TestIsInStandalone()`: Checks if the test is being run by the
+standalone test runner.
+
+Tests can have additional setup requirements before running, for example loading custom libraries. If the script test contains a handler called `TestSetup`, this will be run prior to running each test command. For example:
+````
+on TestSetup
+ TestSkipIfNot "docs"
+ -- All the tests in this script require access to the docs parser
+ start using stack (TestGetEngineRepositoryPath() & slash & "ide-support" & slash & "revdocsparser.livecodescript")
+end TestSetup
+````
+
+The `TestSetup` handler can indicate that a test should be skipped
+*entirely* by returning a value that begins with the word "skip" or by
+using the `TestSkipIf` or `TestSkipIfNot` commands. For example:
+
+````
+on TestSetup
+ TestSkipIfNot "platform", "Win32"
+ -- is the same as
+ if the platform is not "Win32" then
+ return "SKIP Feature is only supported on Windows"
+ end if
+end TestSetup
+````
+
+
+Tests may need to clean up temporary files or other resources after running. If a script test contains a handler called `TestTeardown`, this will be run after running each test command -- even if the test failed. N.b. `TestTeardown` won't be run if running the test command causes an engine crash.
+
+Any new objects created on the test stack, `mainstacks`, `sockets`,
+`open processes` and `open files` are automatically cleared after each
+test and do not need to be included in the `TestTeardown` handler or
+teardown included in the test. Other global properties and variables
+should be reset in the test teardown. The test stack is deleted from
+memory and reloaded for the next test if multiple tests are being run
+within the same process as in the standalone test runner.
+
+Crashes or uncaught errors from a test command cause the test to immediately fail.
+
+### LiveCode Builder
+
+LCB tests live in the `tests/lcb` directory and its subdirectories. There are currently two groups of tests:
+
+* `tests/lcb/stdlib` contains tests that check that syntax and handlers in the LCB standard library work correctly. Each of the `.lcb` files in that directory is named the same as the standard library that it tests. For example, the `com.livecode.list` library is tested by `list.lcb`.
+* `tests/lcb/vm` contains tests for the LCB bytecode interpreter and virtual machine works correctly. Each of the `.lcb` files is named according to the VM feature that it tests. For example, `dynamic-call.lcb` tests passing LCB handlers as callable handler objects.
+
+Just like for the LCS tests described above, new `.lcb` files added to the test suite get detected, compiled and run automatically.
+
+Each test module contains a set of `public handler` definitions, with names beginning with `Test`. Each test command gets run in a fresh LiveCode Builder environment.
+
+The LCB standard library has built-in syntax for writing unit tests, provided by the `com.livecode.unittest` module. For more information and example code, look up `com.livecode.unittest` in the LiveCode Builder dictionary.
+
+### LiveCode Builder Compiler Frontend Tests
+
+LCB compiler frontend tests live in the 'tests/lcb/compiler/frontend' directory and its subdirectories. Compiler test files all have the extension '.compilertest'.
+
+Unlike LCB and LCS tests, the frontend compiler tests consist of fragments of LCB code which are fed to the compiler to check that it either succeeds, or emits the correct warnings or errors.
+
+The compilertest files use directives beginning with '%' to describe how the different LCB code fragments should behave when passed through the compiler. A single compilertest file can contain as many code fragments to check as necessary. The syntax is as follows:
+
+ CompilerTest
+ : { Line, NEWLINE }
+
+ Line
+ : WHITESPACE+
+ | '%%' ANYTHING_BUT_NEWLINE
+ | Test
+
+ Test
+ : '%TEST' NEWLINE
+ { Code, NEWLINE }
+ '%EXPECT' ('PASS' | 'FAIL' | 'SKIP') [ ] NEWLINE
+ { Assertion, NEWLINE }
+ '%ENDTEST'
+
+ Code
+ : { ANYTHING_BUT_NEWLINE | '%{' '}' }
+
+ Assertion
+ : '%ERROR' 'AT'
+ | '%WARNING' 'AT'
+ | '%SUCCESS'
+
+Each %TEST clause indicates a separate test. Within the code fragments the '%{...}' clauses indicate named positions within the code which are used to check the position information provided for an error or a warning.
+
+At least one assertion must be present, and you cannot have an %ERROR and %SUCCESS assertion present in the same test.
+
+For each test present in the compilertest file, the code fragment is extracted, the positions of the '%{...}' references are noted and then references are removed. The resulting code is passed to lc-compile and its stderr output evaluated. The output is checked to ensure that each claimed assertion exists, and is in the correct position. When checking for assertion matches, the type (error or warning) must match, the position must match and the asserted string must be within the output message the compiler generates.
+
+For example, to check whether the scope of variables within 'repeat forever' statements blocks is correct, you might use:
+
+ %TEST RepeatForeverScope
+ module compiler_test
+ handler TestHandler()
+ variable tOuterVariable
+ repeat forever
+ variable tInnerVariable
+ end repeat
+ put %{BEFORE_BADINNERVARIABLE}tInnerVariable into tOuterVariable
+ end handler
+ end module
+ %EXPECT PASS
+ %ERROR "Identifier 'tInnerVariable' not declared" AT BEFORE_BADINNERVARIABLE
+ %ENDTEST
+
+When compiled, lc-compile will emit an error on the 'put' line because tInnerVariable is not declared at that point. This matches the specified '%ERROR' assertion and so the test will pass (i.e. the compiler is correctly identifying the fact that tInnerVariable is not declared outside of the scope of the 'repeat forever' construct).
+
+To help debug compiler tests, set the LCC_VERBOSE environment variable to 1 before running the compiler test. This will cause the compiler testrunner to emit diagnostic information, including the full output of the compile command which is being run.
+
+### LiveCode Script Parser Tests
+
+The syntax for LiveCode Script parser tests is the same as that of the
+LCB compiler frontent tests above. LCS parser test files all have the
+extension '.parsertest'.
+
+Expected errors are referred to by their name in the parse errors
+enumeration. For example the following tests the variable shadowing
+parse error "local: name shadows another variable or constant":
+
+ %TEST ShadowVariable
+ local sVar
+ local %{BEFORE_SHADOW}sVar
+ %EXPECT PASS
+ %ERROR PE_LOCAL_SHADOW AT BEFORE_SHADOW
+ %ENDTEST
+
+The directive `%SET` can be used to specify the value of global properties
+used when running the test. In particular, it can be used to set the
+value of the `explicitvariables` property. If the `explicitvariables`
+property is not set then the test will be run with it set to `true` and
+to `false`, and the test will fail if the result differs. For example:
+
+ %TEST CommentedContinuation
+ on compiler_test
+ -- comment \
+ with%{SYNTAX} continuation character
+ end compiler_test
+ %EXPECT PASS
+ %ERROR PE_EXPRESSION_NOTLITERAL AT SYNTAX
+ %ENDTEST
+
+will fail with "error: test ambiguity with explicit vars".
+
+ %TEST CommentedContinuationExplicit
+ %SET explicitvariables true
+ on compiler_test
+ -- comment \
+ with %{SYNTAX}continuation character
+ end compiler_test
+ %EXPECT PASS
+ %ERROR PE_EXPRESSION_NOTLITERAL AT SYNTAX
+ %ENDTEST
+
+will succeed.
+
+### C++ tests with Google Test
+
+In general, C++ tests should only be used for things that cannot be tested any other way.
+
+Each test is a `.cpp` file added to the `test` directory for the program or library to be tested. At the moment, the C++ test sets are available for **libcpptest**, **libfoundation** and **engine**.
+
+When you add a new C++ test source file, you need to add it to the target's corresponding `module_test_sources` gyp variable. These are currently set in the top-level `.gyp` file for each project, except for the engine, for which you should edit the `engine_test_source_files` variable in `engine/engine-sources.gypi`.
+
+For more information on writing C++ tests with Google Test, please consult the [Google Test documentation](https://github.com/google/googletest/blob/master/googletest/docs/Documentation.md).
+
+## Other tests
+
+The lc-run program has some basic smoke tests for its command-line
+interface and start-up process. You can find them in
+`tests/_lcruntests.livecodescript`, with support files in
+`tests/lc-run/`. lc-run is used to run the LiveCode Builder tests
+mentioned above; only add to the smoke tests for things that *can't*
+be tested by writing a "normal" LiveCode Builder test.
diff --git a/docs/dictionary/command/XBrowser_Focus.lcdoc b/docs/dictionary/command/XBrowser_Focus.lcdoc
index a4550f8bb39..7ec8f0ca6f7 100644
--- a/docs/dictionary/command/XBrowser_Focus.lcdoc
+++ b/docs/dictionary/command/XBrowser_Focus.lcdoc
@@ -30,8 +30,8 @@ The command has no effect and is included for backwards
compatibility with older applications.
>*Note:* For general information on using the browser library, see the
-> notes in the reference.
+> notes in the reference.
References: XBrowser_Unfocus (command), revBrowserOpen (function),
-revBrowserOpen function (function), result (function)
+function (glossary), result (function)
diff --git a/docs/dictionary/command/XBrowser_Init.lcdoc b/docs/dictionary/command/XBrowser_Init.lcdoc
index f6b0eec30f6..7fa645295c7 100644
--- a/docs/dictionary/command/XBrowser_Init.lcdoc
+++ b/docs/dictionary/command/XBrowser_Init.lcdoc
@@ -31,7 +31,7 @@ altBrowser 2.x and 1.x. The command is no longer needed and calling it
has no affect.
>*Note:* For general information on using the browser library, see the
-> notes in the reference.
+> notes in the reference.
-References: revBrowserOpen (function), revBrowserOpen function (function)
+References: revBrowserOpen (function), function (glossary)
diff --git a/docs/dictionary/command/XBrowser_Unfocus.lcdoc b/docs/dictionary/command/XBrowser_Unfocus.lcdoc
index aed94ba8b0f..4c97074c4ef 100644
--- a/docs/dictionary/command/XBrowser_Unfocus.lcdoc
+++ b/docs/dictionary/command/XBrowser_Unfocus.lcdoc
@@ -30,8 +30,8 @@ The command has no affect and is included for
backwards compatibility with older applications.
>*Note:* For general information on using the browser library, see the
-> notes in the reference.
+> notes in the reference.
References: XBrowser_Focus (command), result (function),
-revBrowserOpen function (function)
+revBrowserOpen (function), function (glossary)
diff --git a/docs/dictionary/command/accept.lcdoc b/docs/dictionary/command/accept.lcdoc
index 28341e43e6e..d64b6ef58aa 100644
--- a/docs/dictionary/command/accept.lcdoc
+++ b/docs/dictionary/command/accept.lcdoc
@@ -31,6 +31,10 @@ on connectionMade pIPAddress
put "Connection made:" && pIPAddress
end connectionMade
+Example:
+accept connections on port 0 with message "connectionMade"
+put it into tPort
+
Parameters:
callbackMessage:
The name of a message to be sent when a connection is made or a datagram
@@ -39,6 +43,14 @@ is received.
portNumber:
The TCP port number on which to accept connections.
+The result:
+An error message if the socket could not be opened.
+
+It:
+The actual port that was bound. In the case of accepting connections
+on port 0 the operating system will assign a free port in its ephemeral
+port range.
+
Description:
Use the when running a , to accept
connections or from other systems (or other
@@ -47,10 +59,13 @@ want to accept UDP datagrams.
When a connection is made or a datagram is received, the
creates a new that can be used to communicate with
-the other system (or ). When using the , , or , you can refer to
-this with a socket identifier that looks like this:
-host:port[|connectionID] where the connectionID is a number assigned by
+the other system (or ). When using the ,
+, or , you can
+refer to this with a socket identifier that looks like this:
+
+ host:port[|connectionID]
+
+where the connectionID is a number assigned by
the . (You only need to specify the connection number
if there is more than one connected to a particular and
.)
@@ -72,6 +87,8 @@ the contents of the .
assignments](https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml)
and [RFC 6335](https://tools.ietf.org/html/rfc6335)
+> **Note:** The