Merge branch 'master' into performance

# Conflicts:
#	Build/CMakeLists.txt
#	Cmake/FileList.cmake
#	Cmake/SampleFileList.cmake
#	Cmake/gen_samplelists.sh
#	Include/RmlUi/Controls/Clipboard.h
#	Include/RmlUi/Controls/DataQuery.h
#	Include/RmlUi/Controls/DataSource.h
#	Include/RmlUi/Controls/ElementDataGridCell.h
#	Include/RmlUi/Controls/ElementFormControlInput.h
#	Include/RmlUi/Controls/ElementFormControlTextArea.h
#	Include/RmlUi/Core/ComputedValues.h
#	Include/RmlUi/Core/Containers/chobo/flat_map.hpp
#	Include/RmlUi/Core/Containers/chobo/flat_set.hpp
#	Include/RmlUi/Core/Containers/robin_hood.h
#	Include/RmlUi/Core/Context.h
#	Include/RmlUi/Core/Core.h
#	Include/RmlUi/Core/Debug.h
#	Include/RmlUi/Core/Decorator.h
#	Include/RmlUi/Core/DecoratorInstancer.h
#	Include/RmlUi/Core/Dictionary.h
#	Include/RmlUi/Core/Dictionary.inl
#	Include/RmlUi/Core/ElementScroll.h
#	Include/RmlUi/Core/ID.h
#	Include/RmlUi/Core/Lua/Utilities.h
#	Include/RmlUi/Core/Platform.h
#	Include/RmlUi/Core/PropertiesIteratorView.h
#	Include/RmlUi/Core/PropertyDefinition.h
#	Include/RmlUi/Core/PropertyDictionary.h
#	Include/RmlUi/Core/RenderInterface.h
#	Include/RmlUi/Core/Spritesheet.h
#	Include/RmlUi/Core/String.h
#	Include/RmlUi/Core/StringBase.h
#	Include/RmlUi/Core/StringBase.inl
#	Include/RmlUi/Core/StyleSheetSpecification.h
#	Include/RmlUi/Core/Transform.h
#	Include/RmlUi/Core/TypeConverter.inl
#	Include/RmlUi/Core/Types.h
#	Include/RmlUi/Core/Variant.h
#	Include/RmlUi/Core/Vector3.inl
#	Include/RmlUi/Core/Vector4.inl
#	Include/RmlUi/Core/WString.h
#	Samples/assets/cursor.rml
#	Samples/basic/animation/src/main.cpp
#	Samples/basic/customlog/src/SystemInterface.cpp
#	Samples/basic/drag/src/Inventory.cpp
#	Samples/basic/sdl2/src/RenderInterfaceSDL2.cpp
#	Samples/basic/sfml/src/SystemInterfaceSFML.cpp
#	Samples/basic/transform/src/main.cpp
#	Samples/basic/treeview/src/FileSystem.cpp
#	Samples/invaders/src/DecoratorInstancerDefender.cpp
#	Samples/invaders/src/DecoratorInstancerDefender.h
#	Samples/invaders/src/DecoratorInstancerStarfield.cpp
#	Samples/invaders/src/DecoratorInstancerStarfield.h
#	Samples/invaders/src/ElementGame.cpp
#	Samples/invaders/src/ElementGame.h
#	Samples/invaders/src/Event.h
#	Samples/invaders/src/EventHandlerHighScore.h
#	Samples/invaders/src/EventHandlerOptions.cpp
#	Samples/invaders/src/EventHandlerOptions.h
#	Samples/invaders/src/EventHandlerStartGame.h
#	Samples/invaders/src/EventManager.cpp
#	Samples/invaders/src/Game.cpp
#	Samples/invaders/src/HighScores.cpp
#	Samples/invaders/src/main.cpp
#	Samples/luainvaders/src/DecoratorInstancerDefender.cpp
#	Samples/luainvaders/src/DecoratorInstancerDefender.h
#	Samples/luainvaders/src/DecoratorInstancerStarfield.cpp
#	Samples/luainvaders/src/DecoratorInstancerStarfield.h
#	Samples/luainvaders/src/ElementGame.cpp
#	Samples/luainvaders/src/ElementGame.h
#	Samples/luainvaders/src/Game.cpp
#	Samples/luainvaders/src/HighScores.cpp
#	Samples/luainvaders/src/main.cpp
#	Samples/shell/src/ShellFileInterface.cpp
#	Samples/shell/src/win32/InputWin32.cpp
#	Samples/shell/src/win32/ShellWin32.cpp
#	Samples/shell/src/x11/ShellX11.cpp
#	Samples/tutorial/datagrid/src/DecoratorInstancerDefender.cpp
#	Samples/tutorial/datagrid/src/DecoratorInstancerDefender.h
#	Samples/tutorial/datagrid/src/main.cpp
#	Samples/tutorial/datagrid_tree/src/DecoratorInstancerDefender.cpp
#	Samples/tutorial/datagrid_tree/src/DecoratorInstancerDefender.h
#	Samples/tutorial/datagrid_tree/src/HighScores.cpp
#	Samples/tutorial/datagrid_tree/src/HighScoresShipFormatter.cpp
#	Samples/tutorial/datagrid_tree/src/main.cpp
#	Samples/tutorial/drag/data/tutorial.rcss
#	Samples/tutorial/tutorial_drag/src/Inventory.cpp
#	Source/Controls/Clipboard.cpp
#	Source/Controls/DataSource.cpp
#	Source/Controls/DataSourceListener.cpp
#	Source/Controls/ElementDataGrid.cpp
#	Source/Controls/ElementDataGridCell.cpp
#	Source/Controls/ElementDataGridRow.cpp
#	Source/Controls/ElementForm.cpp
#	Source/Controls/ElementFormControl.cpp
#	Source/Controls/ElementFormControlDataSelect.cpp
#	Source/Controls/ElementFormControlInput.cpp
#	Source/Controls/ElementTabSet.cpp
#	Source/Controls/InputType.cpp
#	Source/Controls/InputTypeButton.h
#	Source/Controls/InputTypeCheckbox.cpp
#	Source/Controls/InputTypeCheckbox.h
#	Source/Controls/InputTypeRadio.cpp
#	Source/Controls/InputTypeRadio.h
#	Source/Controls/InputTypeRange.cpp
#	Source/Controls/InputTypeRange.h
#	Source/Controls/InputTypeSubmit.h
#	Source/Controls/InputTypeText.cpp
#	Source/Controls/InputTypeText.h
#	Source/Controls/WidgetDropDown.cpp
#	Source/Controls/WidgetSlider.cpp
#	Source/Controls/WidgetTextInput.cpp
#	Source/Controls/WidgetTextInput.h
#	Source/Controls/WidgetTextInputSingleLinePassword.cpp
#	Source/Controls/XMLNodeHandlerDataGrid.cpp
#	Source/Controls/XMLNodeHandlerTabSet.cpp
#	Source/Core/BitmapFont/FontProvider.cpp
#	Source/Core/ComputeProperty.h
#	Source/Core/Context.cpp
#	Source/Core/Core.cpp
#	Source/Core/Decorator.cpp
#	Source/Core/DecoratorNone.cpp
#	Source/Core/DecoratorTiledBoxInstancer.cpp
#	Source/Core/DecoratorTiledHorizontalInstancer.cpp
#	Source/Core/DecoratorTiledImageInstancer.cpp
#	Source/Core/DecoratorTiledVerticalInstancer.cpp
#	Source/Core/Dictionary.cpp
#	Source/Core/DocumentHeader.cpp
#	Source/Core/Element.cpp
#	Source/Core/ElementBackground.cpp
#	Source/Core/ElementDefinition.cpp
#	Source/Core/ElementDefinition.h
#	Source/Core/ElementDocument.cpp
#	Source/Core/ElementHandle.cpp
#	Source/Core/ElementImage.cpp
#	Source/Core/ElementStyle.cpp
#	Source/Core/ElementStyle.h
#	Source/Core/ElementStyleCache.cpp
#	Source/Core/ElementStyleCache.h
#	Source/Core/EventDispatcher.cpp
#	Source/Core/EventDispatcher.h
#	Source/Core/EventIterators.h
#	Source/Core/EventSpecification.h
#	Source/Core/LayoutEngine.cpp
#	Source/Core/Log.cpp
#	Source/Core/PropertiesIteratorView.cpp
#	Source/Core/PropertyDictionary.cpp
#	Source/Core/PropertySpecification.cpp
#	Source/Core/ReferenceCountable.cpp
#	Source/Core/RenderInterface.cpp
#	Source/Core/StreamMemory.cpp
#	Source/Core/String.cpp
#	Source/Core/StyleSheetNode.cpp
#	Source/Core/StyleSheetParser.cpp
#	Source/Core/StyleSheetSpecification.cpp
#	Source/Core/Transform.cpp
#	Source/Core/TransformPrimitive.cpp
#	Source/Core/URL.cpp
#	Source/Core/Variant.cpp
#	Source/Core/WString.cpp
#	Source/Debugger/ElementInfo.cpp
#	Source/Debugger/ElementLog.cpp
#	Source/Debugger/Plugin.cpp

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.0.{build}
+version: 2.0.{build}
 image: Visual Studio 2017
 environment:
   matrix:
@@ -14,15 +14,16 @@ install:
 - cmd: >-
     cd Dependencies
 
-    appveyor DownloadFile https://github.com/ubawurinna/freetype-windows-binaries/releases/download/v2.10.0/freetype-%FREETYPE_VER%.zip
+    appveyor DownloadFile https://github.com/ubawurinna/freetype-windows-binaries/releases/download/v%FREETYPE_VER%/freetype-%FREETYPE_VER%.zip
 
     unzip -o freetype-%FREETYPE_VER%.zip
 
     mv win64 lib
 
-    cd ../Build
+    cd ..
 
-    cmake -G "%VS_GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DBUILD_SAMPLES=%BUILD_SAMPLES% -DSKIP_DIRECTX_SAMPLES=ON .
+    cmake -G "%VS_GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DBUILD_SAMPLES=%BUILD_SAMPLES% .
 build:
+  project: RmlUi.sln
   parallel: true
   verbosity: minimal

.gitignore

@@ -1,19 +1,16 @@
-# Ignore compiled python code
-*.pyc
+# Primary cmake build target
+/Build/
+
 # Ignore MacOSX directory info
 .DS_Store
+
 # VS user project files
+.vs/
 *.suo
 *.user
 *.opensdf
-bin/*
-bin64/*
 *.dir/
 Win32/
+x64/
 
-/lib/
-RocketCore.dir/
-RocketControls.dir/
-RocketDebugger.dir/
-
-Win32/
+/Distribution/

.travis.yml

@@ -22,8 +22,6 @@ matrix:
             - libstdc++-7-dev
             - cmake
             - build-essential
-            - libboost-dev
-            - libboost-python-dev
             - libsdl2-dev
             - libsdl2-image-dev
             - libfreetype6-dev
@@ -42,8 +40,6 @@ matrix:
             - g++-7
             - cmake
             - build-essential
-            - libboost-dev
-            - libboost-python-dev
             - libsdl2-dev
             - libsdl2-image-dev
             - libfreetype6-dev
@@ -55,12 +51,10 @@ before_install:
   - if [[ -n "${MATRIX_EVAL}" ]]; then eval "${MATRIX_EVAL}" ; fi
 
 install:
-  - cd "$TRAVIS_BUILD_DIR/Build"
+  - cd "$TRAVIS_BUILD_DIR"
   - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then cmake -DBUILD_LUA_BINDINGS=ON -DBUILD_SAMPLES=ON .; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -G Xcode .; fi
-  - cd "$TRAVIS_BUILD_DIR"
 
 script:
-  - cd Build
   - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then make -j4; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then xcodebuild -project librocket.xcodeproj/ -jobs 4 -configuration Release -target ALL_BUILD; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then xcodebuild -project rmlui.xcodeproj/ -jobs 4 -configuration Release -target ALL_BUILD; fi

Build/.gitignore

@@ -1,178 +0,0 @@
-/build/
-CMakeCache.txt
-cmake_install.cmake
-CMakeFiles
-CMakeScripts
-libRocket.xcodeproj
-Debug
-Debug-iphoneos
-Debug-iphonesimulator
-Release
-Release-iphoneos
-Release-iphonesimulator
-DerivedData
-libRocket.build/Debug/RocketCore.build
-libRocket.build
-
-Makefile
-_rocketcontrols.so
-_rocketcore.so
-customlog
-datagrid
-datagrid_tree
-drag
-invaders
-pyinvaders
-luainvaders
-sdl2
-sfml
-sfml2
-ogre3d
-scores.txt
-options.dat
-log.txt
-libRocketCore.so
-libRocketCore.so.*
-libRocketCore.a
-libRocketControls.so
-libRocketControls.so.*
-libRocketControls.a
-libRocketDebugger.so
-libRocketDebugger.so.*
-libRocketDebugger.a
-libRocketCoreLua.so
-libRocketCoreLua.so.*
-libRocketCoreLua.a
-libRocketControlsLua.so
-libRocketControlsLua.so.*
-libRocketControlsLua.a
-libshell.a
-loaddocument
-template
-treeview
-tutorial_drag
-
-#VisualStudio Project artifacts
-libRocket.sln
-libRocket.sdf
-ALL_BUILD.vcproj
-ALL_BUILD.vcxproj
-ALL_BUILD.vcxproj.filters
-INSTALL.vcproj
-INSTALL.vcxproj
-INSTALL.vcxproj.filters
-ZERO_CHECK.vcproj
-ZERO_CHECK.vcxproj
-ZERO_CHECK.vcxproj.filters
-RocketCore.vcproj
-RocketCore.vcxproj
-RocketCore.vcxproj.filters
-RocketControls.vcproj
-RocketControls.vcxproj
-RocketControls.vcxproj.filters
-RocketDebugger.vcproj
-RocketDebugger.vcxproj
-RocketDebugger.vcxproj.filters
-_rocketcore.vcproj
-_rocketcore.vcxproj
-_rocketcore.vcxproj.filters
-_rocketcontrols.vcproj
-_rocketcontrols.vcxproj
-_rocketcontrols.vcxproj.filters
-RocketCoreLua.vcproj
-RocketCoreLua.vcxproj
-RocketCoreLua.vcxproj.filters
-RocketControlsLua.vcproj
-RocketControlsLua.vcxproj
-RocketControlsLua.vcxproj.filters
-customlog.vcproj
-customlog.vcxproj
-customlog.vcxproj.filters
-datagrid.vcproj
-datagrid.vcxproj
-datagrid.vcxproj.filters
-datagrid_tree.vcproj
-datagrid_tree.vcxproj
-datagrid_tree.vcxproj.filters
-drag.vcproj
-drag.vcxproj
-drag.vcxproj.filters
-invaders.vcproj
-invaders.vcxproj
-invaders.vcxproj.filters
-pyinvaders.vcproj
-pyinvaders.vcxproj
-pyinvaders.vcxproj.filters
-luainvaders.vcproj
-luainvaders.vcxproj
-luainvaders.vcxproj.filters
-loaddocument.vcproj
-loaddocument.vcxproj
-loaddocument.vcxproj.filters
-shell.vcproj
-shell.vcxproj
-shell.vcxproj.filters
-template.vcproj
-template.vcxproj
-template.vcxproj.filters
-treeview.vcproj
-treeview.vcxproj
-treeview.vcxproj.filters
-tutorial_drag.vcproj
-tutorial_drag.vcxproj
-tutorial_drag.vcxproj.filters
-sfml.vcproj
-sfml.vcxproj
-sfml.vcxproj.filters
-sfml2.vcproj
-sfml2.vcxproj
-sfml2.vcxproj.filters
-sdl2.vcproj
-sdl2.vcxproj
-sdl2.vcxproj.filters
-ogre3d.vcproj
-ogre3d.vcxproj
-ogre3d.vcxproj.filters
-
-#Win32 artifacts
-libRocketCore.dll
-libRocketCore.lib
-libRocketControls.dll
-libRocketControls.lib
-libRocketDebugger.dll
-libRocketDebugger.lib
-libRocketCoreLua.dll
-libRocketControlsLua.dll
-
-#Ming32 artifacts
-libRocketCore.dll.a
-libRocketControls.dll.a
-libRocketDebugger.dll.a
-libRocketCoreLua.dll.a
-libRocketControlsLua.dll.a
-
-#OSX Artifacts
-libRocketCore.dylib
-libRocketCore.*.dylib
-libRocketCoreLua.dylib
-libRocketCoreLua.*.dylib
-libRocketControls.dylib
-libRocketControls.*.dylib
-libRocketControlsLua.dylib
-libRocketControlsLua.*.dylib
-libRocketDebugger.dylib
-libRocketDebugger.*.dylib
-_rocketcore.dylib
-_rocketcore.*.dylib
-_rocketcontrols.dylib
-_rocketcontrols.*.dylib
-customlog.app
-datagrid.app
-datagrid_tree.app
-drag.app
-invaders.app
-pyinvaders.app
-loaddocument.app
-template.app
-treeview.app
-tutorial_drag.app

Build/CMakeLists.txt

@@ -1,884 +0,0 @@
-#===================================
-# Build script for libRocket =======
-#===================================
-
-if(APPLE)
-	# This has to be before most other options so CMake properly handles the 
-	# compiler variables, it MUST bebefore the project() definition
-	if(IOS_PLATFORM)
-		set(CMAKE_TOOLCHAIN_FILE cmake/Platform/iOS.cmake)
-	endif(IOS_PLATFORM)
-
-	option(BUILD_UNIVERSAL_BINARIES "Build universal binaries for all architectures supported" ON)
-	if (NOT CMAKE_OSX_ARCHITECTURES AND BUILD_UNIVERSAL_BINARIES)
-		if(IOS)
-			# set the architecture for iOS 
-			if (${IOS_PLATFORM} STREQUAL "OS")
-				set (IOS_ARCH armv6 armv7 armv7s arm64)
-				set (CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} CACHE string  "Build architecture for iOS")
-			else (${IOS_PLATFORM} STREQUAL "OS")
-				set (IOS_ARCH x86_64)
-				set (CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} CACHE string  "Build architecture for iOS Simulator")
-			endif (${IOS_PLATFORM} STREQUAL "OS")
-
-		else(IOS)
-			# set the architectures for OS X
-			set (OSXI_ARCH x86_64)
-			set (CMAKE_OSX_ARCHITECTURES ${OSXI_ARCH} CACHE string  "Build architecture for OS X universal binaries")		
-		endif(IOS)
-	endif (NOT CMAKE_OSX_ARCHITECTURES AND BUILD_UNIVERSAL_BINARIES)
-endif(APPLE)
-
-# We use the new OSX_ARCHITECTURES property
-# and GNUInstallDirs module
-cmake_minimum_required(VERSION 2.8.5)
-
-if(COMMAND cmake_policy)
-  cmake_policy(SET CMP0015 NEW)
-endif(COMMAND cmake_policy)
-
-# Enable the use of MACOSX_RPATH by default for CMake v3.0+; this effectively 
-# allows plug 'n' play functionality, so to speak -- the resulting shared 
-# library files can simply be copied over into the end-user's application 
-# bundle or framework bundle. No mucking around with install_name_tool.
-#
-# 	See also: 
-# cmake --help-policy cmp0042
-# http://www.kitware.com/blog/home/post/510
-if(POLICY CMP0042)
-  cmake_policy(SET CMP0042 NEW)
-endif(POLICY CMP0042)
-
-project(libRocket C CXX)
-
-# paths
-include(GNUInstallDirs)
-
-set(LIBROCKET_VERSION_MAJOR 1)
-set(LIBROCKET_VERSION_MINOR 3)
-set(LIBROCKET_VERSION_PATCH 0)
-set(LIBROCKET_VERSION_TWEAK 0)
-set(PROJECT_VERSION ${LIBROCKET_VERSION_MAJOR}.${LIBROCKET_VERSION_MINOR}.${LIBROCKET_VERSION_PATCH}.${LIBROCKET_VERSION_TWEAK})
-
-# Search in the 'cmake' directory for additional CMake modules.
-list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
-
-# Old versions of CMake need some updated Modules, but we don't want
-# to override newer versions of CMake which have working versions
-if(CMAKE_MAJOR_VERSION LESS 3)
-	list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/v2fixes)
-endif()
-
-#===================================
-# Environment tests ================
-#===================================
-
-include(TestForANSIForScope)
-include(TestForANSIStreamHeaders)
-include(TestForSTDNamespace)
-
-#===================================
-# Provide hints as to where depends=
-# might be found                   =
-#===================================
-
-if(NOT DEFINED ENV{FREETYPE_DIR})
-	set(ENV{FREETYPE_DIR} "${PROJECT_SOURCE_DIR}/../Dependencies")
-endif()
-
-#if(NOT DEFINED ENV{Boost_DIR})
-#	set(ENV{Boost_DIR} "${PROJECT_SOURCE_DIR}/../Dependencies")
-#endif()
-if(NOT DEFINED ENV{BOOST_ROOT})
-	set(ENV{BOOST_ROOT} "${PROJECT_SOURCE_DIR}/../Dependencies/boost")
-endif()
-
-if(NOT DEFINED ENV{LUA_DIR})
-	set(ENV{LUA_DIR} "${PROJECT_SOURCE_DIR}/../Dependencies")
-endif()
-
-if(NOT DEFINED ENV{SDL2DIR})
-	set(ENV{SDL2DIR} "${PROJECT_SOURCE_DIR}/../Dependencies")
-endif()
-
-if(NOT DEFINED ENV{SDL2_IMAGE_DIR})
-	set(ENV{SDL2_IMAGE_DIR} "${PROJECT_SOURCE_DIR}/../Dependencies")
-endif()
-
-if(NOT DEFINED ENV{SFML_ROOT})
-	set(ENV{SFML_ROOT} "${PROJECT_SOURCE_DIR}/../Dependencies")
-endif()
-
-#===================================
-# Plaform specific global hacks ====
-#===================================
-
-if(APPLE)
-	# Disables naked builtins from AssertMacros.h which
-	# This prevents naming collisions such as those from the check()
-	# function macro with LuaType::check
-	add_definitions(-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0)
-endif(APPLE)
-
-#===================================
-# Build options ====================
-#===================================
-
-if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE Release CACHE STRING
-        "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
-        FORCE)
-endif()
-
-if(NOT IOS)
-	option(BUILD_SHARED_LIBS "Build shared libraries" ON)
-endif(NOT IOS)
-
-option(BUILD_PYTHON_BINDINGS "Build python bindings" OFF)
-option(BUILD_LUA_BINDINGS "Build Lua bindings" OFF)
-
-if(APPLE)
-	option(BUILD_FRAMEWORK "Build Framework bundle for OSX" OFF)
-endif()
-
-option(BUILD_SAMPLES "Build samples" OFF)
-if(WIN32)
-	option(SKIP_DIRECTX_SAMPLES "Skip build of all DirectX related samples.  Only applies if BUILD_SAMPLES is ON" OFF)
-	option(SKIP_DIRECTX9_SAMPLE "Skip build of DirectX 9 related sample.  Only applies if BUILD_SAMPLES is ON and SKIP_DIRECTX_SAMPLES is OFF" OFF)
-	option(SKIP_DIRECTX10_SAMPLE "Skip build of DirectX 10 related sample.  Only applies if BUILD_SAMPLES is ON and SKIP_DIRECTX_SAMPLES is OFF" OFF)
-endif()
-
-if(APPLE)
-	if(IOS)
-		if(BUILD_SHARED_LIBS)
-			message(FATAL_ERROR "BUILD_SHARED_LIBS must be OFF for iOS builds.  iOS does not support shared libraries.")
-		endif(BUILD_SHARED_LIBS)
-	endif(IOS)
-
-	if(BUILD_FRAMEWORK)
-		if(NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode")
-			message(FATAL_ERROR "You should use Xcode generator with BUILD_FRAMEWORK enabled")
-		endif()
-		if(NOT BUILD_SHARED_LIBS)
-			message(FATAL_ERROR "BUILD_SHARED_LIBS must be ON with BUILD_FRAMEWORK enabled")
-		endif()
-	endif()
-else(APPLE)
-	if(BUILD_FRAMEWORK)
-		message(FATAL_ERROR "BUILD_FRAMEWORK is only supported on Mac OS X with the Xcode generator")
-	endif()
-endif(APPLE)
-
-if(NOT BUILD_SHARED_LIBS)
-	add_definitions(-DROCKET_STATIC_LIB)
-endif()
-
-#===================================
-# Find dependencies ================
-#===================================
-
-# FreeType
-if(CMAKE_MAJOR_VERSION LESS 3)
-	# Freetype changed the layout of its header files, we  need to use 
-	# the FindFreetype module from cmake v3 at least, included here
-	find_package(Freetype-v2fix REQUIRED)	
-else()
-	find_package(Freetype REQUIRED)	
-endif()
-
-if(FREETYPE_FOUND)
-		include_directories(${FREETYPE_INCLUDE_DIRS})
-		link_directories(${FREETYPE_LINK_DIRS})
-		list(APPEND CORE_LINK_LIBS ${FREETYPE_LIBRARY})
-endif()
-mark_as_advanced(FREETYPE_INCLUDE_DIRS FREETYPE_LIBRARY FREETYPE_LINK_DIRECTORIES)
-
-# Boost and Python
-if(BUILD_PYTHON_BINDINGS)
-    find_package(PythonInterp 2 REQUIRED)
-    find_package(PythonLibs 2 REQUIRED)
-    execute_process(
-        COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1,0,prefix=''))"
-        OUTPUT_VARIABLE PYTHON_INSTDIR
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    if(PYTHONLIBS_FOUND)
-        include_directories(${PYTHON_INCLUDE_DIR})
-    endif()
-
-    #set(Boost_USE_STATIC_LIBS OFF)
-    #set(Boost_USE_MULTITHREADED ON)
-    find_package(Boost 1.40.0 COMPONENTS python REQUIRED)
-    if(Boost_FOUND)
-        include_directories(${Boost_INCLUDE_DIR})
-        list(APPEND PY_BINDINGS_LINK_LIBS ${PYTHON_LIBRARY} ${Boost_LIBRARIES})
-    endif()
-
-endif()
-
-#Lua
-if(BUILD_LUA_BINDINGS)
-    if(CMAKE_MAJOR_VERSION LESS 3)
-        find_package(Lua-v2fix)
-    else()
-        find_package(Lua)
-    endif()
-    if(LUA_FOUND)
-        include_directories(${LUA_INCLUDE_DIR})
-        list(APPEND LUA_BINDINGS_LINK_LIBS ${LUA_LIBRARIES})
-    endif()
-endif()
-
-
-#===================================
-# Setup paths ======================
-#===================================
-
-set(PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/..)
-
-include_directories(
-    ${PROJECT_SOURCE_DIR}/Include
-)
-
-# Include list of source files
-include(FileList)
-
-if(NOT BUILD_FRAMEWORK)
-#===================================
-# Build libraries ==================
-#===================================
-
-set(LIBRARIES Core Controls Debugger)
-
-foreach(library ${LIBRARIES})
-    set(NAME Rocket${library})
-
-    add_library(${NAME}
-                        ${${library}_HDR_FILES}
-                        ${${library}_PUB_HDR_FILES}
-                        ${MASTER_${library}_PUB_HDR_FILES}
-			${${library}_SRC_FILES}
-    )
-
-    set_target_properties(${NAME} PROPERTIES
-                           VERSION ${PROJECT_VERSION}
-                           SOVERSION ${LIBROCKET_VERSION_MAJOR}
-    )
-	
-	if (MSVC)
-		target_compile_options(${NAME} PUBLIC "/MP")
-	endif(MSVC)
-	
-	set_property(TARGET ${NAME} PROPERTY CXX_STANDARD 14)
-	set_property(TARGET ${NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
-    
-    install(TARGETS ${NAME}
-            EXPORT libRocketTargets
-            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    )
-	
-
-    set(ROCKET_EXPORTED_TARGETS ${ROCKET_EXPORTED_TARGETS} ${NAME})
-endforeach(library)
-
-if (MSVC)
-	target_compile_options(RocketCore PRIVATE "/Yuprecompiled.h")
-	set_source_files_properties(${PROJECT_SOURCE_DIR}/Source/Core/precompiled.cpp PROPERTIES COMPILE_FLAGS "/Ycprecompiled.h")
-endif(MSVC)
-
-else(NOT BUILD_FRAMEWORK)
-	#===================================
-	# Build combined Framework =========
-	#===================================
-
-	set(NAME Rocket)
-
-	set(MASTER_PUB_HDR_FILES
-		${MASTER_Core_PUB_HDR_FILES}
-		${MASTER_Controls_PUB_HDR_FILES}
-		${MASTER_Debugger_PUB_HDR_FILES}
-	)
-
-	add_library(${NAME}
-		${Core_HDR_FILES}
-		${MASTER_Core_PUB_HDR_FILES}
-		${Core_PUB_HDR_FILES}
-		${Core_SRC_FILES}
-		${Controls_HDR_FILES}
-		${MASTER_Controls_PUB_HDR_FILES}
-		${Controls_PUB_HDR_FILES}
-		${Controls_SRC_FILES}
-		${Debugger_HDR_FILES}
-		${MASTER_Debugger_PUB_HDR_FILES}
-		${Debugger_PUB_HDR_FILES}
-		${Debugger_SRC_FILES}
-	)
-
-	set_target_properties(${NAME} PROPERTIES
-		VERSION ${PROJECT_VERSION}
-		SOVERSION ${LIBROCKET_VERSION_MAJOR}
-	)
-
-		set_property(SOURCE ${MASTER_PUB_HDR_FILES}
-			PROPERTY MACOSX_PACKAGE_LOCATION Headers
-		)
-		set_property(SOURCE ${Core_PUB_HDR_FILES}
-			PROPERTY MACOSX_PACKAGE_LOCATION Headers/Core
-		)
-		set_property(SOURCE ${Controls_PUB_HDR_FILES}
-			PROPERTY MACOSX_PACKAGE_LOCATION Headers/Controls
-		)
-		set_property(SOURCE ${Debugger_PUB_HDR_FILES}
-			PROPERTY MACOSX_PACKAGE_LOCATION Headers/Debugger
-		)
-		set_target_properties(${NAME} PROPERTIES
-			FRAMEWORK TRUE
-			FRAMEWORK_VERSION ${PROJECT_VERSION}
-			MACOSX_FRAMEWORK_IDENTIFIER com.librocketb.${NAME}
-			MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${LIBROCKET_VERSION_MAJOR}.${LIBROCKET_VERSION_MINOR}.${LIBROCKET_VERSION_PATCH}.${LIBROCKET_VERSION_TWEAK}
-			MACOSX_FRAMEWORK_BUNDLE_VERSION ${PROJECT_VERSION}
-			XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"
-			PUBLIC_HEADER ${MASTER_PUB_HDR_FILES}
-		)
-
-    install(TARGETS ${NAME}
-            EXPORT libRocketTargets
-            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-            FRAMEWORK DESTINATION Library/Frameworks
-    )
-
-    set(ROCKET_EXPORTED_TARGETS ${ROCKET_EXPORTED_TARGETS} ${NAME})
-endif(NOT BUILD_FRAMEWORK)
-
-# Build python bindings
-if(BUILD_PYTHON_BINDINGS)
-    set(LIBRARIES core controls)
-
-    foreach(library ${LIBRARIES})
-        set(NAME _rocket${library})
-
-        add_library(${NAME} MODULE ${Py${library}_SRC_FILES}
-                            ${Py${library}_HDR_FILES}
-                            ${Py${library}_PUB_HDR_FILES}
-        )
-
-        set_target_properties(${NAME} PROPERTIES PREFIX "")
-
-        set_property(TARGET ${NAME} PROPERTY CXX_STANDARD 14)
-        set_property(TARGET ${NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
-
-        install(TARGETS ${NAME}
-                EXPORT libRocketTargets
-                LIBRARY DESTINATION ${PYTHON_INSTDIR}
-        )
- 
-    endforeach(library)
-endif()
-
-# Build Lua bindings
-if(BUILD_LUA_BINDINGS)
-    set(LIBRARIES Core Controls)
-
-    foreach(library ${LIBRARIES})
-        set(NAME Rocket${library}Lua)
-
-        add_library(${NAME} ${Lua${library}_SRC_FILES}
-                            ${Lua${library}_HDR_FILES}
-                            ${Lua${library}_PUB_HDR_FILES}
-        )
-
-        set_target_properties(${NAME} PROPERTIES
-                           VERSION ${PROJECT_VERSION}
-                           SOVERSION ${LIBROCKET_VERSION_MAJOR}
-        )
-
-        set_property(TARGET ${NAME} PROPERTY CXX_STANDARD 14)
-        set_property(TARGET ${NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
-
-        install(TARGETS ${NAME}
-            EXPORT libRocketTargets
-            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        )
-        
-        set(ROCKET_EXPORTED_TARGETS ${ROCKET_EXPORTED_TARGETS} ${NAME})
-    endforeach(library)
-endif()
-
-
-#===================================
-# Link libraries ===================
-#===================================
-
-if(NOT BUILD_FRAMEWORK)
-target_link_libraries(RocketCore ${CORE_LINK_LIBS})
-target_link_libraries(RocketControls RocketCore)
-target_link_libraries(RocketDebugger RocketCore)
-else(NOT BUILD_FRAMEWORK)
-target_link_libraries(Rocket ${CORE_LINK_LIBS})
-endif(NOT BUILD_FRAMEWORK)
-
-if(BUILD_PYTHON_BINDINGS)
-	if(NOT BUILD_FRAMEWORK)
-		target_link_libraries(_rocketcore RocketCore ${PY_BINDINGS_LINK_LIBS})
-		target_link_libraries(_rocketcontrols RocketControls ${PY_BINDINGS_LINK_LIBS})
-	else(NOT BUILD_FRAMEWORK)
-		target_link_libraries(_rocketcore Rocket ${PY_BINDINGS_LINK_LIBS})
-		target_link_libraries(_rocketcontrols Rocket ${PY_BINDINGS_LINK_LIBS})
-	endif(NOT BUILD_FRAMEWORK)
-endif()
-
-if(BUILD_LUA_BINDINGS)
-	if(NOT BUILD_FRAMEWORK)
-		target_link_libraries(RocketCoreLua RocketCore ${LUA_BINDINGS_LINK_LIBS})
-		target_link_libraries(RocketControlsLua RocketControls RocketCoreLua ${LUA_BINDINGS_LINK_LIBS})
-	else(NOT BUILD_FRAMEWORK)
-		target_link_libraries(RocketCoreLua Rocket ${LUA_BINDINGS_LINK_LIBS})
-		target_link_libraries(RocketControlsLua Rocket RocketCoreLua ${LUA_BINDINGS_LINK_LIBS})
-	endif(NOT BUILD_FRAMEWORK)
-endif()
-
-
-#===================================
-# Build samples ====================
-#===================================
-
-# Build and link the samples
-macro(bl_sample NAME)
-	if (WIN32)
-    	add_executable(${NAME} WIN32 ${${NAME}_SRC_FILES} ${${NAME}_HDR_FILES} )
-	elseif(APPLE)
-		add_executable(${NAME} MACOSX_BUNDLE ${${NAME}_SRC_FILES} ${${NAME}_HDR_FILES} )
-
-		# The first rpath is to the proper location where the framework/library SHOULD be, the second is to the location actually seen
-		# in the build environment
-if(BUILD_FRAMEWORK)
-		set_target_properties(${NAME} PROPERTIES LINK_FLAGS "-rpath @executable_path/../Frameworks")
-else()
-		set_target_properties(${NAME} PROPERTIES LINK_FLAGS "-rpath @executable_path/../lib")
-endif()
-    else()
-    	add_executable(${NAME} ${${NAME}_SRC_FILES} ${${NAME}_HDR_FILES} )
-    endif()
-
-    target_link_libraries(${NAME} ${ARGN})
-endmacro()
-
-if(BUILD_SAMPLES)
-    include(SampleFileList)
-
-    set(samples treeview customlog drag loaddocument transform bitmapfont animation benchmark)
-    set(tutorials template datagrid datagrid_tree tutorial_drag)
-    
-if(NOT BUILD_FRAMEWORK)
-    set(sample_LIBRARIES
-    	shell 
-    	RocketCore 
-    	RocketControls
-    	RocketDebugger
-    )
-else(NOT BUILD_FRAMEWORK)
-    set(sample_LIBRARIES
-    	shell 
-    	Rocket
-    )
-endif(NOT BUILD_FRAMEWORK)
-
-	# Find OpenGL 
-	find_package(OpenGL REQUIRED)
-    	   
-    if(OPENGL_FOUND)
-	include_directories(${OPENGL_INCLUDE_DIR})
-	list(APPEND sample_LIBRARIES ${OPENGL_LIBRARIES})
-    endif()
-    
-    # Set up required system libraries
-    if(WIN32)
-		if(SKIP_DIRECTX_SAMPLES)
-			message("-- Skipping all DirectX samples")
-			set(SKIP_DIRECTX9_SAMPLE ON)
-			set(SKIP_DIRECTX10_SAMPLE ON)
-		else()
-			message("-- Determing if DirectX samples can be built")
-			include(FindDirectX)
-			find_package(DirectX)
-			if(DirectX_FOUND)
-				set(DIRECTX_SAMPLE_LIST)
-				set(DIRECTX_SKIPPED_SAMPLE_LIST)
-
-				# We should be able to build DirectX 9 sample
-				message("-- Determing if DirectX samples can be built - Yes")
-
-				if(SKIP_DIRECTX9_SAMPLE)
-					message("-- Skipping build of DirectX 9 sample: User disabled")
-					list(APPEND DIRECTX_SKIPPED_SAMPLE_LIST "DirectX9 ")
-				else()
-					if(DirectX_LIBRARY)
-						if(DirectX_D3DX9_LIBRARY)
-							list(APPEND DIRECTX_SAMPLE_LIST "DirectX9 ")
-						else()
-							set(SKIP_DIRECTX9_SAMPLE ON)
-							message("-- Skipping build of DirectX 9 sample: DirectX_D3DX9_LIBRARY not found")
-							list(APPEND DIRECTX_SKIPPED_SAMPLE_LIST "DirectX9 ")
-						endif()
-					else()
-						set(SKIP_DIRECTX9_SAMPLE ON)
-						message("-- Skipping build of DirectX 9 sample: DirectX_LIBRARY not found")
-						list(APPEND DIRECTX_SKIPPED_SAMPLE_LIST "DirectX9 ")
-					endif()
-				endif()
-
-				if(SKIP_DIRECTX10_SAMPLE)
-					message("-- Skipping build of DirectX 10 sample: User disabled")
-					list(APPEND DIRECTX_SKIPPED_SAMPLE_LIST "DirectX10 ")
-				else()
-					if(DirectX_D3D10_FOUND)
-						list(APPEND DIRECTX_SAMPLE_LIST "DirectX10 ")
-					else()
-						set(SKIP_DIRECTX10_SAMPLE ON)
-						message("-- Skipping build of DirectX 10 sample: Missing DirectX_D3D10_INCLUDE_DIR, DirectX_D3D10_LIBRARY or DirectX_D3DX10_LIBRARY")
-						list(APPEND DIRECTX_SKIPPED_SAMPLE_LIST "DirectX10 ")
-					endif()
-				endif()
-
-
-				if(DIRECTX_SAMPLE_LIST)
-					message("-- Enabled DirectX samples: " ${DIRECTX_SAMPLE_LIST})
-				endif()
-				if(DIRECTX_SKIPPED_SAMPLE_LIST)
-					message("-- Disabled DirectX samples: " ${DIRECTX_SKIPPED_SAMPLE_LIST})
-				endif()
-			else()
-				message("-- Determing if DirectX samples can be built - No")
-				set(SKIP_DIRECTX9_SAMPLE ON)
-				set(SKIP_DIRECTX10_SAMPLE ON)
-			endif()
-		endif()
-    elseif(APPLE)
-		include(FindCarbon)
-    	find_package(Carbon REQUIRED)
-    	
-    	if (Carbon_FOUND)
-    		include_directories(${Carbon_INCLUDE_DIR})
-        	list(APPEND sample_LIBRARIES ${Carbon_LIBRARIES})
-    	endif()
-    else()
-    	find_package(X11 REQUIRED)
-        if (X11_FOUND)
-        	list(APPEND sample_LIBRARIES ${X11_LIBRARIES})
-		# shell/src/x11/InputX11.cpp:InitialiseX11Keymap uses Xkb if
-		# possible instead of XGetKeyboardMapping for performance
-		if(X11_Xkb_FOUND)
-			FIND_PACKAGE_MESSAGE(X11 "Found X11 KBlib: ${X11_X11_LIB}" "[${X11_X11_LIB}][${X11_XkbINCLUDE_DIR}]")
-			add_definitions(-DHAS_X11XKBLIB)
-		endif()
-        endif()
-    endif()
-   
-    set(SAMPLES_DIR opt/Rocket/Samples CACHE PATH "path to samples dir")
-
-    # The samples and tutorials use the shell library
-    include_directories(${PROJECT_SOURCE_DIR}/Samples/shell/include)
-
-    # Build and install sample shell library
-    add_library(shell STATIC ${shell_SRC_FILES} ${shell_HDR_FILES})
-	set_property(TARGET shell PROPERTY CXX_STANDARD 14)
-	set_property(TARGET shell PROPERTY CXX_STANDARD_REQUIRED ON)
-
-    # Build and install the basic samples
-    foreach(sample ${samples})
-        bl_sample(${sample} ${sample_LIBRARIES})
-		
-		set_property(TARGET ${sample} PROPERTY CXX_STANDARD 14)
-		set_property(TARGET ${sample} PROPERTY CXX_STANDARD_REQUIRED ON)
-
-        # The samples always set this as their current working directory
-        install(DIRECTORY DESTINATION ${SAMPLES_DIR}/basic/${sample})
-        install(TARGETS ${sample} 
-        	RUNTIME DESTINATION ${SAMPLES_DIR}/${sample}
-        	BUNDLE DESTINATION ${SAMPLES_DIR})
-    endforeach()
-
-	if(WIN32)
-		if(NOT SKIP_DIRECTX9_SAMPLE)
-			include_directories(${DirectX_INCLUDE_DIR})
-
-			bl_sample(directx ${sample_LIBRARIES}  ${DirectX_LIBRARY} ${DirectX_D3DX9_LIBRARY})
-
-			# The samples always set this as their current working directory
-			install(DIRECTORY DESTINATION ${SAMPLES_DIR}/basic/directx)
-			install(TARGETS directx 
-				RUNTIME DESTINATION ${SAMPLES_DIR}/directx
-				BUNDLE DESTINATION ${SAMPLES_DIR})
-		endif()
-
-		if(NOT SKIP_DIRECTX10_SAMPLE)
-			include_directories(${DirectX_INCLUDE_DIR} ${DirectX_D3D10_INCLUDE_DIRS})
-
-			bl_sample(directx10 ${sample_LIBRARIES}  ${DirectX_D3D10_LIBRARIES})
-
-			# The samples always set this as their current working directory
-			install(DIRECTORY DESTINATION ${SAMPLES_DIR}/basic/directx10)
-			install(TARGETS directx10 
-				RUNTIME DESTINATION ${SAMPLES_DIR}/directx10
-				BUNDLE DESTINATION ${SAMPLES_DIR})
-		endif()
-	endif()
-
-    message("-- Can SDL2 sample be built")
-    find_package(SDL2)
-    if(SDL2_FOUND)
-	find_package(SDL2_image)
-	if(SDL2_IMAGE_FOUND)
-		find_package(GLEW)
-		if(GLEW_FOUND)
-        		message("-- Can SDL2 sample be built - yes")
-			include_directories(${SDL2_INCLUDE_DIR} ${GLEW_INCLUDE_DIR})
-
-			bl_sample(sdl2 ${sample_LIBRARIES}  ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARY} ${GLEW_LIBRARY})
-			set_property(TARGET sdl2 PROPERTY CXX_STANDARD 14)
-			set_property(TARGET sdl2 PROPERTY CXX_STANDARD_REQUIRED ON)
-		
-			# The samples always set this as their current working directory
-			install(DIRECTORY DESTINATION ${SAMPLES_DIR}/basic/sdl2)
-			install(TARGETS sdl2
-				RUNTIME DESTINATION ${SAMPLES_DIR}/sdl2
-				BUNDLE DESTINATION ${SAMPLES_DIR})
-		else()
-		        message("-- Can SDL2 sample be built - GLEW not found")
-		endif()
-	else()
-	        message("-- Can SDL2 sample be built - SDL2_image not found")
-	endif()
-    else()
-        message("-- Can SDL2 sample be built - SDL2 not found")
-    endif()
-
-
-	message("-- Can SFML 1.x sample be built")
-	find_package(SFML 1 COMPONENTS graphics window system)
-	if(NOT SFML_FOUND)
-		message("-- Can SFML 1.x sample be built - no")
-	elseif(SFML_VERSION_MAJOR GREATER 1)
-		message("-- Can SFML 1.x sample be built - no: Version 2 detected")
-	else()
-		message("-- Can SFML 1.x sample be built - yes")
-
-		include_directories(${SFML_INCLUDE_DIR})
-
-		bl_sample(sfml ${sample_LIBRARIES} ${SFML_LIBRARIES})
-			# The samples always set this as their current working directory
-			install(DIRECTORY DESTINATION ${SAMPLES_DIR}/basic/sfml)
-			install(TARGETS sfml
-				RUNTIME DESTINATION ${SAMPLES_DIR}/sfml
-				BUNDLE DESTINATION ${SAMPLES_DIR})
-	endif()
-
-	message("-- Can SFML 2.x sample be built")
-	if (WIN32)
-		find_package(SFML 2 COMPONENTS graphics window system main)
-	else()
-		find_package(SFML 2 COMPONENTS graphics window system)
-	endif()
-	if(NOT SFML_FOUND)
-		message("-- Can SFML 2.x sample be built - no")
-	else()
-		find_package(GLEW)
-                if(GLEW_FOUND)
-			message("-- Can SFML 2.x sample be built - yes: with GLEW")
-			include_directories(${SFML_INCLUDE_DIR} ${GLEW_INCLUDE_DIR})
-			add_definitions( -DENABLE_GLEW )
-			bl_sample(sfml2 ${sample_LIBRARIES} ${SFML_LIBRARIES} ${GLEW_LIBRARY})
-		else()
-			message("-- Can SFML 2.x sample be built - yes: without GLEW")
-			include_directories(${SFML_INCLUDE_DIR})
-			bl_sample(sfml2 ${sample_LIBRARIES} ${SFML_LIBRARIES})
-		endif()
-		
-			set_property(TARGET sfml2 PROPERTY CXX_STANDARD 14)
-			set_property(TARGET sfml2 PROPERTY CXX_STANDARD_REQUIRED ON)
-			
-			# The samples always set this as their current working directory
-			install(DIRECTORY DESTINATION ${SAMPLES_DIR}/basic/sfml2)
-			install(TARGETS sfml2
-				RUNTIME DESTINATION ${SAMPLES_DIR}/sfml2
-				BUNDLE DESTINATION ${SAMPLES_DIR})
-	endif()
-
-    # Build and install the tutorials
-    foreach(tutorial ${tutorials})
-        bl_sample(${tutorial} ${sample_LIBRARIES})
-
-		set_property(TARGET ${tutorial} PROPERTY CXX_STANDARD 14)
-		set_property(TARGET ${tutorial} PROPERTY CXX_STANDARD_REQUIRED ON)
-		
-        # The tutorials always set this as their current working directory
-        install(DIRECTORY DESTINATION ${SAMPLES_DIR}/tutorial/${tutorial})
-        install(TARGETS ${tutorial}
-                RUNTIME DESTINATION ${SAMPLES_DIR}/${tutorial}
-                BUNDLE DESTINATION ${SAMPLES_DIR})
-    endforeach()
-
-    # Build and install invaders sample
-    bl_sample(invaders ${sample_LIBRARIES})
-	set_property(TARGET invaders PROPERTY CXX_STANDARD 14)
-	set_property(TARGET invaders PROPERTY CXX_STANDARD_REQUIRED ON)
-    install(DIRECTORY DESTINATION ${SAMPLES_DIR}/invaders)
-    install(TARGETS invaders 
-    	RUNTIME DESTINATION ${SAMPLES_DIR}/invaders
-    	BUNDLE DESTINATION ${SAMPLES_DIR})
-
-	if(BUILD_PYTHON_BINDINGS)
-	    # Build and install pyinvaders sample
-	    bl_sample(pyinvaders ${sample_LIBRARIES} ${PYTHON_LIBRARIES} ${PY_BINDINGS_LINK_LIBS})
-		set_property(TARGET pyinvaders PROPERTY CXX_STANDARD 14)
-		set_property(TARGET pyinvaders PROPERTY CXX_STANDARD_REQUIRED ON)
-	    install(DIRECTORY DESTINATION ${SAMPLES_DIR}/pyinvaders)
-	    install(TARGETS pyinvaders
-	    	RUNTIME DESTINATION ${SAMPLES_DIR}/pyinvaders
-	    	BUNDLE DESTINATION ${SAMPLES_DIR})
-	endif()
-    
-    if(BUILD_LUA_BINDINGS)
-        bl_sample(luainvaders RocketCoreLua RocketControlsLua ${sample_LIBRARIES} ${LUA_BINDINGS_LINK_LIBS})
-		set_property(TARGET luainvaders PROPERTY CXX_STANDARD 14)
-		set_property(TARGET luainvaders PROPERTY CXX_STANDARD_REQUIRED ON)
-        install(DIRECTORY DESTINATION ${SAMPLES_DIR}/luainvaders)
-        install(TARGETS luainvaders 
-        	RUNTIME DESTINATION ${SAMPLES_DIR}/luainvaders
-        	BUNDLE DESTINATION ${SAMPLES_DIR})
-    endif()
-endif()
-
-
-#===================================
-# Installation =====================
-#===================================
-
-if(BUILD_LUA_BINDINGS AND BUILD_PYTHON_BINDINGS)
-    install(DIRECTORY ${PROJECT_SOURCE_DIR}/Include/Rocket
-            DESTINATION include
-    )
-else()
-	if(NOT BUILD_LUA_BINDINGS AND NOT BUILD_PYTHON_BINDINGS)
-	    install(DIRECTORY ${PROJECT_SOURCE_DIR}/Include/Rocket
-	            DESTINATION include
-	            PATTERN "Python" EXCLUDE
-	            PATTERN "Lua" EXCLUDE
-	    )
-	else()
-		if(BUILD_PYTHON_BINDINGS)
-			install(FILES ${PROJECT_SOURCE_DIR}/bin/rocket.py
-				DESTINATION ${PYTHON_INSTDIR}
-			)
-			install(DIRECTORY ${PROJECT_SOURCE_DIR}/Include/Rocket
-				DESTINATION include
-				PATTERN "Lua" EXCLUDE
-			)
-		else()
-			if(BUILD_LUA_BINDINGS)
-				install(DIRECTORY ${PROJECT_SOURCE_DIR}/Include/Rocket
-					DESTINATION include
-					PATTERN "Python" EXCLUDE
-				)
-			else()
-				message(FATAL_ERROR "ASSERT: Unexpected option combination, this is a logical impossibility.")
-			endif()
-		endif()
-	endif()
-endif()
-
-if(BUILD_SAMPLES)
-    install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/assets
-            DESTINATION ${SAMPLES_DIR}
-    )
-
-    install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/tutorial/template/data
-            DESTINATION ${SAMPLES_DIR}/tutorial/template
-    )
-    install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid/data
-            DESTINATION ${SAMPLES_DIR}/tutorial/datagrid
-    )
-    install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid_tree/data
-            DESTINATION ${SAMPLES_DIR}/tutorial/datagrid_tree
-    )
-    install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/tutorial/tutorial_drag/data
-            DESTINATION ${SAMPLES_DIR}/tutorial/tutorial_drag
-    )
-    install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/basic/treeview/data
-            DESTINATION ${SAMPLES_DIR}/basic/treeview
-    )
-    install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/basic/drag/data
-            DESTINATION ${SAMPLES_DIR}/basic/drag
-    )
-    install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/invaders/data
-            DESTINATION ${SAMPLES_DIR}/invaders
-    )
-
-    if(BUILD_PYTHON_BINDINGS)
-        install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/data
-                DESTINATION ${SAMPLES_DIR}/pyinvaders
-        )
-    endif()
-
-    if(BUILD_LUA_BINDINGS)
-        install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/luainvaders/data 
-                DESTINATION ${SAMPLES_DIR}/luainvaders
-        )
-        install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/luainvaders/lua 
-                DESTINATION ${SAMPLES_DIR}/luainvaders
-        )
-    endif()
-endif()
-
-#===================================
-# Generate Config.cmake files ======
-#===================================
-
-# Try to include helper module
-include(CMakePackageConfigHelpers OPTIONAL
-  RESULT_VARIABLE PkgHelpers_AVAILABLE)
-# guard against older versions of cmake which do not provide it
-if(PkgHelpers_AVAILABLE)
-
-  set (INCLUDE_INSTALL_DIR "include")
-  set (LIB_INSTALL_DIR "lib")
-  set (INCLUDE_DIR "${PROJECT_SOURCE_DIR}/Include")
-
-  # generate configuration for install tree
-  configure_package_config_file(libRocketConfig.cmake.install.in
-    ${CMAKE_CURRENT_BINARY_DIR}/install/libRocketConfig.cmake
-    INSTALL_DESTINATION ${LIB_INSTALL_DIR}/libRocket/cmake
-    PATH_VARS INCLUDE_INSTALL_DIR LIB_INSTALL_DIR)
-  write_basic_package_version_file(
-    ${CMAKE_CURRENT_BINARY_DIR}/install/libRocketConfigVersion.cmake
-    VERSION ${PROJECT_VERSION}
-    COMPATIBILITY SameMajorVersion )
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/install/libRocketConfig.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/install/libRocketConfigVersion.cmake
-    DESTINATION ${LIB_INSTALL_DIR}/libRocket/cmake )
-  install(EXPORT libRocketTargets
-    DESTINATION ${LIB_INSTALL_DIR}/libRocket/cmake)
-
-  # generate configuration for build tree
-  configure_package_config_file(libRocketConfig.cmake.build.in
-    ${CMAKE_CURRENT_BINARY_DIR}/libRocketConfig.cmake
-    INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
-    PATH_VARS INCLUDE_DIR CMAKE_CURRENT_BINARY_DIR)
-  export(TARGETS ${ROCKET_EXPORTED_TARGETS}
-    FILE "${CMAKE_CURRENT_BINARY_DIR}/libRocketTargets.cmake")
-  write_basic_package_version_file(
-    ${CMAKE_CURRENT_BINARY_DIR}/libRocketConfigVersion.cmake
-    VERSION ${PROJECT_VERSION}
-    COMPATIBILITY SameMajorVersion )
-  set(libRocket_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE PATH "The directory containing a CMake configuration file for libRocket.")
-else()
-  message("If you wish to use find_package(libRocket) in your own project to find libRocket library"
-    " please update cmake to version which provides CMakePackageConfighelpers module"
-    " or write generators for libRocketConfig.cmake by yourself.")
-endif()

Build/Rocket_Prefix.pch

@@ -1,28 +0,0 @@
-/*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
- *
- * For the latest information, see http://www.librocket.com
- *
- * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- */
-
-#include <Rocket/Core.h>

Build/cmake/v2fixes/FindFreetype-v2fix.cmake

@@ -1,142 +0,0 @@
-#.rst:
-# FindFreetype
-# ------------
-#
-# Locate FreeType library
-#
-# This module defines
-#
-# ::
-#
-#   FREETYPE_LIBRARIES, the library to link against
-#   FREETYPE_FOUND, if false, do not try to link to FREETYPE
-#   FREETYPE_INCLUDE_DIRS, where to find headers.
-#   FREETYPE_VERSION_STRING, the version of freetype found (since CMake 2.8.8)
-#   This is the concatenation of the paths:
-#   FREETYPE_INCLUDE_DIR_ft2build
-#   FREETYPE_INCLUDE_DIR_freetype2
-#
-#
-#
-# $FREETYPE_DIR is an environment variable that would correspond to the
-# ./configure --prefix=$FREETYPE_DIR used in building FREETYPE.
-
-#=============================================================================
-# Copyright 2007-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-# Created by Eric Wing.
-# Modifications by Alexander Neundorf.
-# This file has been renamed to "FindFreetype.cmake" instead of the correct
-# "FindFreeType.cmake" in order to be compatible with the one from KDE4, Alex.
-
-# Ugh, FreeType seems to use some #include trickery which
-# makes this harder than it should be. It looks like they
-# put ft2build.h in a common/easier-to-find location which
-# then contains a #include to a more specific header in a
-# more specific location (#include <freetype/config/ftheader.h>).
-# Then from there, they need to set a bunch of #define's
-# so you can do something like:
-# #include FT_FREETYPE_H
-# Unfortunately, using CMake's mechanisms like include_directories()
-# wants explicit full paths and this trickery doesn't work too well.
-# I'm going to attempt to cut out the middleman and hope
-# everything still works.
-find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
-  HINTS
-    ENV FREETYPE_DIR
-  PATHS
-    /usr/X11R6
-    /usr/local/X11R6
-    /usr/local/X11
-    /usr/freeware
-    ENV GTKMM_BASEPATH
-    [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
-  PATH_SUFFIXES include/freetype2 include
-)
-
-find_path(FREETYPE_INCLUDE_DIR_freetype2
-  NAMES
-    freetype/config/ftheader.h
-    config/ftheader.h
-  HINTS
-    ENV FREETYPE_DIR
-  PATHS
-    /usr/X11R6
-    /usr/local/X11R6
-    /usr/local/X11
-    /usr/freeware
-    ENV GTKMM_BASEPATH
-    [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
-  PATH_SUFFIXES include/freetype2 include
-)
-
-find_library(FREETYPE_LIBRARY
-  NAMES freetype libfreetype freetype219
-  HINTS
-    ENV FREETYPE_DIR
-  PATH_SUFFIXES lib
-  PATHS
-    /usr/X11R6
-    /usr/local/X11R6
-    /usr/local/X11
-    /usr/freeware
-    ENV GTKMM_BASEPATH
-    [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
-)
-
-# set the user variables
-if(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
-  set(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
-  list(REMOVE_DUPLICATES FREETYPE_INCLUDE_DIRS)
-endif()
-set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
-
-if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
-  set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
-elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
-  set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
-endif()
-
-if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
-    file(STRINGS "${FREETYPE_H}" freetype_version_str
-         REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
-
-    unset(FREETYPE_VERSION_STRING)
-    foreach(VPART MAJOR MINOR PATCH)
-        foreach(VLINE ${freetype_version_str})
-            if(VLINE MATCHES "^#[\t ]*define[\t ]+FREETYPE_${VPART}")
-                string(REGEX REPLACE "^#[\t ]*define[\t ]+FREETYPE_${VPART}[\t ]+([0-9]+)$" "\\1"
-                       FREETYPE_VERSION_PART "${VLINE}")
-                if(FREETYPE_VERSION_STRING)
-                    set(FREETYPE_VERSION_STRING "${FREETYPE_VERSION_STRING}.${FREETYPE_VERSION_PART}")
-                else()
-                    set(FREETYPE_VERSION_STRING "${FREETYPE_VERSION_PART}")
-                endif()
-                unset(FREETYPE_VERSION_PART)
-            endif()
-        endforeach()
-    endforeach()
-endif()
-
-
-# handle the QUIETLY and REQUIRED arguments and set FREETYPE_FOUND to TRUE if
-# all listed variables are TRUE
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Freetype
-                                  REQUIRED_VARS FREETYPE_LIBRARY FREETYPE_INCLUDE_DIRS
-                                  VERSION_VAR FREETYPE_VERSION_STRING)
-
-mark_as_advanced(FREETYPE_LIBRARY FREETYPE_INCLUDE_DIR_freetype2 FREETYPE_INCLUDE_DIR_ft2build)

Build/cmake/v2fixes/FindLua-v2fix.cmake

@@ -1,190 +0,0 @@
-#.rst:
-# FindLua
-# -------
-#
-#
-#
-# Locate Lua library This module defines
-#
-# ::
-#
-#   LUA_FOUND          - if false, do not try to link to Lua
-#   LUA_LIBRARIES      - both lua and lualib
-#   LUA_INCLUDE_DIR    - where to find lua.h
-#   LUA_VERSION_STRING - the version of Lua found
-#   LUA_VERSION_MAJOR  - the major version of Lua
-#   LUA_VERSION_MINOR  - the minor version of Lua
-#   LUA_VERSION_PATCH  - the patch version of Lua
-#
-#
-#
-# Note that the expected include convention is
-#
-# ::
-#
-#   #include "lua.h"
-#
-# and not
-#
-# ::
-#
-#   #include <lua/lua.h>
-#
-# This is because, the lua location is not standardized and may exist in
-# locations other than lua/
-
-#=============================================================================
-# Copyright 2007-2009 Kitware, Inc.
-# Copyright 2013 Rolf Eike Beer <[email protected]>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 
-# * Neither the names of Kitware, Inc., the Insight Software Consortium,
-# nor the names of their contributors may be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#===========================================================================
-
-unset(_lua_include_subdirs)
-unset(_lua_library_names)
-
-# this is a function only to have all the variables inside go away automatically
-function(set_lua_version_vars)
-    set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
-
-    if (Lua_FIND_VERSION_EXACT)
-        if (Lua_FIND_VERSION_COUNT GREATER 1)
-            set(lua_append_versions ${Lua_FIND_VERSION_MAJOR} ${Lua_FIND_VERSION_MINOR})
-        endif ()
-    elseif (Lua_FIND_VERSION)
-        # once there is a different major version supported this should become a loop
-        if (NOT Lua_FIND_VERSION_MAJOR GREATER 5)
-            if (Lua_FIND_VERSION_COUNT EQUAL 1)
-                set(lua_append_versions ${LUA_VERSIONS5})
-            else ()
-                foreach (subver IN LISTS LUA_VERSIONS5)
-                    if (NOT subver VERSION_LESS ${Lua_FIND_VERSION})
-                        list(APPEND lua_append_versions ${subver})
-                    endif ()
-                endforeach ()
-            endif ()
-        endif ()
-    else ()
-        # once there is a different major version supported this should become a loop
-        set(lua_append_versions ${LUA_VERSIONS5})
-    endif ()
-
-    foreach (ver IN LISTS lua_append_versions)
-        string(REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}")
-        list(APPEND _lua_include_subdirs
-             include/lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
-             include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-             include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-        )
-        list(APPEND _lua_library_names
-             lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
-             lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-             lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-        )
-    endforeach ()
-
-    set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)
-    set(_lua_library_names "${_lua_library_names}" PARENT_SCOPE)
-endfunction(set_lua_version_vars)
-
-set_lua_version_vars()
-
-find_path(LUA_INCLUDE_DIR lua.h
-  HINTS
-    ENV LUA_DIR
-  PATH_SUFFIXES ${_lua_include_subdirs} include/lua include
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt
-)
-unset(_lua_include_subdirs)
-
-find_library(LUA_LIBRARY
-  NAMES ${_lua_library_names} lua
-  HINTS
-    ENV LUA_DIR
-  PATH_SUFFIXES lib
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-)
-unset(_lua_library_names)
-
-if (LUA_LIBRARY)
-    # include the math library for Unix
-    if (UNIX AND NOT APPLE AND NOT BEOS)
-        find_library(LUA_MATH_LIBRARY m)
-        set(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
-    # For Windows and Mac, don't need to explicitly include the math library
-    else ()
-        set(LUA_LIBRARIES "${LUA_LIBRARY}")
-    endif ()
-endif ()
-
-if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
-    # At least 5.[012] have different ways to express the version
-    # so all of them need to be tested. Lua 5.2 defines LUA_VERSION
-    # and LUA_RELEASE as joined by the C preprocessor, so avoid those.
-    file(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_strings
-         REGEX "^#define[ \t]+LUA_(RELEASE[ \t]+\"Lua [0-9]|VERSION([ \t]+\"Lua [0-9]|_[MR])).*")
-
-    string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MAJOR ";${lua_version_strings};")
-    if (LUA_VERSION_MAJOR MATCHES "^[0-9]+$")
-        string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MINOR ";${lua_version_strings};")
-        string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_PATCH ";${lua_version_strings};")
-        set(LUA_VERSION_STRING "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.${LUA_VERSION_PATCH}")
-    else ()
-        string(REGEX REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
-        if (NOT LUA_VERSION_STRING MATCHES "^[0-9.]+$")
-            string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
-        endif ()
-        string(REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" LUA_VERSION_MAJOR "${LUA_VERSION_STRING}")
-        string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" LUA_VERSION_MINOR "${LUA_VERSION_STRING}")
-        string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" LUA_VERSION_PATCH "${LUA_VERSION_STRING}")
-    endif ()
-
-    unset(lua_version_strings)
-endif()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
-# all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua
-                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
-                                  VERSION_VAR LUA_VERSION_STRING)
-
-mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARY LUA_MATH_LIBRARY)

Build/libRocketConfig.cmake.build.in

@@ -1,11 +0,0 @@
-@PACKAGE_INIT@
-
-set_and_check(libRocket_INCLUDE_DIRS "@PACKAGE_INCLUDE_DIR@")
-set(libRocket_LIBRARIES @ROCKET_EXPORTED_TARGETS@)
-list(GET libRocket_LIBRARIES 0 ROCKET_FIRST_TARGET)
-
-if(NOT (TARGET ${ROCKET_FIRST_TARGET}))
-  include("${CMAKE_CURRENT_LIST_DIR}/libRocketTargets.cmake")
-endif()
-
-check_required_components(libRocket)

Build/libRocketConfig.cmake.install.in

@@ -1,7 +0,0 @@
-@PACKAGE_INIT@
-
-set_and_check(libRocket_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")
-set(libRocket_LIBRARIES @ROCKET_EXPORTED_TARGETS@)
-include("${CMAKE_CURRENT_LIST_DIR}/libRocketTargets.cmake")
-
-check_required_components(libRocket)

CMakeLists.txt

@@ -0,0 +1,717 @@
+#===================================
+# Build script for RmlUi ===========
+#===================================
+
+cmake_minimum_required(VERSION 3.0)
+
+if(APPLE)
+	# This has to be before most other options so CMake properly handles the 
+	# compiler variables, it MUST bebefore the project() definition
+	if(IOS_PLATFORM)
+		set(CMAKE_TOOLCHAIN_FILE Cmake/Platform/iOS.cmake)
+	endif(IOS_PLATFORM)
+
+	option(BUILD_UNIVERSAL_BINARIES "Build universal binaries for all architectures supported" ON)
+	if (NOT CMAKE_OSX_ARCHITECTURES AND BUILD_UNIVERSAL_BINARIES)
+		if(IOS)
+			# set the architecture for iOS 
+			if (${IOS_PLATFORM} STREQUAL "OS")
+				set (IOS_ARCH armv6 armv7 armv7s arm64)
+				set (CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} CACHE string  "Build architecture for iOS")
+			else (${IOS_PLATFORM} STREQUAL "OS")
+				set (IOS_ARCH x86_64)
+				set (CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} CACHE string  "Build architecture for iOS Simulator")
+			endif (${IOS_PLATFORM} STREQUAL "OS")
+
+		else(IOS)
+			# set the architectures for OS X
+			set (OSXI_ARCH x86_64)
+			set (CMAKE_OSX_ARCHITECTURES ${OSXI_ARCH} CACHE string  "Build architecture for OS X universal binaries")		
+		endif(IOS)
+	endif (NOT CMAKE_OSX_ARCHITECTURES AND BUILD_UNIVERSAL_BINARIES)
+endif(APPLE)
+
+if(COMMAND cmake_policy)
+	cmake_policy(SET CMP0015 NEW)
+endif(COMMAND cmake_policy)
+
+# Enable the use of MACOSX_RPATH by default for CMake v3.0+; this effectively 
+# allows plug 'n' play functionality, so to speak -- the resulting shared 
+# library files can simply be copied over into the end-user's application 
+# bundle or framework bundle. No mucking around with install_name_tool.
+#
+# 	See also: 
+# cmake --help-policy cmp0042
+# http://www.kitware.com/blog/home/post/510
+if(POLICY CMP0042)
+	cmake_policy(SET CMP0042 NEW)
+endif(POLICY CMP0042)
+if(POLICY CMP0074)
+	cmake_policy(SET CMP0074 NEW)
+endif(POLICY CMP0074)
+
+project(RmlUi C CXX)
+
+# paths
+include(GNUInstallDirs)
+
+set(RMLUI_VERSION_MAJOR 2)
+set(RMLUI_VERSION_MINOR 0)
+set(RMLUI_VERSION_PATCH 0)
+set(RMLUI_VERSION_TWEAK 0)
+set(PROJECT_VERSION ${RMLUI_VERSION_MAJOR}.${RMLUI_VERSION_MINOR}.${RMLUI_VERSION_PATCH}.${RMLUI_VERSION_TWEAK})
+
+# Search in the 'cmake' directory for additional CMake modules.
+list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/Cmake;${PROJECT_SOURCE_DIR}/Cmake/Modules)
+
+#===================================
+# Environment tests ================
+#===================================
+
+include(TestForANSIForScope)
+include(TestForANSIStreamHeaders)
+include(TestForSTDNamespace)
+
+#===================================
+# Provide hints as to where depends=
+# might be found                   =
+#===================================
+
+if(NOT DEFINED ENV{FREETYPE_DIR})
+	set(ENV{FREETYPE_DIR} "${PROJECT_SOURCE_DIR}/Dependencies")
+endif()
+
+if(NOT DEFINED ENV{LUA_DIR})
+	set(ENV{LUA_DIR} "${PROJECT_SOURCE_DIR}/Dependencies")
+endif()
+
+if(NOT DEFINED ENV{SDL2DIR})
+	set(ENV{SDL2DIR} "${PROJECT_SOURCE_DIR}/Dependencies")
+endif()
+
+if(NOT DEFINED ENV{SDL2_IMAGE_DIR})
+	set(ENV{SDL2_IMAGE_DIR} "${PROJECT_SOURCE_DIR}/Dependencies")
+endif()
+
+if(NOT DEFINED ENV{SFML_ROOT})
+	set(ENV{SFML_ROOT} "${PROJECT_SOURCE_DIR}/Dependencies")
+endif()
+
+#===================================
+# Plaform specific global hacks ====
+#===================================
+
+if(APPLE)
+	# Disables naked builtins from AssertMacros.h which
+	# This prevents naming collisions such as those from the check()
+	# function macro with LuaType::check
+	add_definitions(-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0)
+endif(APPLE)
+
+#===================================
+# Build options ====================
+#===================================
+
+if(NOT CMAKE_BUILD_TYPE)
+	set(CMAKE_BUILD_TYPE Release CACHE STRING
+		"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+		FORCE)
+endif()
+
+if(NOT IOS)
+	option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+endif(NOT IOS)
+
+option(BUILD_LUA_BINDINGS "Build Lua bindings" OFF)
+
+if(APPLE)
+	option(BUILD_FRAMEWORK "Build Framework bundle for OSX" OFF)
+endif()
+
+option(BUILD_SAMPLES "Build samples" OFF)
+if(WIN32)
+	option(SKIP_DIRECTX_SAMPLES "Skip build of all DirectX related samples. Only applies if BUILD_SAMPLES is ON" ON)
+	option(SKIP_DIRECTX10_SAMPLE "Skip build of DirectX 10 related sample. Only applies if BUILD_SAMPLES is ON and SKIP_DIRECTX_SAMPLES is OFF" ON)
+endif()
+
+if(APPLE)
+	if(IOS)
+		if(BUILD_SHARED_LIBS)
+			message(FATAL_ERROR "BUILD_SHARED_LIBS must be OFF for iOS builds.  iOS does not support shared libraries.")
+		endif(BUILD_SHARED_LIBS)
+	endif(IOS)
+
+	if(BUILD_FRAMEWORK)
+		if(NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode")
+			message(FATAL_ERROR "You should use Xcode generator with BUILD_FRAMEWORK enabled")
+		endif()
+		if(NOT BUILD_SHARED_LIBS)
+			message(FATAL_ERROR "BUILD_SHARED_LIBS must be ON with BUILD_FRAMEWORK enabled")
+		endif()
+	endif()
+else(APPLE)
+	if(BUILD_FRAMEWORK)
+		message(FATAL_ERROR "BUILD_FRAMEWORK is only supported on Mac OS X with the Xcode generator")
+	endif()
+endif(APPLE)
+
+if(NOT BUILD_SHARED_LIBS)
+	add_definitions(-DRMLUI_STATIC_LIB)
+endif()
+
+#===================================
+# Find dependencies ================
+#===================================
+
+# FreeType
+find_package(Freetype REQUIRED)	
+
+if(FREETYPE_FOUND)
+	include_directories(${FREETYPE_INCLUDE_DIRS})
+	link_directories(${FREETYPE_LINK_DIRS})
+	list(APPEND CORE_LINK_LIBS ${FREETYPE_LIBRARY})
+endif()
+
+#Lua
+if(BUILD_LUA_BINDINGS)
+	find_package(Lua)
+	if(LUA_FOUND)
+		include_directories(${LUA_INCLUDE_DIR})
+		list(APPEND LUA_BINDINGS_LINK_LIBS ${LUA_LIBRARIES})
+	endif()
+endif()
+
+
+#===================================
+# Setup paths ======================
+#===================================
+
+include_directories(
+	${PROJECT_SOURCE_DIR}/Include
+)
+
+# Include list of source files
+include(FileList)
+
+if(NOT BUILD_FRAMEWORK)
+#===================================
+# Build libraries ==================
+#===================================
+
+set(LIBRARIES Core Controls Debugger)
+
+foreach(library ${LIBRARIES})
+	set(NAME Rml${library})
+
+	add_library(${NAME}
+		${${library}_HDR_FILES}
+		${${library}_PUB_HDR_FILES}
+		${MASTER_${library}_PUB_HDR_FILES}
+		${${library}_SRC_FILES}
+	)
+
+	set_target_properties(${NAME} PROPERTIES
+	   VERSION ${PROJECT_VERSION}
+	   SOVERSION ${RMLUI_VERSION_MAJOR}
+	)
+	
+	if (MSVC)
+		target_compile_options(${NAME} PUBLIC "/MP")
+	endif(MSVC)
+	
+	set_property(TARGET ${NAME} PROPERTY CXX_STANDARD 14)
+	set_property(TARGET ${NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
+	
+	install(TARGETS ${NAME}
+		EXPORT RmlUiTargets
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+	)
+	
+
+	set(RMLUI_EXPORTED_TARGETS ${RMLUI_EXPORTED_TARGETS} ${NAME})
+endforeach(library)
+
+if (MSVC)
+	target_compile_options(RmlCore PRIVATE "/Yuprecompiled.h")
+	set_source_files_properties(${PROJECT_SOURCE_DIR}/Source/Core/precompiled.cpp PROPERTIES COMPILE_FLAGS "/Ycprecompiled.h")
+endif(MSVC)
+
+else(NOT BUILD_FRAMEWORK)
+	#===================================
+	# Build combined Framework =========
+	#===================================
+
+	set(NAME Rml)
+
+	set(MASTER_PUB_HDR_FILES
+		${MASTER_Core_PUB_HDR_FILES}
+		${MASTER_Controls_PUB_HDR_FILES}
+		${MASTER_Debugger_PUB_HDR_FILES}
+	)
+
+	add_library(${NAME}
+		${Core_HDR_FILES}
+		${MASTER_Core_PUB_HDR_FILES}
+		${Core_PUB_HDR_FILES}
+		${Core_SRC_FILES}
+		${Controls_HDR_FILES}
+		${MASTER_Controls_PUB_HDR_FILES}
+		${Controls_PUB_HDR_FILES}
+		${Controls_SRC_FILES}
+		${Debugger_HDR_FILES}
+		${MASTER_Debugger_PUB_HDR_FILES}
+		${Debugger_PUB_HDR_FILES}
+		${Debugger_SRC_FILES}
+	)
+
+	set_target_properties(${NAME} PROPERTIES
+		VERSION ${PROJECT_VERSION}
+		SOVERSION ${RMLUI_VERSION_MAJOR}
+	)
+
+	set_property(SOURCE ${MASTER_PUB_HDR_FILES}
+		PROPERTY MACOSX_PACKAGE_LOCATION Headers
+	)
+	set_property(SOURCE ${Core_PUB_HDR_FILES}
+		PROPERTY MACOSX_PACKAGE_LOCATION Headers/Core
+	)
+	set_property(SOURCE ${Controls_PUB_HDR_FILES}
+		PROPERTY MACOSX_PACKAGE_LOCATION Headers/Controls
+	)
+	set_property(SOURCE ${Debugger_PUB_HDR_FILES}
+		PROPERTY MACOSX_PACKAGE_LOCATION Headers/Debugger
+	)
+	set_target_properties(${NAME} PROPERTIES
+		FRAMEWORK TRUE
+		FRAMEWORK_VERSION ${PROJECT_VERSION}
+		MACOSX_FRAMEWORK_IDENTIFIER com.rmlui.${NAME}
+		MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${RMLUI_VERSION_MAJOR}.${RMLUI_VERSION_MINOR}.${RMLUI_VERSION_PATCH}.${RMLUI_VERSION_TWEAK}
+		MACOSX_FRAMEWORK_BUNDLE_VERSION ${PROJECT_VERSION}
+		XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"
+		PUBLIC_HEADER ${MASTER_PUB_HDR_FILES}
+	)
+
+	install(TARGETS ${NAME}
+		EXPORT RmlUiTargets
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+		FRAMEWORK DESTINATION Library/Frameworks
+	)
+
+	set(RMLUI_EXPORTED_TARGETS ${RMLUI_EXPORTED_TARGETS} ${NAME})
+endif(NOT BUILD_FRAMEWORK)
+
+# Build Lua bindings
+if(BUILD_LUA_BINDINGS)
+	set(LIBRARIES Core Controls)
+
+	foreach(library ${LIBRARIES})
+		set(NAME Rml${library}Lua)
+
+		add_library(${NAME} ${Lua${library}_SRC_FILES}
+			${Lua${library}_HDR_FILES}
+			${Lua${library}_PUB_HDR_FILES}
+		)
+
+		set_target_properties(${NAME} PROPERTIES
+		   VERSION ${PROJECT_VERSION}
+		   SOVERSION ${RMLUI_VERSION_MAJOR}
+		)
+
+		set_property(TARGET ${NAME} PROPERTY CXX_STANDARD 14)
+		set_property(TARGET ${NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
+
+		install(TARGETS ${NAME}
+			EXPORT RmlUiTargets
+			LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+			ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+			RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+		)
+		
+		set(RMLUI_EXPORTED_TARGETS ${RMLUI_EXPORTED_TARGETS} ${NAME})
+	endforeach(library)
+endif()
+
+
+#===================================
+# Link libraries ===================
+#===================================
+
+if(NOT BUILD_FRAMEWORK)
+target_link_libraries(RmlCore ${CORE_LINK_LIBS})
+target_link_libraries(RmlControls RmlCore)
+target_link_libraries(RmlDebugger RmlCore)
+else(NOT BUILD_FRAMEWORK)
+target_link_libraries(Rml ${CORE_LINK_LIBS})
+endif(NOT BUILD_FRAMEWORK)
+
+if(BUILD_LUA_BINDINGS)
+	if(NOT BUILD_FRAMEWORK)
+		target_link_libraries(RmlCoreLua RmlCore ${LUA_BINDINGS_LINK_LIBS})
+		target_link_libraries(RmlControlsLua RmlControls RmlCoreLua ${LUA_BINDINGS_LINK_LIBS})
+	else(NOT BUILD_FRAMEWORK)
+		target_link_libraries(RmlCoreLua Rml ${LUA_BINDINGS_LINK_LIBS})
+		target_link_libraries(RmlControlsLua Rml RmlCoreLua ${LUA_BINDINGS_LINK_LIBS})
+	endif(NOT BUILD_FRAMEWORK)
+endif()
+
+
+#===================================
+# Build samples ====================
+#===================================
+
+# Build and link the samples
+macro(bl_sample NAME)
+	if (WIN32)
+		add_executable(${NAME} WIN32 ${${NAME}_SRC_FILES} ${${NAME}_HDR_FILES} )
+	elseif(APPLE)
+		add_executable(${NAME} MACOSX_BUNDLE ${${NAME}_SRC_FILES} ${${NAME}_HDR_FILES} )
+
+		# The first rpath is to the proper location where the framework/library SHOULD be, the second is to the location actually seen
+		# in the build environment
+		if(BUILD_FRAMEWORK)
+			set_target_properties(${NAME} PROPERTIES LINK_FLAGS "-rpath @executable_path/../Frameworks")
+		else()
+			set_target_properties(${NAME} PROPERTIES LINK_FLAGS "-rpath @executable_path/../lib")
+		endif()
+	else()
+		add_executable(${NAME} ${${NAME}_SRC_FILES} ${${NAME}_HDR_FILES} )
+	endif()
+
+	target_link_libraries(${NAME} ${ARGN})
+endmacro()
+
+if(BUILD_SAMPLES)
+	include(SampleFileList)
+
+	set(samples treeview customlog drag loaddocument transform bitmapfont animation benchmark)
+	set(tutorials template datagrid datagrid_tree drag)
+	
+if(NOT BUILD_FRAMEWORK)
+	set(sample_LIBRARIES
+		shell 
+		RmlCore 
+		RmlControls
+		RmlDebugger
+	)
+else(NOT BUILD_FRAMEWORK)
+	set(sample_LIBRARIES
+		shell 
+		Rml
+	)
+endif(NOT BUILD_FRAMEWORK)
+
+	# Find OpenGL 
+	find_package(OpenGL REQUIRED)
+		   
+	if(OPENGL_FOUND)
+	include_directories(${OPENGL_INCLUDE_DIR})
+	list(APPEND sample_LIBRARIES ${OPENGL_LIBRARIES})
+	endif()
+	
+	# Set up required system libraries
+	if(WIN32)
+		if(SKIP_DIRECTX_SAMPLES)
+			message("-- Skipping all DirectX samples")
+			set(SKIP_DIRECTX10_SAMPLE ON)
+		else()
+			message("-- Determing if DirectX samples can be built")
+			include(FindDirectX)
+			find_package(DirectX)
+			if(DirectX_FOUND)
+				set(DIRECTX_SAMPLE_LIST)
+				set(DIRECTX_SKIPPED_SAMPLE_LIST)
+
+				message("-- Determing if DirectX samples can be built - Yes")
+
+				if(SKIP_DIRECTX10_SAMPLE)
+					message("-- Skipping build of DirectX 10 sample: User disabled")
+					list(APPEND DIRECTX_SKIPPED_SAMPLE_LIST "DirectX10 ")
+				else()
+					if(DirectX_D3D10_FOUND)
+						list(APPEND DIRECTX_SAMPLE_LIST "DirectX10 ")
+					else()
+						set(SKIP_DIRECTX10_SAMPLE ON)
+						message("-- Skipping build of DirectX 10 sample: Missing DirectX_D3D10_INCLUDE_DIR, DirectX_D3D10_LIBRARY or DirectX_D3DX10_LIBRARY")
+						list(APPEND DIRECTX_SKIPPED_SAMPLE_LIST "DirectX10 ")
+					endif()
+				endif()
+
+
+				if(DIRECTX_SAMPLE_LIST)
+					message("-- Enabled DirectX samples: " ${DIRECTX_SAMPLE_LIST})
+				endif()
+				if(DIRECTX_SKIPPED_SAMPLE_LIST)
+					message("-- Disabled DirectX samples: " ${DIRECTX_SKIPPED_SAMPLE_LIST})
+				endif()
+			else()
+				message("-- Determing if DirectX samples can be built - No")
+				set(SKIP_DIRECTX10_SAMPLE ON)
+			endif()
+		endif()
+	elseif(APPLE)
+		include(FindCarbon)
+		find_package(Carbon REQUIRED)
+		
+		if (Carbon_FOUND)
+			include_directories(${Carbon_INCLUDE_DIR})
+			list(APPEND sample_LIBRARIES ${Carbon_LIBRARIES})
+		endif()
+	else()
+		find_package(X11 REQUIRED)
+		if (X11_FOUND)
+			list(APPEND sample_LIBRARIES ${X11_LIBRARIES})
+		# shell/src/x11/InputX11.cpp:InitialiseX11Keymap uses Xkb if
+		# possible instead of XGetKeyboardMapping for performance
+		if(X11_Xkb_FOUND)
+			FIND_PACKAGE_MESSAGE(X11 "Found X11 KBlib: ${X11_X11_LIB}" "[${X11_X11_LIB}][${X11_XkbINCLUDE_DIR}]")
+			add_definitions(-DHAS_X11XKBLIB)
+		endif()
+		endif()
+	endif()
+   
+	set(SAMPLES_DIR opt/RmlUi/Samples CACHE PATH "path to samples dir")
+	
+	if(WIN32)
+		mark_as_advanced(SAMPLES_DIR)
+	endif()
+
+	# The samples and tutorials use the shell library
+	include_directories(${PROJECT_SOURCE_DIR}/Samples/shell/include)
+
+	# Build and install sample shell library
+	add_library(shell STATIC ${shell_SRC_FILES} ${shell_HDR_FILES})
+	set_property(TARGET shell PROPERTY CXX_STANDARD 14)
+	set_property(TARGET shell PROPERTY CXX_STANDARD_REQUIRED ON)
+
+	# Build and install the basic samples
+	foreach(sample ${samples})
+		bl_sample(${sample} ${sample_LIBRARIES})
+		
+		set_property(TARGET ${sample} PROPERTY CXX_STANDARD 14)
+		set_property(TARGET ${sample} PROPERTY CXX_STANDARD_REQUIRED ON)
+
+		# The samples always set this as their current working directory
+		install(DIRECTORY DESTINATION ${SAMPLES_DIR}/basic/${sample})
+		install(TARGETS ${sample} 
+			RUNTIME DESTINATION ${SAMPLES_DIR}/${sample}
+			BUNDLE DESTINATION ${SAMPLES_DIR})
+	endforeach()
+
+	if(WIN32)
+		if(NOT SKIP_DIRECTX10_SAMPLE)
+			include_directories(${DirectX_INCLUDE_DIR} ${DirectX_D3D10_INCLUDE_DIRS})
+
+			bl_sample(directx10 ${sample_LIBRARIES}  ${DirectX_D3D10_LIBRARIES})
+
+			# The samples always set this as their current working directory
+			install(DIRECTORY DESTINATION ${SAMPLES_DIR}/basic/directx10)
+			install(TARGETS directx10 
+				RUNTIME DESTINATION ${SAMPLES_DIR}/directx10
+				BUNDLE DESTINATION ${SAMPLES_DIR})
+		endif()
+	endif()
+
+	message("-- Can SDL2 sample be built")
+	find_package(SDL2)
+	if(SDL2_FOUND)
+	find_package(SDL2_image)
+	if(SDL2_IMAGE_FOUND)
+		find_package(GLEW)
+		if(GLEW_FOUND)
+			message("-- Can SDL2 sample be built - yes")
+			include_directories(${SDL2_INCLUDE_DIR} ${GLEW_INCLUDE_DIR})
+
+			bl_sample(sdl2 ${sample_LIBRARIES}  ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARY} ${GLEW_LIBRARY})
+			set_property(TARGET sdl2 PROPERTY CXX_STANDARD 14)
+			set_property(TARGET sdl2 PROPERTY CXX_STANDARD_REQUIRED ON)
+		
+			# The samples always set this as their current working directory
+			install(DIRECTORY DESTINATION ${SAMPLES_DIR}/basic/sdl2)
+			install(TARGETS sdl2
+				RUNTIME DESTINATION ${SAMPLES_DIR}/sdl2
+				BUNDLE DESTINATION ${SAMPLES_DIR})
+		else()
+		        message("-- Can SDL2 sample be built - GLEW not found")
+		endif()
+	else()
+	        message("-- Can SDL2 sample be built - SDL2_image not found")
+	endif()
+	else()
+		message("-- Can SDL2 sample be built - SDL2 not found")
+	endif()
+
+
+	message("-- Can SFML 2.x sample be built")
+	if (WIN32)
+		find_package(SFML 2 COMPONENTS graphics window system main)
+	else()
+		find_package(SFML 2 COMPONENTS graphics window system)
+	endif()
+	if(NOT SFML_FOUND)
+		message("-- Can SFML 2.x sample be built - no")
+	else()
+		find_package(GLEW)
+		if(GLEW_FOUND)
+			message("-- Can SFML 2.x sample be built - yes: with GLEW")
+			include_directories(${SFML_INCLUDE_DIR} ${GLEW_INCLUDE_DIR})
+			add_definitions( -DENABLE_GLEW )
+			bl_sample(sfml2 ${sample_LIBRARIES} ${SFML_LIBRARIES} ${GLEW_LIBRARY})
+		else()
+			message("-- Can SFML 2.x sample be built - yes: without GLEW")
+			include_directories(${SFML_INCLUDE_DIR})
+			bl_sample(sfml2 ${sample_LIBRARIES} ${SFML_LIBRARIES})
+		endif()
+		
+			set_property(TARGET sfml2 PROPERTY CXX_STANDARD 14)
+			set_property(TARGET sfml2 PROPERTY CXX_STANDARD_REQUIRED ON)
+			
+			# The samples always set this as their current working directory
+			install(DIRECTORY DESTINATION ${SAMPLES_DIR}/basic/sfml2)
+			install(TARGETS sfml2
+				RUNTIME DESTINATION ${SAMPLES_DIR}/sfml2
+				BUNDLE DESTINATION ${SAMPLES_DIR})
+	endif()
+
+	# Build and install the tutorials
+	foreach(tutorial ${tutorials})
+		set(tutorial_fullname tutorial_${tutorial})
+		bl_sample(${tutorial_fullname} ${sample_LIBRARIES})
+
+		set_property(TARGET ${tutorial_fullname} PROPERTY CXX_STANDARD 14)
+		set_property(TARGET ${tutorial_fullname} PROPERTY CXX_STANDARD_REQUIRED ON)
+		
+		# The tutorials always set this as their current working directory
+		install(DIRECTORY DESTINATION ${SAMPLES_DIR}/tutorial/${tutorial})
+		install(TARGETS ${tutorial_fullname}
+			RUNTIME DESTINATION ${SAMPLES_DIR}/${tutorial}
+			BUNDLE DESTINATION ${SAMPLES_DIR})
+	endforeach()
+
+	# Build and install invaders sample
+	bl_sample(invaders ${sample_LIBRARIES})
+	set_property(TARGET invaders PROPERTY CXX_STANDARD 14)
+	set_property(TARGET invaders PROPERTY CXX_STANDARD_REQUIRED ON)
+	install(DIRECTORY DESTINATION ${SAMPLES_DIR}/invaders)
+	install(TARGETS invaders 
+		RUNTIME DESTINATION ${SAMPLES_DIR}/invaders
+		BUNDLE DESTINATION ${SAMPLES_DIR})
+
+	if(BUILD_LUA_BINDINGS)
+		bl_sample(luainvaders RmlCoreLua RmlControlsLua ${sample_LIBRARIES} ${LUA_BINDINGS_LINK_LIBS})
+		set_property(TARGET luainvaders PROPERTY CXX_STANDARD 14)
+		set_property(TARGET luainvaders PROPERTY CXX_STANDARD_REQUIRED ON)
+		install(DIRECTORY DESTINATION ${SAMPLES_DIR}/luainvaders)
+		install(TARGETS luainvaders 
+			RUNTIME DESTINATION ${SAMPLES_DIR}/luainvaders
+			BUNDLE DESTINATION ${SAMPLES_DIR})
+	endif()
+endif()
+
+
+#===================================
+# Installation =====================
+#===================================
+
+if(BUILD_LUA_BINDINGS)
+	install(DIRECTORY ${PROJECT_SOURCE_DIR}/Include/Rml
+			DESTINATION include
+	)
+else()
+	install(DIRECTORY ${PROJECT_SOURCE_DIR}/Include/Rml
+			DESTINATION include
+			PATTERN "Lua" EXCLUDE
+	)
+endif()
+
+if(BUILD_SAMPLES)
+	install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/assets
+			DESTINATION ${SAMPLES_DIR}
+	)
+
+	install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/tutorial/template/data
+			DESTINATION ${SAMPLES_DIR}/tutorial/template
+	)
+	install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid/data
+			DESTINATION ${SAMPLES_DIR}/tutorial/datagrid
+	)
+	install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid_tree/data
+			DESTINATION ${SAMPLES_DIR}/tutorial/datagrid_tree
+	)
+	install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/tutorial/tutorial_drag/data
+			DESTINATION ${SAMPLES_DIR}/tutorial/tutorial_drag
+	)
+	install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/basic/animation/data
+			DESTINATION ${SAMPLES_DIR}/basic/animation
+	)
+	install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/basic/transform/data
+			DESTINATION ${SAMPLES_DIR}/basic/transform
+	)
+	install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/basic/treeview/data
+			DESTINATION ${SAMPLES_DIR}/basic/treeview
+	)
+	install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/basic/drag/data
+			DESTINATION ${SAMPLES_DIR}/basic/drag
+	)
+	install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/invaders/data
+			DESTINATION ${SAMPLES_DIR}/invaders
+	)
+
+	if(BUILD_LUA_BINDINGS)
+		install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/luainvaders/data 
+				DESTINATION ${SAMPLES_DIR}/luainvaders
+		)
+		install(DIRECTORY ${PROJECT_SOURCE_DIR}/Samples/luainvaders/lua 
+				DESTINATION ${SAMPLES_DIR}/luainvaders
+		)
+	endif()
+endif()
+
+#===================================
+# Generate Config.cmake files ======
+#===================================
+
+# Try to include helper module
+include(CMakePackageConfigHelpers OPTIONAL RESULT_VARIABLE PkgHelpers_AVAILABLE)
+
+# guard against older versions of cmake which do not provide it
+if(PkgHelpers_AVAILABLE)
+	set (INCLUDE_INSTALL_DIR "include")
+	set (LIB_INSTALL_DIR "lib")
+	set (INCLUDE_DIR "${PROJECT_SOURCE_DIR}/Include")
+
+	# generate configuration for install tree
+	configure_package_config_file(${PROJECT_SOURCE_DIR}/Cmake/RmlUiConfig.cmake.install.in
+		${CMAKE_CURRENT_BINARY_DIR}/install/RmlUiConfig.cmake
+		INSTALL_DESTINATION ${LIB_INSTALL_DIR}/RmlUi/cmake
+		PATH_VARS INCLUDE_INSTALL_DIR LIB_INSTALL_DIR)
+	write_basic_package_version_file(
+		${CMAKE_CURRENT_BINARY_DIR}/install/RmlUiConfigVersion.cmake
+		VERSION ${PROJECT_VERSION}
+		COMPATIBILITY SameMajorVersion )
+	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/install/RmlUiConfig.cmake
+		${CMAKE_CURRENT_BINARY_DIR}/install/RmlUiConfigVersion.cmake
+		DESTINATION ${LIB_INSTALL_DIR}/RmlUi/cmake )
+	install(EXPORT RmlUiTargets
+		DESTINATION ${LIB_INSTALL_DIR}/RmlUi/cmake)
+
+	# generate configuration for build tree
+	configure_package_config_file(${PROJECT_SOURCE_DIR}/Cmake/RmlUiConfig.cmake.build.in
+		${CMAKE_CURRENT_BINARY_DIR}/RmlUiConfig.cmake
+		INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+		PATH_VARS INCLUDE_DIR CMAKE_CURRENT_BINARY_DIR)
+	export(TARGETS ${RMLUI_EXPORTED_TARGETS}
+		FILE "${CMAKE_CURRENT_BINARY_DIR}/RmlUiTargets.cmake")
+	write_basic_package_version_file(
+		${CMAKE_CURRENT_BINARY_DIR}/RmlUiConfigVersion.cmake
+		VERSION ${PROJECT_VERSION}
+		COMPATIBILITY SameMajorVersion )
+	set(RmlUi_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE PATH "The directory containing a CMake configuration file for RmlUi.")
+else()
+	message("If you wish to use find_package(RmlUi) in your own project to find RmlUi library"
+		" please update cmake to version which provides CMakePackageConfighelpers module"
+		" or write generators for RmlUiConfig.cmake by yourself.")
+endif()

Build/cmake/FileList.cmake → Cmake/FileList.cmake

@@ -104,104 +104,104 @@ set(Core_HDR_FILES
 )
 
 set(MASTER_Core_PUB_HDR_FILES
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core.h
 )
 
 set(Core_PUB_HDR_FILES
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Animation.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/BaseXMLParser.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/BitmapFont/FontProvider.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Box.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Colour.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Colour.inl
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/ComputedValues.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Containers/chobo/flat_map.hpp
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Containers/chobo/flat_set.hpp
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Containers/robin_hood.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Context.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/ContextInstancer.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/ConvolutionFilter.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Core.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Debug.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Decorator.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/DecoratorInstancer.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Dictionary.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Element.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Element.inl
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/ElementDocument.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/ElementInstancer.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/ElementInstancerGeneric.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/ElementInstancerGeneric.inl
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/ElementReference.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/ElementScroll.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/ElementText.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/ElementUtilities.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Event.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/EventInstancer.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/EventListener.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/EventListenerInstancer.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Factory.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/FileInterface.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Font.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/FontDatabase.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/FontEffect.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/FontEffectInstancer.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/FontFace.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/FontFamily.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/FontGlyph.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/FontProvider.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/FreeType/FontProvider.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Geometry.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/GeometryUtilities.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Header.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/ID.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Input.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Log.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Math.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/MathTypes.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Matrix4.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Matrix4.inl
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Platform.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Plugin.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/PropertiesIteratorView.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Property.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/PropertyDefinition.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/PropertyDictionary.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/PropertyParser.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/PropertySpecification.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/ReferenceCountable.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/RenderInterface.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/ScriptInterface.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Spritesheet.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Stream.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/StreamMemory.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/String.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/StringUtilities.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/StyleSheet.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/StyleSheetKeywords.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/StyleSheetSpecification.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/SystemInterface.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Texture.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Transform.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/TransformPrimitive.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/TransformState.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Tween.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/TypeConverter.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/TypeConverter.inl
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Types.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/URL.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Variant.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Variant.inl
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Vector2.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Vector2.inl
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Vector3.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Vector3.inl
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Vector4.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Vector4.inl
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Vertex.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/ViewState.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/XMLNodeHandler.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/XMLParser.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Animation.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/BaseXMLParser.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/BitmapFont/FontProvider.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Box.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Colour.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Colour.inl
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ComputedValues.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_map.hpp
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_set.hpp
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/robin_hood.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Context.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ContextInstancer.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ConvolutionFilter.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Core.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Debug.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Decorator.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/DecoratorInstancer.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Dictionary.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Element.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Element.inl
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ElementDocument.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ElementInstancer.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ElementInstancerGeneric.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ElementInstancerGeneric.inl
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ElementReference.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ElementScroll.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ElementText.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ElementUtilities.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Event.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/EventInstancer.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/EventListener.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/EventListenerInstancer.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Factory.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/FileInterface.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Font.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/FontDatabase.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/FontEffect.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/FontEffectInstancer.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/FontFace.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/FontFamily.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/FontGlyph.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/FontProvider.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/FreeType/FontProvider.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Geometry.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/GeometryUtilities.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Header.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ID.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Input.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Log.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Math.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/MathTypes.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Matrix4.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Matrix4.inl
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Platform.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Plugin.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/PropertiesIteratorView.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Property.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/PropertyDefinition.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/PropertyDictionary.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/PropertyParser.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/PropertySpecification.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ReferenceCountable.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/RenderInterface.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ScriptInterface.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Spritesheet.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Stream.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/StreamMemory.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/String.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/StringUtilities.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/StyleSheet.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/StyleSheetKeywords.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/StyleSheetSpecification.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/SystemInterface.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Texture.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Transform.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/TransformPrimitive.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/TransformState.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Tween.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/TypeConverter.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/TypeConverter.inl
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Types.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/URL.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Variant.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Variant.inl
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Vector2.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Vector2.inl
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Vector3.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Vector3.inl
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Vector4.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Vector4.inl
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Vertex.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ViewState.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/XMLNodeHandler.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/XMLParser.h
 )
 
 set(Core_SRC_FILES
@@ -380,28 +380,28 @@ set(Controls_HDR_FILES
 )
 
 set(MASTER_Controls_PUB_HDR_FILES
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls.h
 )
 
 set(Controls_PUB_HDR_FILES
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/Controls.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/DataFormatter.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/DataQuery.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/DataSource.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/DataSourceListener.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/ElementDataGrid.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/ElementDataGridCell.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/ElementDataGridExpandButton.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/ElementDataGridRow.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/ElementForm.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/ElementFormControl.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/ElementFormControlDataSelect.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/ElementFormControlInput.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/ElementFormControlSelect.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/ElementFormControlTextArea.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/ElementTabSet.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/Header.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/SelectOption.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/Controls.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/DataFormatter.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/DataQuery.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/DataSource.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/DataSourceListener.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/ElementDataGrid.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/ElementDataGridCell.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/ElementDataGridExpandButton.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/ElementDataGridRow.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/ElementForm.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/ElementFormControl.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/ElementFormControlDataSelect.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/ElementFormControlInput.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/ElementFormControlSelect.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/ElementFormControlTextArea.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/ElementTabSet.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/Header.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/SelectOption.h
 )
 
 set(Controls_SRC_FILES
@@ -458,12 +458,12 @@ set(Debugger_HDR_FILES
 )
 
 set(MASTER_Debugger_PUB_HDR_FILES
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Debugger.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Debugger.h
 )
 
 set(Debugger_PUB_HDR_FILES
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Debugger/Debugger.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Debugger/Header.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Debugger/Debugger.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Debugger/Header.h
 )
 
 set(Debugger_SRC_FILES
@@ -476,85 +476,6 @@ set(Debugger_SRC_FILES
     ${PROJECT_SOURCE_DIR}/Source/Debugger/SystemInterface.cpp
 )
 
-set(Pycore_HDR_FILES
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ContextDocumentProxy.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ContextInstancer.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ContextInterface.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ContextProxy.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/Converters.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ElementAttributeProxy.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ElementChildrenProxy.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ElementDocumentWrapper.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ElementInterface.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ElementStyleProxy.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/EventInstancer.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/EventInterface.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/EventListener.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/EventListenerInstancer.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/EventWrapper.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/Module.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/precompiled.h
-)
-
-set(Pycore_PUB_HDR_FILES
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Python/ConverterScriptObject.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Python/ElementInstancer.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Python/ElementWrapper.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Python/Header.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Python/NameIndexInterface.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Python/PickleTypeConverter.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Python/Python.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Python/Utilities.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Python/VectorInterface.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Python/Wrapper.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Python/WrapperIter.h
-)
-
-set(Pycore_SRC_FILES
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ContextDocumentProxy.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ContextInstancer.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ContextInterface.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ContextProxy.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/Converters.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ElementAttributeProxy.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ElementChildrenProxy.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ElementDocumentWrapper.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ElementInterface.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/ElementStyleProxy.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/EventInstancer.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/EventInterface.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/EventListener.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/EventListenerInstancer.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/EventWrapper.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/Interfaces.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/Module.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/precompiled.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Python/Utilities.cpp
-)
-
-set(Pycontrols_HDR_FILES
-    ${PROJECT_SOURCE_DIR}/Source/Controls/Python/DataFormatterWrapper.h
-    ${PROJECT_SOURCE_DIR}/Source/Controls/Python/DataGridRowProxy.h
-    ${PROJECT_SOURCE_DIR}/Source/Controls/Python/DataSourceWrapper.h
-    ${PROJECT_SOURCE_DIR}/Source/Controls/Python/ElementInterface.h
-    ${PROJECT_SOURCE_DIR}/Source/Controls/Python/Module.h
-    ${PROJECT_SOURCE_DIR}/Source/Controls/Python/precompiled.h
-    ${PROJECT_SOURCE_DIR}/Source/Controls/Python/SelectOptionProxy.h
-)
-
-set(Pycontrols_PUB_HDR_FILES
-)
-
-set(Pycontrols_SRC_FILES
-    ${PROJECT_SOURCE_DIR}/Source/Controls/Python/DataFormatterWrapper.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Controls/Python/DataGridRowProxy.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Controls/Python/DataSourceWrapper.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Controls/Python/ElementInterface.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Controls/Python/Module.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Controls/Python/precompiled.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Controls/Python/SelectOptionProxy.cpp
-)
-
 set(LuaCore_HDR_FILES
     ${PROJECT_SOURCE_DIR}/Source/Core/Lua/Colourb.h
     ${PROJECT_SOURCE_DIR}/Source/Core/Lua/Colourf.h
@@ -578,17 +499,17 @@ set(LuaCore_HDR_FILES
     ${PROJECT_SOURCE_DIR}/Source/Core/Lua/LuaEventListener.h
     ${PROJECT_SOURCE_DIR}/Source/Core/Lua/LuaEventListenerInstancer.h
     ${PROJECT_SOURCE_DIR}/Source/Core/Lua/precompiled.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Lua/Rocket.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Lua/RocketContextsProxy.h
+    ${PROJECT_SOURCE_DIR}/Source/Core/Lua/RmlUi.h
+    ${PROJECT_SOURCE_DIR}/Source/Core/Lua/RmlUiContextsProxy.h
     ${PROJECT_SOURCE_DIR}/Source/Core/Lua/Vector2f.h
     ${PROJECT_SOURCE_DIR}/Source/Core/Lua/Vector2i.h
 )
 
 set(LuaCore_PUB_HDR_FILES
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Lua/Header.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Lua/Interpreter.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Lua/LuaType.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Lua/Utilities.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Lua/Header.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Lua/Interpreter.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Lua/LuaType.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Lua/Utilities.h
 )
 
 set(LuaCore_SRC_FILES
@@ -614,8 +535,8 @@ set(LuaCore_SRC_FILES
     ${PROJECT_SOURCE_DIR}/Source/Core/Lua/LuaEventListener.cpp
     ${PROJECT_SOURCE_DIR}/Source/Core/Lua/LuaEventListenerInstancer.cpp
     ${PROJECT_SOURCE_DIR}/Source/Core/Lua/precompiled.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Lua/Rocket.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/Lua/RocketContextsProxy.cpp
+    ${PROJECT_SOURCE_DIR}/Source/Core/Lua/RmlUi.cpp
+    ${PROJECT_SOURCE_DIR}/Source/Core/Lua/RmlUiContextsProxy.cpp
     ${PROJECT_SOURCE_DIR}/Source/Core/Lua/Utilities.cpp
     ${PROJECT_SOURCE_DIR}/Source/Core/Lua/Vector2f.cpp
     ${PROJECT_SOURCE_DIR}/Source/Core/Lua/Vector2i.cpp
@@ -641,8 +562,8 @@ set(LuaControls_HDR_FILES
 )
 
 set(LuaControls_PUB_HDR_FILES
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/Lua/Controls.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Controls/Lua/Header.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/Lua/Controls.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Controls/Lua/Header.h
 )
 
 set(LuaControls_SRC_FILES

Build/cmake/FindSFML.cmake → Cmake/Modules/FindSFML.cmake

@@ -1,209 +1,209 @@
-# This script locates the SFML library
-# ------------------------------------
-#
-# Usage
-# -----
-#
-# When you try to locate the SFML libraries, you must specify which modules you want to use (system, window, graphics, network, audio, main).
-# If none is given, the SFML_LIBRARIES variable will be empty and you'll end up linking to nothing.
-# example:
-#   find_package(SFML COMPONENTS graphics window system) // find the graphics, window and system modules
-#
-# You can enforce a specific version, either MAJOR.MINOR or only MAJOR.
-# If nothing is specified, the version won't be checked (ie. any version will be accepted).
-# example:
-#   find_package(SFML COMPONENTS ...)     // no specific version required
-#   find_package(SFML 2 COMPONENTS ...)   // any 2.x version
-#   find_package(SFML 2.4 COMPONENTS ...) // version 2.4 or greater
-#
-# By default, the dynamic libraries of SFML will be found. To find the static ones instead,
-# you must set the SFML_STATIC_LIBRARIES variable to TRUE before calling find_package(SFML ...).
-# In case of static linking, the SFML_STATIC macro will also be defined by this script.
-# example:
-#   set(SFML_STATIC_LIBRARIES TRUE)
-#   find_package(SFML 2 COMPONENTS network system)
-#
-# On Mac OS X if SFML_STATIC_LIBRARIES is not set to TRUE then by default CMake will search for frameworks unless
-# CMAKE_FIND_FRAMEWORK is set to "NEVER" for example. Please refer to CMake documentation for more details.
-# Moreover, keep in mind that SFML frameworks are only available as release libraries unlike dylibs which
-# are available for both release and debug modes.
-#
-# If SFML is not installed in a standard path, you can use the SFML_ROOT CMake (or environment) variable
-# to tell CMake where SFML is.
-#
-# Output
-# ------
-#
-# This script defines the following variables:
-# - For each specified module XXX (system, window, graphics, network, audio, main):
-#   - SFML_XXX_LIBRARY_DEBUG:   the name of the debug library of the xxx module (set to SFML_XXX_LIBRARY_RELEASE is no debug version is found)
-#   - SFML_XXX_LIBRARY_RELEASE: the name of the release library of the xxx module (set to SFML_XXX_LIBRARY_DEBUG is no release version is found)
-#   - SFML_XXX_LIBRARY:         the name of the library to link to for the xxx module (includes both debug and optimized names if necessary)
-#   - SFML_XXX_FOUND:           true if either the debug or release library of the xxx module is found
-# - SFML_LIBRARIES:   the list of all libraries corresponding to the required modules
-# - SFML_FOUND:       true if all the required modules are found
-# - SFML_INCLUDE_DIR: the path where SFML headers are located (the directory containing the SFML/Config.hpp file)
-#
-# example:
-#   find_package(SFML 2 COMPONENTS system window graphics audio REQUIRED)
-#   include_directories(${SFML_INCLUDE_DIR})
-#   add_executable(myapp ...)
-#   target_link_libraries(myapp ${SFML_LIBRARIES})
-
-# define the SFML_STATIC macro if static build was chosen
-if(SFML_STATIC_LIBRARIES)
-    add_definitions(-DSFML_STATIC)
-endif()
-
-# deduce the libraries suffix from the options
-set(FIND_SFML_LIB_SUFFIX "")
-if(SFML_STATIC_LIBRARIES)
-    set(FIND_SFML_LIB_SUFFIX "${FIND_SFML_LIB_SUFFIX}-s")
-endif()
-
-# find the SFML include directory
-find_path(SFML_INCLUDE_DIR SFML/Config.hpp
-          PATH_SUFFIXES include
-          PATHS
-          ${SFML_ROOT}
-          $ENV{SFML_ROOT}
-          ~/Library/Frameworks
-          /Library/Frameworks
-          /usr/local/
-          /usr/
-          /sw          # Fink
-          /opt/local/  # DarwinPorts
-          /opt/csw/    # Blastwave
-          /opt/)
-
-# check the version number
-set(SFML_VERSION_OK TRUE)
-if(SFML_FIND_VERSION AND SFML_INCLUDE_DIR)
-    # extract the major and minor version numbers from SFML/Config.hpp
-    # we have to handle framework a little bit differently :
-    if("${SFML_INCLUDE_DIR}" MATCHES "SFML.framework")
-        set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/Headers/Config.hpp")
-    else()
-        set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/SFML/Config.hpp")
-    endif()
-    FILE(READ "${SFML_CONFIG_HPP_INPUT}" SFML_CONFIG_HPP_CONTENTS)
-    STRING(REGEX MATCH ".*#define SFML_VERSION_MAJOR ([0-9]+).*#define SFML_VERSION_MINOR ([0-9]+).*" SFML_CONFIG_HPP_CONTENTS "${SFML_CONFIG_HPP_CONTENTS}")
-    STRING(REGEX REPLACE ".*#define SFML_VERSION_MAJOR ([0-9]+).*" "\\1" SFML_VERSION_MAJOR "${SFML_CONFIG_HPP_CONTENTS}")
-    STRING(REGEX REPLACE ".*#define SFML_VERSION_MINOR ([0-9]+).*" "\\1" SFML_VERSION_MINOR "${SFML_CONFIG_HPP_CONTENTS}")
-    math(EXPR SFML_REQUESTED_VERSION "${SFML_FIND_VERSION_MAJOR} * 10 + ${SFML_FIND_VERSION_MINOR}")
-
-    # if we could extract them, compare with the requested version number
-    if (SFML_VERSION_MAJOR)
-        # transform version numbers to an integer
-        math(EXPR SFML_VERSION "${SFML_VERSION_MAJOR} * 10 + ${SFML_VERSION_MINOR}")
-
-        # compare them
-        if(SFML_VERSION LESS SFML_REQUESTED_VERSION)
-            set(SFML_VERSION_OK FALSE)
-        endif()
-    else()
-        # SFML version is < 2.0
-        if (SFML_REQUESTED_VERSION GREATER 19)
-            set(SFML_VERSION_OK FALSE)
-            set(SFML_VERSION_MAJOR 1)
-            set(SFML_VERSION_MINOR x)
-        endif()
-    endif()
-endif()
-
-# find the requested modules
-set(SFML_FOUND TRUE) # will be set to false if one of the required modules is not found
-set(FIND_SFML_LIB_PATHS
-    ${SFML_ROOT}
-    $ENV{SFML_ROOT}
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local
-    /usr
-    /sw
-    /opt/local
-    /opt/csw
-    /opt)
-foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
-    string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
-    string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
-    set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}${FIND_SFML_LIB_SUFFIX})
-
-    # no suffix for sfml-main, it is always a static library
-    if(FIND_SFML_COMPONENT_LOWER STREQUAL "main")
-        set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER})
-    endif()
-
-    # debug library
-    find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG
-                 NAMES ${FIND_SFML_COMPONENT_NAME}-d
-                 PATH_SUFFIXES lib64 lib
-                 PATHS ${FIND_SFML_LIB_PATHS})
-
-    # release library
-    find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
-                 NAMES ${FIND_SFML_COMPONENT_NAME}
-                 PATH_SUFFIXES lib64 lib
-                 PATHS ${FIND_SFML_LIB_PATHS})
-
-    if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG OR SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
-        # library found
-        set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND TRUE)
-        
-        # if both are found, set SFML_XXX_LIBRARY to contain both
-        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY debug     ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG}
-                                                          optimized ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
-        endif()
-
-        # if only one debug/release variant is found, set the other to be equal to the found one
-        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
-            # debug and not release
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY         ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
-        endif()
-        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
-            # release and not debug
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY       ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
-        endif()
-    else()
-        # library not found
-        set(SFML_FOUND FALSE)
-        set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND FALSE)
-        set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY "")
-        set(FIND_SFML_MISSING "${FIND_SFML_MISSING} SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY")
-    endif()
-
-    # mark as advanced
-    MARK_AS_ADVANCED(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY
-                     SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
-                     SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
-
-    # add to the global list of libraries
-    set(SFML_LIBRARIES ${SFML_LIBRARIES} "${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY}")
-endforeach()
-
-# handle errors
-if(NOT SFML_VERSION_OK)
-    # SFML version not ok
-    set(FIND_SFML_ERROR "SFML found but version too low (requested: ${SFML_FIND_VERSION}, found: ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR})")
-    set(SFML_FOUND FALSE)
-elseif(NOT SFML_FOUND)
-    # include directory or library not found
-    set(FIND_SFML_ERROR "Could NOT find SFML (missing: ${FIND_SFML_MISSING})")
-endif()
-if (NOT SFML_FOUND)
-    if(SFML_FIND_REQUIRED)
-        # fatal error
-        message(FATAL_ERROR ${FIND_SFML_ERROR})
-    elseif(NOT SFML_FIND_QUIETLY)
-        # error but continue
-        message("${FIND_SFML_ERROR}")
-    endif()
-endif()
-
-# handle success
-if(SFML_FOUND)
-    message(STATUS "Found SFML ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR} in ${SFML_INCLUDE_DIR}")
-endif()
+# This script locates the SFML library
+# ------------------------------------
+#
+# Usage
+# -----
+#
+# When you try to locate the SFML libraries, you must specify which modules you want to use (system, window, graphics, network, audio, main).
+# If none is given, the SFML_LIBRARIES variable will be empty and you'll end up linking to nothing.
+# example:
+#   find_package(SFML COMPONENTS graphics window system) // find the graphics, window and system modules
+#
+# You can enforce a specific version, either MAJOR.MINOR or only MAJOR.
+# If nothing is specified, the version won't be checked (ie. any version will be accepted).
+# example:
+#   find_package(SFML COMPONENTS ...)     // no specific version required
+#   find_package(SFML 2 COMPONENTS ...)   // any 2.x version
+#   find_package(SFML 2.4 COMPONENTS ...) // version 2.4 or greater
+#
+# By default, the dynamic libraries of SFML will be found. To find the static ones instead,
+# you must set the SFML_STATIC_LIBRARIES variable to TRUE before calling find_package(SFML ...).
+# In case of static linking, the SFML_STATIC macro will also be defined by this script.
+# example:
+#   set(SFML_STATIC_LIBRARIES TRUE)
+#   find_package(SFML 2 COMPONENTS network system)
+#
+# On Mac OS X if SFML_STATIC_LIBRARIES is not set to TRUE then by default CMake will search for frameworks unless
+# CMAKE_FIND_FRAMEWORK is set to "NEVER" for example. Please refer to CMake documentation for more details.
+# Moreover, keep in mind that SFML frameworks are only available as release libraries unlike dylibs which
+# are available for both release and debug modes.
+#
+# If SFML is not installed in a standard path, you can use the SFML_ROOT CMake (or environment) variable
+# to tell CMake where SFML is.
+#
+# Output
+# ------
+#
+# This script defines the following variables:
+# - For each specified module XXX (system, window, graphics, network, audio, main):
+#   - SFML_XXX_LIBRARY_DEBUG:   the name of the debug library of the xxx module (set to SFML_XXX_LIBRARY_RELEASE is no debug version is found)
+#   - SFML_XXX_LIBRARY_RELEASE: the name of the release library of the xxx module (set to SFML_XXX_LIBRARY_DEBUG is no release version is found)
+#   - SFML_XXX_LIBRARY:         the name of the library to link to for the xxx module (includes both debug and optimized names if necessary)
+#   - SFML_XXX_FOUND:           true if either the debug or release library of the xxx module is found
+# - SFML_LIBRARIES:   the list of all libraries corresponding to the required modules
+# - SFML_FOUND:       true if all the required modules are found
+# - SFML_INCLUDE_DIR: the path where SFML headers are located (the directory containing the SFML/Config.hpp file)
+#
+# example:
+#   find_package(SFML 2 COMPONENTS system window graphics audio REQUIRED)
+#   include_directories(${SFML_INCLUDE_DIR})
+#   add_executable(myapp ...)
+#   target_link_libraries(myapp ${SFML_LIBRARIES})
+
+# define the SFML_STATIC macro if static build was chosen
+if(SFML_STATIC_LIBRARIES)
+    add_definitions(-DSFML_STATIC)
+endif()
+
+# deduce the libraries suffix from the options
+set(FIND_SFML_LIB_SUFFIX "")
+if(SFML_STATIC_LIBRARIES)
+    set(FIND_SFML_LIB_SUFFIX "${FIND_SFML_LIB_SUFFIX}-s")
+endif()
+
+# find the SFML include directory
+find_path(SFML_INCLUDE_DIR SFML/Config.hpp
+          PATH_SUFFIXES include
+          PATHS
+          ${SFML_ROOT}
+          $ENV{SFML_ROOT}
+          ~/Library/Frameworks
+          /Library/Frameworks
+          /usr/local/
+          /usr/
+          /sw          # Fink
+          /opt/local/  # DarwinPorts
+          /opt/csw/    # Blastwave
+          /opt/)
+
+# check the version number
+set(SFML_VERSION_OK TRUE)
+if(SFML_FIND_VERSION AND SFML_INCLUDE_DIR)
+    # extract the major and minor version numbers from SFML/Config.hpp
+    # we have to handle framework a little bit differently :
+    if("${SFML_INCLUDE_DIR}" MATCHES "SFML.framework")
+        set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/Headers/Config.hpp")
+    else()
+        set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/SFML/Config.hpp")
+    endif()
+    FILE(READ "${SFML_CONFIG_HPP_INPUT}" SFML_CONFIG_HPP_CONTENTS)
+    STRING(REGEX MATCH ".*#define SFML_VERSION_MAJOR ([0-9]+).*#define SFML_VERSION_MINOR ([0-9]+).*" SFML_CONFIG_HPP_CONTENTS "${SFML_CONFIG_HPP_CONTENTS}")
+    STRING(REGEX REPLACE ".*#define SFML_VERSION_MAJOR ([0-9]+).*" "\\1" SFML_VERSION_MAJOR "${SFML_CONFIG_HPP_CONTENTS}")
+    STRING(REGEX REPLACE ".*#define SFML_VERSION_MINOR ([0-9]+).*" "\\1" SFML_VERSION_MINOR "${SFML_CONFIG_HPP_CONTENTS}")
+    math(EXPR SFML_REQUESTED_VERSION "${SFML_FIND_VERSION_MAJOR} * 10 + ${SFML_FIND_VERSION_MINOR}")
+
+    # if we could extract them, compare with the requested version number
+    if (SFML_VERSION_MAJOR)
+        # transform version numbers to an integer
+        math(EXPR SFML_VERSION "${SFML_VERSION_MAJOR} * 10 + ${SFML_VERSION_MINOR}")
+
+        # compare them
+        if(SFML_VERSION LESS SFML_REQUESTED_VERSION)
+            set(SFML_VERSION_OK FALSE)
+        endif()
+    else()
+        # SFML version is < 2.0
+        if (SFML_REQUESTED_VERSION GREATER 19)
+            set(SFML_VERSION_OK FALSE)
+            set(SFML_VERSION_MAJOR 1)
+            set(SFML_VERSION_MINOR x)
+        endif()
+    endif()
+endif()
+
+# find the requested modules
+set(SFML_FOUND TRUE) # will be set to false if one of the required modules is not found
+set(FIND_SFML_LIB_PATHS
+    ${SFML_ROOT}
+    $ENV{SFML_ROOT}
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local
+    /usr
+    /sw
+    /opt/local
+    /opt/csw
+    /opt)
+foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
+    string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
+    string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
+    set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}${FIND_SFML_LIB_SUFFIX})
+
+    # no suffix for sfml-main, it is always a static library
+    if(FIND_SFML_COMPONENT_LOWER STREQUAL "main")
+        set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER})
+    endif()
+
+    # debug library
+    find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG
+                 NAMES ${FIND_SFML_COMPONENT_NAME}-d
+                 PATH_SUFFIXES lib64 lib
+                 PATHS ${FIND_SFML_LIB_PATHS})
+
+    # release library
+    find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
+                 NAMES ${FIND_SFML_COMPONENT_NAME}
+                 PATH_SUFFIXES lib64 lib
+                 PATHS ${FIND_SFML_LIB_PATHS})
+
+    if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG OR SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
+        # library found
+        set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND TRUE)
+        
+        # if both are found, set SFML_XXX_LIBRARY to contain both
+        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
+            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY debug     ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG}
+                                                          optimized ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
+        endif()
+
+        # if only one debug/release variant is found, set the other to be equal to the found one
+        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
+            # debug and not release
+            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
+            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY         ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
+        endif()
+        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
+            # release and not debug
+            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
+            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY       ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
+        endif()
+    else()
+        # library not found
+        set(SFML_FOUND FALSE)
+        set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND FALSE)
+        set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY "")
+        set(FIND_SFML_MISSING "${FIND_SFML_MISSING} SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY")
+    endif()
+
+    # mark as advanced
+    MARK_AS_ADVANCED(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY
+                     SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
+                     SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
+
+    # add to the global list of libraries
+    set(SFML_LIBRARIES ${SFML_LIBRARIES} "${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY}")
+endforeach()
+
+# handle errors
+if(NOT SFML_VERSION_OK)
+    # SFML version not ok
+    set(FIND_SFML_ERROR "SFML found but version too low (requested: ${SFML_FIND_VERSION}, found: ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR})")
+    set(SFML_FOUND FALSE)
+elseif(NOT SFML_FOUND)
+    # include directory or library not found
+    set(FIND_SFML_ERROR "Could NOT find SFML (missing: ${FIND_SFML_MISSING})")
+endif()
+if (NOT SFML_FOUND)
+    if(SFML_FIND_REQUIRED)
+        # fatal error
+        message(FATAL_ERROR ${FIND_SFML_ERROR})
+    elseif(NOT SFML_FIND_QUIETLY)
+        # error but continue
+        message("${FIND_SFML_ERROR}")
+    endif()
+endif()
+
+# handle success
+if(SFML_FOUND)
+    message(STATUS "Found SFML ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR} in ${SFML_INCLUDE_DIR}")
+endif()

Cmake/RmlUiConfig.cmake.build.in

@@ -0,0 +1,11 @@
+@PACKAGE_INIT@
+
+set_and_check(RmlUi_INCLUDE_DIRS "@PACKAGE_INCLUDE_DIR@")
+set(RmlUi_LIBRARIES @RMLUI_EXPORTED_TARGETS@)
+list(GET RmlUi_LIBRARIES 0 RMLUI_FIRST_TARGET)
+
+if(NOT (TARGET ${RMLUI_FIRST_TARGET}))
+  include("${CMAKE_CURRENT_LIST_DIR}/RmlUiTargets.cmake")
+endif()
+
+check_required_components(RmlUi)

Cmake/RmlUiConfig.cmake.install.in

@@ -0,0 +1,7 @@
+@PACKAGE_INIT@
+
+set_and_check(RmlUi_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")
+set(RmlUi_LIBRARIES @RMLUI_EXPORTED_TARGETS@)
+include("${CMAKE_CURRENT_LIST_DIR}/RmlUiTargets.cmake")
+
+check_required_components(RmlUi)

Build/cmake/SampleFileList.cmake → Cmake/SampleFileList.cmake

@@ -66,21 +66,6 @@ set(loaddocument_SRC_FILES
     ${PROJECT_SOURCE_DIR}/Samples/basic/loaddocument/src/main.cpp
 )
 
-set(ogre3d_HDR_FILES
-    ${PROJECT_SOURCE_DIR}/Samples/basic/ogre3d/src/RenderInterfaceOgre3D.h
-    ${PROJECT_SOURCE_DIR}/Samples/basic/ogre3d/src/RocketApplication.h
-    ${PROJECT_SOURCE_DIR}/Samples/basic/ogre3d/src/RocketFrameListener.h
-    ${PROJECT_SOURCE_DIR}/Samples/basic/ogre3d/src/SystemInterfaceOgre3D.h
-)
-
-set(ogre3d_SRC_FILES
-    ${PROJECT_SOURCE_DIR}/Samples/basic/ogre3d/src/main.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/basic/ogre3d/src/RenderInterfaceOgre3D.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/basic/ogre3d/src/RocketApplication.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/basic/ogre3d/src/RocketFrameListener.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/basic/ogre3d/src/SystemInterfaceOgre3D.cpp
-)
-
 set(treeview_HDR_FILES
     ${PROJECT_SOURCE_DIR}/Samples/basic/treeview/src/FileFormatter.h
     ${PROJECT_SOURCE_DIR}/Samples/basic/treeview/src/FileSystem.h
@@ -110,17 +95,6 @@ set(sdl2_SRC_FILES
     ${PROJECT_SOURCE_DIR}/Samples/basic/sdl2/src/SystemInterfaceSDL2.cpp
 )
 
-set(sfml_HDR_FILES
-    ${PROJECT_SOURCE_DIR}/Samples/basic/sfml/src/RenderInterfaceSFML.h
-    ${PROJECT_SOURCE_DIR}/Samples/basic/sfml/src/SystemInterfaceSFML.h
-)
-
-set(sfml_SRC_FILES
-    ${PROJECT_SOURCE_DIR}/Samples/basic/sfml/src/main.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/basic/sfml/src/RenderInterfaceSFML.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/basic/sfml/src/SystemInterfaceSFML.cpp
-)
-
 set(sfml2_HDR_FILES
     ${PROJECT_SOURCE_DIR}/Samples/basic/sfml2/src/RenderInterfaceSFML.h
     ${PROJECT_SOURCE_DIR}/Samples/basic/sfml2/src/SystemInterfaceSFML.h
@@ -132,16 +106,6 @@ set(sfml2_SRC_FILES
     ${PROJECT_SOURCE_DIR}/Samples/basic/sfml2/src/SystemInterfaceSFML.cpp
 )
 
-set(directx_HDR_FILES
-    ${PROJECT_SOURCE_DIR}/Samples/basic/directx/src/RenderInterfaceDirectX.h
-)
-
-set(directx_SRC_FILES
-    ${PROJECT_SOURCE_DIR}/Samples/basic/directx/src/main.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/basic/directx/src/RenderInterfaceDirectX.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/basic/directx/src/ShellRenderInterfaceExtensionsDirectX_Win32.cpp
-)
-
 set(directx10_HDR_FILES
     ${PROJECT_SOURCE_DIR}/Samples/basic/directx10/src/D3D10Effect.h
     ${PROJECT_SOURCE_DIR}/Samples/basic/directx10/src/RenderInterfaceDirectx10.h
@@ -153,34 +117,34 @@ set(directx10_SRC_FILES
     ${PROJECT_SOURCE_DIR}/Samples/basic/directx10/src/ShellRenderInterfaceExtensionsDirectX10_Win32.cpp
 )
 
-set(template_HDR_FILES
+set(tutorial_template_HDR_FILES
 )
 
-set(template_SRC_FILES
+set(tutorial_template_SRC_FILES
     ${PROJECT_SOURCE_DIR}/Samples/tutorial/template/src/main.cpp
 )
 
-set(datagrid_HDR_FILES
+set(tutorial_datagrid_HDR_FILES
     ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid/src/DecoratorDefender.h
     ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid/src/DecoratorInstancerDefender.h
     ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid/src/HighScores.h
 )
 
-set(datagrid_SRC_FILES
+set(tutorial_datagrid_SRC_FILES
     ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid/src/DecoratorDefender.cpp
     ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid/src/DecoratorInstancerDefender.cpp
     ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid/src/HighScores.cpp
     ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid/src/main.cpp
 )
 
-set(datagrid_tree_HDR_FILES
+set(tutorial_datagrid_tree_HDR_FILES
     ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid_tree/src/DecoratorDefender.h
     ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid_tree/src/DecoratorInstancerDefender.h
     ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid_tree/src/HighScores.h
     ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid_tree/src/HighScoresShipFormatter.h
 )
 
-set(datagrid_tree_SRC_FILES
+set(tutorial_datagrid_tree_SRC_FILES
     ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid_tree/src/DecoratorDefender.cpp
     ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid_tree/src/DecoratorInstancerDefender.cpp
     ${PROJECT_SOURCE_DIR}/Samples/tutorial/datagrid_tree/src/HighScores.cpp
@@ -189,12 +153,12 @@ set(datagrid_tree_SRC_FILES
 )
 
 set(tutorial_drag_HDR_FILES
-    ${PROJECT_SOURCE_DIR}/Samples/tutorial/tutorial_drag/src/Inventory.h
+    ${PROJECT_SOURCE_DIR}/Samples/tutorial/drag/src/Inventory.h
 )
 
 set(tutorial_drag_SRC_FILES
-    ${PROJECT_SOURCE_DIR}/Samples/tutorial/tutorial_drag/src/Inventory.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/tutorial/tutorial_drag/src/main.cpp
+    ${PROJECT_SOURCE_DIR}/Samples/tutorial/drag/src/Inventory.cpp
+    ${PROJECT_SOURCE_DIR}/Samples/tutorial/drag/src/main.cpp
 )
 
 set(invaders_HDR_FILES
@@ -285,41 +249,6 @@ set(luainvaders_SRC_FILES
     ${PROJECT_SOURCE_DIR}/Samples/luainvaders/src/Sprite.cpp
 )
 
-set(pyinvaders_HDR_FILES
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/DecoratorDefender.h
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/DecoratorInstancerDefender.h
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/DecoratorInstancerStarfield.h
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/DecoratorStarfield.h
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/Defender.h
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/ElementGame.h
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/Game.h
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/GameDetails.h
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/HighScores.h
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/Invader.h
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/Mothership.h
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/PythonInterface.h
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/Shield.h
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/Sprite.h
-)
-
-set(pyinvaders_SRC_FILES
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/DecoratorDefender.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/DecoratorInstancerDefender.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/DecoratorInstancerStarfield.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/DecoratorStarfield.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/Defender.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/ElementGame.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/Game.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/GameDetails.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/HighScores.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/Invader.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/main.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/Mothership.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/PythonInterface.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/Shield.cpp
-    ${PROJECT_SOURCE_DIR}/Samples/pyinvaders/src/Sprite.cpp
-)
-
 # Deal with platform specific sources for sample shell
 if(WIN32)
        list(APPEND shell_SRC_FILES

Build/builddist.py → Cmake/builddist.py

@@ -10,8 +10,7 @@ import re
 def Usage(args):
 	print sys.argv[0] + ' [-hp] [-r revision]'
 	print ''
-	print ' -r\t: Specify rocket internal revision number'
-	print ' -p\t: Include python libraries'
+	print ' -r\t: Specify RmlUi internal revision number'
 	print ' -s\t: Include full source code and build files'
 	print ' -h\t: This help screen'
 	print ''
@@ -31,7 +30,7 @@ def CheckVSVars():
 	
 def ProcessOptions(args):
 
-	options = {'ROCKET_VERSION': 'custom', 'BUILD_PYTHON': False, 'FULL_SOURCE': False, 'ARCHIVE_NAME': 'libRocket-sdk'}
+	options = {'RMLUI_VERSION': 'custom', 'FULL_SOURCE': False, 'ARCHIVE_NAME': 'RmlUi-sdk'}
 	
 	try:
 		optlist, args = getopt.getopt(args, 'r:phs')
@@ -43,12 +42,10 @@ def ProcessOptions(args):
 		if opt[0] == '-h':
 			Usage(args)
 		if opt[0] == '-r':
-			options['ROCKET_VERSION'] = opt[1]
-		if opt[0] == '-p':
-			options['BUILD_PYTHON'] = True
+			options['RMLUI_VERSION'] = opt[1]
 		if opt[0] == '-s':
 			options['FULL_SOURCE'] = True
-			options['ARCHIVE_NAME'] = 'libRocket-source'
+			options['ARCHIVE_NAME'] = 'RmlUi-source'
 			
 	return options
 		
@@ -154,22 +151,19 @@ def main():
 	CheckVSVars()
 	options = ProcessOptions(sys.argv[1:])
 	
-	Build('RocketCore', ['Debug', 'Release'], {'ROCKET_VERSION': '\\"' + options['ROCKET_VERSION'] + '\\"'})
-	Build('RocketControls', ['Debug', 'Release'])
-	Build('RocketDebugger', ['Debug', 'Release'])
-	if options['BUILD_PYTHON']:
-		Build('RocketCorePython', ['Debug', 'Release'])
-		Build('RocketControlsPython', ['Debug', 'Release'])
-		
-	DelTree('../dist/libRocket')
-	CopyFiles('../Include', '../dist/libRocket/Include')
-	CopyFiles('../bin', '../dist/libRocket/bin', ['\.dll$', '^[^_].*\.lib$', '\.py$', '\.pyd$'])
-	CopyFiles('../Samples', '../dist/libRocket/Samples', ['\.h$', '\.cpp$', '\.vcproj$', '\.sln$', '\.vcproj\.user$', '\.rml$', '\.rcss$', '\.tga$', '\.py$', '\.otf$', '\.txt$'])
+	Build('RmlCore', ['Debug', 'Release'], {'RMLUI_VERSION': '\\"' + options['RMLUI_VERSION'] + '\\"'})
+	Build('RmlControls', ['Debug', 'Release'])
+	Build('RmlDebugger', ['Debug', 'Release'])
+	
+	DelTree('../Distribution/RmlUi')
+	CopyFiles('../Include', '../Distribution/RmlUi/Include')
+	CopyFiles('../Build', '../Distribution/RmlUi/Build', ['\.dll$', '^[^_].*\.lib$', '\.py$', '\.pyd$'])
+	CopyFiles('../Samples', '../Distribution/RmlUi/Samples', ['\.h$', '\.cpp$', '\.vcproj$', '\.sln$', '\.vcproj\.user$', '\.rml$', '\.rcss$', '\.tga$', '\.py$', '\.otf$', '\.txt$'])
 	if options['FULL_SOURCE']:
-		CopyFiles('../Build', '../dist/libRocket/Build', ['\.vcproj$', '\.sln$', '\.vsprops$', '\.py$'])
-		CopyFiles('../Source', '../dist/libRocket/Source', ['\.cpp$', '\.h$', '\.inl$'])
-	shutil.copyfile('../changelog.txt', '../dist/libRocket/changelog.txt')
-	Archive(options['ARCHIVE_NAME'] + '-' + options['ROCKET_VERSION'], '../dist/libRocket');
+		CopyFiles('../Build', '../Distribution/RmlUi/Build', ['\.vcproj$', '\.sln$', '\.vsprops$', '\.py$'])
+		CopyFiles('../Source', '../Distribution/RmlUi/Source', ['\.cpp$', '\.h$', '\.inl$'])
+	shutil.copyfile('../changelog.txt', '../Distribution/RmlUi/changelog.txt')
+	Archive(options['ARCHIVE_NAME'] + '-' + options['RMLUI_VERSION'], '../Distribution/RmlUi');
 	
 if __name__ == '__main__':
 	main()

Build/cmake/gen_filelists.sh → Cmake/gen_filelists.sh

@@ -1,48 +1,32 @@
 #!/usr/bin/env bash
 
-basedir="../.."
-file=Build/cmake/FileList.cmake
+basedir=".."
+file=Cmake/FileList.cmake
 src='set(lib_SRC_FILES'
 hdr='set(lib_HDR_FILES'
 masterpubhdr='set(MASTER_lib_PUB_HDR_FILES'
 pubhdr='set(lib_PUB_HDR_FILES'
 srcdir='${PROJECT_SOURCE_DIR}'
 srcpath=Source
-hdrpath=Include/Rocket
-pypath=Python
+hdrpath=Include/RmlUi
 luapath=Lua
 
 printfiles() {
     # Print headers
     echo ${hdr/lib/$1} >>$file
-    find  $srcpath/$1 -maxdepth 3 -path */$luapath -prune -o -path */$pypath -prune -o \( -iname "*.h" -o -iname "*.hpp" \) -exec echo '    '$srcdir/{} \; 2>/dev/null | sort -f >>$file
+    find  $srcpath/$1 -maxdepth 3 -path */$luapath -prune -o \( -iname "*.h" -o -iname "*.hpp" \) -exec echo '    '$srcdir/{} \; 2>/dev/null | sort -f >>$file
     echo -e ')\n' >>$file
     # Print master header for library
     echo ${masterpubhdr/lib/$1} >>$file
-    echo '    '$srcdir/Include/Rocket/$1.h >>$file
+    echo '    '$srcdir/Include/RmlUi/$1.h >>$file
     echo -e ')\n' >>$file
     # Print public headers sub directory
     echo ${pubhdr/lib/$1} >>$file
-    find  $hdrpath/$1 -maxdepth 3 -path */$luapath -prune -o -path */$pypath -prune -o \( -iname "*.h" -o -iname "*.inl" -o -iname "*.hpp" \) -exec echo '    '$srcdir/{} \; 2>/dev/null | sort -f >>$file
+    find  $hdrpath/$1 -maxdepth 3 -path */$luapath -prune -o \( -iname "*.h" -o -iname "*.inl" -o -iname "*.hpp" \) -exec echo '    '$srcdir/{} \; 2>/dev/null | sort -f >>$file
     echo -e ')\n' >>$file
     # Print source files
     echo ${src/lib/$1} >>$file
-    find  $srcpath/$1 -maxdepth 3 -path */$luapath -prune -o -path */$pypath -prune -o -iname "*.cpp" -exec echo '    '$srcdir/{} \; 2>/dev/null | sort -f >>$file
-    echo -e ')\n' >>$file
-}
-
-printpyfiles() {
-    # Print headers
-    echo ${hdr/lib/Py${1}} | sed 's/PyCo/Pyco/' >>$file
-    find  $srcpath/$1/$pypath -iname "*.h" -exec echo '    '$srcdir/{} \; 2>/dev/null | sort -f >>$file
-    echo -e ')\n' >>$file
-    # Print public headers
-    echo ${pubhdr/lib/Py${1}} | sed 's/PyCo/Pyco/' >>$file
-    find  $hdrpath/$1/$pypath -iname "*.h" -exec echo '    '$srcdir/{} \; 2>/dev/null | sort -f >>$file 2>/dev/null
-    echo -e ')\n' >>$file
-    # Print source files
-    echo ${src/lib/Py${1}} | sed 's/PyCo/Pyco/' >>$file
-    find  $srcpath/$1/$pypath -iname "*.cpp" -exec echo '    '$srcdir/{} \; 2>/dev/null | sort -f >>$file
+    find  $srcpath/$1 -maxdepth 3 -path */$luapath -prune -o -iname "*.cpp" -exec echo '    '$srcdir/{} \; 2>/dev/null | sort -f >>$file
     echo -e ')\n' >>$file
 }
 
@@ -67,9 +51,6 @@ for lib in "Core" "Controls" "Debugger"; do
     printfiles $lib
 done
 
-for lib in "Core" "Controls"; do
-    printpyfiles $lib
-done
 for lib in "Core" "Controls"; do
     printluafiles $lib
 done

Build/cmake/gen_samplelists.sh → Cmake/gen_samplelists.sh

@@ -1,23 +1,23 @@
 #!/usr/bin/env bash
 
-basedir="../.."
-file=Build/cmake/SampleFileList.cmake
+basedir=".."
+file=Cmake/SampleFileList.cmake
 src='set(sample_SRC_FILES'
 hdr='set(sample_HDR_FILES'
 srcdir='${PROJECT_SOURCE_DIR}'
 srcpath=Samples
 samples=( 'shell'
-	'basic/animation' 'basic/benchmark' 'basic/bitmapfont' 'basic/customlog' 'basic/drag' 'basic/loaddocument' 'basic/ogre3d' 'basic/treeview' 'basic/transform'
-	'basic/sdl2' 'basic/sfml' 'basic/sfml2'
-	'basic/directx' 'basic/directx10'
-	'tutorial/template' 'tutorial/datagrid' 'tutorial/datagrid_tree' 'tutorial/tutorial_drag'
-	'invaders' 'luainvaders' 'pyinvaders'
+	'basic/animation' 'basic/benchmark' 'basic/bitmapfont' 'basic/customlog' 'basic/drag' 'basic/loaddocument' 'basic/treeview' 'basic/transform'
+	'basic/sdl2' 'basic/sfml2'
+	'basic/directx10'
+	'tutorial/template' 'tutorial/datagrid' 'tutorial/datagrid_tree' 'tutorial/drag'
+	'invaders' 'luainvaders'
 )
 
 printfiles() {
     # Print headers
     name=${1//basic\//} #substitute basic/ for nothing
-    name=${name//tutorial\/} #substitute tutorial/ for nothing
+    name=${name//tutorial\//tutorial_} #substitute 'tutorial/' for 'tutorial_'
     echo ${hdr/sample/$name} >>$file
     find  $srcpath/$1/src -maxdepth 1 -iname "*.h" -exec echo '    '$srcdir/{} \; 2>/dev/null | sort -f >>$file
     find  $srcpath/$1/include -maxdepth 1 -iname "*.h" -exec echo '    '$srcdir/{} \; 2>/dev/null | sort -f >>$file 2>/dev/null

Dependencies/osx-depends.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env sh
 
 BUILD_FREETYPE2=YES
-BUILD_BOOST_PYTHON=YES
 BUILD_LUA=YES
 BUILD_PLATFORM=osx
 
@@ -62,59 +61,5 @@ build_freetype()
 	cd "${DEPS_DIR}"
 }
 
-build_boostpython()
-{
-	cd "${DEPS_DIR}"
-	if [ ! -d "boost" ]; then
-		git clone --recursive https://github.com/boostorg/boost.git boost
-	fi
-
-	cd boost
-
-	git submodule foreach 'git clean -fdx; git reset --hard'
-	git clean -fdx
-
-	./bootstrap.sh
-	./b2 architecture=x86 address-model=32_64 --with-python
-	##./b2 architecture=x86 address-model=32_64 link=shared --with-python
-	##./b2 architecture=x86 address-model=32_64 link=static --with-python
-
-
-	cp libs/python/include/boost/python.hpp boost/
-	cp libs/utility/include/boost/utility/value_init.hpp boost/utility/
-	cp libs/lexical_cast/include/boost/lexical_cast.hpp boost/
-cp -R libs/lexical_cast/include/boost/lexical_cast boost/
-	cp libs/lexical_cast/include/boost/detail/lcast_precision.hpp boost/detail/
-#	mkdir -p boost/math
-#	cp libs/math/include/boost/math/special_functions/sign.hpp boost/math/special_functions/
-#	cp libs/math/include/boost/math/special_functions/math_fwd.hpp boost/math/special_functions/
-#	cp libs/math/include/boost/math/special_functions/detail/round_fwd.hpp boost/math/special_functions/detail/
-#	cp libs/math/include/boost/math/special_functions/detail/fp_traits.hpp boost/math/special_functions/detail/
-	cp -R libs/math/include/boost/math boost/math
-
-#	mkdir -p boost/math/tools
-#	cp libs/math/include/boost/math/tools/config.hpp boost/math/tools/
-#	cp libs/math/include/boost/math/tools/user.hpp boost/math/tools/
-#	cp libs/math/include/boost/math/tools/promotion.hpp boost/math/tools/
-	mkdir -p boost/math/policies
-	cp libs/math/include/boost/math/policies/policy.hpp boost/math/policies/
-
-	cp libs/predef/include/boost/detail/endian.hpp boost/detail/
-
-	cp libs/math/include/boost/math/special_functions/fpclassify.hpp boost/math/special_functions/
-
-	cp libs/math/include/boost/math/tools/real_cast.hpp boost/math/tools/
-
-	cp libs/lexical_cast/include/boost/detail/basic_pointerbuf.hpp boost/detail/
-
-	cp libs/foreach/include/boost/foreach.hpp boost/
-
-	cp -R boost "${BUILD_OUTPUTDIR}/include/"
-	cp -R stage/lib/* "${BUILD_OUTPUTDIR}/lib/"
-	cd "${DEPS_DIR}"
-}
-
-
 
 build_freetype
-build_boostpython

Include/Rocket/Controls.h → Include/RmlUi/Controls.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,8 +26,8 @@
  *
  */
 
-#ifndef ROCKETCONTROLS_H
-#define ROCKETCONTROLS_H
+#ifndef RMLUICONTROLS_H
+#define RMLUICONTROLS_H
 
 #include "Controls/Controls.h"
 

Include/Rocket/Controls/Controls.h → Include/RmlUi/Controls/Controls.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,8 +26,8 @@
  *
  */
 
-#ifndef ROCKETCONTROLSCONTROLS_H
-#define ROCKETCONTROLSCONTROLS_H
+#ifndef RMLUICONTROLSCONTROLS_H
+#define RMLUICONTROLSCONTROLS_H
 
 #include "DataFormatter.h"
 #include "ElementDataGrid.h"
@@ -42,11 +43,11 @@
 #include "ElementTabSet.h"
 #include "SelectOption.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 
 /// Registers the instancers for the custom controls.
-ROCKETCONTROLS_API void Initialise();
+RMLUICONTROLS_API void Initialise();
 
 }
 }

Include/Rocket/Controls/DataFormatter.h → Include/RmlUi/Controls/DataFormatter.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,14 +26,14 @@
  *
  */
 
-#ifndef ROCKETCONTROLSDATAFORMATTER_H
-#define ROCKETCONTROLSDATAFORMATTER_H
+#ifndef RMLUICONTROLSDATAFORMATTER_H
+#define RMLUICONTROLSDATAFORMATTER_H
 
 #include "../Core/ScriptInterface.h"
 #include "../Core/String.h"
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 
 class Element;
@@ -45,31 +46,31 @@ class Element;
 	@author Robert Curry
  */
 
-class ROCKETCONTROLS_API DataFormatter
+class RMLUICONTROLS_API DataFormatter
 {
 public:
-	DataFormatter(const Rocket::Core::String& name = "");
+	DataFormatter(const Rml::Core::String& name = "");
 	virtual ~DataFormatter();
 
 	/// Returns the name by which this data formatter is referenced by.
 	/// @return The name of this data formatter.
-	const Rocket::Core::String& GetDataFormatterName();
+	const Rml::Core::String& GetDataFormatterName();
 	/// Returns a data formatter with the given name.
 	/// @parameter [in] data_formatter_name The name of the data formatter to
 	/// be returned.
 	/// @return If the data formatter with the specified name has been
 	/// constructed, a pointer to it will be returned. Otherwise, NULL.
-	static DataFormatter* GetDataFormatter(const Rocket::Core::String& data_formatter_name);
+	static DataFormatter* GetDataFormatter(const Rml::Core::String& data_formatter_name);
 
 	/// Formats the raw results of a data source request into RML.
 	/// @param[out] formatted_data The formatted RML.
 	/// @param[in] raw_data A list of the raw data fields.
-	virtual void FormatData(Rocket::Core::String& formatted_data, const Rocket::Core::StringList& raw_data) = 0;
+	virtual void FormatData(Rml::Core::String& formatted_data, const Rml::Core::StringList& raw_data) = 0;
 
 	virtual void* GetScriptObject() const;
 
 private:
-	Rocket::Core::String name;
+	Rml::Core::String name;
 };
 
 }

Include/Rocket/Controls/DataQuery.h → Include/RmlUi/Controls/DataQuery.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,14 +26,14 @@
  *
  */
 
-#ifndef ROCKETCONTROLSDATAQUERY_H
-#define ROCKETCONTROLSDATAQUERY_H
+#ifndef RMLUICONTROLSDATAQUERY_H
+#define RMLUICONTROLSDATAQUERY_H
 
 #include "Header.h"
 #include "../Core/TypeConverter.h"
 #include "../Core/Log.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 
 class DataSource;
@@ -45,25 +46,25 @@ class DataSource;
 	mechanisms to iterate through the returned rows.
 */
 
-class ROCKETCONTROLS_API DataQuery
+class RMLUICONTROLS_API DataQuery
 {
 public:
 	DataQuery();
-	DataQuery(DataSource* data_source, const Rocket::Core::String& table, const Rocket::Core::String& fields, int offset = 0, int limit = -1, const Rocket::Core::String& order = "");
+	DataQuery(DataSource* data_source, const Rml::Core::String& table, const Rml::Core::String& fields, int offset = 0, int limit = -1, const Rml::Core::String& order = "");
 	virtual ~DataQuery();
 
-	void ExecuteQuery(DataSource* data_source, const Rocket::Core::String& table, const Rocket::Core::String& fields, int offset = 0, int limit = -1, const Rocket::Core::String& order = "");
+	void ExecuteQuery(DataSource* data_source, const Rml::Core::String& table, const Rml::Core::String& fields, int offset = 0, int limit = -1, const Rml::Core::String& order = "");
 	bool NextRow();
 
-	bool IsFieldSet(const Rocket::Core::String& field) const;
+	bool IsFieldSet(const Rml::Core::String& field) const;
 
 	template< typename T >
-	T Get(const Rocket::Core::String& field_name, const T& default_value) const
+	T Get(const Rml::Core::String& field_name, const T& default_value) const
 	{
 		FieldIndices::const_iterator itr = field_indices.find(field_name);
 		if (itr == field_indices.end())
 		{
-			Rocket::Core::Log::Message(Rocket::Core::Log::LT_ERROR, "Field %s not found in query", field_name.c_str());
+			Rml::Core::Log::Message(Rml::Core::Log::LT_ERROR, "Field %s not found in query", field_name.c_str());
 			return default_value;
 		}		
 		
@@ -75,12 +76,12 @@ public:
 	}
 
 	template< typename T >
-	bool GetInto(const Rocket::Core::String& field_name, T& value) const
+	bool GetInto(const Rml::Core::String& field_name, T& value) const
 	{
 		FieldIndices::const_iterator itr = field_indices.find(field_name);
 		if (itr == field_indices.end())
 		{
-			Rocket::Core::Log::Message(Rocket::Core::Log::LT_ERROR, "Field %s not found in query", field_name.c_str());
+			Rml::Core::Log::Message(Rml::Core::Log::LT_ERROR, "Field %s not found in query", field_name.c_str());
 			return false;
 		}		
 
@@ -102,7 +103,7 @@ public:
 	{
 		if (field_index < rows[current_row].size())
 		{
-			return Rocket::Core::TypeConverter< Rocket::Core::String, T >::Convert(rows[current_row][field_index], value);
+			return Rml::Core::TypeConverter< Rml::Core::String, T >::Convert(rows[current_row][field_index], value);
 		}
 
 		return false;
@@ -114,17 +115,17 @@ public:
 	}
 
 private:
-	Rocket::Core::StringList fields;
+	Rml::Core::StringList fields;
 
 	DataSource* data_source;
-	Rocket::Core::String table;
+	Rml::Core::String table;
 	int current_row;
 	int offset;
 	int limit;
 
-	typedef std::vector< Rocket::Core::StringList > Rows;
-	Rows rows;
-	typedef Core::UnorderedMap< Rocket::Core::String, size_t > FieldIndices;
+	typedef std::vector< Rml::Core::StringList > Rows;
+	Rows rows;    
+	typedef Core::UnorderedMap< Rml::Core::String, size_t > FieldIndices;
 	FieldIndices field_indices;
 	
 	void LoadRow();
@@ -133,4 +134,4 @@ private:
 }
 }
 
-#endif // ROCKETCONTROLSDATAQUERY_H
+#endif // RMLUICONTROLSDATAQUERY_H

Include/Rocket/Controls/DataSource.h → Include/RmlUi/Controls/DataSource.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,15 +26,15 @@
  *
  */
 
-#ifndef ROCKETCONTROLSDATASOURCE_H
-#define ROCKETCONTROLSDATASOURCE_H
+#ifndef RMLUICONTROLSDATASOURCE_H
+#define RMLUICONTROLSDATASOURCE_H
 
 #include "Header.h"
 #include "../Core/Types.h"
 #include "../Core/String.h"
 #include <list>
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 
 class DataSourceListener;
@@ -43,61 +44,61 @@ class DataSourceListener;
 	@author Robert Curry
  */
 
-class ROCKETCONTROLS_API DataSource
+class RMLUICONTROLS_API DataSource
 {
 	public:
-		DataSource(const Rocket::Core::String& name = "");
+		DataSource(const Rml::Core::String& name = "");
 		virtual ~DataSource();
 
-		const Rocket::Core::String& GetDataSourceName();
-		static DataSource* GetDataSource(const Rocket::Core::String& data_source_name);
+		const Rml::Core::String& GetDataSourceName();
+		static DataSource* GetDataSource(const Rml::Core::String& data_source_name);
 
 		/// Fetches the contents of one row of a table within the data source.
 		/// @param[out] row The list of values in the table.
 		/// @param[in] table The name of the table to query.
 		/// @param[in] row_index The index of the desired row.
 		/// @param[in] columns The list of desired columns within the row.
-		virtual void GetRow(Rocket::Core::StringList& row, const Rocket::Core::String& table, int row_index, const Rocket::Core::StringList& columns) = 0;
+		virtual void GetRow(Rml::Core::StringList& row, const Rml::Core::String& table, int row_index, const Rml::Core::StringList& columns) = 0;
 		/// Fetches the number of rows within one of this data source's tables.
 		/// @param[in] table The name of the table to query.
 		/// @return The number of rows within the specified table.
-		virtual int GetNumRows(const Rocket::Core::String& table) = 0;
+		virtual int GetNumRows(const Rml::Core::String& table) = 0;
 
 		void AttachListener(DataSourceListener* listener);
 		void DetachListener(DataSourceListener* listener);
 
 		virtual void* GetScriptObject() const;
 
-		static const Rocket::Core::String CHILD_SOURCE;
-		static const Rocket::Core::String DEPTH;
-		static const Rocket::Core::String NUM_CHILDREN;
+		static const Rml::Core::String CHILD_SOURCE;
+		static const Rml::Core::String DEPTH;
+		static const Rml::Core::String NUM_CHILDREN;
 
 	protected:
 		/// Tells all attached listeners that one or more rows have been added to the data source.
 		/// @param[in] table The name of the table to have rows added to it.
 		/// @param[in] first_row_added The index of the first row added.
 		/// @param[in] num_rows_added The number of rows added (including the first row).
-		void NotifyRowAdd(const Rocket::Core::String& table, int first_row_added, int num_rows_added);
+		void NotifyRowAdd(const Rml::Core::String& table, int first_row_added, int num_rows_added);
 
 		/// Tells all attached listeners that one or more rows have been removed from the data source.
 		/// @param[in] table The name of the table to have rows removed from it.
 		/// @param[in] first_row_removed The index of the first row removed.
 		/// @param[in] num_rows_removed The number of rows removed (including the first row).
-		void NotifyRowRemove(const Rocket::Core::String& table, int first_row_removed, int num_rows_removed);
+		void NotifyRowRemove(const Rml::Core::String& table, int first_row_removed, int num_rows_removed);
 
 		/// Tells all attached listeners that one or more rows have been changed in the data source.
 		/// @param[in] table The name of the table to have rows changed in it.
 		/// @param[in] first_row_changed The index of the first row changed.
 		/// @param[in] num_rows_changed The number of rows changed (including the first row).
-		void NotifyRowChange(const Rocket::Core::String& table, int first_row_changed, int num_rows_changed);
+		void NotifyRowChange(const Rml::Core::String& table, int first_row_changed, int num_rows_changed);
 
 		/// Tells all attached listeners that the row structure has completely changed in the data source.
 		/// @param[in] table The name of the table to have rows changed in it.
-		void NotifyRowChange(const Rocket::Core::String& table);
+		void NotifyRowChange(const Rml::Core::String& table);
 
 		/// Helper function for building a result set.
-		typedef Core::UnorderedMap< Rocket::Core::String, Rocket::Core::String > RowMap;
-		void BuildRowEntries(Rocket::Core::StringList& row, const RowMap& row_map, const Rocket::Core::StringList& columns);
+		typedef Core::UnorderedMap< Rml::Core::String, Rml::Core::String > RowMap;
+		void BuildRowEntries(Rml::Core::StringList& row, const RowMap& row_map, const Rml::Core::StringList& columns);
 
 	private:
 		Core::String name;
@@ -109,5 +110,5 @@ class ROCKETCONTROLS_API DataSource
 }
 }
 
-#endif // ROCKETCONTROLSDATASOURCE_H
+#endif // RMLUICONTROLSDATASOURCE_H
 

Include/Rocket/Controls/DataSourceListener.h → Include/RmlUi/Controls/DataSourceListener.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +26,13 @@
  *
  */
 
-#ifndef ROCKETCONTROLSDATASOURCELISTENER_H
-#define ROCKETCONTROLSDATASOURCELISTENER_H
+#ifndef RMLUICONTROLSDATASOURCELISTENER_H
+#define RMLUICONTROLSDATASOURCELISTENER_H
 
 #include "Header.h"
 #include "../Core/String.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 
 class DataSource;
@@ -43,7 +44,7 @@ class DataSource;
 	@author Robert Curry
  */
 
-class ROCKETCONTROLS_API DataSourceListener
+class RMLUICONTROLS_API DataSourceListener
 {
 public:
 	DataSourceListener();
@@ -57,35 +58,35 @@ public:
 	/// @param[in] table The name of the changing table within the data source.
 	/// @param[in] first_row_added Index of the first new row.
 	/// @param[in] num_rows_added Number of new sequential rows being added.
-	virtual void OnRowAdd(DataSource* data_source, const Rocket::Core::String& table, int first_row_added, int num_rows_added);
+	virtual void OnRowAdd(DataSource* data_source, const Rml::Core::String& table, int first_row_added, int num_rows_added);
 	/// Notification of the removal of one or more rows from an observed data source's table.
 	/// @param[in] data_source Data source being changed.
 	/// @param[in] table The name of the changing table within the data source.
 	/// @param[in] first_row_removed Index of the first removed row.
 	/// @param[in] num_rows_removed Number of new sequential rows being removed.
-	virtual void OnRowRemove(DataSource* data_source, const Rocket::Core::String& table, int first_row_removed, int num_rows_removed);
+	virtual void OnRowRemove(DataSource* data_source, const Rml::Core::String& table, int first_row_removed, int num_rows_removed);
 	/// Notification of the changing of one or more rows from an observed data source's table.
 	/// @param[in] data_source Data source being changed.
 	/// @param[in] table The name of the changing table within the data source.
 	/// @param[in] first_row_removed Index of the first changed row.
 	/// @param[in] num_rows_removed Number of new sequential rows being changed.
-	virtual void OnRowChange(DataSource* data_source, const Rocket::Core::String& table, int first_row_changed, int num_rows_changed);
+	virtual void OnRowChange(DataSource* data_source, const Rml::Core::String& table, int first_row_changed, int num_rows_changed);
 	/// Notification of the change of all of the data of an observed data source's table.
 	/// @param[in] data_source Data source being changed.
 	/// @param[in] table The name of the changing table within the data source.
-	virtual void OnRowChange(DataSource* data_source, const Rocket::Core::String& table);
+	virtual void OnRowChange(DataSource* data_source, const Rml::Core::String& table);
 
 protected:
-	/// Sets up data source and table from a given Rocket::Core::String.
+	/// Sets up data source and table from a given Rml::Core::String.
 	/// @param[out] data_source A pointer to a data_source that gets loaded with the specified data source.
-	/// @param[out] table_name A reference to an Rocket::Core::String that gets loaded with the specified data table.
+	/// @param[out] table_name A reference to an Rml::Core::String that gets loaded with the specified data table.
 	/// @param[in] data_source_name The data source and table in SOURCE.TABLE format.
 	/// @return True if the data source name was in the correct format, and the data source was found.
-	bool ParseDataSource(DataSource*& data_source, Rocket::Core::String& table_name, const Rocket::Core::String& data_source_name);
+	bool ParseDataSource(DataSource*& data_source, Rml::Core::String& table_name, const Rml::Core::String& data_source_name);
 };
 
 }
 }
 
-#endif // ROCKETCONTROLSDATASOURCELISTENER_H
+#endif // RMLUICONTROLSDATASOURCELISTENER_H
 

Include/Rocket/Controls/ElementDataGrid.h → Include/RmlUi/Controls/ElementDataGrid.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,14 +26,14 @@
  *
  */
 
-#ifndef ROCKETCONTROLSELEMENTDATAGRID_H
-#define ROCKETCONTROLSELEMENTDATAGRID_H
+#ifndef RMLUICONTROLSELEMENTDATAGRID_H
+#define RMLUICONTROLSELEMENTDATAGRID_H
 
 #include "Header.h"
 #include "DataSourceListener.h"
 #include "../Core/Element.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 
 class DataFormatter;
@@ -44,15 +45,15 @@ class ElementDataGridRow;
 	@author Robert Curry
  */
 
-class ROCKETCONTROLS_API ElementDataGrid : public Core::Element, public DataSourceListener
+class RMLUICONTROLS_API ElementDataGrid : public Core::Element, public DataSourceListener
 {
 public:
-	ElementDataGrid(const Rocket::Core::String& tag);
+	ElementDataGrid(const Rml::Core::String& tag);
 	virtual ~ElementDataGrid();
 
 	/// Sets a new data source for the contents of the data grid.
 	/// @param[in] data_source_name The name of the new data source.
-	void SetDataSource(const Rocket::Core::String& data_source_name);
+	void SetDataSource(const Rml::Core::String& data_source_name);
 
 	/**
 		A column inside a table.
@@ -63,7 +64,7 @@ public:
 	{
 		/// The list of fields that this column reads from the data source for
 		/// each row.
-		Rocket::Core::StringList fields;
+		Rml::Core::StringList fields;
 
 		/// The data formatter this is used to process the field information
 		/// into what is finally displayed in the data grid.
@@ -87,19 +88,19 @@ public:
 	/// @param[in] initial_width The initial width, in pixels, of the column.
 	/// @param[in] header_rml The RML to use as the column header.
 	/// @return True if the column was added successfully, false if not.
-	bool AddColumn(const Rocket::Core::String& fields, const Rocket::Core::String& formatter, float initial_width, const Rocket::Core::String& header_rml);
+	bool AddColumn(const Rml::Core::String& fields, const Rml::Core::String& formatter, float initial_width, const Rml::Core::String& header_rml);
 	/// Adds a column to the table.
 	/// @param[in] fields A comma-separated list of fields that this column reads from the data source.
 	/// @param[in] formatter The name of the data formatter to be used to format the raw column data into RML.
 	/// @param[in] initial_width The initial width, in pixels, of the column.
 	/// @param[in] header_element The element hierarchy to use as the column header.
-	void AddColumn(const Rocket::Core::String& fields, const Rocket::Core::String& formatter, float initial_width, Core::Element* header_element);
+	void AddColumn(const Rml::Core::String& fields, const Rml::Core::String& formatter, float initial_width, Core::Element* header_element);
 	/// Returns the number of columns in this table
 	int GetNumColumns();
 	/// Returns the column at the specified index.
 	const Column* GetColumn(int column_index);
 	/// Returns a CSV string containing all the fields that each column requires, in order.
-	const Rocket::Core::String& GetAllColumnFields();
+	const Rml::Core::String& GetAllColumnFields();
 
 	/// Adds a new row to the table. This is only called from child rows.
 	/// @param[in] parent The parent row that the row is being added under.
@@ -124,14 +125,14 @@ protected:
 
 	/// Gets the markup and content of the element.
 	/// @param content[out] The content of the element.
-	virtual void GetInnerRML(Rocket::Core::String& content) const;
+	virtual void GetInnerRML(Rml::Core::String& content) const;
 
 private:
 	typedef std::vector< Column > ColumnList;
 	typedef std::vector< ElementDataGridRow* > RowList;
 
 	ColumnList columns;
-	Rocket::Core::String column_fields;
+	Rml::Core::String column_fields;
 
 	// The row that contains the header elements of the table.
 	ElementDataGridRow* header;
@@ -141,7 +142,7 @@ private:
 	ElementDataGridRow* root;
 	// If this is non-empty, then in the previous update the data source was set
 	// and we must set it this update.
-	Rocket::Core::String new_data_source;
+	Rml::Core::String new_data_source;
 
 	// The block element that contains all our rows. Only used for applying styles.
 	Core::Element* body;

Include/Rocket/Controls/ElementDataGridCell.h → Include/RmlUi/Controls/ElementDataGridCell.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,14 +26,14 @@
  *
  */
 
-#ifndef ROCKETCONTROLSELEMENTDATAGRIDCELL_H
-#define ROCKETCONTROLSELEMENTDATAGRIDCELL_H
+#ifndef RMLUICONTROLSELEMENTDATAGRIDCELL_H
+#define RMLUICONTROLSELEMENTDATAGRIDCELL_H
 
 #include "../Core/Element.h"
 #include "../Core/EventListener.h"
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 
 /**
@@ -41,10 +42,10 @@ namespace Controls {
 	@author Robert Curry
  */
 
-class ROCKETCONTROLS_API ElementDataGridCell : public Core::Element
+class RMLUICONTROLS_API ElementDataGridCell : public Core::Element
 {
 public:
-	ElementDataGridCell(const Rocket::Core::String& tag);
+	ElementDataGridCell(const Rml::Core::String& tag);
 	virtual ~ElementDataGridCell();
 
 	void Initialise(int column, Core::Element* header);

Include/Rocket/Controls/ElementDataGridExpandButton.h → Include/RmlUi/Controls/ElementDataGridExpandButton.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,23 +26,23 @@
  *
  */
 
-#ifndef ROCKETCONTROLSELEMENTDATAGRIDEXPANDBUTTON_H
-#define ROCKETCONTROLSELEMENTDATAGRIDEXPANDBUTTON_H
+#ifndef RMLUICONTROLSELEMENTDATAGRIDEXPANDBUTTON_H
+#define RMLUICONTROLSELEMENTDATAGRIDEXPANDBUTTON_H
 
 #include "../Core/Element.h"
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 
 /**
 	@author Robert Curry
  */
 
-class ROCKETCONTROLS_API ElementDataGridExpandButton : public Core::Element
+class RMLUICONTROLS_API ElementDataGridExpandButton : public Core::Element
 {
 public:
-	ElementDataGridExpandButton(const Rocket::Core::String& tag);
+	ElementDataGridExpandButton(const Rml::Core::String& tag);
 	virtual ~ElementDataGridExpandButton();
 
 protected:

Include/Rocket/Controls/ElementDataGridRow.h → Include/RmlUi/Controls/ElementDataGridRow.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,8 +26,8 @@
  *
  */
 
-#ifndef ROCKETCONTROLSELEMENTDATAGRIDROW_H
-#define ROCKETCONTROLSELEMENTDATAGRIDROW_H
+#ifndef RMLUICONTROLSELEMENTDATAGRIDROW_H
+#define RMLUICONTROLSELEMENTDATAGRIDROW_H
 
 #include "Header.h"
 #include "DataSourceListener.h"
@@ -34,7 +35,7 @@
 #include "../Core/Element.h"
 #include <queue>
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 
 class ElementDataGrid;
@@ -45,19 +46,19 @@ class ElementDataGrid;
 	@author Robert Curry
  */
 
-class ROCKETCONTROLS_API ElementDataGridRow : public Core::Element, public DataSourceListener
+class RMLUICONTROLS_API ElementDataGridRow : public Core::Element, public DataSourceListener
 {
 friend class ElementDataGrid;
 
 public:
-	ElementDataGridRow(const Rocket::Core::String& tag);
+	ElementDataGridRow(const Rml::Core::String& tag);
 	virtual ~ElementDataGridRow();
 
 	void Initialise(ElementDataGrid* parent_grid, ElementDataGridRow* parent_row = NULL, int child_index = -1, ElementDataGridRow* header_row = NULL, int depth = -1);
 	void SetChildIndex(int child_index);
 	int GetDepth();
 
-	void SetDataSource(const Rocket::Core::String& data_source_name);
+	void SetDataSource(const Rml::Core::String& data_source_name);
 
 	/// Checks dirty children and cells, and loads them if necessary.
 	/// @return True if any children were updated.
@@ -89,10 +90,10 @@ public:
 
 protected:
 	virtual void OnDataSourceDestroy(DataSource* data_source);
-	virtual void OnRowAdd(DataSource* data_source, const Rocket::Core::String& table, int first_row_added, int num_rows_added);
-	virtual void OnRowRemove(DataSource* data_source, const Rocket::Core::String& table, int first_row_removed, int num_rows_removed);
-	virtual void OnRowChange(DataSource* data_source, const Rocket::Core::String& table, int first_row_changed, int num_rows_changed);
-	virtual void OnRowChange(DataSource* data_source, const Rocket::Core::String& table);
+	virtual void OnRowAdd(DataSource* data_source, const Rml::Core::String& table, int first_row_added, int num_rows_added);
+	virtual void OnRowRemove(DataSource* data_source, const Rml::Core::String& table, int first_row_removed, int num_rows_removed);
+	virtual void OnRowChange(DataSource* data_source, const Rml::Core::String& table, int first_row_changed, int num_rows_changed);
+	virtual void OnRowChange(DataSource* data_source, const Rml::Core::String& table);
 
 private:
 	typedef std::queue< ElementDataGridRow* > RowQueue;
@@ -126,12 +127,12 @@ private:
 	int GetNumDescendants();
 
 	// Adds or refreshes the cell contents, and undirties the row's cells.
-	void Load(const Rocket::Controls::DataQuery& row_information);
+	void Load(const Rml::Controls::DataQuery& row_information);
 	// Finds all children that have cell information missing (either though being
 	// refreshed or not being loaded yet) and reloads them.
 	void LoadChildren(float time_slice);
 	// Loads a specific set of children. Called by the above function.
-	void LoadChildren(int first_row_to_load, int num_rows_to_load, Rocket::Core::Time time_slice);
+	void LoadChildren(int first_row_to_load, int num_rows_to_load, Rml::Core::Time time_slice);
 
 	// If the cells need reloading, this takes care of it. If any children
 	// need updating, they are added to the queue.
@@ -165,7 +166,7 @@ private:
 
 	// The data source and table that the children are fetched from.
 	DataSource* data_source;
-	Rocket::Core::String data_table;
+	Rml::Core::String data_table;
 };
 
 }

Include/Rocket/Controls/ElementForm.h → Include/RmlUi/Controls/ElementForm.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +26,13 @@
  *
  */
 
-#ifndef ROCKETCONTROLSELEMENTFORM_H
-#define ROCKETCONTROLSELEMENTFORM_H
+#ifndef RMLUICONTROLSELEMENTFORM_H
+#define RMLUICONTROLSELEMENTFORM_H
 
 #include "../Core/Element.h"
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 
 /**
@@ -40,18 +41,18 @@ namespace Controls {
 	@author Peter Curry
  */
 
-class ROCKETCONTROLS_API ElementForm : public Core::Element
+class RMLUICONTROLS_API ElementForm : public Core::Element
 {
 public:
 	/// Constructs a new ElementForm. This should not be called directly; use the Factory instead.
 	/// @param[in] tag The tag the element was declared as in RML.
-	ElementForm(const Rocket::Core::String& tag);
+	ElementForm(const Rml::Core::String& tag);
 	virtual ~ElementForm();
 
 	/// Submits the form.
 	/// @param[in] name The name of the item doing the submit
 	/// @param[in] submit_value The value to send through as the 'submit' parameter.
-	void Submit(const Rocket::Core::String& name = "", const Rocket::Core::String& submit_value = "");
+	void Submit(const Rml::Core::String& name = "", const Rml::Core::String& submit_value = "");
 };
 
 }

Include/Rocket/Controls/ElementFormControl.h → Include/RmlUi/Controls/ElementFormControl.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +26,13 @@
  *
  */
 
-#ifndef ROCKETCONTROLSELEMENTFORMCONTROL_H
-#define ROCKETCONTROLSELEMENTFORMCONTROL_H
+#ifndef RMLUICONTROLSELEMENTFORMCONTROL_H
+#define RMLUICONTROLSELEMENTFORMCONTROL_H
 
 #include "../Core/Element.h"
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 
 /**
@@ -40,29 +41,29 @@ namespace Controls {
 	@author Peter Curry
  */
 
-class ROCKETCONTROLS_API ElementFormControl : public Core::Element
+class RMLUICONTROLS_API ElementFormControl : public Core::Element
 {
 public:
 	/// Constructs a new ElementFormControl. This should not be called directly; use the Factory
 	/// instead.
 	/// @param[in] tag The tag the element was declared as in RML.
-	ElementFormControl(const Rocket::Core::String& tag);
+	ElementFormControl(const Rml::Core::String& tag);
 	virtual ~ElementFormControl();
 
 	/// Returns the name of the form control. This is not guaranteed to be unique, and in the case of some form
 	/// controls (such as radio buttons) most likely will not be.
 	/// @return The name of the form control.
-	Rocket::Core::String GetName() const;
+	Rml::Core::String GetName() const;
 	/// Sets the name of the form control.
 	/// @param[in] name The new name of the form control.
-	void SetName(const Rocket::Core::String& name);
+	void SetName(const Rml::Core::String& name);
 
 	/// Returns a string representation of the current value of the form control.
 	/// @return The value of the form control.
-	virtual Rocket::Core::String GetValue() const = 0;
+	virtual Rml::Core::String GetValue() const = 0;
 	/// Sets the current value of the form control.
 	/// @param[in] value The new value of the form control.
-	virtual void SetValue(const Rocket::Core::String& value) = 0;
+	virtual void SetValue(const Rml::Core::String& value) = 0;
 	/// Returns if this value should be submitted with the form.
 	/// @return True if the value should be be submitted with the form, false otherwise.
 	virtual bool IsSubmitted();

Include/Rocket/Controls/ElementFormControlDataSelect.h → Include/RmlUi/Controls/ElementFormControlDataSelect.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,14 +26,14 @@
  *
  */
 
-#ifndef ROCKETCONTROLSELEMENTFORMCONTROLDATASELECT_H
-#define ROCKETCONTROLSELEMENTFORMCONTROLDATASELECT_H
+#ifndef RMLUICONTROLSELEMENTFORMCONTROLDATASELECT_H
+#define RMLUICONTROLSELEMENTFORMCONTROLDATASELECT_H
 
 #include "Header.h"
 #include "ElementFormControlSelect.h"
 #include "DataSourceListener.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 	
 class DataSource;
@@ -43,18 +44,18 @@ class DataSource;
 	@author Peter Curry
  */
 
-class ROCKETCONTROLS_API ElementFormControlDataSelect : public ElementFormControlSelect, public DataSourceListener
+class RMLUICONTROLS_API ElementFormControlDataSelect : public ElementFormControlSelect, public DataSourceListener
 {
 public:
 	/// Constructs a new ElementFormControlDataSelect. This should not be called directly; use the
 	/// Factory instead.
 	/// @param[in] tag The tag the element was declared as in RML.
-	ElementFormControlDataSelect(const Rocket::Core::String& tag);
+	ElementFormControlDataSelect(const Rml::Core::String& tag);
 	virtual ~ElementFormControlDataSelect();
 
 	/// Sets the data source the control's options are driven from.
 	/// @param[in] data_source The name of the new data source.
-	void SetDataSource(const Rocket::Core::String& data_source);
+	void SetDataSource(const Rml::Core::String& data_source);
 
 protected:
 	/// If a new data source has been set on the control, this will attach to it and build the
@@ -68,20 +69,20 @@ protected:
 	/// Detaches from the data source and rebuilds the options.
 	virtual void OnDataSourceDestroy(DataSource* data_source);
 	/// Rebuilds the available options from the data source.
-	virtual void OnRowAdd(DataSource* data_source, const Rocket::Core::String& table, int first_row_added, int num_rows_added);
+	virtual void OnRowAdd(DataSource* data_source, const Rml::Core::String& table, int first_row_added, int num_rows_added);
 	/// Rebuilds the available options from the data source.
-	virtual void OnRowRemove(DataSource* data_source, const Rocket::Core::String& table, int first_row_removed, int num_rows_removed);
+	virtual void OnRowRemove(DataSource* data_source, const Rml::Core::String& table, int first_row_removed, int num_rows_removed);
 	/// Rebuilds the available options from the data source.
-	virtual void OnRowChange(DataSource* data_source, const Rocket::Core::String& table, int first_row_changed, int num_rows_changed);
+	virtual void OnRowChange(DataSource* data_source, const Rml::Core::String& table, int first_row_changed, int num_rows_changed);
 	/// Rebuilds the available options from the data source.
-	virtual void OnRowChange(DataSource* data_source, const Rocket::Core::String& table);
+	virtual void OnRowChange(DataSource* data_source, const Rml::Core::String& table);
 
 private:
 	// Builds the option list from the data source.
 	void BuildOptions();
 
 	DataSource* data_source;
-	Rocket::Core::String data_table;
+	Rml::Core::String data_table;
 
 	bool initialised;
 };

Include/Rocket/Controls/ElementFormControlInput.h → Include/RmlUi/Controls/ElementFormControlInput.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +26,13 @@
  *
  */
 
-#ifndef ROCKETCONTROLSELEMENTFORMCONTROLINPUT_H
-#define ROCKETCONTROLSELEMENTFORMCONTROLINPUT_H
+#ifndef RMLUICONTROLSELEMENTFORMCONTROLINPUT_H
+#define RMLUICONTROLSELEMENTFORMCONTROLINPUT_H
 
 #include "Header.h"
 #include "ElementFormControl.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 
 class InputType;
@@ -42,21 +43,21 @@ class InputType;
 	@author Peter Curry
  */
 
-class ROCKETCONTROLS_API ElementFormControlInput : public ElementFormControl
+class RMLUICONTROLS_API ElementFormControlInput : public ElementFormControl
 {
 public:
 	/// Constructs a new ElementFormControlInput. This should not be called directly; use the
 	/// Factory instead.
 	/// @param[in] tag The tag the element was declared as in RML.
-	ElementFormControlInput(const Rocket::Core::String& tag);
+	ElementFormControlInput(const Rml::Core::String& tag);
 	virtual ~ElementFormControlInput();
 
 	/// Returns a string representation of the current value of the form control.
 	/// @return The value of the form control.
-	virtual Rocket::Core::String GetValue() const;
+	virtual Rml::Core::String GetValue() const;
 	/// Sets the current value of the form control.
 	/// @param value[in] The new value of the form control.
-	virtual void SetValue(const Rocket::Core::String& value);
+	virtual void SetValue(const Rml::Core::String& value);
 	/// Returns if this value's type should be submitted with the form.
 	/// @return True if the form control is to be submitted, false otherwise.
 	virtual bool IsSubmitted();
@@ -78,10 +79,10 @@ protected:
 
 	/// If we are the added element, this will pass the call onto our type handler.
 	/// @param[in] child The new member of the hierarchy.
-	virtual void OnChildAdd(Rocket::Core::Element* child) override;
+	virtual void OnChildAdd(Rml::Core::Element* child) override;
 	/// If we are the removed element, this will pass the call onto our type handler.
 	/// @param[in] child The member of the hierarchy that was just removed.
-	virtual void OnChildRemove(Rocket::Core::Element* child) override;
+	virtual void OnChildRemove(Rml::Core::Element* child) override;
 
 	/// Checks for necessary functional changes in the control as a result of the event.
 	/// @param[in] event The event to process.
@@ -89,11 +90,11 @@ protected:
 
 	/// Sizes the dimensions to the element's inherent size.
 	/// @return True.
-	virtual bool GetIntrinsicDimensions(Rocket::Core::Vector2f& dimensions) override;
+	virtual bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions) override;
 
 private:
 	InputType* type;
-	Rocket::Core::String type_name;
+	Rml::Core::String type_name;
 };
 
 }

Include/Rocket/Controls/ElementFormControlSelect.h → Include/RmlUi/Controls/ElementFormControlSelect.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,14 +26,14 @@
  *
  */
 
-#ifndef ROCKETCONTROLSELEMENTFORMCONTROLSELECT_H
-#define ROCKETCONTROLSELEMENTFORMCONTROLSELECT_H
+#ifndef RMLUICONTROLSELEMENTFORMCONTROLSELECT_H
+#define RMLUICONTROLSELEMENTFORMCONTROLSELECT_H
 
 #include "Header.h"
 #include "ElementFormControl.h"
 #include "SelectOption.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 
 class WidgetDropDown;
@@ -43,21 +44,21 @@ class WidgetDropDown;
 	@author Peter Curry
  */
 
-class ROCKETCONTROLS_API ElementFormControlSelect : public ElementFormControl
+class RMLUICONTROLS_API ElementFormControlSelect : public ElementFormControl
 {
 public:
 	/// Constructs a new ElementFormControlSelect. This should not be called directly; use the
 	/// Factory instead.
 	/// @param[in] tag The tag the element was declared as in RML.
-	ElementFormControlSelect(const Rocket::Core::String& tag);
+	ElementFormControlSelect(const Rml::Core::String& tag);
 	virtual ~ElementFormControlSelect();
 
 	/// Returns a string representation of the current value of the form control.
 	/// @return The value of the form control.
-	virtual Rocket::Core::String GetValue() const;
+	virtual Rml::Core::String GetValue() const;
 	/// Sets the current value of the form control.
 	/// @param[in] value The new value of the form control.
-	virtual void SetValue(const Rocket::Core::String& value);
+	virtual void SetValue(const Rml::Core::String& value);
 
 	/// Sets the index of the selection. If the new index lies outside of the bounds, it will be clamped.
 	/// @param[in] selection The new selection index.
@@ -80,7 +81,7 @@ public:
 	/// @param[in] before The index of the element to insert the new option before. If out of bounds of the control's option list (the default) the new option will be added at the end of the list.
 	/// @param[in] selectable If true this option can be selected. If false, this option is not selectable.
 	/// @return The index of the new option.
-	int Add(const Rocket::Core::String& rml, const Rocket::Core::String& value, int before = -1, bool selectable = true);
+	int Add(const Rml::Core::String& rml, const Rml::Core::String& value, int before = -1, bool selectable = true);
 	/// Removes an option from the select control.
 	/// @param[in] index The index of the option to remove. If this is outside of the bounds of the control's option list, no option will be removed.
 	void Remove(int index);
@@ -100,7 +101,7 @@ protected:
 	/// Returns true to mark this element as replaced.
 	/// @param[out] intrinsic_dimensions Set to the arbitrary dimensions of 128 x 16 just to give this element a size. Resize with the 'width' and 'height' properties.
 	/// @return True.
-	virtual bool GetIntrinsicDimensions(Rocket::Core::Vector2f& intrinsic_dimensions);
+	virtual bool GetIntrinsicDimensions(Rml::Core::Vector2f& intrinsic_dimensions);
 
 	WidgetDropDown* widget;
 };

Include/Rocket/Controls/ElementFormControlTextArea.h → Include/RmlUi/Controls/ElementFormControlTextArea.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,39 +26,39 @@
  *
  */
 
-#ifndef ROCKETCONTROLSELEMENTFORMCONTROLTEXTAREA_H
-#define ROCKETCONTROLSELEMENTFORMCONTROLTEXTAREA_H
+#ifndef RMLUICONTROLSELEMENTFORMCONTROLTEXTAREA_H
+#define RMLUICONTROLSELEMENTFORMCONTROLTEXTAREA_H
 
 #include "Header.h"
 #include "ElementFormControl.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 
 class WidgetTextInput;
 
 /**
-	Default Rocket implemention of a text area.
+	Default RmlUi implemention of a text area.
 
 	@author Peter Curry
  */
 
-class ROCKETCONTROLS_API ElementFormControlTextArea : public ElementFormControl
+class RMLUICONTROLS_API ElementFormControlTextArea : public ElementFormControl
 {
 public:
 	/// Constructs a new ElementFormControlTextArea. This should not be called directly; use the
 	/// Factory instead.
 	/// @param[in] tag The tag the element was declared as in RML.
-	ElementFormControlTextArea(const Rocket::Core::String& tag);
+	ElementFormControlTextArea(const Rml::Core::String& tag);
 	virtual ~ElementFormControlTextArea();
 
 	/// Returns a string representation of the current value of the form control. This is the value of the control
 	/// regardless of whether it has been selected / checked (as appropriate for the control).
 	/// @return The value of the form control.
-	virtual Rocket::Core::String GetValue() const override;
+	virtual Rml::Core::String GetValue() const override;
 	/// Sets the current value of the form control.
 	/// @param[in] value The new value of the form control.
-	virtual void SetValue(const Rocket::Core::String& value) override;
+	virtual void SetValue(const Rml::Core::String& value) override;
 
 	/// Sets the number of characters visible across the text area. Note that this will only be precise when using
 	/// a fixed-width font.
@@ -91,7 +92,7 @@ public:
 
 	/// Returns the control's inherent size, based on the length of the input field and the current font size.
 	/// @return True.
-	virtual bool GetIntrinsicDimensions(Rocket::Core::Vector2f& dimensions) override;
+	virtual bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions) override;
 
 protected:
 	/// Updates the control's widget.
@@ -109,7 +110,7 @@ protected:
 
 	/// Returns the text content of the element.
 	/// @param[out] content The content of the element.
-	virtual void GetInnerRML(Rocket::Core::String& content) const override;
+	virtual void GetInnerRML(Rml::Core::String& content) const override;
 
 private:
 	WidgetTextInput* widget;		

Include/Rocket/Controls/ElementTabSet.h → Include/RmlUi/Controls/ElementTabSet.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,14 +26,14 @@
  *
  */
 
-#ifndef ROCKETCONTROLSELEMENTTABSET_H
-#define ROCKETCONTROLSELEMENTTABSET_H
+#ifndef RMLUICONTROLSELEMENTTABSET_H
+#define RMLUICONTROLSELEMENTTABSET_H
 
 #include "../Core/Element.h"
 #include "../Core/EventListener.h"
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 
 /**
@@ -41,20 +42,20 @@ namespace Controls {
 	@author Lloyd Weehuizen
  */
 
-class ROCKETCONTROLS_API ElementTabSet : public Core::Element, public Core::EventListener
+class RMLUICONTROLS_API ElementTabSet : public Core::Element, public Core::EventListener
 {
 public:
-	ElementTabSet(const Rocket::Core::String& tag);
+	ElementTabSet(const Rml::Core::String& tag);
 	~ElementTabSet();
 
 	/// Sets the specifed tab index's tab title RML.
 	/// @param[in] tab_index The tab index to set. If it doesn't already exist, it will be created.
 	/// @param[in] rml The RML to set on the tab title.
-	void SetTab(int tab_index, const Rocket::Core::String& rml);
+	void SetTab(int tab_index, const Rml::Core::String& rml);
 	/// Sets the specifed tab index's tab panel RML.
 	/// @param[in] tab_index The tab index to set. If it doesn't already exist, it will be created.
 	/// @param[in] rml The RML to set on the tab panel.
-	void SetPanel(int tab_index, const Rocket::Core::String& rml);
+	void SetPanel(int tab_index, const Rml::Core::String& rml);
 
 	/// Set the specifed tab index's title element.
 	/// @param[in] tab_index The tab index to set. If it doesn't already exist, it will be created.
@@ -96,7 +97,7 @@ protected:
 	virtual void OnChildRemove(Core::Element* child);
 
 private:
-	Core::Element* GetChildByTag(const Rocket::Core::String& tag);
+	Core::Element* GetChildByTag(const Rml::Core::String& tag);
 
 	int active_tab;
 };

Include/Rocket/Controls/Header.h → Include/RmlUi/Controls/Header.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,28 +26,28 @@
  *
  */
 
-#ifndef ROCKETCONTROLSHEADER_H
-#define ROCKETCONTROLSHEADER_H
+#ifndef RMLUICONTROLSHEADER_H
+#define RMLUICONTROLSHEADER_H
 
 #include "../Core/Platform.h"
 
 #ifdef STATIC_LIB
-	#define ROCKET_STATIC_LIB
-	#pragma message("DEPRECATED: STATIC_LIB macro has been deprecated in favor of ROCKET_STATIC_LIB and support will be removed in a future release")
+	#define RMLUI_STATIC_LIB
+	#pragma message("DEPRECATED: STATIC_LIB macro has been deprecated in favor of RMLUI_STATIC_LIB and support will be removed in a future release")
 #endif
 
-#if !defined ROCKET_STATIC_LIB
-	#ifdef ROCKET_PLATFORM_WIN32
-		#ifdef RocketControls_EXPORTS
-			#define ROCKETCONTROLS_API __declspec(dllexport)
+#if !defined RMLUI_STATIC_LIB
+	#ifdef RMLUI_PLATFORM_WIN32
+		#ifdef RmlControls_EXPORTS
+			#define RMLUICONTROLS_API __declspec(dllexport)
 		#else
-			#define ROCKETCONTROLS_API __declspec(dllimport)
+			#define RMLUICONTROLS_API __declspec(dllimport)
 		#endif
 	#else
-		#define ROCKETCONTROLS_API __attribute__((visibility("default")))
+		#define RMLUICONTROLS_API __attribute__((visibility("default")))
 	#endif
 #else
-	#define ROCKETCONTROLS_API
+	#define RMLUICONTROLS_API
 #endif
 
 #endif

Include/Rocket/Controls/Lua/Controls.h → Include/RmlUi/Controls/Lua/Controls.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,20 +26,20 @@
  *
  */
 
-#ifndef ROCKETCONTROLSLUACONTROLS_H
-#define ROCKETCONTROLSLUACONTROLS_H
+#ifndef RMLUICONTROLSLUACONTROLS_H
+#define RMLUICONTROLSLUACONTROLS_H
 
-#include <Rocket/Controls/Lua/Header.h>
+#include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 namespace Lua {
 /** Doxygen doesn't like to get the namespace, so the full name is
-@c Rocket::Controls::Lua::RegisterTypes.
-This will define all of the types from RocketControls for Lua. 
-@sa Rocket::Core::Lua::Interpreter::RegisterCoreTypes(lua_State*)
-@relatesalso Rocket::Core::Lua::Interpreter*/
-void ROCKETLUA_API RegisterTypes(lua_State* L);
+@c Rml::Controls::Lua::RegisterTypes.
+This will define all of the types from RmlControls for Lua. 
+@sa Rml::Core::Lua::Interpreter::RegisterCoreTypes(lua_State*)
+@relatesalso Rml::Core::Lua::Interpreter*/
+void RMLUILUA_API RegisterTypes(lua_State* L);
 }
 }
 }

Include/Rocket/Core/Lua/Header.h → Include/RmlUi/Controls/Lua/Header.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,34 +26,34 @@
  *
  */
  
-#ifndef ROCKETCORELUAHEADER_H
-#define ROCKETCORELUAHEADER_H
+#ifndef RMLUICONTROLSLUAHEADER_H
+#define RMLUICONTROLSLUAHEADER_H
 
-#include <Rocket/Core/Platform.h>
+#include "../../Core/Platform.h"
 
-#ifdef ROCKETLUA_API
-#undef ROCKETLUA_API
+#ifdef RMLUILUA_API
+#undef RMLUILUA_API
 #endif
 
 #ifdef STATIC_LIB
-	#define ROCKET_STATIC_LIB
-	#pragma message("DEPRECATED: STATIC_LIB macro has been deprecated in favor of ROCKET_STATIC_LIB and support will be removed in a future release")
+	#define RMLUI_STATIC_LIB
+	#pragma message("DEPRECATED: STATIC_LIB macro has been deprecated in favor of RMLUI_STATIC_LIB and support will be removed in a future release")
 #endif
 
-#if !defined ROCKET_STATIC_LIB
-	#ifdef ROCKET_PLATFORM_WIN32
-		#if defined RocketCoreLua_EXPORTS 
-			#define ROCKETLUA_API __declspec(dllexport)
-        	#elif defined RocketControlsLua_EXPORTS
-        	    #define ROCKETLUA_API __declspec(dllexport)
+#if !defined RMLUI_STATIC_LIB
+	#ifdef RMLUI_PLATFORM_WIN32
+		#if defined RmlCoreLua_EXPORTS 
+			#define RMLUILUA_API __declspec(dllexport)
+		#elif defined RmlControlsLua_EXPORTS
+			#define RMLUILUA_API __declspec(dllexport)
         	#else
-			#define ROCKETLUA_API __declspec(dllimport)
+			#define RMLUILUA_API __declspec(dllimport)
 		#endif
 	#else
-		#define ROCKETLUA_API __attribute__((visibility("default")))
+		#define RMLUILUA_API __attribute__((visibility("default")))
 	#endif
 #else
-	#define ROCKETLUA_API
+	#define RMLUILUA_API
 #endif
 
 #endif

Include/Rocket/Controls/SelectOption.h → Include/RmlUi/Controls/SelectOption.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +26,13 @@
  *
  */
 
-#ifndef ROCKETCONTROLSSELECTOPTION_H
-#define ROCKETCONTROLSSELECTOPTION_H
+#ifndef RMLUICONTROLSSELECTOPTION_H
+#define RMLUICONTROLSSELECTOPTION_H
 
 #include "Header.h"
 #include "../Core/String.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Element;
@@ -46,10 +47,10 @@ namespace Controls {
 	@author Peter Curry
  */
 
-class ROCKETCONTROLS_API SelectOption
+class RMLUICONTROLS_API SelectOption
 {
 public:
-	SelectOption(Core::Element* element, const Rocket::Core::String& value, bool selectable);
+	SelectOption(Core::Element* element, const Rml::Core::String& value, bool selectable);
 	~SelectOption();
 
 	/// Returns the element that represents the option visually.
@@ -57,7 +58,7 @@ public:
 	Core::Element* GetElement();
 	/// Returns the value of the option.
 	/// @return The option's value.
-	const Rocket::Core::String& GetValue() const;
+	const Rml::Core::String& GetValue() const;
 
 	/// Returns true if the item is selectable.
 	/// @return True if the item is selectable.
@@ -65,7 +66,7 @@ public:
 
 private:
 	Core::Element* element;
-	Rocket::Core::String value;
+	Rml::Core::String value;
 	bool selectable;
 };
 

Include/Rocket/Core.h → Include/RmlUi/Core.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,8 +26,8 @@
  *
  */
 
-#ifndef ROCKETCORE_H
-#define ROCKETCORE_H
+#ifndef RMLUICORE_H
+#define RMLUICORE_H
 
 #include "Core/Core.h"
 

Include/Rocket/Core/Animation.h → Include/RmlUi/Core/Animation.h

@@ -1,7 +1,7 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2018 Michael Ragazzon
  *
@@ -27,14 +27,14 @@
 
 
 
-#ifndef ROCKETCOREANIMATION_H
-#define ROCKETCOREANIMATION_H
+#ifndef RMLUICOREANIMATION_H
+#define RMLUICOREANIMATION_H
 
 
 #include "String.h"
 #include "Tween.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 /* Data parsed from the 'animation' property. */

Include/Rocket/Core/BaseXMLParser.h → Include/RmlUi/Core/BaseXMLParser.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,15 +26,15 @@
  *
  */
 
-#ifndef ROCKETCOREBASEXMLPARSER_H
-#define ROCKETCOREBASEXMLPARSER_H
+#ifndef RMLUICOREBASEXMLPARSER_H
+#define RMLUICOREBASEXMLPARSER_H
 
 #include "Header.h"
 #include "Types.h"
 #include "Dictionary.h"
 #include <set>
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Stream;
@@ -44,7 +45,7 @@ typedef Dictionary XMLAttributes;
 	@author Peter Curry
  */
 
-class ROCKETCORE_API BaseXMLParser
+class RMLUICORE_API BaseXMLParser
 {
 	public:
 		BaseXMLParser();

Include/Rocket/Core/BitmapFont/FontProvider.h → Include/RmlUi/Core/BitmapFont/FontProvider.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,14 +26,14 @@
  *
  */
 
-#ifndef ROCKETCOREBITMAPFONTFONTPROVIDER_H
-#define ROCKETCOREBITMAPFONTFONTPROVIDER_H
+#ifndef RMLUICOREBITMAPFONTFONTPROVIDER_H
+#define RMLUICOREBITMAPFONTFONTPROVIDER_H
 
 #include "../StringUtilities.h"
 #include "../Font.h"
 #include "../FontProvider.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 
@@ -45,11 +46,11 @@ namespace BitmapFont {
 class FontFamily;
 
 /**
-    The font database contains all font families currently in use by Rocket.
+    The font database contains all font families currently in use by RmlUi.
     @author Peter Curry
  */
 
-class ROCKETCORE_API FontProvider : public Rocket::Core::FontProvider
+class RMLUICORE_API FontProvider : public Rml::Core::FontProvider
 {
 public:
     static bool Initialise();

Include/Rocket/Core/Box.h → Include/RmlUi/Core/Box.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,12 +26,12 @@
  *
  */
 
-#ifndef ROCKETCOREBOX_H
-#define ROCKETCOREBOX_H
+#ifndef RMLUICOREBOX_H
+#define RMLUICOREBOX_H
 
 #include "Types.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 /**
@@ -40,7 +41,7 @@ namespace Core {
 	@author Peter Curry
  */
 
-class ROCKETCORE_API Box
+class RMLUICORE_API Box
 {
 public:
 	enum Area

Include/Rocket/Core/Colour.h → Include/RmlUi/Core/Colour.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,12 +26,12 @@
  *
  */
 
-#ifndef ROCKETCORECOLOUR_H
-#define ROCKETCORECOLOUR_H
+#ifndef RMLUICORECOLOUR_H
+#define RMLUICORECOLOUR_H
 
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 /**	

Include/Rocket/Core/Colour.inl → Include/RmlUi/Core/Colour.inl

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +26,7 @@
  *
  */
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 // Lightweight, non-initialising constructor.
@@ -110,16 +111,16 @@ void Colour< ColourType, AlphaDefault >::operator/=(float rhs)
 }
 
 template < >
-Colour< float, 1 > ROCKETCORE_API Colour< float, 1 >::operator*(const Colour< float, 1 >& rhs) const;
+Colour< float, 1 > RMLUICORE_API Colour< float, 1 >::operator*(const Colour< float, 1 >& rhs) const;
 
 template < >
-Colour< byte, 255 > ROCKETCORE_API Colour< byte, 255 >::operator*(const Colour< byte, 255 >& rhs) const;
+Colour< byte, 255 > RMLUICORE_API Colour< byte, 255 >::operator*(const Colour< byte, 255 >& rhs) const;
 
 template < >
-void ROCKETCORE_API Colour< float, 1 >::operator*=(const Colour& rhs);
+void RMLUICORE_API Colour< float, 1 >::operator*=(const Colour& rhs);
 
 template < >
-void ROCKETCORE_API Colour< byte, 255 >::operator*=(const Colour& rhs);
+void RMLUICORE_API Colour< byte, 255 >::operator*=(const Colour& rhs);
 
 }
 }

Include/Rocket/Core/ComputedValues.h → Include/RmlUi/Core/ComputedValues.h

@@ -1,9 +1,9 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
- * Copyright (c) 2019 Michael R. P. Ragazzon
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +25,13 @@
  *
  */
 
-#ifndef ROCKETCORERCSS_H
-#define ROCKETCORERCSS_H
+#ifndef RMLUICORECOMPUTEDVALUES_H
+#define RMLUICORECOMPUTEDVALUES_H
 
 #include "Types.h"
 #include "Animation.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 namespace Style
@@ -207,8 +207,8 @@ struct ComputedValues
 // Resolves a computed LengthPercentage value to the base unit 'px'. 
 // Percentages are scaled by the base_value.
 // Note: Auto must be manually handled during layout, here it returns zero.
-ROCKETCORE_API float ResolveValue(Style::LengthPercentageAuto length, float base_value);
-ROCKETCORE_API float ResolveValue(Style::LengthPercentage length, float base_value);
+RMLUICORE_API float ResolveValue(Style::LengthPercentageAuto length, float base_value);
+RMLUICORE_API float ResolveValue(Style::LengthPercentage length, float base_value);
 
 
 using ComputedValues = Style::ComputedValues;

Include/Rocket/Core/Containers/chobo/flat_map.hpp → Include/RmlUi/Core/Containers/chobo/flat_map.hpp

@@ -74,7 +74,7 @@
 // 1. Throw
 // Whether to throw exceptions: when `at` is called with a non-existent key.
 // By default, like std::map, it throws an std::out_of_range exception. If you define
-// ROCKET_CHOBO_FLAT_MAP_NO_THROW before including this header, the exception will
+// RMLUI_CHOBO_FLAT_MAP_NO_THROW before including this header, the exception will
 // be substituted by an assertion.
 //
 // 2. const char* overloads
@@ -85,21 +85,21 @@
 // However if const char* or any other class with implicit conversion from
 // const char* is the key, they won't compile.
 // If you plan on using flat_map with such keys, you'll need to define
-// ROCKET_CHOBO_FLAT_MAP_NO_CONST_CHAR_OVERLOADS before including the header
+// RMLUI_CHOBO_FLAT_MAP_NO_CONST_CHAR_OVERLOADS before including the header
 //
 //
 //                  TESTS
 //
 // The tests are included in the header file and use doctest (https://github.com/onqtam/doctest).
-// To run them, define ROCKET_CHOBO_FLAT_MAP_TEST_WITH_DOCTEST before including
+// To run them, define RMLUI_CHOBO_FLAT_MAP_TEST_WITH_DOCTEST before including
 // the header in a file which has doctest.h already included.
 //
 // Additionally if chobo::static_vector is also available you may define
-// ROCKET_CHOBO_FLAT_MAP_TEST_STATIC_VECTOR_WITH_DOCTEST to test flat_map with an
+// RMLUI_CHOBO_FLAT_MAP_TEST_STATIC_VECTOR_WITH_DOCTEST to test flat_map with an
 // unrelying static_vector
 //
 // Additionally if chobo::vector_ptr is also available you may define
-// ROCKET_CHOBO_FLAT_MAP_TEST_VECTOR_PTR_WITH_DOCTEST to test flat_map with an
+// RMLUI_CHOBO_FLAT_MAP_TEST_VECTOR_PTR_WITH_DOCTEST to test flat_map with an
 // unrelying vector_ptr
 //
 #pragma once
@@ -108,19 +108,19 @@
 #include <algorithm>
 #include <type_traits>
 
-#if !defined(ROCKET_CHOBO_FLAT_MAP_NO_CONST_CHAR_OVERLOADS)
+#if !defined(RMLUI_CHOBO_FLAT_MAP_NO_CONST_CHAR_OVERLOADS)
 #include <cstring>
 #endif
 
-#if !defined(ROCKET_CHOBO_FLAT_MAP_NO_THROW)
+#if !defined(RMLUI_CHOBO_FLAT_MAP_NO_THROW)
 #   include <stdexcept>
-#   define _ROCKET_CHOBO_THROW_FLAT_MAP_OUT_OF_RANGE() throw std::out_of_range("chobo::flat_map out of range")
+#   define _RMLUI_CHOBO_THROW_FLAT_MAP_OUT_OF_RANGE() throw std::out_of_range("chobo::flat_map out of range")
 #else
 #   include <cassert>
-#   define _ROCKET_CHOBO_THROW_FLAT_MAP_OUT_OF_RANGE() assert(false && "chobo::flat_map out of range")
+#   define _RMLUI_CHOBO_THROW_FLAT_MAP_OUT_OF_RANGE() assert(false && "chobo::flat_map out of range")
 #endif
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 namespace chobo
 {
@@ -307,7 +307,7 @@ public:
         auto i = lower_bound(k);
         if (i == end() || m_cmp(*i, k))
         {
-            _ROCKET_CHOBO_THROW_FLAT_MAP_OUT_OF_RANGE();
+            _RMLUI_CHOBO_THROW_FLAT_MAP_OUT_OF_RANGE();
         }
 
         return i->second;
@@ -318,7 +318,7 @@ public:
         auto i = lower_bound(k);
         if (i == end() || m_cmp(*i, k))
         {
-            _ROCKET_CHOBO_THROW_FLAT_MAP_OUT_OF_RANGE();
+            _RMLUI_CHOBO_THROW_FLAT_MAP_OUT_OF_RANGE();
         }
 
         return i->second;
@@ -341,7 +341,7 @@ public:
         return m_container;
     }
 
-#if !defined(ROCKET_CHOBO_FLAT_MAP_NO_CONST_CHAR_OVERLOADS)
+#if !defined(RMLUI_CHOBO_FLAT_MAP_NO_CONST_CHAR_OVERLOADS)
     ///////////////////////////////////////////////////////////////////////////////////
     // const char* overloads for maps with an std::string key to avoid allocs
     iterator lower_bound(const char* k)
@@ -381,7 +381,7 @@ public:
         auto i = lower_bound(k);
         if (i == end() || i->first != k)
         {
-            _ROCKET_CHOBO_THROW_FLAT_MAP_OUT_OF_RANGE();
+            _RMLUI_CHOBO_THROW_FLAT_MAP_OUT_OF_RANGE();
         }
 
         return i->second;
@@ -392,7 +392,7 @@ public:
         auto i = lower_bound(k);
         if (i == end() || i->first != k)
         {
-            _ROCKET_CHOBO_THROW_FLAT_MAP_OUT_OF_RANGE();
+            _RMLUI_CHOBO_THROW_FLAT_MAP_OUT_OF_RANGE();
         }
 
         return i->second;
@@ -421,7 +421,7 @@ public:
         return find(k) == end() ? 0 : 1;
     }
 
-#endif // !defined(ROCKET_CHOBO_FLAT_MAP_NO_CONST_CHAR_OVERLOADS)
+#endif // !defined(RMLUI_CHOBO_FLAT_MAP_NO_CONST_CHAR_OVERLOADS)
 
 private:
     struct pair_compare
@@ -466,7 +466,7 @@ bool operator<(const flat_map<Key, T, Compare, Container>& a, const flat_map<Key
 }
 }
 
-#if defined(ROCKET_CHOBO_FLAT_MAP_TEST_WITH_DOCTEST)
+#if defined(RMLUI_CHOBO_FLAT_MAP_TEST_WITH_DOCTEST)
 
 #include <string>
 
@@ -493,7 +493,7 @@ struct int_wrap
 
 TEST_CASE("[flat_map] test")
 {
-    using namespace Rocket::Core::chobo;
+    using namespace Rml::Core::chobo;
     using namespace chobo_flat_map_test;
 
     flat_map<int, float> ifmap;
@@ -654,7 +654,7 @@ TEST_CASE("[flat_map] test")
     CHECK(m2.capacity() == m1c);
 }
 
-#if defined(ROCKET_CHOBO_FLAT_MAP_TEST_STATIC_VECTOR_WITH_DOCTEST)
+#if defined(RMLUI_CHOBO_FLAT_MAP_TEST_STATIC_VECTOR_WITH_DOCTEST)
 
 TEST_CASE("[flat_map] static_vector test")
 {
@@ -724,7 +724,7 @@ TEST_CASE("[flat_map] static_vector test")
 
 #endif
 
-#if defined(ROCKET_CHOBO_FLAT_MAP_TEST_VECTOR_PTR_WITH_DOCTEST)
+#if defined(RMLUI_CHOBO_FLAT_MAP_TEST_VECTOR_PTR_WITH_DOCTEST)
 
 TEST_CASE("[flat_map] vector_ptr test")
 {

Include/Rocket/Core/Containers/chobo/flat_set.hpp → Include/RmlUi/Core/Containers/chobo/flat_set.hpp

@@ -79,21 +79,21 @@
 // However if const char* or any other class with implicit conversion from
 // const char* is the key, they won't compile.
 // If you plan on using flat_set with such keys, you'll need to define
-// ROCKET_CHOBO_FLAT_SET_NO_CONST_CHAR_OVERLOADS before including the header
+// RMLUI_CHOBO_FLAT_SET_NO_CONST_CHAR_OVERLOADS before including the header
 //
 //
 //                  TESTS
 //
 // The tests are included in the header file and use doctest (https://github.com/onqtam/doctest).
-// To run them, define ROCKET_CHOBO_FLAT_SET_TEST_WITH_DOCTEST before including
+// To run them, define RMLUI_CHOBO_FLAT_SET_TEST_WITH_DOCTEST before including
 // the header in a file which has doctest.h already included.
 //
 // Additionally if chobo::static_vector is also available you may define
-// ROCKET_CHOBO_FLAT_SET_TEST_STATIC_VECTOR_WITH_DOCTEST to test flat_set with an
+// RMLUI_CHOBO_FLAT_SET_TEST_STATIC_VECTOR_WITH_DOCTEST to test flat_set with an
 // unrelying static_vector
 //
 // Additionally if chobo::vector_ptr is also available you may define
-// ROCKET_CHOBO_FLAT_SET_TEST_VECTOR_PTR_WITH_DOCTEST to test flat_set with an
+// RMLUI_CHOBO_FLAT_SET_TEST_VECTOR_PTR_WITH_DOCTEST to test flat_set with an
 // unrelying vector_ptr
 //
 #pragma once
@@ -102,11 +102,11 @@
 #include <algorithm>
 #include <type_traits>
 
-#if !defined(ROCKET_CHOBO_FLAT_SET_NO_CONST_CHAR_OVERLOADS)
+#if !defined(RMLUI_CHOBO_FLAT_SET_NO_CONST_CHAR_OVERLOADS)
 #include <cstring>
 #endif
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 namespace chobo {
 
@@ -277,7 +277,7 @@ public:
         return m_container;
     }
 
-#if !defined(ROCKET_CHOBO_FLAT_SET_NO_CONST_CHAR_OVERLOADS)
+#if !defined(RMLUI_CHOBO_FLAT_SET_NO_CONST_CHAR_OVERLOADS)
     ///////////////////////////////////////////////////////////////////////////////////
     // const char* overloads for sets with an std::string key to avoid allocs
     iterator lower_bound(const char* k)
@@ -323,7 +323,7 @@ public:
         return find(k) == end() ? 0 : 1;
     }
 
-#endif // !defined(ROCKET_CHOBO_FLAT_SET_NO_CONST_CHAR_OVERLOADS)
+#endif // !defined(RMLUI_CHOBO_FLAT_SET_NO_CONST_CHAR_OVERLOADS)
 
 private:
 	key_compare m_cmp;
@@ -352,7 +352,7 @@ bool operator<(const flat_set<T, Compare, Container>& a, const flat_set<T, Compa
 }
 }
 
-#if defined(ROCKET_CHOBO_FLAT_SET_TEST_WITH_DOCTEST)
+#if defined(RMLUI_CHOBO_FLAT_SET_TEST_WITH_DOCTEST)
 
 #include <string>
 
@@ -379,7 +379,7 @@ struct int_wrap
 
 TEST_CASE("[flat_set] test")
 {
-    using namespace Rocket::Core::chobo;
+    using namespace Rml::Core::chobo;
     using namespace chobo_flat_set_test;
 
     flat_set<int> iset;
@@ -539,22 +539,22 @@ TEST_CASE("[flat_set] test")
 	CHECK(std::is_sorted(ilset.begin(), ilset.end()));
 }
 
-#if defined(ROCKET_CHOBO_FLAT_SET_TEST_STATIC_VECTOR_WITH_DOCTEST)
+#if defined(RMLUI_CHOBO_FLAT_SET_TEST_STATIC_VECTOR_WITH_DOCTEST)
 
 TEST_CASE("[flat_set] static_vector test")
 {
-    using namespace Rocket::Core::chobo;
+    using namespace Rml::Core::chobo;
 	
 	// Not implemented
 }
 
 #endif
 
-#if defined(ROCKET_CHOBO_FLAT_SET_TEST_VECTOR_PTR_WITH_DOCTEST)
+#if defined(RMLUI_CHOBO_FLAT_SET_TEST_VECTOR_PTR_WITH_DOCTEST)
 
 TEST_CASE("[flat_set] vector_ptr test")
 {
-    using namespace Rocket::Core::chobo;
+    using namespace Rml::Core::chobo;
 
 	// Not implemented
 }

Include/Rocket/Core/Containers/robin_hood.h → Include/RmlUi/Core/Containers/robin_hood.h

@@ -31,13 +31,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#ifndef ROCKET_ROBIN_HOOD_H_INCLUDED
-#define ROCKET_ROBIN_HOOD_H_INCLUDED
+#ifndef RMLUI_ROBIN_HOOD_H_INCLUDED
+#define RMLUI_ROBIN_HOOD_H_INCLUDED
 
 // see https://semver.org/
-#define ROCKET_ROBIN_HOOD_VERSION_MAJOR 3 // for incompatible API changes
-#define ROCKET_ROBIN_HOOD_VERSION_MINOR 2 // for adding functionality in a backwards-compatible manner
-#define ROCKET_ROBIN_HOOD_VERSION_PATCH 7 // for backwards-compatible bug fixes
+#define RMLUI_ROBIN_HOOD_VERSION_MAJOR 3 // for incompatible API changes
+#define RMLUI_ROBIN_HOOD_VERSION_MINOR 2 // for adding functionality in a backwards-compatible manner
+#define RMLUI_ROBIN_HOOD_VERSION_PATCH 7 // for backwards-compatible bug fixes
 
 #include <algorithm>
 #include <cstdlib>
@@ -48,34 +48,34 @@
 #include <type_traits>
 #include <utility>
 
-// #define ROCKET_ROBIN_HOOD_LOG_ENABLED
-#ifdef ROCKET_ROBIN_HOOD_LOG_ENABLED
+// #define RMLUI_ROBIN_HOOD_LOG_ENABLED
+#ifdef RMLUI_ROBIN_HOOD_LOG_ENABLED
 #    include <iostream>
-#    define ROCKET_ROBIN_HOOD_LOG(x) std::cout << __FUNCTION__ << "@" << __LINE__ << ": " << x << std::endl
+#    define RMLUI_ROBIN_HOOD_LOG(x) std::cout << __FUNCTION__ << "@" << __LINE__ << ": " << x << std::endl
 #else
-#    define ROCKET_ROBIN_HOOD_LOG(x)
+#    define RMLUI_ROBIN_HOOD_LOG(x)
 #endif
 
 // mark unused members with this macro
-#define ROCKET_ROBIN_HOOD_UNUSED(identifier)
+#define RMLUI_ROBIN_HOOD_UNUSED(identifier)
 
 // bitness
 #if SIZE_MAX == UINT32_MAX
-#    define ROCKET_ROBIN_HOOD_BITNESS 32
+#    define RMLUI_ROBIN_HOOD_BITNESS 32
 #elif SIZE_MAX == UINT64_MAX
-#    define ROCKET_ROBIN_HOOD_BITNESS 64
+#    define RMLUI_ROBIN_HOOD_BITNESS 64
 #else
 #    error Unsupported bitness
 #endif
 
 // endianess
 #ifdef _WIN32
-#    define ROCKET_ROBIN_HOOD_LITTLE_ENDIAN 1
-#    define ROCKET_ROBIN_HOOD_BIG_ENDIAN 0
+#    define RMLUI_ROBIN_HOOD_LITTLE_ENDIAN 1
+#    define RMLUI_ROBIN_HOOD_BIG_ENDIAN 0
 #else
 #    if __GNUC__ >= 4
-#        define ROCKET_ROBIN_HOOD_LITTLE_ENDIAN (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-#        define ROCKET_ROBIN_HOOD_BIG_ENDIAN (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
+#        define RMLUI_ROBIN_HOOD_LITTLE_ENDIAN (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+#        define RMLUI_ROBIN_HOOD_BIG_ENDIAN (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
 #    else
 #        error cannot determine endianness
 #    endif
@@ -83,48 +83,48 @@
 
 // inline
 #ifdef _WIN32
-#    define ROCKET_ROBIN_HOOD_NOINLINE __declspec(noinline)
+#    define RMLUI_ROBIN_HOOD_NOINLINE __declspec(noinline)
 #else
 #    if __GNUC__ >= 4
-#        define ROCKET_ROBIN_HOOD_NOINLINE __attribute__((noinline))
+#        define RMLUI_ROBIN_HOOD_NOINLINE __attribute__((noinline))
 #    else
-#        define ROCKET_ROBIN_HOOD_NOINLINE
+#        define RMLUI_ROBIN_HOOD_NOINLINE
 #    endif
 #endif
 
 // count leading/trailing bits
 #ifdef _WIN32
-#    if ROCKET_ROBIN_HOOD_BITNESS == 32
-#        define ROCKET_ROBIN_HOOD_BITSCANFORWARD _BitScanForward
+#    if RMLUI_ROBIN_HOOD_BITNESS == 32
+#        define RMLUI_ROBIN_HOOD_BITSCANFORWARD _BitScanForward
 #    else
-#        define ROCKET_ROBIN_HOOD_BITSCANFORWARD _BitScanForward64
+#        define RMLUI_ROBIN_HOOD_BITSCANFORWARD _BitScanForward64
 #    endif
 #    include <intrin.h>
-#    pragma intrinsic(ROCKET_ROBIN_HOOD_BITSCANFORWARD)
-#    define ROCKET_ROBIN_HOOD_COUNT_TRAILING_ZEROES(x)                                      \
+#    pragma intrinsic(RMLUI_ROBIN_HOOD_BITSCANFORWARD)
+#    define RMLUI_ROBIN_HOOD_COUNT_TRAILING_ZEROES(x)                                      \
         [](size_t mask) -> int {                                                     \
             unsigned long index;                                                     \
-            return ROCKET_ROBIN_HOOD_BITSCANFORWARD(&index, mask) ? static_cast<int>(index) \
-                                                           : ROCKET_ROBIN_HOOD_BITNESS;     \
+            return RMLUI_ROBIN_HOOD_BITSCANFORWARD(&index, mask) ? static_cast<int>(index) \
+                                                           : RMLUI_ROBIN_HOOD_BITNESS;     \
         }(x)
 #else
 #    if __GNUC__ >= 4
-#        if ROCKET_ROBIN_HOOD_BITNESS == 32
-#            define ROCKET_ROBIN_HOOD_CTZ(x) __builtin_ctzl(x)
-#            define ROCKET_ROBIN_HOOD_CLZ(x) __builtin_clzl(x)
+#        if RMLUI_ROBIN_HOOD_BITNESS == 32
+#            define RMLUI_ROBIN_HOOD_CTZ(x) __builtin_ctzl(x)
+#            define RMLUI_ROBIN_HOOD_CLZ(x) __builtin_clzl(x)
 #        else
-#            define ROCKET_ROBIN_HOOD_CTZ(x) __builtin_ctzll(x)
-#            define ROCKET_ROBIN_HOOD_CLZ(x) __builtin_clzll(x)
+#            define RMLUI_ROBIN_HOOD_CTZ(x) __builtin_ctzll(x)
+#            define RMLUI_ROBIN_HOOD_CLZ(x) __builtin_clzll(x)
 #        endif
-#        define ROCKET_ROBIN_HOOD_COUNT_LEADING_ZEROES(x) (x ? ROCKET_ROBIN_HOOD_CLZ(x) : ROCKET_ROBIN_HOOD_BITNESS)
-#        define ROCKET_ROBIN_HOOD_COUNT_TRAILING_ZEROES(x) (x ? ROCKET_ROBIN_HOOD_CTZ(x) : ROCKET_ROBIN_HOOD_BITNESS)
+#        define RMLUI_ROBIN_HOOD_COUNT_LEADING_ZEROES(x) (x ? RMLUI_ROBIN_HOOD_CLZ(x) : RMLUI_ROBIN_HOOD_BITNESS)
+#        define RMLUI_ROBIN_HOOD_COUNT_TRAILING_ZEROES(x) (x ? RMLUI_ROBIN_HOOD_CTZ(x) : RMLUI_ROBIN_HOOD_BITNESS)
 #    else
 #        error clz not supported
 #    endif
 #endif
 
 // umul
-namespace Rocket {
+namespace Rml {
 namespace Core {
 namespace robin_hood {
 namespace detail {
@@ -135,21 +135,21 @@ namespace detail {
 using uint128_t = unsigned __int128;
 #        pragma GCC diagnostic pop
 #    endif
-#    define ROCKET_ROBIN_HOOD_UMULH(a, b) \
+#    define RMLUI_ROBIN_HOOD_UMULH(a, b) \
         static_cast<uint64_t>((static_cast<uint128_t>(a) * static_cast<uint128_t>(b)) >> 64u)
 
-#    define ROCKET_ROBIN_HOOD_HAS_UMUL128 1
+#    define RMLUI_ROBIN_HOOD_HAS_UMUL128 1
 inline uint64_t umul128(uint64_t a, uint64_t b, uint64_t* high) {
     auto result = static_cast<uint128_t>(a) * static_cast<uint128_t>(b);
     *high = static_cast<uint64_t>(result >> 64);
     return static_cast<uint64_t>(result);
 }
-#elif (defined(_WIN32) && ROCKET_ROBIN_HOOD_BITNESS == 64)
-#    define ROCKET_ROBIN_HOOD_HAS_UMUL128 1
+#elif (defined(_WIN32) && RMLUI_ROBIN_HOOD_BITNESS == 64)
+#    define RMLUI_ROBIN_HOOD_HAS_UMUL128 1
 #    include <intrin.h> // for __umulh
 #    pragma intrinsic(__umulh)
 #    pragma intrinsic(_umul128)
-#    define ROCKET_ROBIN_HOOD_UMULH(a, b) __umulh(a, b)
+#    define RMLUI_ROBIN_HOOD_UMULH(a, b) __umulh(a, b)
 inline uint64_t umul128(uint64_t a, uint64_t b, uint64_t* high) {
     return _umul128(a, b, high);
 }
@@ -182,17 +182,17 @@ inline T reinterpret_cast_no_cast_align_warning(void const* ptr) {
 } // namespace detail
 } // namespace robin_hood
 } // namespace Core
-} // namespace Rocket
+} // namespace Rml
 
 // likely/unlikely
 #if !defined(_WIN32) && (__GNUC__ >= 4)
-#    define ROCKET_ROBIN_HOOD_LIKELY(condition) __builtin_expect(condition, 1)
-#    define ROCKET_ROBIN_HOOD_UNLIKELY(condition) __builtin_expect(condition, 0)
+#    define RMLUI_ROBIN_HOOD_LIKELY(condition) __builtin_expect(condition, 1)
+#    define RMLUI_ROBIN_HOOD_UNLIKELY(condition) __builtin_expect(condition, 0)
 #else
-#    define ROCKET_ROBIN_HOOD_LIKELY(condition) condition
-#    define ROCKET_ROBIN_HOOD_UNLIKELY(condition) condition
+#    define RMLUI_ROBIN_HOOD_LIKELY(condition) condition
+#    define RMLUI_ROBIN_HOOD_UNLIKELY(condition) condition
 #endif
-namespace Rocket {
+namespace Rml {
 namespace Core {
 namespace robin_hood {
 
@@ -201,13 +201,13 @@ namespace detail {
 // make sure this is not inlined as it is slow and dramatically enlarges code, thus making other
 // inlinings more difficult. Throws are also generally the slow path.
 template <typename E, typename... Args>
-ROCKET_ROBIN_HOOD_NOINLINE void doThrow(Args&&... args) {
+RMLUI_ROBIN_HOOD_NOINLINE void doThrow(Args&&... args) {
     throw E(std::forward<Args>(args)...);
 }
 
 template <typename E, typename T, typename... Args>
 T* assertNotNull(T* t, Args&&... args) {
-    if (ROCKET_ROBIN_HOOD_UNLIKELY(nullptr == t)) {
+    if (RMLUI_ROBIN_HOOD_UNLIKELY(nullptr == t)) {
         doThrow<E>(std::forward<Args>(args)...);
     }
     return t;
@@ -233,7 +233,7 @@ public:
         , mListForFree(nullptr) {}
 
     // does not copy anything, just creates a new allocator.
-    BulkPoolAllocator(const BulkPoolAllocator& ROCKET_ROBIN_HOOD_UNUSED(o) /*unused*/)
+    BulkPoolAllocator(const BulkPoolAllocator& RMLUI_ROBIN_HOOD_UNUSED(o) /*unused*/)
         : mHead(nullptr)
         , mListForFree(nullptr) {}
 
@@ -253,7 +253,7 @@ public:
         return *this;
     }
 
-    BulkPoolAllocator& operator=(const BulkPoolAllocator& ROCKET_ROBIN_HOOD_UNUSED(o) /*unused*/) {
+    BulkPoolAllocator& operator=(const BulkPoolAllocator& RMLUI_ROBIN_HOOD_UNUSED(o) /*unused*/) {
         // does not do anything
         return *this;
     }
@@ -362,7 +362,7 @@ private:
 
     // Called when no memory is available (mHead == 0).
     // Don't inline this slow path.
-    ROCKET_ROBIN_HOOD_NOINLINE T* performAllocation() {
+    RMLUI_ROBIN_HOOD_NOINLINE T* performAllocation() {
         size_t const numElementsToAlloc = calcNumElementsToAlloc();
 
         // alloc new memory: [prev |T, T, ... T]
@@ -395,7 +395,7 @@ template <typename T, size_t MinSize, size_t MaxSize>
 struct NodeAllocator<T, MinSize, MaxSize, true> {
 
     // we are not using the data, so just free it.
-    void addOrFree(void* ptr, size_t ROCKET_ROBIN_HOOD_UNUSED(numBytes) /*unused*/) {
+    void addOrFree(void* ptr, size_t RMLUI_ROBIN_HOOD_UNUSED(numBytes) /*unused*/) {
         free(ptr);
     }
 };
@@ -541,7 +541,7 @@ inline size_t hash_bytes(void const* ptr, size_t const len) {
     h ^= h >> r;
     h *= m;
     h ^= h >> r;
-#if ROCKET_ROBIN_HOOD_BITNESS == 32
+#if RMLUI_ROBIN_HOOD_BITNESS == 32
     return static_cast<size_t>(h);
 #else
     return h;
@@ -559,13 +559,13 @@ struct hash<std::string> {
 template <>
 struct hash<uint64_t> {
     size_t operator()(uint64_t const& obj) const {
-#if defined(ROCKET_ROBIN_HOOD_HAS_UMUL128)
+#if defined(RMLUI_ROBIN_HOOD_HAS_UMUL128)
         // 167079903232 masksum, 120428523 ops best: 0xde5fb9d2630458e9
         static constexpr uint64_t k = UINT64_C(0xde5fb9d2630458e9);
         uint64_t h;
         uint64_t l = detail::umul128(obj, k, &h);
         return h + l;
-#elif ROCKET_ROBIN_HOOD_BITNESS == 32
+#elif RMLUI_ROBIN_HOOD_BITNESS == 32
         static constexpr uint32_t k = UINT32_C(0x9a0ecda7);
         uint64_t const r = obj * k;
         uint32_t h = static_cast<uint32_t>(r >> 32);
@@ -594,7 +594,7 @@ struct hash<int64_t> {
 template <>
 struct hash<uint32_t> {
     size_t operator()(uint32_t const& h) const {
-#if ROCKET_ROBIN_HOOD_BITNESS == 32
+#if RMLUI_ROBIN_HOOD_BITNESS == 32
         return static_cast<size_t>((UINT64_C(0xca4bcaa75ec3f625) * static_cast<uint64_t>(h)) >> 32);
 #else
         return hash<uint64_t>{}(static_cast<uint64_t>(h));
@@ -687,14 +687,14 @@ private:
     class DataNode<M, true> final {
     public:
         template <typename... Args>
-        explicit DataNode(M& ROCKET_ROBIN_HOOD_UNUSED(map) /*unused*/, Args&&... args)
+        explicit DataNode(M& RMLUI_ROBIN_HOOD_UNUSED(map) /*unused*/, Args&&... args)
             : mData(std::forward<Args>(args)...) {}
 
-        DataNode(M& ROCKET_ROBIN_HOOD_UNUSED(map) /*unused*/, DataNode<M, true>&& n)
+        DataNode(M& RMLUI_ROBIN_HOOD_UNUSED(map) /*unused*/, DataNode<M, true>&& n)
             : mData(std::move(n.mData)) {}
 
         // doesn't do anything
-        void destroy(M& ROCKET_ROBIN_HOOD_UNUSED(map) /*unused*/) {}
+        void destroy(M& RMLUI_ROBIN_HOOD_UNUSED(map) /*unused*/) {}
         void destroyDoNotDeallocate() {}
 
         value_type const* operator->() const {
@@ -746,7 +746,7 @@ private:
             ::new (static_cast<void*>(mData)) value_type(std::forward<Args>(args)...);
         }
 
-        DataNode(M& ROCKET_ROBIN_HOOD_UNUSED(map) /*unused*/, DataNode<M, false>&& n)
+        DataNode(M& RMLUI_ROBIN_HOOD_UNUSED(map) /*unused*/, DataNode<M, false>&& n)
             : mData(std::move(n.mData)) {}
 
         void destroy(M& map) {
@@ -912,7 +912,7 @@ private:
             , mInfo(infoPtr) {}
 
         Iter(NodePtr valPtr, uint8_t const* infoPtr,
-             fast_forward_tag ROCKET_ROBIN_HOOD_UNUSED(tag) /*unused*/)
+             fast_forward_tag RMLUI_ROBIN_HOOD_UNUSED(tag) /*unused*/)
             : mKeyVals(valPtr)
             , mInfo(infoPtr) {
             fastForward();
@@ -950,10 +950,10 @@ private:
             int inc;
             do {
                 auto const n = detail::unaligned_load<size_t>(mInfo);
-#if ROCKET_ROBIN_HOOD_LITTLE_ENDIAN
-                inc = ROCKET_ROBIN_HOOD_COUNT_TRAILING_ZEROES(n) / 8;
+#if RMLUI_ROBIN_HOOD_LITTLE_ENDIAN
+                inc = RMLUI_ROBIN_HOOD_COUNT_TRAILING_ZEROES(n) / 8;
 #else
-                inc = ROCKET_ROBIN_HOOD_COUNT_LEADING_ZEROES(n) / 8;
+                inc = RMLUI_ROBIN_HOOD_COUNT_LEADING_ZEROES(n) / 8;
 #endif
                 mInfo += inc;
                 mKeyVals += inc;
@@ -970,7 +970,7 @@ private:
 
     size_t calcNumBytesInfo(size_t numElements) const {
         const size_t s = sizeof(uint8_t) * (numElements + 1);
-        if (ROCKET_ROBIN_HOOD_UNLIKELY(s / sizeof(uint8_t) != numElements + 1)) {
+        if (RMLUI_ROBIN_HOOD_UNLIKELY(s / sizeof(uint8_t) != numElements + 1)) {
             throwOverflowError();
         }
         // make sure it's a bit larger, so we can load 64bit numbers
@@ -978,7 +978,7 @@ private:
     }
     size_t calcNumBytesNode(size_t numElements) const {
         const size_t s = sizeof(Node) * numElements;
-        if (ROCKET_ROBIN_HOOD_UNLIKELY(s / sizeof(Node) != numElements)) {
+        if (RMLUI_ROBIN_HOOD_UNLIKELY(s / sizeof(Node) != numElements)) {
             throwOverflowError();
         }
         return s;
@@ -987,7 +987,7 @@ private:
         const size_t si = calcNumBytesInfo(numElements);
         const size_t sn = calcNumBytesNode(numElements);
         const size_t s = si + sn;
-        if (ROCKET_ROBIN_HOOD_UNLIKELY(s <= si || s <= sn)) {
+        if (RMLUI_ROBIN_HOOD_UNLIKELY(s <= si || s <= sn)) {
             throwOverflowError();
         }
         return s;
@@ -999,9 +999,9 @@ private:
     template <typename HashKey>
     void keyToIdx(HashKey&& key, size_t& idx, InfoType& info) const {
         static constexpr size_t bad_hash_prevention =
-            std::is_same<::Rocket::Core::robin_hood::hash<key_type>, hasher>::value
+            std::is_same<::Rml::Core::robin_hood::hash<key_type>, hasher>::value
                 ? 1
-                : (ROCKET_ROBIN_HOOD_BITNESS == 64 ? UINT64_C(0xb3727c1f779b8d8b) : UINT32_C(0xda4afe47));
+                : (RMLUI_ROBIN_HOOD_BITNESS == 64 ? UINT64_C(0xb3727c1f779b8d8b) : UINT32_C(0xda4afe47));
         idx = Hash::operator()(key) * bad_hash_prevention;
         info = mInfoInc + static_cast<InfoType>(idx >> mInfoHashShift);
         idx &= mMask;
@@ -1032,7 +1032,7 @@ private:
                 ::new (static_cast<void*>(mKeyVals + idx)) Node(std::move(mKeyVals[prev_idx]));
             }
             mInfo[idx] = static_cast<uint8_t>(mInfo[prev_idx] + mInfoInc);
-            if (ROCKET_ROBIN_HOOD_UNLIKELY(mInfo[idx] + mInfoInc > 0xFF)) {
+            if (RMLUI_ROBIN_HOOD_UNLIKELY(mInfo[idx] + mInfoInc > 0xFF)) {
                 mMaxNumElementsAllowed = 0;
             }
             idx = prev_idx;
@@ -1108,7 +1108,7 @@ private:
         // key not found, so we are now exactly where we want to insert it.
         auto const insertion_idx = idx;
         auto const insertion_info = static_cast<uint8_t>(info);
-        if (ROCKET_ROBIN_HOOD_UNLIKELY(insertion_info + mInfoInc > 0xFF)) {
+        if (RMLUI_ROBIN_HOOD_UNLIKELY(insertion_info + mInfoInc > 0xFF)) {
             mMaxNumElementsAllowed = 0;
         }
 
@@ -1141,13 +1141,13 @@ public:
     // payed at the first insert, and not before. Lookup of this empty map works because everybody
     // points to DummyInfoByte::b. parameter bucket_count is dictated by the standard, but we can
     // ignore it.
-    explicit unordered_map(size_t ROCKET_ROBIN_HOOD_UNUSED(bucket_count) /*unused*/ = 0,
+    explicit unordered_map(size_t RMLUI_ROBIN_HOOD_UNUSED(bucket_count) /*unused*/ = 0,
                            const Hash& h = Hash{}, const KeyEqual& equal = KeyEqual{})
         : Hash(h)
         , KeyEqual(equal) {}
 
     template <typename Iter>
-    unordered_map(Iter first, Iter last, size_t ROCKET_ROBIN_HOOD_UNUSED(bucket_count) /*unused*/ = 0,
+    unordered_map(Iter first, Iter last, size_t RMLUI_ROBIN_HOOD_UNUSED(bucket_count) /*unused*/ = 0,
                   const Hash& h = Hash{}, const KeyEqual& equal = KeyEqual{})
         : Hash(h)
         , KeyEqual(equal) {
@@ -1155,7 +1155,7 @@ public:
     }
 
     unordered_map(std::initializer_list<value_type> init,
-                  size_t ROCKET_ROBIN_HOOD_UNUSED(bucket_count) /*unused*/ = 0, const Hash& h = Hash{},
+                  size_t RMLUI_ROBIN_HOOD_UNUSED(bucket_count) /*unused*/ = 0, const Hash& h = Hash{},
                   const KeyEqual& equal = KeyEqual{})
         : Hash(h)
         , KeyEqual(equal) {
@@ -1510,7 +1510,7 @@ public:
         while (calcMaxNumElementsAllowed(newSize) < count && newSize != 0) {
             newSize *= 2;
         }
-        if (ROCKET_ROBIN_HOOD_UNLIKELY(newSize == 0)) {
+        if (RMLUI_ROBIN_HOOD_UNLIKELY(newSize == 0)) {
             throwOverflowError();
         }
 
@@ -1518,7 +1518,7 @@ public:
     }
 
     void rehash(size_t numBuckets) {
-        if (ROCKET_ROBIN_HOOD_UNLIKELY((numBuckets & (numBuckets - 1)) != 0)) {
+        if (RMLUI_ROBIN_HOOD_UNLIKELY((numBuckets & (numBuckets - 1)) != 0)) {
             doThrow<std::runtime_error>("rehash only allowed for power of two");
         }
 
@@ -1569,7 +1569,7 @@ public:
     }
 
 private:
-    ROCKET_ROBIN_HOOD_NOINLINE void throwOverflowError() const {
+    RMLUI_ROBIN_HOOD_NOINLINE void throwOverflowError() const {
         throw std::overflow_error("robin_hood::map overflow");
     }
 
@@ -1609,7 +1609,7 @@ private:
             }
 
             // unlikely that this evaluates to true
-            if (ROCKET_ROBIN_HOOD_UNLIKELY(mNumElements >= mMaxNumElementsAllowed)) {
+            if (RMLUI_ROBIN_HOOD_UNLIKELY(mNumElements >= mMaxNumElementsAllowed)) {
                 increase_size();
                 continue;
             }
@@ -1617,7 +1617,7 @@ private:
             // key not found, so we are now exactly where we want to insert it.
             auto const insertion_idx = idx;
             auto const insertion_info = info;
-            if (ROCKET_ROBIN_HOOD_UNLIKELY(insertion_info + mInfoInc > 0xFF)) {
+            if (RMLUI_ROBIN_HOOD_UNLIKELY(insertion_info + mInfoInc > 0xFF)) {
                 mMaxNumElementsAllowed = 0;
             }
 
@@ -1668,7 +1668,7 @@ private:
             }
 
             // unlikely that this evaluates to true
-            if (ROCKET_ROBIN_HOOD_UNLIKELY(mNumElements >= mMaxNumElementsAllowed)) {
+            if (RMLUI_ROBIN_HOOD_UNLIKELY(mNumElements >= mMaxNumElementsAllowed)) {
                 increase_size();
                 continue;
             }
@@ -1676,7 +1676,7 @@ private:
             // key not found, so we are now exactly where we want to insert it.
             auto const insertion_idx = idx;
             auto const insertion_info = info;
-            if (ROCKET_ROBIN_HOOD_UNLIKELY(insertion_info + mInfoInc > 0xFF)) {
+            if (RMLUI_ROBIN_HOOD_UNLIKELY(insertion_info + mInfoInc > 0xFF)) {
                 mMaxNumElementsAllowed = 0;
             }
 
@@ -1714,7 +1714,7 @@ private:
     }
 
     bool try_increase_info() {
-        ROCKET_ROBIN_HOOD_LOG("mInfoInc=" << mInfoInc << ", numElements=" << mNumElements
+        RMLUI_ROBIN_HOOD_LOG("mInfoInc=" << mInfoInc << ", numElements=" << mNumElements
                                    << ", maxNumElementsAllowed="
                                    << calcMaxNumElementsAllowed(mMask + 1));
         if (mInfoInc <= 2) {
@@ -1749,7 +1749,7 @@ private:
             return;
         }
 
-        ROCKET_ROBIN_HOOD_LOG("mNumElements=" << mNumElements << ", maxNumElementsAllowed="
+        RMLUI_ROBIN_HOOD_LOG("mNumElements=" << mNumElements << ", maxNumElementsAllowed="
                                        << maxNumElementsAllowed << ", load="
                                        << (static_cast<double>(mNumElements) * 100.0 /
                                            (static_cast<double>(mMask) + 1)));
@@ -1803,5 +1803,5 @@ using unordered_map =
 
 } // namespace robin_hood
 } // namespace Core
-} // namespace Rocket
+} // namespace Rml
 #endif

Include/Rocket/Core/Context.h → Include/RmlUi/Core/Context.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,8 +26,8 @@
  *
  */
 
-#ifndef ROCKETCORECONTEXT_H
-#define ROCKETCORECONTEXT_H
+#ifndef RMLUICORECONTEXT_H
+#define RMLUICORECONTEXT_H
 
 #include "Header.h"
 #include "Types.h"
@@ -37,7 +38,7 @@
 #include "ScriptInterface.h"
 #include "ViewState.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Stream;
@@ -53,7 +54,7 @@ enum class EventId : uint16_t;
 	@author Peter Curry
  */
 
-class ROCKETCORE_API Context : public ScriptInterface
+class RMLUICORE_API Context : public ScriptInterface
 {
 public:
 	/// Constructs a new, uninitialised context. This should not be called directly, use Core::CreateContext()
@@ -193,15 +194,15 @@ public:
 	/// @param[in] key_modifier_state The state of key modifiers (shift, control, caps-lock, etc) keys; this should be generated by ORing together members of the Input::KeyModifier enumeration.
 	void ProcessMouseButtonUp(int button_index, int key_modifier_state);
 	/// Sends a mouse-wheel movement event into this context.
-	/// @param[in] wheel_delta The mouse-wheel movement this frame. Rocket treats a negative delta as up movement (away from the user), positive as down.
+	/// @param[in] wheel_delta The mouse-wheel movement this frame. RmlUi treats a negative delta as up movement (away from the user), positive as down.
 	/// @param[in] key_modifier_state The state of key modifiers (shift, control, caps-lock, etc) keys; this should be generated by ORing together members of the Input::KeyModifier enumeration.
 	/// @return True if the event was not consumed (ie, was prevented from propagating by an element), false if it was.
 	bool ProcessMouseWheel(float wheel_delta, int key_modifier_state);
 
-	/// Notifies Rocket of a change in the projection matrix.
+	/// Notifies RmlUi of a change in the projection matrix.
 	/// @param[in] projection The new projection matrix.
 	void ProcessProjectionChange(const Matrix4f &projection);
-	/// Notifies Rocket of a change in the view matrix.
+	/// Notifies RmlUi of a change in the view matrix.
 	/// @param[in] projection The new view matrix.
 	void ProcessViewChange(const Matrix4f &view);
 
@@ -330,7 +331,7 @@ private:
 	static void SendEvents(const ElementSet& old_items, const ElementSet& new_items, EventId id, const Dictionary& parameters);
 
 	friend class Element;
-	friend ROCKETCORE_API Context* CreateContext(const String&, const Vector2i&, RenderInterface*);
+	friend RMLUICORE_API Context* CreateContext(const String&, const Vector2i&, RenderInterface*);
 };
 
 }

Include/Rocket/Core/ContextInstancer.h → Include/RmlUi/Core/ContextInstancer.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +26,13 @@
  *
  */
 
-#ifndef ROCKETCORECONTEXTINSTANCER_H
-#define ROCKETCORECONTEXTINSTANCER_H
+#ifndef RMLUICORECONTEXTINSTANCER_H
+#define RMLUICORECONTEXTINSTANCER_H
 
 #include "ReferenceCountable.h"
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Context;
@@ -43,7 +44,7 @@ class Event;
 	@author Lloyd Weehuizen
  */
 
-class ROCKETCORE_API ContextInstancer : public ReferenceCountable
+class RMLUICORE_API ContextInstancer : public ReferenceCountable
 {
 public:
 	virtual ~ContextInstancer();

Include/Rocket/Core/ConvolutionFilter.h → Include/RmlUi/Core/ConvolutionFilter.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,10 +26,10 @@
  *
  */
 
-#ifndef ROCKETCORECONVOLUTIONFILTER_H
-#define ROCKETCORECONVOLUTIONFILTER_H
+#ifndef RMLUICORECONVOLUTIONFILTER_H
+#define RMLUICORECONVOLUTIONFILTER_H
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 /**

Include/Rocket/Core/Core.h → Include/RmlUi/Core/Core.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,8 +26,8 @@
  *
  */
 
-#ifndef ROCKETCORECORE_H
-#define ROCKETCORECORE_H
+#ifndef RMLUICORECORE_H
+#define RMLUICORECORE_H
 
 #include "Types.h"
 #include "Math.h"
@@ -82,70 +83,70 @@
 #include "XMLNodeHandler.h"
 #include "XMLParser.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Plugin;
 
 /**
-	Rocket library core API.
+	RmlUi library core API.
 
 	@author Peter Curry
  */
 
-/// Initialises Rocket.
-ROCKETCORE_API bool Initialise();
-/// Shutdown Rocket.
-ROCKETCORE_API void Shutdown();
+/// Initialises RmlUi.
+RMLUICORE_API bool Initialise();
+/// Shutdown RmlUi.
+RMLUICORE_API void Shutdown();
 
-/// Returns the version of this Rocket library.
+/// Returns the version of this RmlUi library.
 /// @return The version number.
-ROCKETCORE_API String GetVersion();
+RMLUICORE_API String GetVersion();
 
 /// Sets the interface through which all system requests are made. This must be called before Initialise().
 /// @param[in] system_interface The application-specified logging interface.
-ROCKETCORE_API void SetSystemInterface(SystemInterface* system_interface);
-/// Returns Rocket's system interface.
-/// @return Rocket's system interface.
-ROCKETCORE_API SystemInterface* GetSystemInterface();
+RMLUICORE_API void SetSystemInterface(SystemInterface* system_interface);
+/// Returns RmlUi's system interface.
+/// @return RmlUi's system interface.
+RMLUICORE_API SystemInterface* GetSystemInterface();
 
 /// Sets the interface through which all rendering requests are made. This is not required to be called, but if it is
 /// it must be called before Initialise(). If no render interface is specified, then all contexts must have a custom
 /// render interface.
 /// @param[in] render_interface Render interface implementation.
-ROCKETCORE_API void SetRenderInterface(RenderInterface* render_interface);
-/// Returns Rocket's default's render interface.
-/// @return Rocket's render interface.
-ROCKETCORE_API RenderInterface* GetRenderInterface();
+RMLUICORE_API void SetRenderInterface(RenderInterface* render_interface);
+/// Returns RmlUi's default's render interface.
+/// @return RmlUi's render interface.
+RMLUICORE_API RenderInterface* GetRenderInterface();
 
 /// Sets the interface through which all file I/O requests are made. This is not required to be called, but if it is it
 /// must be called before Initialise().
 /// @param[in] file_interface The application-specified file interface
-ROCKETCORE_API void SetFileInterface(FileInterface* file_interface);
-/// Returns Rocket's file interface.
-/// @return Rocket's file interface.
-ROCKETCORE_API FileInterface* GetFileInterface();
+RMLUICORE_API void SetFileInterface(FileInterface* file_interface);
+/// Returns RmlUi's file interface.
+/// @return RmlUi's file interface.
+RMLUICORE_API FileInterface* GetFileInterface();
 
 /// Creates a new element context.
 /// @param[in] name The new name of the context. This must be unique.
 /// @param[in] dimensions The initial dimensions of the new context.
 /// @param[in] render_interface The custom render interface to use, or NULL to use the default.
 /// @return The new context, or NULL if the context could not be created.
-ROCKETCORE_API Context* CreateContext(const String& name, const Vector2i& dimensions, RenderInterface* render_interface = NULL);
+RMLUICORE_API Context* CreateContext(const String& name, const Vector2i& dimensions, RenderInterface* render_interface = NULL);
 /// Fetches a previously constructed context by name.
 /// @param[in] name The name of the desired context.
 /// @return The desired context, or NULL if no context exists with the given name.
-ROCKETCORE_API Context* GetContext(const String& name);
+RMLUICORE_API Context* GetContext(const String& name);
 /// Fetches a context by index.
 /// @param[in] index The index of the desired context. If this is outside of the valid range of contexts, it will be clamped.
 /// @return The requested context, or NULL if no contexts exist.
-ROCKETCORE_API Context* GetContext(int index);
+RMLUICORE_API Context* GetContext(int index);
 /// Returns the number of active contexts.
-/// @return The total number of active Rocket contexts.
-ROCKETCORE_API int GetNumContexts();
+/// @return The total number of active RmlUi contexts.
+RMLUICORE_API int GetNumContexts();
 
-/// Registers a generic Rocket plugin.
-ROCKETCORE_API void RegisterPlugin(Plugin* plugin);
+/// Registers a generic RmlUi plugin.
+RMLUICORE_API void RegisterPlugin(Plugin* plugin);
 
 /// Registers a new event type. If the type already exists, it will replace custom event types, but not internal types.
 /// @param[in] type The new event type.
@@ -153,12 +154,12 @@ ROCKETCORE_API void RegisterPlugin(Plugin* plugin);
 /// @param[in] bubbles Whether the event executes the bubble phase. If false, only capture and target phase is executed.
 /// @param[in] default_action_phase Defines during which phase(s) the 'Element::ProcessDefaultAction' method is called.
 /// @return The EventId of the newly created type, or existing type if 'type' is an internal type.
-ROCKETCORE_API EventId RegisterEventType(const String& type, bool interruptible, bool bubbles, DefaultActionPhase default_action_phase = DefaultActionPhase::None);
+RMLUICORE_API EventId RegisterEventType(const String& type, bool interruptible, bool bubbles, DefaultActionPhase default_action_phase = DefaultActionPhase::None);
 
-/// Forces all compiled geometry handles generated by libRocket to be released.
-ROCKETCORE_API void ReleaseCompiledGeometries();
-/// Forces all texture handles loaded and generated by libRocket to be released.
-ROCKETCORE_API void ReleaseTextures();
+/// Forces all compiled geometry handles generated by RmlUi to be released.
+RMLUICORE_API void ReleaseCompiledGeometries();
+/// Forces all texture handles loaded and generated by RmlUi to be released.
+RMLUICORE_API void ReleaseTextures();
 
 }
 }

Include/RmlUi/Core/Debug.h

@@ -0,0 +1,116 @@
+/*
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
+ *
+ * For the latest information, see http://github.com/mikke89/RmlUi
+ *
+ * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+#ifndef RMLUICOREDEBUG_H
+#define RMLUICOREDEBUG_H
+
+#include "Header.h"
+
+// Define for breakpointing.
+#if defined (RMLUI_PLATFORM_WIN32)
+	#if defined (__MINGW32__)
+		#define RMLUI_BREAK {asm("int $0x03");}
+	#elif defined (_MSC_VER)
+		#define RMLUI_BREAK {__debugbreak();}
+	#else
+		#define RMLUI_BREAK
+	#endif
+#elif defined (RMLUI_PLATFORM_LINUX)
+	#if defined __GNUC__
+		#define RMLUI_BREAK {__builtin_trap();}
+	#else
+		#define RMLUI_BREAK
+	#endif
+#elif defined (RMLUI_PLATFORM_MACOSX)
+	#define RMLUI_BREAK {__builtin_trap();}
+#endif
+
+
+
+// Define the LT_ASSERT and RMLUI_VERIFY macros.
+#if !defined RMLUI_DEBUG
+#define RMLUI_ASSERT(x)
+#define RMLUI_ASSERTMSG(x, m)
+#define RMLUI_ERROR
+#define RMLUI_ERRORMSG(m)
+#define RMLUI_VERIFY(x) x
+#define RMLUI_ASSERT_NONRECURSIVE
+#else
+namespace Rml {
+namespace Core {
+
+bool RMLUICORE_API Assert(const char* message, const char* file, int line);
+#define RMLUI_ASSERT(x) \
+if (!(x)) \
+{ \
+	if (!Rml::Core::Assert("RMLUI_ASSERT("#x")", __FILE__, __LINE__ )) \
+	{ \
+		RMLUI_BREAK; \
+	} \
+}
+#define RMLUI_ASSERTMSG(x, m)	\
+if (!(x)) \
+{ \
+	if (!Rml::Core::Assert(m, __FILE__, __LINE__ )) \
+	{ \
+		RMLUI_BREAK; \
+	} \
+}
+#define RMLUI_ERROR \
+if (!Rml::Core::Assert("RMLUI_ERROR", __FILE__, __LINE__)) \
+{ \
+	RMLUI_BREAK; \
+}
+#define RMLUI_ERRORMSG(m) \
+if (!Rml::Core::Assert(m, __FILE__, __LINE__)) \
+{ \
+	RMLUI_BREAK; \
+}
+#define RMLUI_VERIFY(x) RMLUI_ASSERT(x)
+
+struct RmlUiAssertNonrecursive {
+	bool& entered;
+	RmlUiAssertNonrecursive(bool& entered) : entered(entered) {
+		RMLUI_ASSERTMSG(!entered, "A method defined as non-recursive was entered twice!");
+		entered = true;
+	}
+	~RmlUiAssertNonrecursive() {
+		entered = false;
+	}
+};
+
+#define RMLUI_ASSERT_NONRECURSIVE \
+static bool rmlui_nonrecursive_entered = false; \
+RmlUiAssertNonrecursive rmlui_nonrecursive(rmlui_nonrecursive_entered)
+
+}
+}
+#endif
+
+
+#endif

Include/Rocket/Core/Decorator.h → Include/RmlUi/Core/Decorator.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,15 +26,15 @@
  *
  */
 
-#ifndef ROCKETCOREDECORATOR_H
-#define ROCKETCOREDECORATOR_H
+#ifndef RMLUICOREDECORATOR_H
+#define RMLUICOREDECORATOR_H
 
 #include <vector>
 #include "Header.h"
 #include "Texture.h"
 #include "Types.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class DecoratorInstancer;
@@ -49,7 +50,7 @@ class TextureResource;
 	@author Peter Curry
  */
 
-class ROCKETCORE_API Decorator
+class RMLUICORE_API Decorator
 {
 public:
 	Decorator();

Include/Rocket/Core/DecoratorInstancer.h → Include/RmlUi/Core/DecoratorInstancer.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,14 +26,14 @@
  *
  */
 
-#ifndef ROCKETCOREDECORATORINSTANCER_H
-#define ROCKETCOREDECORATORINSTANCER_H
+#ifndef RMLUICOREDECORATORINSTANCER_H
+#define RMLUICOREDECORATORINSTANCER_H
 
 #include "Header.h"
 #include "PropertyDictionary.h"
 #include "PropertySpecification.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 struct Sprite;
@@ -50,7 +51,7 @@ class DecoratorInstancerInterface;
 	@author Peter Curry
  */
 
-class ROCKETCORE_API DecoratorInstancer
+class RMLUICORE_API DecoratorInstancer
 {
 public:
 	DecoratorInstancer();
@@ -84,7 +85,7 @@ private:
 };
 
 
-class ROCKETCORE_API DecoratorInstancerInterface {
+class RMLUICORE_API DecoratorInstancerInterface {
 public:
 	DecoratorInstancerInterface(const StyleSheet& style_sheet) : style_sheet(style_sheet) {}
 

Include/Rocket/Core/Dictionary.h → Include/RmlUi/Core/Dictionary.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +26,13 @@
  *
  */
 
-#ifndef ROCKETCOREDICTIONARY_H
-#define ROCKETCOREDICTIONARY_H
+#ifndef RMLUICOREDICTIONARY_H
+#define RMLUICOREDICTIONARY_H
 
 #include "Header.h"
 #include "Variant.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 inline Variant* GetIf(Dictionary& dictionary, const String& key)

Include/Rocket/Core/Element.h → Include/RmlUi/Core/Element.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,8 +26,8 @@
  *
  */
 
-#ifndef ROCKETCOREELEMENT_H
-#define ROCKETCOREELEMENT_H
+#ifndef RMLUICOREELEMENT_H
+#define RMLUICOREELEMENT_H
 
 #include "ReferenceCountable.h"
 #include "ScriptInterface.h"
@@ -42,7 +43,7 @@
 
 #include <memory>
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Context;
@@ -71,10 +72,10 @@ struct ElementMeta;
 	@author Peter Curry
  */
 
-class ROCKETCORE_API Element : public ScriptInterface
+class RMLUICORE_API Element : public ScriptInterface
 {
 public:
-	/// Constructs a new libRocket element. This should not be called directly; use the Factory
+	/// Constructs a new RmlUi element. This should not be called directly; use the Factory
 	/// instead.
 	/// @param[in] tag The tag the element was declared as in RML.
 	Element(const String& tag);

Include/Rocket/Core/Element.inl → Include/RmlUi/Core/Element.inl

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +26,7 @@
  *
  */
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 // Returns the values of one of this element's properties.
@@ -34,7 +35,7 @@ template < typename T >
 T Element::GetProperty(const String& name)
 {
 	const Property* property = GetProperty(name);
-	ROCKET_ASSERTMSG(property, "Invalid property name.");
+	RMLUI_ASSERTMSG(property, "Invalid property name.");
 	return property->Get< T >();
 }
 

Include/Rocket/Core/ElementDocument.h → Include/RmlUi/Core/ElementDocument.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,12 +26,12 @@
  *
  */
 
-#ifndef ROCKETCOREELEMENTDOCUMENT_H
-#define ROCKETCOREELEMENTDOCUMENT_H
+#ifndef RMLUICOREELEMENTDOCUMENT_H
+#define RMLUICOREELEMENTDOCUMENT_H
 
 #include "Element.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Stream;
@@ -38,7 +39,7 @@ class Stream;
 }
 }
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Context;
@@ -52,7 +53,7 @@ class StyleSheet;
 	@author Lloyd Weehuizen
  */
 
-class ROCKETCORE_API ElementDocument : public Element
+class RMLUICORE_API ElementDocument : public Element
 {
 public:
 	ElementDocument(const String& tag);

Include/Rocket/Core/ElementInstancer.h → Include/RmlUi/Core/ElementInstancer.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,14 +26,14 @@
  *
  */
 
-#ifndef ROCKETCOREELEMENTINSTANCER_H
-#define ROCKETCOREELEMENTINSTANCER_H
+#ifndef RMLUICOREELEMENTINSTANCER_H
+#define RMLUICOREELEMENTINSTANCER_H
 
 #include "ReferenceCountable.h"
 #include "XMLParser.h"
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Element;
@@ -51,7 +52,7 @@ class Element;
 	@author Lloyd Weehuizen
  */ 
 
-class ROCKETCORE_API ElementInstancer : public ReferenceCountable
+class RMLUICORE_API ElementInstancer : public ReferenceCountable
 {
 public:
 	virtual ~ElementInstancer();

Include/Rocket/Core/ElementInstancerGeneric.h → Include/RmlUi/Core/ElementInstancerGeneric.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,12 +26,12 @@
  *
  */
 
-#ifndef ROCKETCOREELEMENTINSTANCERGENERIC_H
-#define ROCKETCOREELEMENTINSTANCERGENERIC_H
+#ifndef RMLUICOREELEMENTINSTANCERGENERIC_H
+#define RMLUICOREELEMENTINSTANCERGENERIC_H
 
 #include "ElementInstancer.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 /**

Include/Rocket/Core/ElementInstancerGeneric.inl → Include/RmlUi/Core/ElementInstancerGeneric.inl

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +26,7 @@
  *
  */
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 template <typename T>

Include/Rocket/Core/ElementReference.h → Include/RmlUi/Core/ElementReference.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,23 +26,23 @@
  *
  */
 
-#ifndef ROCKETCOREELEMENTREFERENCE_H
-#define ROCKETCOREELEMENTREFERENCE_H
+#ifndef RMLUICOREELEMENTREFERENCE_H
+#define RMLUICOREELEMENTREFERENCE_H
 
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Element;
 
 /**
-	A smart pointer for RKTElements.
+	A smart pointer for elements.
 
 	@author Peter Curry
  */
 
-class ROCKETCORE_API ElementReference
+class RMLUICORE_API ElementReference
 {
 public:
 	ElementReference(Element* element = NULL);

Include/Rocket/Core/ElementScroll.h → Include/RmlUi/Core/ElementScroll.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,12 +26,12 @@
  *
  */
 
-#ifndef ROCKETCOREELEMENTSCROLL_H
-#define ROCKETCOREELEMENTSCROLL_H
+#ifndef RMLUICOREELEMENTSCROLL_H
+#define RMLUICOREELEMENTSCROLL_H
 
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Element;
@@ -42,7 +43,7 @@ class WidgetSliderScroll;
 	@author Peter Curry
  */
 
-class ROCKETCORE_API ElementScroll
+class RMLUICORE_API ElementScroll
 {
 public:
 	enum Orientation

Include/Rocket/Core/ElementText.h → Include/RmlUi/Core/ElementText.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,23 +26,23 @@
  *
  */
 
-#ifndef ROCKETCOREELEMENTTEXT_H
-#define ROCKETCOREELEMENTTEXT_H
+#ifndef RMLUICOREELEMENTTEXT_H
+#define RMLUICOREELEMENTTEXT_H
 
 #include "Header.h"
 #include "Element.h"
 #include "String.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 /**
-	Rocket's text-element interface.
+	RmlUi's text-element interface.
 
 	@author Peter Curry
  */
 
-class ROCKETCORE_API ElementText : public Element
+class RMLUICORE_API ElementText : public Element
 {
 public:
 	ElementText(const String& tag);

Include/Rocket/Core/ElementUtilities.h → Include/RmlUi/Core/ElementUtilities.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,15 +26,15 @@
  *
  */
 
-#ifndef ROCKETCOREELEMENTUTILITIES_H
-#define ROCKETCOREELEMENTUTILITIES_H
+#ifndef RMLUICOREELEMENTUTILITIES_H
+#define RMLUICOREELEMENTUTILITIES_H
 
 #include "Header.h"
 #include "Box.h"
 #include "String.h"
 #include "Types.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Context;
@@ -48,7 +49,7 @@ namespace Style { struct ComputedValues; }
 	@author Lloyd Weehuizen
  */
 
-class ROCKETCORE_API ElementUtilities
+class RMLUICORE_API ElementUtilities
 {
 public:
 	enum PositionAnchor

Include/Rocket/Core/Event.h → Include/RmlUi/Core/Event.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,15 +26,15 @@
  *
  */
 
-#ifndef ROCKETCOREEVENT_H
-#define ROCKETCOREEVENT_H
+#ifndef RMLUICOREEVENT_H
+#define RMLUICOREEVENT_H
 
 #include "Header.h"
 #include "Dictionary.h"
 #include "ScriptInterface.h"
 #include "ID.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Element;
@@ -50,7 +51,7 @@ enum class DefaultActionPhase { None, Target = (int)EventPhase::Target, Bubble =
 	@author Lloyd Weehuizen
  */
 
-class ROCKETCORE_API Event : public ScriptInterface
+class RMLUICORE_API Event : public ScriptInterface
 {
 public:
 	/// Constructor

Include/Rocket/Core/EventInstancer.h → Include/RmlUi/Core/EventInstancer.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +26,13 @@
  *
  */
 
-#ifndef ROCKETCOREEVENTINSTANCER_H
-#define ROCKETCOREEVENTINSTANCER_H
+#ifndef RMLUICOREEVENTINSTANCER_H
+#define RMLUICOREEVENTINSTANCER_H
 
 #include "ReferenceCountable.h"
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Element;
@@ -43,7 +44,7 @@ class Event;
 	@author Lloyd Weehuizen
  */
 
-class ROCKETCORE_API EventInstancer : public ReferenceCountable
+class RMLUICORE_API EventInstancer : public ReferenceCountable
 {
 public:
 	virtual ~EventInstancer();

Include/Rocket/Core/EventListener.h → Include/RmlUi/Core/EventListener.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +26,13 @@
  *
  */
 
-#ifndef ROCKETCOREEVENTLISTENER_H
-#define ROCKETCOREEVENTLISTENER_H
+#ifndef RMLUICOREEVENTLISTENER_H
+#define RMLUICOREEVENTLISTENER_H
 
 #include "Header.h"
 #include "Event.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Event;
@@ -43,7 +44,7 @@ class Element;
 	@author Lloyd Weehuizen
  */
 
-class ROCKETCORE_API EventListener
+class RMLUICORE_API EventListener
 {
 public:
 	virtual ~EventListener() {}
@@ -52,15 +53,15 @@ public:
 	virtual void ProcessEvent(Event& event) = 0;
 
 	/// Called when the listener has been attached to a new Element
-	virtual void OnAttach(Element* ROCKET_UNUSED_PARAMETER(element))
+	virtual void OnAttach(Element* RMLUI_UNUSED_PARAMETER(element))
 	{
-		ROCKET_UNUSED(element);
+		RMLUI_UNUSED(element);
 	}
 
 	/// Called when the listener has been detached from a Element
-	virtual void OnDetach(Element* ROCKET_UNUSED_PARAMETER(element))
+	virtual void OnDetach(Element* RMLUI_UNUSED_PARAMETER(element))
 	{
-		ROCKET_UNUSED(element);
+		RMLUI_UNUSED(element);
 	}
 };
 

Include/Rocket/Core/EventListenerInstancer.h → Include/RmlUi/Core/EventListenerInstancer.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,15 +26,15 @@
  *
  */
 
-#ifndef ROCKETCOREEVENTLISTENERINSTANCER_H
-#define ROCKETCOREEVENTLISTENERINSTANCER_H
+#ifndef RMLUICOREEVENTLISTENERINSTANCER_H
+#define RMLUICOREEVENTLISTENERINSTANCER_H
 
 #include "ReferenceCountable.h"
 #include "String.h"
 #include "Header.h"
 #include "Element.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class EventListener;
@@ -45,7 +46,7 @@ class EventListener;
 	@author Lloyd Weehuizen
  */
 
-class ROCKETCORE_API EventListenerInstancer : public ReferenceCountable
+class RMLUICORE_API EventListenerInstancer : public ReferenceCountable
 {
 public:
 	virtual ~EventListenerInstancer();

Include/Rocket/Core/Factory.h → Include/RmlUi/Core/Factory.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +26,13 @@
  *
  */
 
-#ifndef ROCKETCOREFACTORY_H
-#define ROCKETCOREFACTORY_H
+#ifndef RMLUICOREFACTORY_H
+#define RMLUICOREFACTORY_H
 
 #include "XMLParser.h"
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Context;
@@ -56,13 +57,13 @@ enum class EventId : uint16_t;
 /**
 	The Factory contains a registry of instancers for different types.
 
-	All instantiation of these rocket types should go through the factory
+	All instantiation of these rmlui types should go through the factory
 	so that scripting API's can bind in new types.
 
 	@author Lloyd Weehuizen
  */
 
-class ROCKETCORE_API Factory
+class RMLUICORE_API Factory
 {
 public:
 	/// Initialise the element factory
@@ -110,7 +111,7 @@ public:
 	/// @param[in] context The context that is creating the document.
 	/// @param[in] stream The stream to instance from.
 	/// @return The instanced document, or NULL if an error occurred.
-	static ElementDocument* InstanceDocumentStream(Rocket::Core::Context* context, Stream* stream);
+	static ElementDocument* InstanceDocumentStream(Rml::Core::Context* context, Stream* stream);
 
 	/// Registers an instancer that will be used to instance decorators.
 	/// @param[in] name The name of the decorator the instancer will be called for.

Include/Rocket/Core/FileInterface.h → Include/RmlUi/Core/FileInterface.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,27 +26,27 @@
  *
  */
 
-#ifndef ROCKETCOREFILEINTERFACE_H
-#define ROCKETCOREFILEINTERFACE_H
+#ifndef RMLUICOREFILEINTERFACE_H
+#define RMLUICOREFILEINTERFACE_H
 
 #include "Header.h"
 #include "Types.h"
 #include "ReferenceCountable.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 /**
 	The abstract base class for application-specific file I/O.
 
-	By default, Rocket will use a file interface implementing the standard C file functions. If this is not sufficient,
+	By default, RmlUi will use a file interface implementing the standard C file functions. If this is not sufficient,
 	or your application wants more control over file I/O, this class should be derived, instanced, and installed
-	through Core::SetFileInterface() before you initialise Rocket.
+	through Core::SetFileInterface() before you initialise RmlUi.
 
 	@author Peter Curry
  */
 
-class ROCKETCORE_API FileInterface : public ReferenceCountable
+class RMLUICORE_API FileInterface : public ReferenceCountable
 {
 public:
 	FileInterface();

Include/Rocket/Core/Font.h → Include/RmlUi/Core/Font.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,10 +26,10 @@
  *
  */
 
-#ifndef ROCKETCOREFONT_H
-#define ROCKETCOREFONT_H
+#ifndef RMLUICOREFONT_H
+#define RMLUICOREFONT_H
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 namespace Font

Include/Rocket/Core/FontDatabase.h → Include/RmlUi/Core/FontDatabase.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,15 +26,15 @@
  *
  */
 
-#ifndef ROCKETCOREFONTDATABASE_H
-#define ROCKETCOREFONTDATABASE_H
+#ifndef RMLUICOREFONTDATABASE_H
+#define RMLUICOREFONTDATABASE_H
 
 #include "StringUtilities.h"
 #include "Header.h"
 #include "Font.h"
 #include "FontProvider.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class FontEffect;
@@ -42,12 +43,12 @@ class FontFaceHandle;
 class PropertyDictionary;
 
 /**
-	The font database contains all font families currently in use by Rocket.
+	The font database contains all font families currently in use by RmlUi.
 
 	@author Peter Curry
  */
 
-class ROCKETCORE_API FontDatabase
+class RMLUICORE_API FontDatabase
 {
 public:
 

Include/Rocket/Core/FontEffect.h → Include/RmlUi/Core/FontEffect.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,12 +26,12 @@
  *
  */
 
-#ifndef ROCKETCOREFONTEFFECT_H
-#define ROCKETCOREFONTEFFECT_H
+#ifndef RMLUICOREFONTEFFECT_H
+#define RMLUICOREFONTEFFECT_H
 
 #include "FontGlyph.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class FontEffectInstancer;

Include/Rocket/Core/FontEffectInstancer.h → Include/RmlUi/Core/FontEffectInstancer.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,15 +26,15 @@
  *
  */
 
-#ifndef ROCKETCOREFONTEFFECTINSTANCER_H
-#define ROCKETCOREFONTEFFECTINSTANCER_H
+#ifndef RMLUICOREFONTEFFECTINSTANCER_H
+#define RMLUICOREFONTEFFECTINSTANCER_H
 
 #include "ReferenceCountable.h"
 #include "Header.h"
 #include "PropertyDictionary.h"
 #include "PropertySpecification.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class FontEffect;
@@ -47,7 +48,7 @@ class FontEffect;
 	@author Peter Curry
  */
 
-class ROCKETCORE_API FontEffectInstancer : public ReferenceCountable
+class RMLUICORE_API FontEffectInstancer : public ReferenceCountable
 {
 public:
 	FontEffectInstancer();

Include/Rocket/Core/FontFace.h → Include/RmlUi/Core/FontFace.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,12 +26,12 @@
  *
  */
 
-#ifndef ROCKETCOREFONTFACE_H
-#define ROCKETCOREFONTFACE_H
+#ifndef RMLUICOREFONTFACE_H
+#define RMLUICOREFONTFACE_H
 
 #include "Font.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class FontFaceHandle;

Include/Rocket/Core/FontFamily.h → Include/RmlUi/Core/FontFamily.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +26,13 @@
  *
  */
 
-#ifndef ROCKETCOREFONTFAMILY_H
-#define ROCKETCOREFONTFAMILY_H
+#ifndef RMLUICOREFONTFAMILY_H
+#define RMLUICOREFONTFAMILY_H
 
-#include <Rocket/Core/StringUtilities.h>
+#include "StringUtilities.h"
 #include "Font.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class FontFace;

Include/Rocket/Core/FontGlyph.h → Include/RmlUi/Core/FontGlyph.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,12 +26,12 @@
  *
  */
 
-#ifndef ROCKETCOREFONTGLYPH_H
-#define ROCKETCOREFONTGLYPH_H
+#ifndef RMLUICOREFONTGLYPH_H
+#define RMLUICOREFONTGLYPH_H
 
 #include <vector>
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 /**

Include/Rocket/Core/FontProvider.h → Include/RmlUi/Core/FontProvider.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,25 +26,25 @@
  *
  */
 
-#ifndef ROCKETCOREFONTPROVIDER_H
-#define ROCKETCOREFONTPROVIDER_H
+#ifndef RMLUICOREFONTPROVIDER_H
+#define RMLUICOREFONTPROVIDER_H
 
-#include <Rocket/Core/StringUtilities.h>
-#include <Rocket/Core/Font.h>
-#include <Rocket/Core/Header.h>
+#include "StringUtilities.h"
+#include "Font.h"
+#include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class FontFaceHandle;
 class FontFamily;
 
 /**
-    The font database contains all font families currently in use by Rocket.
+    The font database contains all font families currently in use by RmlUi.
     @author Peter Curry
  */
 
-class ROCKETCORE_API FontProvider
+class RMLUICORE_API FontProvider
 {
 public:
 

Include/Rocket/Core/FreeType/FontProvider.h → Include/RmlUi/Core/FreeType/FontProvider.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,14 +26,14 @@
  *
  */
 
-#ifndef ROCKETCOREFREETYPEFONTPROVIDER_H
-#define ROCKETCOREFREETYPEFONTPROVIDER_H
+#ifndef RMLUICOREFREETYPEFONTPROVIDER_H
+#define RMLUICOREFREETYPEFONTPROVIDER_H
 
 #include "../StringUtilities.h"
 #include "../Font.h"
 #include "../FontProvider.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 
@@ -45,11 +46,11 @@ namespace FreeType {
 class FontFamily;
 
 /**
-    The font database contains all font families currently in use by Rocket.
+    The font database contains all font families currently in use by RmlUi.
     @author Peter Curry
  */
 
-class ROCKETCORE_API FontProvider : public Rocket::Core::FontProvider
+class RMLUICORE_API FontProvider : public Rml::Core::FontProvider
 {
 public:
     static bool Initialise();

Include/Rocket/Core/Geometry.h → Include/RmlUi/Core/Geometry.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +26,13 @@
  *
  */
 
-#ifndef ROCKETCOREGEOMETRY_H
-#define ROCKETCOREGEOMETRY_H
+#ifndef RMLUICOREGEOMETRY_H
+#define RMLUICOREGEOMETRY_H
 
 #include "Header.h"
 #include "Vertex.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Context;
@@ -45,7 +46,7 @@ struct Texture;
 	@author Peter Curry
  */
 
-class ROCKETCORE_API Geometry
+class RMLUICORE_API Geometry
 {
 public:
 	Geometry(Element* host_element = NULL);

Include/Rocket/Core/GeometryUtilities.h → Include/RmlUi/Core/GeometryUtilities.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,14 +26,14 @@
  *
  */
 
-#ifndef ROCKETCOREGEOMETRYUTILITIES_H
-#define ROCKETCOREGEOMETRYUTILITIES_H
+#ifndef RMLUICOREGEOMETRYUTILITIES_H
+#define RMLUICOREGEOMETRYUTILITIES_H
 
 #include "Header.h"
 #include "Types.h"
 #include "Vertex.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 /**
@@ -41,7 +42,7 @@ namespace Core {
 	@author Robert Curry
  */
 
-class ROCKETCORE_API GeometryUtilities
+class RMLUICORE_API GeometryUtilities
 {
 public:
 	/// Generates a quad from a position, size and colour.

Include/Rocket/Core/Header.h → Include/RmlUi/Core/Header.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,29 +26,29 @@
  *
  */
 
-#ifndef ROCKETCOREHEADER_H
-#define ROCKETCOREHEADER_H
+#ifndef RMLUICOREHEADER_H
+#define RMLUICOREHEADER_H
 
 #include "Platform.h"
 
-// Note: Changing a ROCKETCORE_API_INLINE method
+// Note: Changing a RMLUICORE_API_INLINE method
 // breaks ABI compatibility!!
 
-#if !defined ROCKET_STATIC_LIB
-	#if defined ROCKET_PLATFORM_WIN32
-		#if defined RocketCore_EXPORTS
-			#define ROCKETCORE_API __declspec(dllexport)
-			// Note: Changing a ROCKETCORE_API_INLINE method
+#if !defined RMLUI_STATIC_LIB
+	#if defined RMLUI_PLATFORM_WIN32
+		#if defined RmlCore_EXPORTS
+			#define RMLUICORE_API __declspec(dllexport)
+			// Note: Changing a RMLUICORE_API_INLINE method
 			// breaks ABI compatibility!!
 			
 			// This results in an exported method from the DLL
 			// that may be inlined in DLL clients, or if not
 			// possible the client may choose to import the copy
 			// in the DLL if it can not be inlined.
-			#define ROCKETCORE_API_INLINE __declspec(dllexport) inline
+			#define RMLUICORE_API_INLINE __declspec(dllexport) inline
 		#else
-			#define ROCKETCORE_API __declspec(dllimport)
-			// Note: Changing a ROCKETCORE_API_INLINE method
+			#define RMLUICORE_API __declspec(dllimport)
+			// Note: Changing a RMLUICORE_API_INLINE method
 			// breaks ABI compatibility!!
 
 			// Based on the warnngs emitted by GCC/MinGW if using
@@ -60,26 +61,26 @@
 				// /Ob1 or /Ob2 options are given for inline
 				// expansion, or pulled from the DLL if it can
 				// not be inlined.
-				#define ROCKETCORE_API_INLINE __declspec(dllimport) inline
+				#define RMLUICORE_API_INLINE __declspec(dllimport) inline
 			#else
 				// MinGW 32/64 dllimport inline is not supported
 				// and dllimport is ignored, so we avoid using
 				// it here to squelch compiler generated
 				// warnings.
-				#define ROCKETCORE_API_INLINE inline
+				#define RMLUICORE_API_INLINE inline
 			#endif
 		#endif
 	#else
-		#define ROCKETCORE_API __attribute__((visibility("default")))
-		// Note: Changing a ROCKETCORE_API_INLINE method
+		#define RMLUICORE_API __attribute__((visibility("default")))
+		// Note: Changing a RMLUICORE_API_INLINE method
 		// breaks ABI compatibility!!
-		#define ROCKETCORE_API_INLINE __attribute__((visibility("default"))) inline
+		#define RMLUICORE_API_INLINE __attribute__((visibility("default"))) inline
 	#endif
 #else
-	#define ROCKETCORE_API
-	// Note: Changing a ROCKETCORE_API_INLINE method
+	#define RMLUICORE_API
+	// Note: Changing a RMLUICORE_API_INLINE method
 	// breaks ABI compatibility!!
-	#define ROCKETCORE_API_INLINE inline
+	#define RMLUICORE_API_INLINE inline
 #endif
 
 #endif

Include/Rocket/Core/ID.h → Include/RmlUi/Core/ID.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,10 +27,10 @@
  */
 
  
-#ifndef ROCKETCOREID_H
-#define ROCKETCOREID_H
+#ifndef RMLUICOREID_H
+#define RMLUICOREID_H
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 

Include/Rocket/Core/Input.h → Include/RmlUi/Core/Input.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,14 +26,14 @@
  *
  */
 
-#ifndef ROCKETCOREINPUT_H
-#define ROCKETCOREINPUT_H
+#ifndef RMLUICOREINPUT_H
+#define RMLUICOREINPUT_H
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 /*
-	Enumerants for sending input events into Rocket.
+	Enumerants for sending input events into RmlUi.
 
 	@author Peter Curry
  */

Include/Rocket/Core/Log.h → Include/RmlUi/Core/Log.h

@@ -1,9 +1,10 @@
 /*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
- * For the latest information, see http://www.librocket.com
+ * For the latest information, see http://github.com/mikke89/RmlUi
  *
  * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,22 +26,22 @@
  *
  */
 
-#ifndef ROCKETCORELOG_H
-#define ROCKETCORELOG_H
+#ifndef RMLUICORELOG_H
+#define RMLUICORELOG_H
 
 #include "Header.h"
 #include "Types.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 /**
-	libRocket logging API.
+	RmlUi logging API.
 
 	@author Lloyd Weehuizen
  */
 
-class ROCKETCORE_API Log
+class RMLUICORE_API Log
 {
 public:
 	enum Type