The big rename. We are now RmlUi version 2.0!

From now on, use #include <RmlUi/...>, and namespace Rml:: ... .

.gitignore

@@ -10,8 +10,8 @@ bin64/*
 Win32/
 
 /lib/
-RocketCore.dir/
-RocketControls.dir/
-RocketDebugger.dir/
+RmlCore.dir/
+RmlControls.dir/
+RmlDebugger.dir/
 
 Win32/

.travis.yml

@@ -59,4 +59,4 @@ install:
 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

@@ -3,7 +3,7 @@ CMakeCache.txt
 cmake_install.cmake
 CMakeFiles
 CMakeScripts
-libRocket.xcodeproj
+RmlUi.xcodeproj
 Debug
 Debug-iphoneos
 Debug-iphonesimulator
@@ -11,12 +11,12 @@ Release
 Release-iphoneos
 Release-iphonesimulator
 DerivedData
-libRocket.build/Debug/RocketCore.build
-libRocket.build
+RmlUi.build/Debug/RmlCore.build
+RmlUi.build
 
 Makefile
-_rocketcontrols.so
-_rocketcore.so
+_rmlcontrols.so
+_rmlcore.so
 customlog
 datagrid
 datagrid_tree
@@ -28,21 +28,21 @@ sfml2
 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
+RmlCore.so
+RmlCore.so.*
+RmlCore.a
+RmlControls.so
+RmlControls.so.*
+RmlControls.a
+RmlDebugger.so
+RmlDebugger.so.*
+RmlDebugger.a
+RmlCoreLua.so
+RmlCoreLua.so.*
+RmlCoreLua.a
+RmlControlsLua.so
+RmlControlsLua.so.*
+RmlControlsLua.a
 libshell.a
 loaddocument
 template
@@ -50,8 +50,8 @@ treeview
 tutorial_drag
 
 #VisualStudio Project artifacts
-libRocket.sln
-libRocket.sdf
+RmlUi.sln
+RmlUi.sdf
 ALL_BUILD.vcproj
 ALL_BUILD.vcxproj
 ALL_BUILD.vcxproj.filters
@@ -61,27 +61,27 @@ 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
+RmlCore.vcproj
+RmlCore.vcxproj
+RmlCore.vcxproj.filters
+RmlControls.vcproj
+RmlControls.vcxproj
+RmlControls.vcxproj.filters
+RmlDebugger.vcproj
+RmlDebugger.vcxproj
+RmlDebugger.vcxproj.filters
+_rmlcore.vcproj
+_rmlcore.vcxproj
+_rmlcore.vcxproj.filters
+_rmlcontrols.vcproj
+_rmlcontrols.vcxproj
+_rmlcontrols.vcxproj.filters
+RmlCoreLua.vcproj
+RmlCoreLua.vcxproj
+RmlCoreLua.vcxproj.filters
+RmlControlsLua.vcproj
+RmlControlsLua.vcxproj
+RmlControlsLua.vcxproj.filters
 customlog.vcproj
 customlog.vcxproj
 customlog.vcxproj.filters
@@ -123,37 +123,37 @@ sdl2.vcxproj
 sdl2.vcxproj.filters
 
 #Win32 artifacts
-libRocketCore.dll
-libRocketCore.lib
-libRocketControls.dll
-libRocketControls.lib
-libRocketDebugger.dll
-libRocketDebugger.lib
-libRocketCoreLua.dll
-libRocketControlsLua.dll
+RmlCore.dll
+RmlCore.lib
+RmlControls.dll
+RmlControls.lib
+RmlDebugger.dll
+RmlDebugger.lib
+RmlCoreLua.dll
+RmlControlsLua.dll
 
 #Ming32 artifacts
-libRocketCore.dll.a
-libRocketControls.dll.a
-libRocketDebugger.dll.a
-libRocketCoreLua.dll.a
-libRocketControlsLua.dll.a
+RmlCore.dll.a
+RmlControls.dll.a
+RmlDebugger.dll.a
+RmlCoreLua.dll.a
+RmlControlsLua.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
+RmlCore.dylib
+RmlCore.*.dylib
+RmlCoreLua.dylib
+RmlCoreLua.*.dylib
+RmlControls.dylib
+RmlControls.*.dylib
+RmlControlsLua.dylib
+RmlControlsLua.*.dylib
+RmlDebugger.dylib
+RmlDebugger.*.dylib
+_rmlcore.dylib
+_rmlcore.*.dylib
+_rmlcontrols.dylib
+_rmlcontrols.*.dylib
 customlog.app
 datagrid.app
 datagrid_tree.app

Build/CMakeLists.txt

@@ -1,5 +1,5 @@
 #===================================
-# Build script for libRocket =======
+# Build script for RmlUi ===========
 #===================================
 
 if(APPLE)
@@ -49,16 +49,16 @@ if(POLICY CMP0042)
   cmake_policy(SET CMP0042 NEW)
 endif(POLICY CMP0042)
 
-project(libRocket C CXX)
+project(RmlUi 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})
+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)
@@ -161,7 +161,7 @@ else(APPLE)
 endif(APPLE)
 
 if(NOT BUILD_SHARED_LIBS)
-	add_definitions(-DROCKET_STATIC_LIB)
+	add_definitions(-DRMLUI_STATIC_LIB)
 endif()
 
 #===================================
@@ -219,7 +219,7 @@ if(NOT BUILD_FRAMEWORK)
 set(LIBRARIES Core Controls Debugger)
 
 foreach(library ${LIBRARIES})
-    set(NAME Rocket${library})
+    set(NAME Rml${library})
 
     add_library(${NAME}
                         ${${library}_HDR_FILES}
@@ -230,7 +230,7 @@ foreach(library ${LIBRARIES})
 
     set_target_properties(${NAME} PROPERTIES
                            VERSION ${PROJECT_VERSION}
-                           SOVERSION ${LIBROCKET_VERSION_MAJOR}
+                           SOVERSION ${RMLUI_VERSION_MAJOR}
     )
 	
 	if (MSVC)
@@ -241,18 +241,18 @@ foreach(library ${LIBRARIES})
 	set_property(TARGET ${NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
     
     install(TARGETS ${NAME}
-            EXPORT libRocketTargets
+            EXPORT RmlUiTargets
             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     )
 	
 
-    set(ROCKET_EXPORTED_TARGETS ${ROCKET_EXPORTED_TARGETS} ${NAME})
+    set(RMLUI_EXPORTED_TARGETS ${RMLUI_EXPORTED_TARGETS} ${NAME})
 endforeach(library)
 
 if (MSVC)
-	target_compile_options(RocketCore PRIVATE "/Yuprecompiled.h")
+	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)
 
@@ -261,7 +261,7 @@ else(NOT BUILD_FRAMEWORK)
 	# Build combined Framework =========
 	#===================================
 
-	set(NAME Rocket)
+	set(NAME Rml)
 
 	set(MASTER_PUB_HDR_FILES
 		${MASTER_Core_PUB_HDR_FILES}
@@ -286,7 +286,7 @@ else(NOT BUILD_FRAMEWORK)
 
 	set_target_properties(${NAME} PROPERTIES
 		VERSION ${PROJECT_VERSION}
-		SOVERSION ${LIBROCKET_VERSION_MAJOR}
+		SOVERSION ${RMLUI_VERSION_MAJOR}
 	)
 
 		set_property(SOURCE ${MASTER_PUB_HDR_FILES}
@@ -304,22 +304,22 @@ else(NOT BUILD_FRAMEWORK)
 		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_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 libRocketTargets
+            EXPORT RmlUiTargets
             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})
+    set(RMLUI_EXPORTED_TARGETS ${RMLUI_EXPORTED_TARGETS} ${NAME})
 endif(NOT BUILD_FRAMEWORK)
 
 # Build Lua bindings
@@ -327,7 +327,7 @@ if(BUILD_LUA_BINDINGS)
     set(LIBRARIES Core Controls)
 
     foreach(library ${LIBRARIES})
-        set(NAME Rocket${library}Lua)
+        set(NAME Rml${library}Lua)
 
         add_library(${NAME} ${Lua${library}_SRC_FILES}
                             ${Lua${library}_HDR_FILES}
@@ -336,20 +336,20 @@ if(BUILD_LUA_BINDINGS)
 
         set_target_properties(${NAME} PROPERTIES
                            VERSION ${PROJECT_VERSION}
-                           SOVERSION ${LIBROCKET_VERSION_MAJOR}
+                           SOVERSION ${RMLUI_VERSION_MAJOR}
         )
 
         set_property(TARGET ${NAME} PROPERTY CXX_STANDARD 11)
         set_property(TARGET ${NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
 
         install(TARGETS ${NAME}
-            EXPORT libRocketTargets
+            EXPORT RmlUiTargets
             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         )
         
-        set(ROCKET_EXPORTED_TARGETS ${ROCKET_EXPORTED_TARGETS} ${NAME})
+        set(RMLUI_EXPORTED_TARGETS ${RMLUI_EXPORTED_TARGETS} ${NAME})
     endforeach(library)
 endif()
 
@@ -359,20 +359,20 @@ endif()
 #===================================
 
 if(NOT BUILD_FRAMEWORK)
-target_link_libraries(RocketCore ${CORE_LINK_LIBS})
-target_link_libraries(RocketControls RocketCore)
-target_link_libraries(RocketDebugger RocketCore)
+target_link_libraries(RmlCore ${CORE_LINK_LIBS})
+target_link_libraries(RmlControls RmlCore)
+target_link_libraries(RmlDebugger RmlCore)
 else(NOT BUILD_FRAMEWORK)
-target_link_libraries(Rocket ${CORE_LINK_LIBS})
+target_link_libraries(Rml ${CORE_LINK_LIBS})
 endif(NOT BUILD_FRAMEWORK)
 
 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})
+		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(RocketCoreLua Rocket ${LUA_BINDINGS_LINK_LIBS})
-		target_link_libraries(RocketControlsLua Rocket RocketCoreLua ${LUA_BINDINGS_LINK_LIBS})
+		target_link_libraries(RmlCoreLua Rml ${LUA_BINDINGS_LINK_LIBS})
+		target_link_libraries(RmlControlsLua Rml RmlCoreLua ${LUA_BINDINGS_LINK_LIBS})
 	endif(NOT BUILD_FRAMEWORK)
 endif()
 
@@ -411,14 +411,14 @@ if(BUILD_SAMPLES)
 if(NOT BUILD_FRAMEWORK)
     set(sample_LIBRARIES
     	shell 
-    	RocketCore 
-    	RocketControls
-    	RocketDebugger
+    	RmlCore 
+    	RmlControls
+    	RmlDebugger
     )
 else(NOT BUILD_FRAMEWORK)
     set(sample_LIBRARIES
     	shell 
-    	Rocket
+    	Rml
     )
 endif(NOT BUILD_FRAMEWORK)
 
@@ -491,7 +491,7 @@ endif(NOT BUILD_FRAMEWORK)
         endif()
     endif()
    
-    set(SAMPLES_DIR opt/Rocket/Samples CACHE PATH "path to samples dir")
+    set(SAMPLES_DIR opt/Rml/Samples CACHE PATH "path to samples dir")
 
     # The samples and tutorials use the shell library
     include_directories(${PROJECT_SOURCE_DIR}/Samples/shell/include)
@@ -614,7 +614,7 @@ endif(NOT BUILD_FRAMEWORK)
     	BUNDLE DESTINATION ${SAMPLES_DIR})
 
     if(BUILD_LUA_BINDINGS)
-        bl_sample(luainvaders RocketCoreLua RocketControlsLua ${sample_LIBRARIES} ${LUA_BINDINGS_LINK_LIBS})
+        bl_sample(luainvaders RmlCoreLua RmlControlsLua ${sample_LIBRARIES} ${LUA_BINDINGS_LINK_LIBS})
 		set_property(TARGET luainvaders PROPERTY CXX_STANDARD 11)
 		set_property(TARGET luainvaders PROPERTY CXX_STANDARD_REQUIRED ON)
         install(DIRECTORY DESTINATION ${SAMPLES_DIR}/luainvaders)
@@ -630,11 +630,11 @@ endif()
 #===================================
 
 if(BUILD_LUA_BINDINGS)
-    install(DIRECTORY ${PROJECT_SOURCE_DIR}/Include/Rocket
+    install(DIRECTORY ${PROJECT_SOURCE_DIR}/Include/Rml
             DESTINATION include
     )
 else()
-    install(DIRECTORY ${PROJECT_SOURCE_DIR}/Include/Rocket
+    install(DIRECTORY ${PROJECT_SOURCE_DIR}/Include/Rml
             DESTINATION include
             PATTERN "Lua" EXCLUDE
     )
@@ -698,34 +698,34 @@ if(PkgHelpers_AVAILABLE)
   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
+  configure_package_config_file(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/libRocketConfigVersion.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/install/RmlUiConfigVersion.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)
+  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(libRocketConfig.cmake.build.in
-    ${CMAKE_CURRENT_BINARY_DIR}/libRocketConfig.cmake
+  configure_package_config_file(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 ${ROCKET_EXPORTED_TARGETS}
-    FILE "${CMAKE_CURRENT_BINARY_DIR}/libRocketTargets.cmake")
+  export(TARGETS ${RMLUI_EXPORTED_TARGETS}
+    FILE "${CMAKE_CURRENT_BINARY_DIR}/RmlUiTargets.cmake")
   write_basic_package_version_file(
-    ${CMAKE_CURRENT_BINARY_DIR}/libRocketConfigVersion.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/RmlUiConfigVersion.cmake
     VERSION ${PROJECT_VERSION}
     COMPATIBILITY SameMajorVersion )
-  set(libRocket_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE PATH "The directory containing a CMake configuration file for libRocket.")
+  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(libRocket) in your own project to find libRocket library"
+  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 libRocketConfig.cmake by yourself.")
+    " or write generators for RmlUiConfig.cmake by yourself.")
 endif()

Build/RmlUiConfig.cmake.build.in

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

Build/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/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/builddist.py

@@ -10,7 +10,7 @@ import re
 def Usage(args):
 	print sys.argv[0] + ' [-hp] [-r revision]'
 	print ''
-	print ' -r\t: Specify rocket internal revision number'
+	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 ''
@@ -30,7 +30,7 @@ def CheckVSVars():
 	
 def ProcessOptions(args):
 
-	options = {'ROCKET_VERSION': 'custom', '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')
@@ -42,10 +42,10 @@ def ProcessOptions(args):
 		if opt[0] == '-h':
 			Usage(args)
 		if opt[0] == '-r':
-			options['ROCKET_VERSION'] = opt[1]
+			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
 		
@@ -151,19 +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'])
+	Build('RmlCore', ['Debug', 'Release'], {'RMLUI_VERSION': '\\"' + options['RMLUI_VERSION'] + '\\"'})
+	Build('RmlControls', ['Debug', 'Release'])
+	Build('RmlDebugger', ['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$'])
+	DelTree('../dist/RmlUi')
+	CopyFiles('../Include', '../dist/RmlUi/Include')
+	CopyFiles('../bin', '../dist/RmlUi/bin', ['\.dll$', '^[^_].*\.lib$', '\.py$', '\.pyd$'])
+	CopyFiles('../Samples', '../dist/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', '../dist/RmlUi/Build', ['\.vcproj$', '\.sln$', '\.vsprops$', '\.py$'])
+		CopyFiles('../Source', '../dist/RmlUi/Source', ['\.cpp$', '\.h$', '\.inl$'])
+	shutil.copyfile('../changelog.txt', '../dist/RmlUi/changelog.txt')
+	Archive(options['ARCHIVE_NAME'] + '-' + options['RMLUI_VERSION'], '../dist/RmlUi');
 	
 if __name__ == '__main__':
 	main()

Build/cmake/FileList.cmake

@@ -103,101 +103,101 @@ 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/Box.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Colour.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Colour.inl
-    ${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/Dictionary.inl
-    ${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/BitmapFont/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/Input.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Log.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Math.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Matrix4.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Matrix4.inl
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/MathTypes.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Platform.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/Plugin.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/Stream.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/StreamMemory.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/String.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/StringBase.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/StringBase.inl
-    ${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/TransformState.h
-    ${PROJECT_SOURCE_DIR}/Include/Rocket/Core/TransformPrimitive.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/Tween.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/WString.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/Box.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Colour.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Colour.inl
+    ${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/Dictionary.inl
+    ${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/BitmapFont/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/Input.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Log.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Math.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Matrix4.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Matrix4.inl
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/MathTypes.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Platform.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Plugin.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/Stream.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/StreamMemory.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/String.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/StringBase.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/StringBase.inl
+    ${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/TransformState.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/TransformPrimitive.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/Tween.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/WString.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/XMLNodeHandler.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/XMLParser.h
 )
 
 set(Core_SRC_FILES
@@ -376,29 +376,29 @@ 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/Clipboard.h
-    ${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/Clipboard.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
@@ -456,12 +456,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
@@ -497,17 +497,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
@@ -533,8 +533,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
@@ -560,8 +560,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/gen_filelists.sh

@@ -8,7 +8,7 @@ masterpubhdr='set(MASTER_lib_PUB_HDR_FILES'
 pubhdr='set(lib_PUB_HDR_FILES'
 srcdir='${PROJECT_SOURCE_DIR}'
 srcpath=Source
-hdrpath=Include/Rocket
+hdrpath=Include/RmlUi
 luapath=Lua
 
 printfiles() {
@@ -18,7 +18,7 @@ printfiles() {
     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

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)

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/Clipboard.h → Include/RmlUi/Controls/Clipboard.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 ROCKETCONTROLSCLIPBOARD_H
-#define ROCKETCONTROLSCLIPBOARD_H
+#ifndef RMLUICONTROLSCLIPBOARD_H
+#define RMLUICONTROLSCLIPBOARD_H
 
 #include "../Core/WString.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Controls {
 
 /**
@@ -43,12 +44,12 @@ class Clipboard
 {
 public:
 	/// Get the current contents of the clipboard.
-	static Rocket::Core::WString Get();
+	static Rml::Core::WString Get();
 
 	/// Set the contents of the clipboard.
-	static void Set(const Rocket::Core::WString& content);
+	static void Set(const Rml::Core::WString& content);
 
-	#if defined ROCKET_PLATFORM_WIN32
+	#if defined RMLUI_PLATFORM_WIN32
 	/// Set the window handle of the application. This shouldn't need to be called unless the host
 	/// application opens multiple windows, or opens and closes windows, etc.
 	static void SetHWND(void* hwnd);

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.CString());
+			Rml::Core::Log::Message(Rml::Core::Log::LT_ERROR, "Field %s not found in query", field_name.CString());
 			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.CString());
+			Rml::Core::Log::Message(Rml::Core::Log::LT_ERROR, "Field %s not found in query", field_name.CString());
 			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;
+	typedef std::vector< Rml::Core::StringList > Rows;
 	Rows rows;
-	typedef std::map< Rocket::Core::String, size_t > FieldIndices;
+	typedef std::map< 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/String.h"
 #include <list>
 #include <map>
 
-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 std::map< Rocket::Core::String, Rocket::Core::String > RowMap;
-		void BuildRowEntries(Rocket::Core::StringList& row, const RowMap& row_map, const Rocket::Core::StringList& columns);
+		typedef std::map< 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, public Core::EventListener
+class RMLUICONTROLS_API ElementDataGridCell : public Core::Element, public Core::EventListener
 {
 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.
@@ -90,10 +91,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;
@@ -127,12 +128,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.
@@ -166,7 +167,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();
@@ -76,10 +77,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);
+	virtual void OnChildAdd(Rml::Core::Element* child);
 	/// 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);
+	virtual void OnChildRemove(Rml::Core::Element* child);
 
 	/// Checks for necessary functional changes in the control as a result of the event.
 	/// @param[in] event The event to process.
@@ -87,11 +88,11 @@ protected:
 
 	/// Sizes the dimensions to the element's inherent size.
 	/// @return True.
-	virtual bool GetIntrinsicDimensions(Rocket::Core::Vector2f& dimensions);
+	virtual bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions);
 
 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;
+	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 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);
+	virtual bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions);
 
 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;
+	virtual void GetInnerRML(Rml::Core::String& content) const;
 
 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/Debugger/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 ROCKETDEBUGGERHEADER_H
-#define ROCKETDEBUGGERHEADER_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 RocketDebugger_EXPORTS
-			#define ROCKETDEBUGGER_API __declspec(dllexport)
+#if !defined RMLUI_STATIC_LIB
+	#ifdef RMLUI_PLATFORM_WIN32
+		#ifdef RmlControls_EXPORTS
+			#define RMLUICONTROLS_API __declspec(dllexport)
 		#else
-			#define ROCKETDEBUGGER_API __declspec(dllimport)
+			#define RMLUICONTROLS_API __declspec(dllimport)
 		#endif
 	#else
-		#define ROCKETDEBUGGER_API __attribute__((visibility("default")))
+		#define RMLUICONTROLS_API __attribute__((visibility("default")))
 	#endif
 #else
-	#define ROCKETDEBUGGER_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 "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/Controls/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 ROCKETCONTROLSLUAHEADER_H
-#define ROCKETCONTROLSLUAHEADER_H
+#ifndef RMLUICONTROLSLUAHEADER_H
+#define RMLUICONTROLSLUAHEADER_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/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;
@@ -46,7 +47,7 @@ class Dictionary;
 }
 }
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class ContextInstancer;
@@ -60,7 +61,7 @@ class RenderInterface;
 	@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()
@@ -201,15 +202,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(int 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);
 
@@ -338,7 +339,7 @@ private:
 	static void SendEvents(const ElementSet& old_items, const ElementSet& new_items, const String& event, const Dictionary& parameters, bool interruptible);
 
 	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"
@@ -78,75 +79,75 @@
 #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);
 
-/// 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/Rocket/Core/Debug.h → Include/RmlUi/Core/Debug.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,77 +26,77 @@
  *
  */
 
-#ifndef ROCKETCOREDEBUG_H
-#define ROCKETCOREDEBUG_H
+#ifndef RMLUICOREDEBUG_H
+#define RMLUICOREDEBUG_H
 
 #include "Header.h"
 
 // Define for breakpointing.
-#if defined (ROCKET_PLATFORM_WIN32)
+#if defined (RMLUI_PLATFORM_WIN32)
 	#if defined (__MINGW32__)
-		#define ROCKET_BREAK {asm("int $0x03");}
+		#define RMLUI_BREAK {asm("int $0x03");}
 	#elif defined (_MSC_VER)
-		#define ROCKET_BREAK {__debugbreak();}
+		#define RMLUI_BREAK {__debugbreak();}
 	#else
-		#define ROCKET_BREAK
+		#define RMLUI_BREAK
 	#endif
-#elif defined (ROCKET_PLATFORM_LINUX)
+#elif defined (RMLUI_PLATFORM_LINUX)
 	#if defined __GNUC__
-		#define ROCKET_BREAK {__builtin_trap();}
+		#define RMLUI_BREAK {__builtin_trap();}
 	#else
-		#define ROCKET_BREAK
+		#define RMLUI_BREAK
 	#endif
-#elif defined (ROCKET_PLATFORM_MACOSX)
-	#define ROCKET_BREAK {__builtin_trap();}
+#elif defined (RMLUI_PLATFORM_MACOSX)
+	#define RMLUI_BREAK {__builtin_trap();}
 #endif
 
 
 
-// Define the LT_ASSERT and ROCKET_VERIFY macros.
-#if !defined ROCKET_DEBUG
-#define ROCKET_ASSERT(x)
-#define ROCKET_ASSERTMSG(x, m)
-#define ROCKET_ERROR
-#define ROCKET_ERRORMSG(m)
-#define ROCKET_VERIFY(x) x
+// 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
 #else
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
-bool ROCKETCORE_API Assert(const char* message, const char* file, int line);
-#define ROCKET_ASSERT(x) \
+bool RMLUICORE_API Assert(const char* message, const char* file, int line);
+#define RMLUI_ASSERT(x) \
 if (!(x)) \
 { \
-	if (!Rocket::Core::Assert("ROCKET_ASSERT("#x")", __FILE__, __LINE__ )) \
+	if (!Rml::Core::Assert("RMLUI_ASSERT("#x")", __FILE__, __LINE__ )) \
 	{ \
-		ROCKET_BREAK; \
+		RMLUI_BREAK; \
 	} \
 }
-#define ROCKET_ASSERTMSG(x, m)	\
+#define RMLUI_ASSERTMSG(x, m)	\
 if (!(x)) \
 { \
-	if (!Rocket::Core::Assert(m, __FILE__, __LINE__ )) \
+	if (!Rml::Core::Assert(m, __FILE__, __LINE__ )) \
 	{ \
-		ROCKET_BREAK; \
+		RMLUI_BREAK; \
 	} \
 }
-#define ROCKET_ERROR \
-if (!Rocket::Core::Assert("ROCKET_ERROR", __FILE__, __LINE__)) \
+#define RMLUI_ERROR \
+if (!Rml::Core::Assert("RMLUI_ERROR", __FILE__, __LINE__)) \
 { \
-	ROCKET_BREAK; \
+	RMLUI_BREAK; \
 }
-#define ROCKET_ERRORMSG(m) \
-if (!Rocket::Core::Assert(m, __FILE__, __LINE__)) \
+#define RMLUI_ERRORMSG(m) \
+if (!Rml::Core::Assert(m, __FILE__, __LINE__)) \
 { \
-	ROCKET_BREAK; \
+	RMLUI_BREAK; \
 }
-#define ROCKET_VERIFY(x) ROCKET_ASSERT(x)
+#define RMLUI_VERIFY(x) RMLUI_ASSERT(x)
 
 }
 }
 #endif
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 template <bool> struct STATIC_ASSERTION_FAILURE;
@@ -103,6 +104,6 @@ template <> struct STATIC_ASSERTION_FAILURE<true>{};
 	
 }
 }
-#define ROCKET_STATIC_ASSERT(cond, msg) Rocket::Core::STATIC_ASSERTION_FAILURE<cond> msg; (void)&msg;
+#define RMLUI_STATIC_ASSERT(cond, msg) Rml::Core::STATIC_ASSERTION_FAILURE<cond> msg; (void)&msg;
 
 #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,8 +26,8 @@
  *
  */
 
-#ifndef ROCKETCOREDECORATOR_H
-#define ROCKETCOREDECORATOR_H
+#ifndef RMLUICOREDECORATOR_H
+#define RMLUICOREDECORATOR_H
 
 #include "ReferenceCountable.h"
 #include <vector>
@@ -34,7 +35,7 @@
 #include "Texture.h"
 #include "Types.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class DecoratorInstancer;
@@ -50,7 +51,7 @@ class TextureResource;
 	@author Peter Curry
  */
 
-class ROCKETCORE_API Decorator : public ReferenceCountable
+class RMLUICORE_API Decorator : public ReferenceCountable
 {
 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,15 +26,15 @@
  *
  */
 
-#ifndef ROCKETCOREDECORATORINSTANCER_H
-#define ROCKETCOREDECORATORINSTANCER_H
+#ifndef RMLUICOREDECORATORINSTANCER_H
+#define RMLUICOREDECORATORINSTANCER_H
 
 #include "ReferenceCountable.h"
 #include "Header.h"
 #include "PropertyDictionary.h"
 #include "PropertySpecification.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Decorator;
@@ -47,7 +48,7 @@ class Decorator;
 	@author Peter Curry
  */
 
-class ROCKETCORE_API DecoratorInstancer : public ReferenceCountable
+class RMLUICORE_API DecoratorInstancer : public ReferenceCountable
 {
 public:
 	DecoratorInstancer();

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 {
 
 /**
@@ -41,7 +42,7 @@ namespace Core {
 	@author Lloyd Weehuizen
  */
 
-class ROCKETCORE_API Dictionary
+class RMLUICORE_API Dictionary
 {
 public:
 	Dictionary();

Include/Rocket/Core/Dictionary.inl → Include/RmlUi/Core/Dictionary.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/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"
@@ -41,7 +42,7 @@
 
 #include <memory>
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Context;
@@ -68,10 +69,10 @@ class StyleSheet;
 	@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,13 +26,13 @@
  *
  */
 
-#ifndef ROCKETCOREELEMENTSCROLL_H
-#define ROCKETCOREELEMENTSCROLL_H
+#ifndef RMLUICOREELEMENTSCROLL_H
+#define RMLUICOREELEMENTSCROLL_H
 
 #include "Header.h"
 #include "EventListener.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Element;
@@ -43,7 +44,7 @@ class WidgetSliderScroll;
 	@author Peter Curry
  */
 
-class ROCKETCORE_API ElementScroll : public EventListener
+class RMLUICORE_API ElementScroll : public EventListener
 {
 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 "WString.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 "WString.h"
 #include "Types.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Context;
@@ -47,7 +48,7 @@ class ViewState;
 	@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,14 +26,14 @@
  *
  */
 
-#ifndef ROCKETCOREEVENT_H
-#define ROCKETCOREEVENT_H
+#ifndef RMLUICOREEVENT_H
+#define RMLUICOREEVENT_H
 
 #include "Dictionary.h"
 #include "ScriptInterface.h"
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Element;
@@ -45,7 +46,7 @@ class EventInstancer;
 	@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,14 +26,14 @@
  *
  */
 
-#ifndef ROCKETCOREFACTORY_H
-#define ROCKETCOREFACTORY_H
+#ifndef RMLUICOREFACTORY_H
+#define RMLUICOREFACTORY_H
 
 #include "XMLParser.h"
 #include "Header.h"
 #include <map>
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Context;
@@ -54,13 +55,13 @@ class PropertyDictionary;
 /**
 	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
@@ -108,7 +109,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 "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 "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/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

Include/Rocket/Core/Lua/Header.h → Include/RmlUi/Core/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 RMLUICORELUAHEADER_H
+#define RMLUICORELUAHEADER_H
 
 #include "../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/Core/Lua/Interpreter.h → Include/RmlUi/Core/Lua/Interpreter.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 ROCKETCORELUAINTERPRETER_H
-#define ROCKETCORELUAINTERPRETER_H 
+#ifndef RMLUICORELUAINTERPRETER_H
+#define RMLUICORELUAINTERPRETER_H 
 
 #include "Header.h"
 #include "lua.hpp"
 #include "../Plugin.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 namespace Lua {
 
@@ -42,23 +43,23 @@ namespace Lua {
 
     @author Nathan Starkey
 */
-class ROCKETLUA_API Interpreter : public Plugin
+class RMLUILUA_API Interpreter : public Plugin
 {
 public:
     /** This function calls luaL_loadfile and then lua_pcall, reporting the errors (if any)
     @param[in] file Fully qualified file name to execute.
     @remark Somewhat misleading name if you are used to the Lua meaning of "load file". It behaves
     exactly as luaL_dofile does.            */
-    static void LoadFile(const Rocket::Core::String& file);
+    static void LoadFile(const Rml::Core::String& file);
     /** Calls lua_dostring and reports the errors.
     @param[in] code String to execute
     @param[in] name Name for the code that will show up in the Log  */
-    static void DoString(const Rocket::Core::String& code, const Rocket::Core::String& name = "");
+    static void DoString(const Rml::Core::String& code, const Rml::Core::String& name = "");
     /** Same as DoString, except does NOT call pcall on it. It will leave the compiled (but not executed) string
     on top of the stack. It behaves exactly like luaL_loadstring, but you get to specify the name
     @param[in] code String to compile
     @param[in] name Name for the code that will show up in the Log    */
-    static void LoadString(const Rocket::Core::String& code, const Rocket::Core::String& name = "");
+    static void LoadString(const Rml::Core::String& code, const Rml::Core::String& name = "");
 
     /** Clears all of the items on the stack, and pushes the function from funRef on top of the stack. Only use
     this if you used lua_ref instead of luaL_ref
@@ -80,14 +81,14 @@ public:
     /** This will populate the global Lua table with all of the Lua core types by calling LuaType<T>::Register
     @param[in] L The lua_State to use to register the types
     @remark This is called automatically inside of Interpreter::Startup(), so you do not have to 
-    call this function upon initialization of the Interpreter. If you are using RocketControlsLua, then you
-    \em will need to call Rocket::Controls::Lua::RegisterTypes(lua_State*)     */
+    call this function upon initialization of the Interpreter. If you are using RmlControlsLua, then you
+    \em will need to call Rml::Controls::Lua::RegisterTypes(lua_State*)     */
     static void RegisterCoreTypes(lua_State* L);
 
     /** 
     @return The lua_State that the Interpreter created in Interpreter::Startup()
     @remark This class lacks a SetLuaState for a reason. If you have to use a seperate Lua binding and want to keep the types
-    from libRocket, then use this lua_State; it will already have all of the libraries loaded, and all of the types defined.
+    from RmlUi, then use this lua_State; it will already have all of the libraries loaded, and all of the types defined.
     Alternatively, you can call RegisterCoreTypes(lua_State*) with your own Lua state if you need them defined in it. */
     static lua_State* GetLuaState();
 
@@ -95,11 +96,11 @@ public:
 	@remark This is equivilent to calling Initialise(NULL).
       */
     static void Initialise();
-    /** Creates the plugin and adds Rocket to an existing Lua context if one is provided.
+    /** Creates the plugin and adds RmlUi to an existing Lua context if one is provided.
 	 @remark Call this function only once, and special care must be taken when destroying the lua_State passed to this method.
 	 Interpreter::Shutdown() calles lua_close on the lua_State pointer provided here, do not call Interpreter::Shutdown if you
 	 must call lua_close yourself or if you need to continue to use the lua_State pointer provided here.  Internally, it calls
-	 Interpreter::Startup() and registers the "body" tag to generate a LuaDocument rather than a Rocket::Core::ElementDocument.
+	 Interpreter::Startup() and registers the "body" tag to generate a LuaDocument rather than a Rml::Core::ElementDocument.
 	 If the argument provided is NULL, a Lua context is created automatically instead. */
     static void Initialise(lua_State *_L);
 
@@ -108,12 +109,12 @@ public:
 	 original call to Initialise, Shutdown should not be called OR you must not call lua_Close from within your code. */
 	static void Shutdown();
     
-    /** @sa Rocket::Core::Plugin::GetEventClasses */
+    /** @sa Rml::Core::Plugin::GetEventClasses */
     virtual int GetEventClasses();
-    /** @sa Rocket::Core::Plugin::OnInitialise */
+    /** @sa Rml::Core::Plugin::OnInitialise */
     virtual void OnInitialise();
     /** Currently does nothing. You must call Interpreter::Shutdown yourself at the appropriate time.
-    @sa Rocket::Core::Plugin::OnShutdown    */
+    @sa Rml::Core::Plugin::OnShutdown    */
     virtual void OnShutdown();
 private:
     /** Creates a lua_State for @var _L and calls luaL_openlibs, then calls Interpreter::RegisterCoreTypes(lua_State*)

Include/Rocket/Core/Lua/LuaType.h → Include/RmlUi/Core/Lua/LuaType.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 ROCKETCORELUALUATYPE_H
-#define ROCKETCORELUALUATYPE_H
+#ifndef RMLUICORELUALUATYPE_H
+#define RMLUICORELUALUATYPE_H
 
 #include "Header.h"
 #include "lua.hpp"
@@ -56,7 +57,7 @@
  functions with the same name as defined in the macro. For example, if you used @c Element as type, you would
  have to have functions named @c ElementMethods, @c ElementGetters, @c ElementSetters that return the appropriate
  types.
- @param is_reference_counted true if the type inherits from Rocket::Core::ReferenceCountable, false otherwise*/
+ @param is_reference_counted true if the type inherits from Rml::Core::ReferenceCountable, false otherwise*/
 #define LUACORETYPEDEFINE(type,is_ref_counted) \
     template<> const char* GetTClassName<type>() { return #type; } \
     template<> RegType<type>* GetMethodTable<type>() { return type##Methods; } \
@@ -67,9 +68,9 @@
 //We can't use LUACORETYPEDEFINE due to namespace issues
 #define LUACONTROLSTYPEDEFINE(type,is_ref_counted) \
     template<> const char* GetTClassName<type>() { return #type; } \
-    template<> RegType<type>* GetMethodTable<type>() { return Rocket::Controls::Lua::type##Methods; } \
-    template<> luaL_Reg* GetAttrTable<type>() { return Rocket::Controls::Lua::type##Getters; } \
-    template<> luaL_Reg* SetAttrTable<type>() { return Rocket::Controls::Lua::type##Setters; } \
+    template<> RegType<type>* GetMethodTable<type>() { return Rml::Controls::Lua::type##Methods; } \
+    template<> luaL_Reg* GetAttrTable<type>() { return Rml::Controls::Lua::type##Getters; } \
+    template<> luaL_Reg* SetAttrTable<type>() { return Rml::Controls::Lua::type##Setters; } \
     template<> bool IsReferenceCounted<type>() { return (is_ref_counted); } \
 
 /** Used to remove repetitive typing at the cost of flexibility. It creates function prototypes for
@@ -77,50 +78,50 @@ getting the name of the type, method tables, and if it is reference counted.
 When you use this, you either must also use
 the LUACORETYPEDEFINE macro, or make sure that the function signatures are @em exact.*/
 #define LUACORETYPEDECLARE(type) \
-    template<> ROCKETLUA_API const char* GetTClassName<type>(); \
-    template<> ROCKETLUA_API RegType<type>* GetMethodTable<type>(); \
-    template<> ROCKETLUA_API luaL_Reg* GetAttrTable<type>(); \
-    template<> ROCKETLUA_API luaL_Reg* SetAttrTable<type>(); \
-    template<> ROCKETLUA_API bool IsReferenceCounted<type>(); \
+    template<> RMLUILUA_API const char* GetTClassName<type>(); \
+    template<> RMLUILUA_API RegType<type>* GetMethodTable<type>(); \
+    template<> RMLUILUA_API luaL_Reg* GetAttrTable<type>(); \
+    template<> RMLUILUA_API luaL_Reg* SetAttrTable<type>(); \
+    template<> RMLUILUA_API bool IsReferenceCounted<type>(); \
 
 /** Used to remove repetitive typing at the cost of flexibility. It creates function prototypes for
 getting the name of the type, method tables, and if it is reference counted.
 When you use this, you either must also use
 the LUACORETYPEDEFINE macro, or make sure that the function signatures are @em exact.*/
 #define LUACONTROLSTYPEDECLARE(type) \
-    template<> ROCKETLUA_API const char* GetTClassName<type>(); \
-    template<> ROCKETLUA_API RegType<type>* GetMethodTable<type>(); \
-    template<> ROCKETLUA_API luaL_Reg* GetAttrTable<type>(); \
-    template<> ROCKETLUA_API luaL_Reg* SetAttrTable<type>(); \
-    template<> ROCKETLUA_API bool IsReferenceCounted<type>(); \
+    template<> RMLUILUA_API const char* GetTClassName<type>(); \
+    template<> RMLUILUA_API RegType<type>* GetMethodTable<type>(); \
+    template<> RMLUILUA_API luaL_Reg* GetAttrTable<type>(); \
+    template<> RMLUILUA_API luaL_Reg* SetAttrTable<type>(); \
+    template<> RMLUILUA_API bool IsReferenceCounted<type>(); \
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 namespace Lua {
 //replacement for luaL_Reg that uses a different function pointer signature, but similar syntax
 template<typename T>
-struct ROCKETLUA_API RegType
+struct RMLUILUA_API RegType
 {
     const char* name;
     int (*ftnptr)(lua_State*,T*);
 };
 
 /** For all of the methods available from Lua that call to the C functions. */
-template<typename T> ROCKETLUA_API RegType<T>* GetMethodTable();
+template<typename T> RMLUILUA_API RegType<T>* GetMethodTable();
 /** For all of the function that 'get' an attribute/property */
-template<typename T> ROCKETLUA_API luaL_Reg* GetAttrTable();
+template<typename T> RMLUILUA_API luaL_Reg* GetAttrTable();
 /** For all of the functions that 'set' an attribute/property  */
-template<typename T> ROCKETLUA_API luaL_Reg* SetAttrTable();
+template<typename T> RMLUILUA_API luaL_Reg* SetAttrTable();
 /** String representation of the class */
-template<typename T> ROCKETLUA_API const char* GetTClassName();
+template<typename T> RMLUILUA_API const char* GetTClassName();
 /** bool for if it is reference counted */
-template<typename T> ROCKETLUA_API bool IsReferenceCounted();
+template<typename T> RMLUILUA_API bool IsReferenceCounted();
 /** gets called from the LuaType<T>::Register function, right before @c _regfunctions.
 If you want to inherit from another class, in the function you would want
 to call @c _regfunctions<superclass>, where method is metatable_index - 1. Anything
 that has the same name in the subclass will be overwrite whatever had the 
 same name in the superclass.    */
-template<typename T> ROCKETLUA_API void ExtraInit(lua_State* L, int metatable_index);
+template<typename T> RMLUILUA_API void ExtraInit(lua_State* L, int metatable_index);
 
 /**
     This is mostly the definition of the Lua userdata that C++ gives to the user, plus
@@ -129,7 +130,7 @@ template<typename T> ROCKETLUA_API void ExtraInit(lua_State* L, int metatable_in
     @author Nathan Starkey
 */
 template<typename T>
-class ROCKETLUA_API LuaType
+class RMLUILUA_API LuaType
 {
 public:
     typedef int (*ftnptr)(lua_State* L, T* ptr);

Include/Rocket/Core/Lua/LuaType.inl → Include/RmlUi/Core/Lua/LuaType.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
@@ -30,7 +31,7 @@
 #include "../Core.h"
 #include "Utilities.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 namespace Lua {
 template<typename T>
@@ -119,7 +120,7 @@ int LuaType<T>::push(lua_State *L, T* obj, bool gc)
         {
             //If you look at the gc_T function, reference countables do not
             //care about the "DO NOT TRASH" table
-            ((Rocket::Core::ReferenceCountable*)obj)->AddReference();
+            ((Rml::Core::ReferenceCountable*)obj)->AddReference();
         }
 
         lua_pop(L,1); // -> pop [3]
@@ -182,7 +183,7 @@ int LuaType<T>::gc_T(lua_State* L)
         // ReferenceCountables do not care about the "DO NOT TRASH" table.
         // Because userdata is pushed which contains a pointer to the pointer
         // of 'obj', 'obj' will be garbage collected for every time 'obj' was pushed.
-        ((Rocket::Core::ReferenceCountable*)obj)->RemoveReference();
+        ((Rml::Core::ReferenceCountable*)obj)->RemoveReference();
         return 0;
     }
     lua_getfield(L,LUA_REGISTRYINDEX,"DO NOT TRASH"); //->[2] = return value from this

Include/Rocket/Core/Lua/Utilities.h → Include/RmlUi/Core/Lua/Utilities.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 ROCKETCORELUAUTILITIES_H
-#define ROCKETCORELUAUTILITIES_H
+#ifndef RMLUICORELUAUTILITIES_H
+#define RMLUICORELUAUTILITIES_H
 /*
     This file is for free-floating functions that are used across more than one file.
 */
@@ -35,20 +36,20 @@
 #include "LuaType.h"
 #include "../Variant.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 namespace Lua {
 
 /** casts the variant to its specific type before pushing it to the stack 
-@relates Rocket::Core::Lua::LuaType */
-void ROCKETLUA_API PushVariant(lua_State* L, Variant* var);
+@relates Rml::Core::Lua::LuaType */
+void RMLUILUA_API PushVariant(lua_State* L, Variant* var);
 
 /** If there are errors on the top of the stack, this will print those out to the log.
 @param L A Lua state, and if not passed in, will use the Interpreter's state
 @param place A string that will be printed to the log right before the error message, seperated by a space. Set
 this when you would get no information about where the error happens.
-@relates Rocket::Core::Lua::Interpreter   */
-void ROCKETLUA_API Report(lua_State* L = NULL, const Rocket::Core::String& place = "");
+@relates Rml::Core::Lua::Interpreter   */
+void RMLUILUA_API Report(lua_State* L = NULL, const Rml::Core::String& place = "");
 
 //Helper function, so that the types don't have to define individual functions themselves
 // to fill the Elements.As table

Include/Rocket/Core/Lua/lua.hpp → Include/RmlUi/Core/Lua/lua.hpp

@@ -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

Include/Rocket/Core/Math.h → Include/RmlUi/Core/Math.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,17 +26,17 @@
  *
  */
 
-#ifndef ROCKETCOREMATH_H
-#define ROCKETCOREMATH_H
+#ifndef RMLUICOREMATH_H
+#define RMLUICOREMATH_H
 
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 namespace Math {
 
 // The constant PI.
-extern ROCKETCORE_API const float ROCKET_PI;
+extern RMLUICORE_API const float RMLUI_PI;
 
 template < typename Type >
 Type Max(Type a, Type b)
@@ -70,110 +71,110 @@ Type Clamp(Type value, Type min, Type max)
 /// Evaluates if a number is, or close to, zero.
 /// @param[in] value The number to compare to zero.
 /// @return True if the number if zero or close to it, false otherwise.
-ROCKETCORE_API bool IsZero(float value);
+RMLUICORE_API bool IsZero(float value);
 /// Evaluates if two floating-point numbers are equal, or so similar that they could be considered
 /// so.
 /// @param[in] value_0 The first number to compare.
 /// @param[in] value_1 The second number to compare.
 /// @return True if the numbers are similar or equal.
-ROCKETCORE_API bool AreEqual(float value_0, float value_1);
+RMLUICORE_API bool AreEqual(float value_0, float value_1);
 
 /// Calculates the absolute value of a number.
 /// @param[in] value The number of get the absolute value of.
 /// @return The absolute value of the number.
-ROCKETCORE_API float AbsoluteValue(float value);
+RMLUICORE_API float AbsoluteValue(float value);
 
 /// Calculates the cosine of an angle.
 /// @param[in] angle The angle to calculate the cosine of, in radians.
 /// @return The cosine of the angle.
-ROCKETCORE_API float Cos(float angle);
+RMLUICORE_API float Cos(float angle);
 /// Calculates the arc-cosine of an value.
 /// @param[in] angle The value to calculate the arc-cosine of.
 /// @return The angle, in radians.
-ROCKETCORE_API float ACos(float value);
+RMLUICORE_API float ACos(float value);
 /// Calculates the sine of an angle.
 /// @param[in] angle The angle to calculate the sine of, in radians.
 /// @return The sine of the angle.
-ROCKETCORE_API float Sin(float angle);
+RMLUICORE_API float Sin(float angle);
 /// Calculates the arc-sine of an value.
 /// @param[in] angle The value to calculate the arc-sine of.
 /// @return The angle, in radians.
-ROCKETCORE_API float ASin(float angle);
+RMLUICORE_API float ASin(float angle);
 /// Calculates the tangent of an angle.
 /// @param[in] angle The angle to calculate the tangent of, in radians.
 /// @return The tanget of the angle.
-ROCKETCORE_API float Tan(float angle);
+RMLUICORE_API float Tan(float angle);
 /// Calculates the angle of a two-dimensional line.
 /// @param[in] y The y-component of the line.
 /// @param[in] x The x-component of the line.
 /// @return The angle of the line in radians.
-ROCKETCORE_API float ATan2(float y, float x);
+RMLUICORE_API float ATan2(float y, float x);
 /// Evaluates the natural exponential function on a value.
 /// @param[in] value The value
 /// @return e^(value)
-ROCKETCORE_API float Exp(float value);
+RMLUICORE_API float Exp(float value);
 
 /// Converts an angle from radians to degrees.
 /// @param[in] The angle, in radians.
 /// @return The angle converted to degrees.
-ROCKETCORE_API float RadiansToDegrees(float angle);
+RMLUICORE_API float RadiansToDegrees(float angle);
 /// Converts an angle from degrees to radians.
 /// @param[in] The angle, in degrees.
 /// @return The angle converted to radians.
-ROCKETCORE_API float DegreesToRadians(float angle);
+RMLUICORE_API float DegreesToRadians(float angle);
 /// Normalises and angle in radians
 /// @param[in] The angle, in randians
 /// @return The normalised angle
-ROCKETCORE_API float NormaliseAngle(float angle);
+RMLUICORE_API float NormaliseAngle(float angle);
 
 /// Calculates the square root of a value.
 /// @param[in] value The value to calculate the square root of. This must be above zero.
 /// @return The square root of the value.
-ROCKETCORE_API float SquareRoot(float value);
+RMLUICORE_API float SquareRoot(float value);
 
 /// Rounds a floating-point value to the nearest integer.
 /// @param[in] value The value to round.
 /// @return The rounded integer as float.
-ROCKETCORE_API float RoundFloat(float value);
+RMLUICORE_API float RoundFloat(float value);
 /// Rounds a floating-point value to the nearest integer.
 /// @param[in] value The value to round.
 /// @return The rounded integer.
-ROCKETCORE_API int RoundToInteger(float value);
+RMLUICORE_API int RoundToInteger(float value);
 /// Rounds a floating-point value up to the nearest integer.
 /// @param[in] value The value to round.
 /// @return The rounded integer.
-ROCKETCORE_API int RoundUpToInteger(float value);
+RMLUICORE_API int RoundUpToInteger(float value);
 /// Rounds a floating-point value down to the nearest integer.
 /// @param[in] value The value to round.
 /// @return The rounded integer.
-ROCKETCORE_API int RoundDownToInteger(float value);
+RMLUICORE_API int RoundDownToInteger(float value);
 
 /// Efficiently truncates a floating-point value into an integer.
 /// @param[in] value The value to truncate.
 /// @return The truncated value as a signed integer.
-ROCKETCORE_API int RealToInteger(float value);
+RMLUICORE_API int RealToInteger(float value);
 
 /// Converts a number to the nearest power of two, rounding up if necessary.
 /// @param[in] value The value to convert to a power-of-two.
 /// @return The smallest power of two that is as least as big as the input value.
-ROCKETCORE_API int ToPowerOfTwo(int value);
+RMLUICORE_API int ToPowerOfTwo(int value);
 
 /// Converts from the ASCII-representation of a hexadecimal digit to decimal.
 /// @param[in] hex_digit The hexadecimal digit to convert to decimal.
 /// @return The digit in decimal.
-ROCKETCORE_API int HexToDecimal(char hex_digit);
+RMLUICORE_API int HexToDecimal(char hex_digit);
 
 /// Generates a random floating-point value between 0 and a user-specified value.
 /// @param[in] max_value The limit to random value. The generated value will be guaranteed to be below this limit.
 /// @return The random value.
-ROCKETCORE_API float RandomReal(float max_value);
+RMLUICORE_API float RandomReal(float max_value);
 /// Generates a random integer value between 0 and a user-specified value.
 /// @param[in] max_value The limit to random value. The generated value will be guaranteed to be below this limit.
 /// @return The random value.
-ROCKETCORE_API int RandomInteger(int max_value);
+RMLUICORE_API int RandomInteger(int max_value);
 /// Generates a random boolean value, with equal chance of true or false.
 /// @return The random value.
-ROCKETCORE_API bool RandomBool();
+RMLUICORE_API bool RandomBool();
 
 }
 }

Include/Rocket/Core/MathTypes.h → Include/RmlUi/Core/MathTypes.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 ROCKETCOREMATHTYPES_H
-#define ROCKETCOREMATHTYPES_H
+#ifndef RMLUICOREMATHTYPES_H
+#define RMLUICOREMATHTYPES_H
 
 #include "Header.h"
 #include "Vector2.h"
 #include "Vector3.h"
 #include "Vector4.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 // Define common Vector2 types.
 typedef Vector2< int > Vector2i;
 typedef Vector2< float > Vector2f;
-ROCKETCORE_API Vector2i operator*(int lhs, const Vector2i& rhs);
-ROCKETCORE_API Vector2f operator*(float lhs, const Vector2f& rhs);
+RMLUICORE_API Vector2i operator*(int lhs, const Vector2i& rhs);
+RMLUICORE_API Vector2f operator*(float lhs, const Vector2f& rhs);
 
 // Define common Vector3 types.
 typedef Vector3< int > Vector3i;
 typedef Vector3< float > Vector3f;
-ROCKETCORE_API Vector3i operator*(int lhs, const Vector3i& rhs);
-ROCKETCORE_API Vector3f operator*(float lhs, const Vector3f& rhs);
+RMLUICORE_API Vector3i operator*(int lhs, const Vector3i& rhs);
+RMLUICORE_API Vector3f operator*(float lhs, const Vector3f& rhs);
 
 // Define common Vector4 types.
 typedef Vector4< int > Vector4i;
 typedef Vector4< float > Vector4f;
-ROCKETCORE_API Vector4i operator*(int lhs, const Vector4i& rhs);
-ROCKETCORE_API Vector4f operator*(float lhs, const Vector4f& rhs);
+RMLUICORE_API Vector4i operator*(int lhs, const Vector4i& rhs);
+RMLUICORE_API Vector4f operator*(float lhs, const Vector4f& rhs);
 
 }
 }

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

@@ -1,7 +1,7 @@
 /*
- * This source file is part of rocket, 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) 2014 Markus Schöngart
  *
@@ -25,14 +25,14 @@
  *
  */
 
-#ifndef ROCKETCOREMATRIX4_H
-#define ROCKETCOREMATRIX4_H
+#ifndef RMLUICOREMATRIX4_H
+#define RMLUICOREMATRIX4_H
 
 #include "Debug.h"
 #include "Math.h"
 #include "Vector4.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 /**

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

@@ -1,7 +1,7 @@
 /*
- * This source file is part of rocket, 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) 2014 Markus Schöngart
  *
@@ -25,7 +25,7 @@
  *
  */
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 // Initialising constructor.
@@ -312,7 +312,7 @@ bool Matrix4< Component, Storage >::Invert() noexcept
 
 
 template<typename Component, class Storage>
-inline float Rocket::Core::Matrix4<Component, Storage>::Determinant() const noexcept
+inline float Rml::Core::Matrix4<Component, Storage>::Determinant() const noexcept
 {
 	const Component *src = data();
 	float diag[4]; // Diagonal elements of the matrix inverse (see Invert)
@@ -674,7 +674,7 @@ Matrix4< Component, Storage > Matrix4< Component, Storage >::SkewY(Component ang
 }
 
 template<typename Component, class Storage>
-Matrix4< Component, Storage > Rocket::Core::Matrix4<Component, Storage>::Compose(const Vector3<Component>& translation,
+Matrix4< Component, Storage > Rml::Core::Matrix4<Component, Storage>::Compose(const Vector3<Component>& translation,
 	const Vector3<Component>& scale, const Vector3<Component>& skew, const Vector4<Component>& perspective,
 	const Vector4<Component>& quaternion) noexcept
 {

Include/Rocket/Core/Platform.h → Include/RmlUi/Core/Platform.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,37 +26,37 @@
  *
  */
 
-#ifndef ROCKETCOREPLATFORM_H
-#define ROCKETCOREPLATFORM_H
+#ifndef RMLUICOREPLATFORM_H
+#define RMLUICOREPLATFORM_H
 
 #if defined __WIN32__ || defined _WIN32
-	#define ROCKET_PLATFORM_WIN32
-	#define ROCKET_PLATFORM_NAME "win32"
+	#define RMLUI_PLATFORM_WIN32
+	#define RMLUI_PLATFORM_NAME "win32"
 	#if !defined(__MINGW32__)
 		#pragma warning(disable:4355)
 	#endif
 #elif defined __APPLE_CC__
-	#define ROCKET_PLATFORM_UNIX
-	#define ROCKET_PLATFORM_MACOSX
-	#define ROCKET_PLATFORM_NAME "macosx"
+	#define RMLUI_PLATFORM_UNIX
+	#define RMLUI_PLATFORM_MACOSX
+	#define RMLUI_PLATFORM_NAME "macosx"
 #else
-	#define ROCKET_PLATFORM_UNIX
-	#define ROCKET_PLATFORM_LINUX
-	#define ROCKET_PLATFORM_NAME "linux"
+	#define RMLUI_PLATFORM_UNIX
+	#define RMLUI_PLATFORM_LINUX
+	#define RMLUI_PLATFORM_NAME "linux"
 #endif
 
-#if !defined NDEBUG && !defined ROCKET_DEBUG
-	#define ROCKET_DEBUG
+#if !defined NDEBUG && !defined RMLUI_DEBUG
+	#define RMLUI_DEBUG
 #endif
 
 #if defined __LP64__ || defined _M_X64 || defined __MINGW64__ || defined _LP64
-    #define ROCKET_ARCH_64
+    #define RMLUI_ARCH_64
 #else
-    #define ROCKET_ARCH_32
+    #define RMLUI_ARCH_32
 #endif
 
 
-#if defined(ROCKET_PLATFORM_WIN32) && !defined(__MINGW32__)
+#if defined(RMLUI_PLATFORM_WIN32) && !defined(__MINGW32__)
 	// alignment of a member was sensitive to packing
 	#pragma warning(disable : 4121)
 
@@ -74,65 +75,65 @@
 #endif
 
 // Wraps unused variables in methods or functions to avoid compiler warnings.  This should
-// be wrapped around the name of all parameters that are wrapped with ROCKET_UNUSED_PARAMETER
+// be wrapped around the name of all parameters that are wrapped with RMLUI_UNUSED_PARAMETER
 // to cover warnings generated by non-llvm/gcc style compilers that can't be covered with
-// ROCKET_UNUSED_PARAMETER
+// RMLUI_UNUSED_PARAMETER
 #if defined __llvm__
-//#  define ROCKET_UNUSED(x) UNUSED_ ## x __unused
-#  define ROCKET_UNUSED(x)
+//#  define RMLUI_UNUSED(x) UNUSED_ ## x __unused
+#  define RMLUI_UNUSED(x)
 #elif defined __GNUC__
-//#  define ROCKET_UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
-#  define ROCKET_UNUSED(x)
+//#  define RMLUI_UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
+#  define RMLUI_UNUSED(x)
 #else
-#  define ROCKET_UNUSED(x) (void)(UNUSED_ ## x)
+#  define RMLUI_UNUSED(x) (void)(UNUSED_ ## x)
 #endif
 
 // Wraps unused parameter names in method or function declarations.  When used, the first lines
-// of the function should contain a matching ROCKET_UNUSED call with the name of the function
-// as well to cover compilers with no-op ROCKET_UNUSED_PARAMETER macros.
+// of the function should contain a matching RMLUI_UNUSED call with the name of the function
+// as well to cover compilers with no-op RMLUI_UNUSED_PARAMETER macros.
 #if defined __llvm__
-#  define ROCKET_UNUSED_PARAMETER(x) UNUSED_ ## x __attribute__((unused))
+#  define RMLUI_UNUSED_PARAMETER(x) UNUSED_ ## x __attribute__((unused))
 #elif defined __GNUC__
-#  define ROCKET_UNUSED_PARAMETER(x) UNUSED_ ## x __attribute__((__unused__))
+#  define RMLUI_UNUSED_PARAMETER(x) UNUSED_ ## x __attribute__((__unused__))
 #else
-#  define ROCKET_UNUSED_PARAMETER(x) UNUSED_ ## x
+#  define RMLUI_UNUSED_PARAMETER(x) UNUSED_ ## x
 #endif
 
-// ROCKET_UNUSED_ASSERT_PARAMETERS wraps method parameters which are not used in the method other than
-// by a ROCKET_ASSERT check.  This safely deals with debug versus release mode configurations
+// RMLUI_UNUSED_ASSERT_PARAMETERS wraps method parameters which are not used in the method other than
+// by a RMLUI_ASSERT check.  This safely deals with debug versus release mode configurations
 // and will warn if the parameter starts being used when compiled with GCC
-#ifdef ROCKET_DEBUG
-   // In this case, the parameter is used by a ROCKET_ASSERT test, so we just pass through as is
-#  define ROCKET_UNUSED_ASSERT_PARAMETER(x) x
-#  define ROCKET_UNUSED_ASSERT(x)
+#ifdef RMLUI_DEBUG
+   // In this case, the parameter is used by a RMLUI_ASSERT test, so we just pass through as is
+#  define RMLUI_UNUSED_ASSERT_PARAMETER(x) x
+#  define RMLUI_UNUSED_ASSERT(x)
 #else
    // If not in DEBUG builds, this parameter is unused, mark it as such
 #  if defined __llvm__
-#    define ROCKET_UNUSED_ASSERT_PARAMETER(x) UNUSED_ ## x __attribute__((unused))
-#    define ROCKET_UNUSED_ASSERT(x)
+#    define RMLUI_UNUSED_ASSERT_PARAMETER(x) UNUSED_ ## x __attribute__((unused))
+#    define RMLUI_UNUSED_ASSERT(x)
 #  elif defined __GNUC__
-#    define ROCKET_UNUSED_ASSERT_PARAMETER(x) UNUSED_ ## x __attribute__((__unused__))
-#    define ROCKET_UNUSED_ASSERT(x)
+#    define RMLUI_UNUSED_ASSERT_PARAMETER(x) UNUSED_ ## x __attribute__((__unused__))
+#    define RMLUI_UNUSED_ASSERT(x)
 #  else
-#    define ROCKET_UNUSED_ASSERT_PARAMETER(x) UNUSED_ ## x
-#    define ROCKET_UNUSED_ASSERT(x) (void)(UNUSED_ ## x)
+#    define RMLUI_UNUSED_ASSERT_PARAMETER(x) UNUSED_ ## x
+#    define RMLUI_UNUSED_ASSERT(x) (void)(UNUSED_ ## x)
 #  endif
 #endif
 
 // Wraps functions which are not referenced or exported to avoid compiler warnings
 #if defined __llvm__
-#  define ROCKET_UNUSED_FUNCTION(x) __attribute__((unused)) UNUSED_ ## x
+#  define RMLUI_UNUSED_FUNCTION(x) __attribute__((unused)) UNUSED_ ## x
 #elif defined __GNUC__
-#  define ROCKET_UNUSED_FUNCTION(x) __attribute__((__unused__)) UNUSED_ ## x
+#  define RMLUI_UNUSED_FUNCTION(x) __attribute__((__unused__)) UNUSED_ ## x
 #else
-#  define ROCKET_UNUSED_FUNCTION(x) UNUSED_ ## x
+#  define RMLUI_UNUSED_FUNCTION(x) UNUSED_ ## x
 #endif
 
 // Squelchs warnings for unused enums in switch statements, this should only be used for special values
 // that are known to NEVER be used.
-#define ROCKET_UNUSED_SWITCH_ENUM(x) \
+#define RMLUI_UNUSED_SWITCH_ENUM(x) \
   case x: \
-    ROCKET_ERRORMSG("Switch case for unhandled ENUM has been hit!  This shouldn't happen!  ENUM Name: " # x); \
+    RMLUI_ERRORMSG("Switch case for unhandled ENUM has been hit!  This shouldn't happen!  ENUM Name: " # x); \
     break;
 
 #endif

Include/Rocket/Core/Plugin.h → Include/RmlUi/Core/Plugin.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 ROCKETCOREPLUGIN_H
-#define ROCKETCOREPLUGIN_H
+#ifndef RMLUICOREPLUGIN_H
+#define RMLUICOREPLUGIN_H
 
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Element;
@@ -38,12 +39,12 @@ class ElementDocument;
 class Context;
 
 /**
-	Generic Interface for plugins to Rocket.
+	Generic Interface for plugins to RmlUi.
 
 	@author Lloyd Weehuizen
  */
 
-class ROCKETCORE_API Plugin
+class RMLUICORE_API Plugin
 {
 public:
 	virtual ~Plugin();
@@ -60,10 +61,10 @@ public:
 	/// which of the above event types the plugin is interested in
 	virtual int GetEventClasses();
 
-	/// Called when Rocket is initialised, or immediately when the plugin registers itself if 
-	/// Rocket has already been initialised.
+	/// Called when RmlUi is initialised, or immediately when the plugin registers itself if 
+	/// RmlUi has already been initialised.
 	virtual void OnInitialise();
-	/// Called when Rocket shuts down.
+	/// Called when RmlUi shuts down.
 	virtual void OnShutdown();
 
 	/// Called when a new context is created.

Include/Rocket/Core/Property.h → Include/RmlUi/Core/Property.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 ROCKETCOREPROPERTY_H
-#define ROCKETCOREPROPERTY_H
+#ifndef RMLUICOREPROPERTY_H
+#define RMLUICOREPROPERTY_H
 
 #include "Variant.h"
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class PropertyDefinition;
@@ -40,7 +41,7 @@ class PropertyDefinition;
 	@author Peter Curry
  */
 
-class ROCKETCORE_API Property
+class RMLUICORE_API Property
 {
 public:
 	enum Unit

Include/Rocket/Core/PropertyDefinition.h → Include/RmlUi/Core/PropertyDefinition.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 ROCKETCOREPROPERTYDEFINITION_H
-#define ROCKETCOREPROPERTYDEFINITION_H
+#ifndef RMLUICOREPROPERTYDEFINITION_H
+#define RMLUICOREPROPERTYDEFINITION_H
 
 #include "Header.h"
 #include "Property.h"
 #include "PropertyParser.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 /**
@@ -41,7 +42,7 @@ namespace Core {
 
 enum class RelativeTarget { None, ContainingBlockWidth, ContainingBlockHeight, FontSize, ParentFontSize, LineHeight };
 
-class ROCKETCORE_API PropertyDefinition
+class RMLUICORE_API PropertyDefinition
 {
 public:
 	PropertyDefinition(const String& default_value, bool inherited, bool forces_layout);

Include/Rocket/Core/PropertyDictionary.h → Include/RmlUi/Core/PropertyDictionary.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 ROCKETCOREPROPERTYDICTIONARY_H
-#define ROCKETCOREPROPERTYDICTIONARY_H
+#ifndef RMLUICOREPROPERTYDICTIONARY_H
+#define RMLUICOREPROPERTYDICTIONARY_H
 
 #include "Header.h"
 #include "Property.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 
@@ -42,7 +43,7 @@ namespace Core {
 	@author Peter Curry
  */
 
-class ROCKETCORE_API PropertyDictionary
+class RMLUICORE_API PropertyDictionary
 {
 public:
 	PropertyDictionary();
@@ -85,7 +86,7 @@ private:
 	// Sets a property on the dictionary and its specificity if there is no name conflict, or its
 	// specificity (given by the parameter, not read from the property itself) is at least equal to
 	// the specificity of the conflicting property.
-	void SetProperty(const String& name, const Rocket::Core::Property& property, int specificity);
+	void SetProperty(const String& name, const Rml::Core::Property& property, int specificity);
 
 	PropertyMap properties;
 };

Include/Rocket/Core/PropertyParser.h → Include/RmlUi/Core/PropertyParser.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 ROCKETCOREPROPERTYPARSER_H
-#define ROCKETCOREPROPERTYPARSER_H
+#ifndef RMLUICOREPROPERTYPARSER_H
+#define RMLUICOREPROPERTYPARSER_H
 
 #include "Header.h"
 #include "Property.h"
 #include <map>
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 typedef std::map < String, int, StringUtilities::StringComparei > ParameterMap;
@@ -43,7 +44,7 @@ typedef std::map < String, int, StringUtilities::StringComparei > ParameterMap;
 	@author Peter Curry
  */
 
-class ROCKETCORE_API PropertyParser
+class RMLUICORE_API PropertyParser
 {
 public:
 	virtual ~PropertyParser()

Include/Rocket/Core/PropertySpecification.h → Include/RmlUi/Core/PropertySpecification.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 ROCKETCOREPROPERTYSPECIFICATION_H
-#define ROCKETCOREPROPERTYSPECIFICATION_H
+#ifndef RMLUICOREPROPERTYSPECIFICATION_H
+#define RMLUICOREPROPERTYSPECIFICATION_H
 
 #include "Header.h"
 #include "Element.h"
 #include "PropertyDefinition.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class PropertyDictionary;
@@ -44,7 +45,7 @@ struct PropertyShorthandDefinition;
 	@author Peter Curry
  */
 
-class ROCKETCORE_API PropertySpecification
+class RMLUICORE_API PropertySpecification
 {
 public:
 	enum ShorthandType

Include/Rocket/Core/ReferenceCountable.h → Include/RmlUi/Core/ReferenceCountable.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 ROCKETCOREREFERENCECOUNTABLE_H
-#define ROCKETCOREREFERENCECOUNTABLE_H
+#ifndef RMLUICOREREFERENCECOUNTABLE_H
+#define RMLUICOREREFERENCECOUNTABLE_H
 
 #include "Header.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 /**
@@ -38,7 +39,7 @@ namespace Core {
 	@author Robert Curry
 */
 
-class ROCKETCORE_API ReferenceCountable
+class RMLUICORE_API ReferenceCountable
 {
 public:
 	/// Constructor.

Include/Rocket/Core/RenderInterface.h → Include/RmlUi/Core/RenderInterface.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 ROCKETCORERENDERINTERFACE_H
-#define ROCKETCORERENDERINTERFACE_H
+#ifndef RMLUICORERENDERINTERFACE_H
+#define RMLUICORERENDERINTERFACE_H
 
 #include "ReferenceCountable.h"
 #include "Header.h"
@@ -34,7 +35,7 @@
 #include "Vertex.h"
 #include "Types.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 class Context;
@@ -46,14 +47,14 @@ class Context;
 	@author Peter Curry
  */
 
-class ROCKETCORE_API RenderInterface : public ReferenceCountable
+class RMLUICORE_API RenderInterface : public ReferenceCountable
 {
 public:
 	RenderInterface();
 	virtual ~RenderInterface();
 
-	/// Called by Rocket when it wants to render geometry that the application does not wish to optimise. Note that
-	/// Rocket renders everything as triangles.
+	/// Called by RmlUi when it wants to render geometry that the application does not wish to optimise. Note that
+	/// RmlUi renders everything as triangles.
 	/// @param[in] vertices The geometry's vertex data.
 	/// @param[in] num_vertices The number of vertices passed to the function.
 	/// @param[in] indices The geometry's index data.
@@ -62,7 +63,7 @@ public:
 	/// @param[in] translation The translation to apply to the geometry.
 	virtual void RenderGeometry(Vertex* vertices, int num_vertices, int* indices, int num_indices, TextureHandle texture, const Vector2f& translation) = 0;
 
-	/// Called by Rocket when it wants to compile geometry it believes will be static for the forseeable future.
+	/// Called by RmlUi when it wants to compile geometry it believes will be static for the forseeable future.
 	/// If supported, this should be return a pointer to an optimised, application-specific version of the data. If
 	/// not, do not override the function or return NULL; the simpler RenderGeometry() will be called instead.
 	/// @param[in] vertices The geometry's vertex data.
@@ -72,37 +73,37 @@ public:
 	/// @param[in] texture The texture to be applied to the geometry. This may be NULL, in which case the geometry is untextured.
 	/// @return The application-specific compiled geometry. Compiled geometry will be stored and rendered using RenderCompiledGeometry() in future calls, and released with ReleaseCompiledGeometry() when it is no longer needed.
 	virtual CompiledGeometryHandle CompileGeometry(Vertex* vertices, int num_vertices, int* indices, int num_indices, TextureHandle texture);
-	/// Called by Rocket when it wants to render application-compiled geometry.
+	/// Called by RmlUi when it wants to render application-compiled geometry.
 	/// @param[in] geometry The application-specific compiled geometry to render.
 	/// @param[in] translation The translation to apply to the geometry.
 	virtual void RenderCompiledGeometry(CompiledGeometryHandle geometry, const Vector2f& translation);
-	/// Called by Rocket when it wants to release application-compiled geometry.
+	/// Called by RmlUi when it wants to release application-compiled geometry.
 	/// @param[in] geometry The application-specific compiled geometry to release.
 	virtual void ReleaseCompiledGeometry(CompiledGeometryHandle geometry);
 
-	/// Called by Rocket when it wants to enable or disable scissoring to clip content.
+	/// Called by RmlUi when it wants to enable or disable scissoring to clip content.
 	/// @param[in] enable True if scissoring is to enabled, false if it is to be disabled.
 	virtual void EnableScissorRegion(bool enable) = 0;
-	/// Called by Rocket when it wants to change the scissor region.
+	/// Called by RmlUi when it wants to change the scissor region.
 	/// @param[in] x The left-most pixel to be rendered. All pixels to the left of this should be clipped.
 	/// @param[in] y The top-most pixel to be rendered. All pixels to the top of this should be clipped.
 	/// @param[in] width The width of the scissored region. All pixels to the right of (x + width) should be clipped.
 	/// @param[in] height The height of the scissored region. All pixels to below (y + height) should be clipped.
 	virtual void SetScissorRegion(int x, int y, int width, int height) = 0;
 
-	/// Called by Rocket when a texture is required by the library.
+	/// Called by RmlUi when a texture is required by the library.
 	/// @param[out] texture_handle The handle to write the texture handle for the loaded texture to.
 	/// @param[out] texture_dimensions The variable to write the dimensions of the loaded texture.
 	/// @param[in] source The application-defined image source, joined with the path of the referencing document.
 	/// @return True if the load attempt succeeded and the handle and dimensions are valid, false if not.
 	virtual bool LoadTexture(TextureHandle& texture_handle, Vector2i& texture_dimensions, const String& source);
-	/// Called by Rocket when a texture is required to be built from an internally-generated sequence of pixels.
+	/// Called by RmlUi when a texture is required to be built from an internally-generated sequence of pixels.
 	/// @param[out] texture_handle The handle to write the texture handle for the generated texture to.
 	/// @param[in] source The raw 8-bit texture data. Each pixel is made up of four 8-bit values, indicating red, green, blue and alpha in that order.
 	/// @param[in] source_dimensions The dimensions, in pixels, of the source data.
 	/// @return True if the texture generation succeeded and the handle is valid, false if not.
 	virtual bool GenerateTexture(TextureHandle& texture_handle, const byte* source, const Vector2i& source_dimensions);
-	/// Called by Rocket when a loaded texture is no longer required.
+	/// Called by RmlUi when a loaded texture is no longer required.
 	/// @param texture The texture handle to release.
 	virtual void ReleaseTexture(TextureHandle texture);
 
@@ -117,10 +118,10 @@ public:
 	/// @returns The number of pixels per inch. The default implementation returns 100.
 	virtual float GetPixelsPerInch();
 
-	/// Called by Rocket when it wants to set the current transform matrix to a new matrix.
+	/// Called by RmlUi when it wants to set the current transform matrix to a new matrix.
 	/// @param[in] transform The new transform to apply.
 	virtual void PushTransform(const Matrix4f& transform);
-	/// Called by Rocket when it wants to revert the latest transform change.
+	/// Called by RmlUi when it wants to revert the latest transform change.
 	/// @param[in] transform This is the transform to unapply.
 	///            It always equals the argument of the latest call to PushTransform().
 	virtual void PopTransform(const Matrix4f& transform);

Include/Rocket/Core/ScriptInterface.h → Include/RmlUi/Core/ScriptInterface.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 ROCKETCORESCRIPTINTERFACE_H
-#define ROCKETCORESCRIPTINTERFACE_H
+#ifndef RMLUICORESCRIPTINTERFACE_H
+#define RMLUICORESCRIPTINTERFACE_H
 
 #include "Header.h"
 #include "ReferenceCountable.h"
 #include "Types.h"
 
-namespace Rocket {
+namespace Rml {
 namespace Core {
 
 /**
@@ -40,7 +41,7 @@ namespace Core {
 	@author Peter Curry
  */
 
-class ROCKETCORE_API ScriptInterface : public ReferenceCountable
+class RMLUICORE_API ScriptInterface : public ReferenceCountable
 {
 	public:
 		virtual ~ScriptInterface()