diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,14 @@ # Revision history for skylighting and skylighting-core +## 0.14.5 + + * Update xml syntax definitions for bash, cmake, commonlisp, isocpp, + javascript-react, julia, latex, lua, markdown, modelines, nix, orgmode, + php, python, rhtml, ruby, swift, xml, yaml, zig, zsh. Add odin (required + by orgmode). + + * Update JSON syntax definition from upstream. (#203) + ## 0.14.4 * Add `gdscript`, `typst`, `tlaplus` syntax (#184, #199). diff --git a/skylighting-core.cabal b/skylighting-core.cabal --- a/skylighting-core.cabal +++ b/skylighting-core.cabal @@ -1,5 +1,5 @@ name: skylighting-core -version: 0.14.4 +version: 0.14.5 synopsis: syntax highlighting library description: Skylighting is a syntax highlighting library. It derives its tokenizers from XML syntax diff --git a/test/expected/abc.ruby.native b/test/expected/abc.ruby.native --- a/test/expected/abc.ruby.native +++ b/test/expected/abc.ruby.native @@ -1,10 +1,11 @@ [ [ ( NormalTok , "words " ) - , ( KeywordTok , "=" ) - , ( OtherTok , " %w(" ) - , ( StringTok , "A BaRK BOoK tREaT COmMOn SqUAD CoNfuSE" ) + , ( OperatorTok , "=" ) + , ( NormalTok , " " ) + , ( OtherTok , "%w(" ) + , ( VerbatimStringTok , "A BaRK BOoK tREaT COmMOn SqUAD CoNfuSE" ) , ( OtherTok , ")" ) , ( NormalTok , " " ) - , ( KeywordTok , "<<" ) + , ( OperatorTok , "<<" ) , ( NormalTok , " " ) , ( StringTok , "\"\"" ) ] @@ -14,36 +15,38 @@ , ( NormalTok , " " ) , ( ControlFlowTok , "do" ) , ( NormalTok , " " ) - , ( KeywordTok , "|" ) + , ( OperatorTok , "|" ) , ( NormalTok , "word" ) - , ( KeywordTok , "|" ) + , ( OperatorTok , "|" ) ] , [ ( NormalTok , " blocks " ) - , ( KeywordTok , "=" ) + , ( OperatorTok , "=" ) , ( NormalTok , " " ) , ( StringTok , "\"BO XK DQ CP NA GT RE TG QD FS JW HU VI AN OB ER FS LY PC ZM\"" ) ] , [ ( NormalTok , " res " ) - , ( KeywordTok , "=" ) + , ( OperatorTok , "=" ) , ( NormalTok , " word" ) , ( AttributeTok , ".each_char.all?" ) - , ( KeywordTok , "{|" ) + , ( OperatorTok , "{|" ) , ( NormalTok , "c" ) - , ( KeywordTok , "|" ) + , ( OperatorTok , "|" ) , ( NormalTok , " blocks" ) , ( AttributeTok , ".sub!" ) , ( NormalTok , "(" ) - , ( SpecialStringTok , "/\\w?" ) + , ( SpecialStringTok , "/" ) + , ( SpecialCharTok , "\\w" ) + , ( SpecialStringTok , "?" ) , ( SpecialCharTok , "#{" ) , ( NormalTok , "c" ) - , ( SpecialCharTok , "}" ) - , ( SpecialStringTok , "\\w?/i" ) + , ( SpecialCharTok , "}\\w" ) + , ( SpecialStringTok , "?/i" ) , ( NormalTok , ", " ) , ( StringTok , "\"\"" ) , ( NormalTok , ")" ) - , ( KeywordTok , "}" ) + , ( OperatorTok , "}" ) , ( NormalTok , " " ) , ( CommentTok , "#regexps can be interpolated like strings" ) ] diff --git a/xml/bash.xml b/xml/bash.xml --- a/xml/bash.xml +++ b/xml/bash.xml @@ -56,17 +56,22 @@ - - + + ]> + + + @@ -1239,12 +1245,12 @@ - + - + @@ -1368,7 +1374,7 @@ - + @@ -1495,13 +1501,19 @@ - + + + + - + + + + @@ -1525,8 +1537,12 @@ + + + - + + @@ -1641,7 +1657,10 @@ - + + + + @@ -1657,7 +1676,10 @@ - + + + + @@ -1773,7 +1795,7 @@ - + @@ -1788,7 +1810,7 @@ - + @@ -1807,7 +1829,7 @@ - + diff --git a/xml/cmake.xml b/xml/cmake.xml --- a/xml/cmake.xml +++ b/xml/cmake.xml @@ -18,14 +18,13 @@ --> cmake_minimum_required cmake_parse_arguments cmake_path + cmake_pkg_config cmake_policy configure_file continue @@ -214,6 +214,7 @@ DEFER DIRECTORY EVAL + EXIT GET_CALL GET_CALL_IDS GET_MESSAGE_LOG_LEVEL @@ -277,6 +278,31 @@ TO_CMAKE_PATH_LIST TO_NATIVE_PATH_LIST + + ALLOW_SYSTEM_INCLUDES + ALLOW_SYSTEM_LIBS + DISABLE_UNINSTALLED + ENV_MODE + EXACT + EXTRACT + PC_LIBDIR + PC_PATH + PC_SYSROOT_DIR + QUIET + REQUIRED + STRICTNESS + SYSTEM_INCLUDE_DIRS + SYSTEM_LIBRARY_DIRS + TOP_BUILD_DIR + + + BEST_EFFORT + FDO + IGNORE + PERMISSIVE + PKGCONF + STRICT + GET POP @@ -315,8 +341,11 @@ IN_LIST IS_ABSOLUTE IS_DIRECTORY + IS_EXECUTABLE IS_NEWER_THAN + IS_READABLE IS_SYMLINK + IS_WRITABLE LESS LESS_EQUAL MATCHES @@ -480,6 +509,7 @@ TIMESTAMP TLS_CAINFO TLS_VERIFY + TLS_VERSION TOUCH TOUCH_NOCREATE TO_CMAKE_PATH @@ -490,6 +520,7 @@ USE_SOURCE_PERMISSIONS UTC VERBOSE + WORKING_DIRECTORY WRITE @@ -848,6 +879,7 @@ APPEND ARGS BYPRODUCTS + CODEGEN COMMAND COMMAND_EXPAND_LISTS COMMENT @@ -970,11 +1002,17 @@ ANDROID_MK APPEND + AUTO + ENABLED EXPORT EXPORT_LINK_INTERFACE_LIBRARIES FILE NAMESPACE + PACKAGE_DEPENDENCY + SETUP + TARGET TARGETS + XCFRAMEWORK_LOCATION DIRECTORY @@ -1047,14 +1085,28 @@ USE_SOURCE_PERMISSIONS + BIN + DATA + DOC GROUP_EXECUTE GROUP_READ GROUP_WRITE + INCLUDE + INFO + LIB + LIBEXEC + LOCALE + LOCALSTATE + MAN OWNER_EXECUTE OWNER_READ OWNER_WRITE + RUNSTATE + SBIN SETGID SETUID + SHAREDSTATE + SYSCONF WORLD_EXECUTE WORLD_READ WORLD_WRITE @@ -1358,8 +1410,10 @@ EXCLUDE_FIXTURE EXCLUDE_FIXTURE_CLEANUP EXCLUDE_FIXTURE_SETUP + EXCLUDE_FROM_FILE EXCLUDE_LABEL INCLUDE + INCLUDE_FROM_FILE INCLUDE_LABEL PARALLEL_LEVEL QUIET @@ -1468,6 +1522,28 @@ SameMajorVersion SameMinorVersion + + INSTALL_DESTINATION + INSTALL_PREFIX + IOS_INCLUDE_FILE + IOS_SIMULATOR_INCLUDE_FILE + MACOS_INCLUDE_FILE + TVOS_INCLUDE_FILE + TVOS_SIMULATOR_INCLUDE_FILE + VISIONOS_INCLUDE_FILE + VISIONOS_SIMULATOR_INCLUDE_FILE + WATCHOS_INCLUDE_FILE + WATCHOS_SIMULATOR_INCLUDE_FILE + + + ERROR_VARIABLE + INSTALL_DESTINATION + INSTALL_PREFIX + SINGLE_ARCHITECTURES + SINGLE_ARCHITECTURE_INCLUDE_FILES + UNIVERSAL_ARCHITECTURES + UNIVERSAL_INCLUDE_FILE + CACHE_ENTRIES DIRECTORIES @@ -1667,6 +1743,7 @@ TIMEOUT TLS_CAINFO TLS_VERIFY + TLS_VERSION TMP_DIR UPDATE_COMMAND UPDATE_DISCONNECTED @@ -1878,6 +1955,7 @@ WORKING_DIRECTORY + DISCOVERY_EXTRA_ARGS DISCOVERY_MODE DISCOVERY_TIMEOUT EXTRA_ARGS @@ -2123,7 +2201,9 @@ CABLE_TCL_LIBRARY CMAKE_ABSOLUTE_DESTINATION_FILES CMAKE_ADD_CUSTOM_COMMAND_DEPENDS_EXPLICIT_ONLY + CMAKE_ADSP_ROOT CMAKE_AIX_EXPORT_ALL_SYMBOLS + CMAKE_AIX_SHARED_LIBRARY_ARCHIVE CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS CMAKE_ANDROID_API CMAKE_ANDROID_API_MIN @@ -2165,7 +2245,6 @@ CMAKE_AUTOMOC_EXECUTABLE CMAKE_AUTOMOC_MOC_OPTIONS CMAKE_AUTOMOC_PATH_PREFIX - CMAKE_AUTOMOC_RELAXED_MODE CMAKE_AUTORCC CMAKE_AUTORCC_EXECUTABLE CMAKE_AUTORCC_OPTIONS @@ -2173,7 +2252,6 @@ CMAKE_AUTOUIC_EXECUTABLE CMAKE_AUTOUIC_OPTIONS CMAKE_AUTOUIC_SEARCH_PATHS - CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BINARY_DIR CMAKE_BUILD_RPATH CMAKE_BUILD_RPATH_USE_ORIGIN @@ -2195,9 +2273,6 @@ CMAKE_COLOR_MAKEFILE CMAKE_COMMAND CMAKE_COMPILER_2005 - CMAKE_COMPILER_IS_GNUCC - CMAKE_COMPILER_IS_GNUCXX - CMAKE_COMPILER_IS_GNUG77 CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY CMAKE_COMPILE_WARNING_AS_ERROR CMAKE_CONFIGURATION_TYPES @@ -2209,7 +2284,6 @@ CMAKE_CUDA_ARCHITECTURES CMAKE_CUDA_COMPILE_FEATURES CMAKE_CUDA_EXTENSIONS - CMAKE_CUDA_HOST_COMPILER CMAKE_CUDA_LINK_NO_PIE_SUPPORTED CMAKE_CUDA_LINK_PIE_SUPPORTED CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS @@ -2265,10 +2339,10 @@ CMAKE_EXECUTE_PROCESS_COMMAND_ECHO CMAKE_EXE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS_INIT + CMAKE_EXPORT_BUILD_DATABASE CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_NO_PACKAGE_REGISTRY CMAKE_EXPORT_PACKAGE_REGISTRY - CMAKE_EXTRA_GENERATOR CMAKE_EXTRA_INCLUDE_FILES CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES CMAKE_FIND_APPBUNDLE @@ -2280,8 +2354,6 @@ CMAKE_FIND_LIBRARY_SUFFIXES CMAKE_FIND_NO_INSTALL_PREFIX CMAKE_FIND_PACKAGE_NAME - CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY - CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_PREFER_CONFIG CMAKE_FIND_PACKAGE_REDIRECTS_DIR CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS @@ -2339,6 +2411,7 @@ CMAKE_HIP_STANDARD_REQUIRED CMAKE_HOST_APPLE CMAKE_HOST_BSD + CMAKE_HOST_EXECUTABLE_SUFFIX CMAKE_HOST_LINUX CMAKE_HOST_SOLARIS CMAKE_HOST_SYSTEM @@ -2424,12 +2497,14 @@ CMAKE_LIBRARY_OUTPUT_DIRECTORY CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_FLAG + CMAKE_LINKER_TYPE CMAKE_LINK_DEF_FILE_FLAG CMAKE_LINK_DEPENDS_NO_SHARED CMAKE_LINK_DEPENDS_USE_LINKER CMAKE_LINK_DIRECTORIES_BEFORE CMAKE_LINK_INTERFACE_LIBRARIES CMAKE_LINK_LIBRARIES_ONLY_TARGETS + CMAKE_LINK_LIBRARIES_STRATEGY CMAKE_LINK_LIBRARY_FILE_FLAG CMAKE_LINK_LIBRARY_FLAG CMAKE_LINK_LIBRARY_SUFFIX @@ -2485,6 +2560,28 @@ CMAKE_PCH_INSTANTIATE_TEMPLATES CMAKE_PCH_WARN_INVALID CMAKE_PDB_OUTPUT_DIRECTORY + CMAKE_PKG_CONFIG_ALLOW_SYS_INCLUDES + CMAKE_PKG_CONFIG_ALLOW_SYS_LIBS + CMAKE_PKG_CONFIG_CFLAGS + CMAKE_PKG_CONFIG_COMPILE_OPTIONS + CMAKE_PKG_CONFIG_CONFLICTS + CMAKE_PKG_CONFIG_DESCRIPTION + CMAKE_PKG_CONFIG_DISABLE_UNINSTALLED + CMAKE_PKG_CONFIG_INCLUDES + CMAKE_PKG_CONFIG_LIBDIRS + CMAKE_PKG_CONFIG_LIBNAMES + CMAKE_PKG_CONFIG_LIBS + CMAKE_PKG_CONFIG_LINK_OPTIONS + CMAKE_PKG_CONFIG_NAME + CMAKE_PKG_CONFIG_PC_LIB_DIRS + CMAKE_PKG_CONFIG_PC_PATH + CMAKE_PKG_CONFIG_PKGCONF_INCLUDES + CMAKE_PKG_CONFIG_PROVIDES + CMAKE_PKG_CONFIG_REQUIRES + CMAKE_PKG_CONFIG_SYSROOT_DIR + CMAKE_PKG_CONFIG_SYS_INCLUDE_DIRS + CMAKE_PKG_CONFIG_SYS_LIB_DIRS + CMAKE_PKG_CONFIG_TOP_BUILD_DIR CMAKE_PLATFORM_NO_VERSIONED_SONAME CMAKE_POSITION_INDEPENDENT_CODE CMAKE_PREFIX_PATH @@ -2505,6 +2602,7 @@ CMAKE_REQUIRED_FLAGS CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES + CMAKE_REQUIRED_LINK_DIRECTORIES CMAKE_REQUIRED_LINK_OPTIONS CMAKE_REQUIRED_QUIET CMAKE_ROOT @@ -2523,6 +2621,7 @@ CMAKE_SKIP_INSTALL_RPATH CMAKE_SKIP_INSTALL_RULES CMAKE_SKIP_RPATH + CMAKE_SKIP_TEST_ALL_DEPENDENCY CMAKE_SOURCE_DIR CMAKE_STAGING_PREFIX CMAKE_STATIC_LIBRARY_PREFIX @@ -2549,9 +2648,12 @@ CMAKE_SYSTEM_PROCESSOR CMAKE_SYSTEM_PROGRAM_PATH CMAKE_SYSTEM_VERSION + CMAKE_Swift_COMPILATION_MODE CMAKE_Swift_LANGUAGE_VERSION CMAKE_Swift_MODULE_DIRECTORY + CMAKE_Swift_NUM_THREADS CMAKE_TASKING_TOOLSET + CMAKE_TEST_LAUNCHER CMAKE_THREAD_LIBS_INIT CMAKE_THREAD_PREFER_PTHREAD CMAKE_TOOLCHAIN_FILE @@ -2564,7 +2666,6 @@ CMAKE_UNITY_BUILD_BATCH_SIZE CMAKE_USER_MAKE_RULES_OVERRIDE CMAKE_USE_PTHREADS_INIT - CMAKE_USE_RELATIVE_PATHS CMAKE_USE_SPROC_INIT CMAKE_USE_WIN32_THREADS_INIT CMAKE_VERBOSE_MAKEFILE @@ -2600,6 +2701,7 @@ CMAKE_VS_TARGET_FRAMEWORK_IDENTIFIER CMAKE_VS_TARGET_FRAMEWORK_TARGETS_VERSION CMAKE_VS_TARGET_FRAMEWORK_VERSION + CMAKE_VS_USE_DEBUG_LIBRARIES CMAKE_VS_VERSION_BUILD_NUMBER CMAKE_VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION @@ -2687,6 +2789,7 @@ CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY CPACK_DEBIAN_PACKAGE_HOMEPAGE CPACK_DEBIAN_PACKAGE_MAINTAINER + CPACK_DEBIAN_PACKAGE_MULTIARCH CPACK_DEBIAN_PACKAGE_NAME CPACK_DEBIAN_PACKAGE_PREDEPENDS CPACK_DEBIAN_PACKAGE_PRIORITY @@ -2749,6 +2852,7 @@ CPACK_IFW_PACKAGE_MAINTENANCE_TOOL_NAME CPACK_IFW_PACKAGE_NAME CPACK_IFW_PACKAGE_PRODUCT_IMAGES + CPACK_IFW_PACKAGE_PRODUCT_IMAGE_URLS CPACK_IFW_PACKAGE_PUBLISHER CPACK_IFW_PACKAGE_REMOVE_TARGET_DIR CPACK_IFW_PACKAGE_RESOURCES @@ -2852,10 +2956,15 @@ CPACK_NUGET_PACKAGE_LICENSE_FILE_NAME CPACK_NUGET_PACKAGE_NAME CPACK_NUGET_PACKAGE_OWNERS + CPACK_NUGET_PACKAGE_README CPACK_NUGET_PACKAGE_RELEASE_NOTES + CPACK_NUGET_PACKAGE_REPOSITORY_BRANCH + CPACK_NUGET_PACKAGE_REPOSITORY_COMMIT + CPACK_NUGET_PACKAGE_REPOSITORY_TYPE + CPACK_NUGET_PACKAGE_REPOSITORY_URL CPACK_NUGET_PACKAGE_TAGS + CPACK_NUGET_PACKAGE_TFMS CPACK_NUGET_PACKAGE_TITLE - CPACK_NUGET_PACKAGE_VERSION CPACK_OBJCOPY_EXECUTABLE CPACK_OBJDUMP_EXECUTABLE CPACK_OUTPUT_CONFIG_FILE @@ -2987,6 +3096,7 @@ CPACK_WIX_EXTENSIONS CPACK_WIX_EXTRA_OBJECTS CPACK_WIX_EXTRA_SOURCES + CPACK_WIX_INSTALL_SCOPE CPACK_WIX_LICENSE_RTF CPACK_WIX_PATCH_FILE CPACK_WIX_PRODUCT_GUID @@ -3033,7 +3143,6 @@ CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION CTEST_CUSTOM_WARNING_EXCEPTION CTEST_CUSTOM_WARNING_MATCH - CTEST_CVS_CHECKOUT CTEST_CVS_COMMAND CTEST_CVS_UPDATE_OPTIONS CTEST_DROP_LOCATION @@ -3062,7 +3171,6 @@ CTEST_P4_UPDATE_OPTIONS CTEST_RESOURCE_SPEC_FILE CTEST_RUN_CURRENT_SCRIPT - CTEST_SCP_COMMAND CTEST_SITE CTEST_SOURCE_DIRECTORY CTEST_SUBMIT_INACTIVITY_TIMEOUT @@ -3072,7 +3180,8 @@ CTEST_SVN_UPDATE_OPTIONS CTEST_TEST_LOAD CTEST_TEST_TIMEOUT - CTEST_TRIGGER_SITE + CTEST_TLS_VERIFY + CTEST_TLS_VERSION CTEST_UPDATE_COMMAND CTEST_UPDATE_OPTIONS CTEST_UPDATE_VERSION_ONLY @@ -3297,15 +3406,6 @@ MPI_SKIP_GUESSING MPI_SUBARRAYS_SUPPORTED MSVC - MSVC10 - MSVC11 - MSVC12 - MSVC14 - MSVC60 - MSVC70 - MSVC71 - MSVC80 - MSVC90 MSVC_IDE MSVC_TOOLSET_VERSION MSVC_VERSION @@ -3337,6 +3437,7 @@ OpenGL_GL_PREFERENCE OpenMP_Fortran_HAVE_OMPLIB_HEADER OpenMP_Fortran_HAVE_OMPLIB_MODULE + OpenMP_RUNTIME_MSVC PACKAGE_FIND_NAME PACKAGE_FIND_VERSION_COMPLETE PACKAGE_FIND_VERSION_COUNT @@ -3409,8 +3510,10 @@ Python2_ARTIFACTS_INTERACTIVE Python2_COMPILER Python2_COMPILER_ID + Python2_DEBUG_POSTFIX Python2_DOTNET_LAUNCHER Python2_EXECUTABLE + Python2_EXECUTABLE_DEBUG Python2_FIND_ABI Python2_FIND_FRAMEWORK Python2_FIND_IMPLEMENTATIONS @@ -3418,6 +3521,7 @@ Python2_FIND_STRATEGY Python2_FIND_UNVERSIONED_NAMES Python2_FIND_VIRTUALENV + Python2_INTERPRETER Python2_INTERPRETER_ID Python2_LINK_OPTIONS Python2_SITEARCH @@ -3429,8 +3533,10 @@ Python3_ARTIFACTS_INTERACTIVE Python3_COMPILER Python3_COMPILER_ID + Python3_DEBUG_POSTFIX Python3_DOTNET_LAUNCHER Python3_EXECUTABLE + Python3_EXECUTABLE_DEBUG Python3_FIND_ABI Python3_FIND_FRAMEWORK Python3_FIND_IMPLEMENTATIONS @@ -3438,19 +3544,23 @@ Python3_FIND_STRATEGY Python3_FIND_UNVERSIONED_NAMES Python3_FIND_VIRTUALENV + Python3_INTERPRETER Python3_INTERPRETER_ID Python3_LINK_OPTIONS Python3_SITEARCH Python3_SITELIB Python3_SOABI + Python3_SOSABI Python3_STDARCH Python3_STDLIB Python3_USE_STATIC_LIBS Python_ARTIFACTS_INTERACTIVE Python_COMPILER Python_COMPILER_ID + Python_DEBUG_POSTFIX Python_DOTNET_LAUNCHER Python_EXECUTABLE + Python_EXECUTABLE_DEBUG Python_FIND_ABI Python_FIND_FRAMEWORK Python_FIND_IMPLEMENTATIONS @@ -3458,11 +3568,13 @@ Python_FIND_STRATEGY Python_FIND_UNVERSIONED_NAMES Python_FIND_VIRTUALENV + Python_INTERPRETER Python_INTERPRETER_ID Python_LINK_OPTIONS Python_SITEARCH Python_SITELIB Python_SOABI + Python_SOSABI Python_STDARCH Python_STDLIB Python_USE_STATIC_LIBS @@ -3529,8 +3641,16 @@ + CMAKE_AUTOMOC_RELAXED_MODE + CMAKE_BACKWARDS_COMPATIBILITY + CMAKE_COMPILER_IS_GNUCC + CMAKE_COMPILER_IS_GNUCXX + CMAKE_COMPILER_IS_GNUG77 CMAKE_ENABLE_EXPORTS + CMAKE_EXTRA_GENERATOR CMAKE_FILES_DIRECTORY + CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY + CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY CMAKE_HOME_DIRECTORY CMAKE_INTERNAL_PLATFORM_ABI CMAKE_IOS_INSTALL_COMBINED @@ -3539,6 +3659,7 @@ CMAKE_SUPPRESS_DEVELOPER_ERRORS CMAKE_SUPPRESS_DEVELOPER_WARNINGS CMAKE_SYSTEM_ARCH + CMAKE_USE_RELATIVE_PATHS CMAKE_VS_INTEL_Fortran_PROJECT_VERSION CPACK_INSTALL_PREFIX CPACK_INSTALL_SCRIPT @@ -3546,6 +3667,18 @@ CPACK_PACKAGE_RELOCATABLE CPACK_TEMPORARY_DIRECTORY CPACK_TOPLEVEL_DIRECTORY + CTEST_CVS_CHECKOUT + CTEST_SCP_COMMAND + CTEST_TRIGGER_SITE + MSVC10 + MSVC11 + MSVC12 + MSVC14 + MSVC60 + MSVC70 + MSVC71 + MSVC80 + MSVC90 @@ -3561,17 +3694,25 @@ CMAKE_CONFIGURATION_TYPES CMAKE_CONFIG_TYPE CMAKE_CROSSCOMPILING_EMULATOR + CMAKE_EXPORT_BUILD_DATABASE CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_FRAMEWORK_PATH CMAKE_GENERATOR CMAKE_GENERATOR_INSTANCE CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET + CMAKE_INCLUDE_PATH CMAKE_INSTALL_MODE + CMAKE_INSTALL_PREFIX + CMAKE_LIBRARY_PATH + CMAKE_MAXIMUM_RECURSION_DEPTH CMAKE_MSVCIDE_RUN_PATH CMAKE_NO_VERBOSE CMAKE_OSX_ARCHITECTURES CMAKE_PREFIX_PATH + CMAKE_PROGRAM_PATH + CMAKE_TLS_VERIFY + CMAKE_TLS_VERSION CMAKE_TOOLCHAIN_FILE CSFLAGS CTEST_INTERACTIVE_DEBUG_MODE @@ -3603,6 +3744,7 @@ QTIFWDIR RC RCFLAGS + SOURCE_DATE_EPOCH SSL_CERT_DIR SSL_CERT_FILE SWIFTC @@ -3639,6 +3781,7 @@ PACKAGES_FOUND PACKAGES_NOT_FOUND PREDEFINED_TARGETS_FOLDER + PROPAGATE_TOP_LEVEL_INCLUDES_TO_TRY_COMPILE REPORT_UNDEFINED_PROPERTIES RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM @@ -3688,7 +3831,9 @@ ADDITIONAL_CLEAN_FILES AIX_EXPORT_ALL_SYMBOLS + AIX_SHARED_LIBRARY_ARCHIVE ALIASED_TARGET + ALIAS_GLOBAL ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API ANDROID_API_MIN @@ -3779,6 +3924,7 @@ ENABLE_EXPORTS EXCLUDE_FROM_ALL EXCLUDE_FROM_DEFAULT_BUILD + EXPORT_BUILD_DATABASE EXPORT_COMPILE_COMMANDS EXPORT_NAME EXPORT_NO_SYSTEM @@ -3861,6 +4007,8 @@ LINK_INTERFACE_MULTIPLICITY LINK_LIBRARIES LINK_LIBRARIES_ONLY_TARGETS + LINK_LIBRARIES_STRATEGY + LINK_LIBRARY_OVERRIDE LINK_OPTIONS LINK_SEARCH_END_STATIC LINK_SEARCH_START_STATIC @@ -3870,7 +4018,12 @@ MACHO_CURRENT_VERSION MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST + MACOSX_FRAMEWORK_BUNDLE_NAME + MACOSX_FRAMEWORK_BUNDLE_VERSION + MACOSX_FRAMEWORK_ICON_FILE + MACOSX_FRAMEWORK_IDENTIFIER MACOSX_FRAMEWORK_INFO_PLIST + MACOSX_FRAMEWORK_SHORT_VERSION_STRING MACOSX_RPATH MANUALLY_ADDED_DEPENDENCIES MSVC_DEBUG_INFORMATION_FORMAT @@ -3914,9 +4067,14 @@ STATIC_LIBRARY_OPTIONS SUFFIX SYSTEM + Swift_COMPILATION_MODE Swift_DEPENDENCIES_FILE + Swift_LANGUAGE_VERSION Swift_MODULE_DIRECTORY Swift_MODULE_NAME + TEST_LAUNCHER + TRANSITIVE_COMPILE_PROPERTIES + TRANSITIVE_LINK_PROPERTIES TYPE UNITY_BUILD UNITY_BUILD_BATCH_SIZE @@ -3939,6 +4097,8 @@ VS_DOTNET_STARTUP_OBJECT VS_DOTNET_TARGET_FRAMEWORK_VERSION VS_DPI_AWARE + VS_FILTER_PROPS + VS_FRAMEWORK_REFERENCES VS_GLOBAL_KEYWORD VS_GLOBAL_PROJECT_TYPES VS_GLOBAL_ROOTNAMESPACE @@ -3959,6 +4119,7 @@ VS_SDK_REFERENCES VS_SOLUTION_DEPLOY VS_USER_PROPS + VS_USE_DEBUG_LIBRARIES VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS @@ -4144,6 +4305,14 @@ Fortran_COMPILER_ID HIP_COMPILER_ID ISPC_COMPILER_ID + C_COMPILER_FRONTEND_VARIANT + CXX_COMPILER_FRONTEND_VARIANT + CUDA_COMPILER_FRONTEND_VARIANT + OBJC_COMPILER_FRONTEND_VARIANT + OBJCXX_COMPILER_FRONTEND_VARIANT + Fortran_COMPILER_FRONTEND_VARIANT + HIP_COMPILER_FRONTEND_VARIANT + ISPC_COMPILER_FRONTEND_VARIANT COMPILE_LANGUAGE COMPILE_LANG_AND_ID COMPILE_FEATURES @@ -4200,6 +4369,7 @@ ANGLE-R COMMA SEMICOLON + QUOTE LENGTH @@ -4557,6 +4727,7 @@ + @@ -4719,6 +4890,8 @@ + + @@ -4902,6 +5075,17 @@ + + + + + + + + + + + @@ -5469,13 +5653,14 @@ + - + @@ -5550,7 +5735,7 @@ - + @@ -6023,6 +6208,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -6037,7 +6242,7 @@ - + @@ -6381,7 +6586,7 @@ - + @@ -6401,7 +6606,7 @@ - + @@ -6606,7 +6811,7 @@ - + @@ -6632,7 +6837,7 @@ - + diff --git a/xml/commonlisp.xml b/xml/commonlisp.xml --- a/xml/commonlisp.xml +++ b/xml/commonlisp.xml @@ -2,7 +2,7 @@ ]> - + < @@ -911,7 +911,6 @@ translate-pathname tree-equal truename - truncase truncate two-way-stream two-way-stream-input-stream diff --git a/xml/isocpp.xml b/xml/isocpp.xml --- a/xml/isocpp.xml +++ b/xml/isocpp.xml @@ -35,7 +35,7 @@ + - - + + - + - - + diff --git a/xml/javascript-react.xml b/xml/javascript-react.xml --- a/xml/javascript-react.xml +++ b/xml/javascript-react.xml @@ -53,7 +53,7 @@ * v1 [2018-06-20]: Initial version --> - diff --git a/xml/json.xml b/xml/json.xml --- a/xml/json.xml +++ b/xml/json.xml @@ -13,7 +13,7 @@ ** https://www.json.org/json-en.html *************************************************************************** --> - + null @@ -62,7 +62,7 @@ - + diff --git a/xml/julia.xml b/xml/julia.xml --- a/xml/julia.xml +++ b/xml/julia.xml @@ -36,7 +36,7 @@ ]> - + @@ -45,11 +45,11 @@ if begin do + try else elseif - try catch finally diff --git a/xml/latex.xml b/xml/latex.xml --- a/xml/latex.xml +++ b/xml/latex.xml @@ -4,7 +4,7 @@ ]> - + - + and diff --git a/xml/markdown.xml b/xml/markdown.xml --- a/xml/markdown.xml +++ b/xml/markdown.xml @@ -94,7 +94,7 @@ ]> - + @@ -368,7 +368,8 @@ - + + @@ -491,9 +492,13 @@ - + - + + + + + diff --git a/xml/modelines.xml b/xml/modelines.xml --- a/xml/modelines.xml +++ b/xml/modelines.xml @@ -1,14 +1,10 @@ - - -]> + auto-brackets - + automatic-spell-checking backspace-indents - block-selection bookmark-sorting bom byte-order-marker byte-order-mark dynamic-word-wrap + enter-to-insert-completion folding-markers folding-preview icon-border @@ -55,7 +51,8 @@ replace-tabs-save replace-tabs - replace-trailing-space-save + + smart-home scrollbar-minimap scrollbar-preview @@ -64,7 +61,6 @@ show-trailing-spaces tab-indents word-wrap - wrap-cursor @@ -82,10 +78,10 @@ auto-center-lines font-size - indent-mode indent-width tab-width - undo-steps + + word-wrap-column @@ -100,6 +96,7 @@ font hl icon-bar-color + indent-mode mode scheme selection-color @@ -129,7 +126,6 @@ - @@ -141,31 +137,28 @@ - - - - + + + - - - + + - - - + - - - + + - - + + + + diff --git a/xml/nix.xml b/xml/nix.xml --- a/xml/nix.xml +++ b/xml/nix.xml @@ -4,7 +4,7 @@ ]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/orgmode.xml b/xml/orgmode.xml --- a/xml/orgmode.xml +++ b/xml/orgmode.xml @@ -33,20 +33,33 @@ - + TODO + NEXT + + DOING + + + WAITING + + + CANCELED + CANCELLED + DONE + + @@ -60,12 +73,18 @@ - + + + + + + + @@ -80,6 +99,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -114,6 +173,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -124,6 +330,9 @@ + + + diff --git a/xml/php.xml b/xml/php.xml --- a/xml/php.xml +++ b/xml/php.xml @@ -77,7 +77,7 @@ ]> -