diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,18 @@ # Revision history for skylighting-core +## 0.7.4 -- 2018-10-08 + + * HTML output: use title instead of data-line-number. + data- attributes are not valid HTML 4, and we would like this to + work with HTML 4 (e.g. in epub v2). See jgm/pandoc#4920. + * Print FALLTHROUGH in --trace output. + * Updated syntax definitions for actionscript, awk, bash, c, clojure, cmake, + coffee, cs, css, dockerfile, email, fortran, gcc, haskell, ini, isocpp, + java, javadoc, javascript, jsp, kotlin, latex, lua, mediawiki, modelines, + modula-2, objectivec, objectivecpp, opencl, perl, powershell, prolog, + python, r, rest, rhtml, ruby, rust, scala, sql-mysql, sql-postgresql, sql, + tcl, vhdl, xml, xul, yaml, zsh. + ## 0.7.3 -- 2018-08-27 * Add 'default.xml' to syntax descriptions. 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.7.3 +version: 0.7.4 synopsis: syntax highlighting library description: Skylighting is a syntax highlighting library. It derives its tokenizers from XML syntax @@ -180,7 +180,7 @@ text, containers, directory, - criterion >= 1.0 && < 1.5 + criterion >= 1.0 && < 1.6 Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind Default-Language: Haskell2010 diff --git a/src/Skylighting/Format/HTML.hs b/src/Skylighting/Format/HTML.hs --- a/src/Skylighting/Format/HTML.hs +++ b/src/Skylighting/Format/HTML.hs @@ -93,8 +93,7 @@ lineNum = toValue prefixedLineNo lineRef = toValue ('#':prefixedLineNo) prefixedLineNo = Text.unpack (lineIdPrefix opts) <> show (lineNo lno) - dataAttrib = H.dataAttribute (fromString "line-number") - (toValue (show (lineNo lno))) + dataAttrib = A.title (toValue (show (lineNo lno))) tokenToHtml :: FormatOptions -> Token -> Html tokenToHtml _ (NormalTok, txt) = toHtml txt @@ -155,7 +154,7 @@ "pre.numberSource a.sourceLine" , " { position: relative; left: -4em; }" , "pre.numberSource a.sourceLine::before" - , " { content: attr(data-line-number);" + , " { content: attr(title);" , " position: relative; left: -1em; text-align: right; vertical-align: baseline;" , " border: none; pointer-events: all; display: inline-block;" , " -webkit-touch-callout: none; -webkit-user-select: none;" diff --git a/src/Skylighting/Tokenizer.hs b/src/Skylighting/Tokenizer.hs --- a/src/Skylighting/Tokenizer.hs +++ b/src/Skylighting/Tokenizer.hs @@ -254,7 +254,11 @@ cs -> cs doContextSwitches fallthroughContext getToken - else (\x -> Just (cAttribute context, x)) <$> normalChunk + else do + t <- normalChunk + let mbtok = Just (cAttribute context, t) + info $ "FALLTHROUGH " ++ show mbtok + return mbtok takeChars :: Int -> TokenizerM Text takeChars 0 = mzero diff --git a/test/expected/abc.haskell.native b/test/expected/abc.haskell.native --- a/test/expected/abc.haskell.native +++ b/test/expected/abc.haskell.native @@ -101,13 +101,25 @@ ] , [ ( NormalTok , "main " ) , ( FunctionTok , "=" ) - , ( NormalTok , " mapM_ (\\w " ) + , ( NormalTok , " " ) + , ( FunctionTok , "mapM_" ) + , ( NormalTok , " (\\w " ) , ( OtherTok , "->" ) - , ( NormalTok , " print (w, not " ) + , ( NormalTok , " " ) + , ( FunctionTok , "print" ) + , ( NormalTok , " (w, " ) + , ( FunctionTok , "not" ) + , ( NormalTok , " " ) , ( FunctionTok , "." ) - , ( NormalTok , " null " ) + , ( NormalTok , " " ) + , ( FunctionTok , "null" ) + , ( NormalTok , " " ) , ( FunctionTok , "$" ) - , ( NormalTok , " abc blocks (map toUpper w)))" ) + , ( NormalTok , " abc blocks (" ) + , ( FunctionTok , "map" ) + , ( NormalTok , " " ) + , ( FunctionTok , "toUpper" ) + , ( NormalTok , " w)))" ) ] , [ ( NormalTok , " [" ) , ( StringTok , "\"\"" ) diff --git a/test/test-skylighting.hs b/test/test-skylighting.hs --- a/test/test-skylighting.hs +++ b/test/test-skylighting.hs @@ -131,19 +131,16 @@ ] @=? tokenize defConfig perl "my $foo = q/bar/;\nmy $baz = 'quux';\n" , testCase "cpp floats" $ Right - [ [ ( FloatTok , "0.1f" ) ] - , [ ( FloatTok , "1.0f" ) ] - , [ ( FloatTok , "-0.1f" ) ] - , [ ( FloatTok , "-1.0F" ) ] - , [ ( FloatTok , "-1.0L" ) ] - , [ ( FloatTok , "1e3" ) ] - , [ ( FloatTok , "-15e+3" ) ] - , [ ( FloatTok , "0.f" ) ] - , [ ( FloatTok , "1.F" ) ] - , [ ( DecValTok , "1" ) - , ( NormalTok ,".E" ) - , ( DecValTok , "3" ) - ] + [ [ (FloatTok,"0.1") , (BuiltInTok,"f")] + , [ (FloatTok,"1.0") , (BuiltInTok,"f")] + , [ (NormalTok,"-") , (FloatTok,"0.1") , (BuiltInTok,"f")] + , [ (NormalTok,"-") , (FloatTok,"1.0") , (BuiltInTok,"F")] + , [ (NormalTok,"-") , (FloatTok,"1.0") , (BuiltInTok,"L")] + , [ (FloatTok,"1e3")] + , [ (NormalTok,"-") , (FloatTok,"15e+3")] + , [ (FloatTok,"0.") , (BuiltInTok,"f")] + , [ (FloatTok,"1.") , (BuiltInTok,"F")] + , [ (FloatTok,"1.E3")] ] @=? tokenize defConfig cpp "0.1f\n1.0f\n-0.1f\n-1.0F\n-1.0L\n1e3\n-15e+3\n0.f\n1.F\n1.E3" ] diff --git a/xml/actionscript.xml b/xml/actionscript.xml --- a/xml/actionscript.xml +++ b/xml/actionscript.xml @@ -1,6 +1,6 @@ - + @@ -253,21 +253,10 @@ - - - + - - - - - - - - - - + @@ -282,6 +271,19 @@ + + + + + + + + + + + + + diff --git a/xml/awk.xml b/xml/awk.xml --- a/xml/awk.xml +++ b/xml/awk.xml @@ -1,94 +1,117 @@ - - + if else while do for - in - continue break + continue + return + switch + case + default + exit + + + in + delete print printf getline function - return next nextfile - exit - switch - case - default @include @load ARGC + ARGIND ARGV + BINMODE CONVFMT ENVIRON ERRNO + FIELDWIDTHS FILENAME FNR FPAT FS FUNCTAB IGNORECASE + LINT NF NR OFMT OFS ORS + PREC PROCINFO + ROUNDMODE RS + RT RSTART RLENGTH SUBSEP SYMTAB + TEXTDOMAIN + + close + fflush + system + + atan2 + cos + exp + int + log + rand + sin + sqrt + srand + asort asorti - gsub gensub + gsub index - isarray length - lshift match - mktime patsplit - rshift split sprintf - sround - strftime strtonum sub substr - systime tolower toupper - typeof + + mktime + strftime + systime + + and + compl + lshift + or + rshift xor - atan2 - cos - exp - int - log - rand - sin - sqrt - srand - close - fflush - system + + isarray + typeof + + bindtextdomain + dcgettext + dcngettext BEGIN @@ -96,122 +119,149 @@ END ENDFILE + + alpha + alnum + blank + cntrl + digit + graph + lower + print + punct + space + upper + xdigit + - + + - + - - + + + - - - - - + + + + + + + + + + + + + - - + - - + + + - - + - + + - + + - - - + + + + - - - + + + + - + - - - - - - - - - + + + - - - + + + + + + - - + + + + + - - - + + + + - - - + + + + - - - + + + + @@ -221,16 +271,18 @@ - + + + - - + + - + diff --git a/xml/bash.xml b/xml/bash.xml --- a/xml/bash.xml +++ b/xml/bash.xml @@ -8,7 +8,7 @@ ]> - + - + - + + + + + + + + + + + + + @@ -800,7 +813,7 @@ - + @@ -827,16 +840,18 @@ + - + + - + diff --git a/xml/c.xml b/xml/c.xml --- a/xml/c.xml +++ b/xml/c.xml @@ -1,7 +1,7 @@ - - - + - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/xml/clojure.xml b/xml/clojure.xml --- a/xml/clojure.xml +++ b/xml/clojure.xml @@ -22,7 +22,7 @@ * Boston, MA 02110-1301, USA. * ********************************************************************** --> - + def @@ -736,13 +736,15 @@ - - - - - - + + + + + + + + diff --git a/xml/cmake.xml b/xml/cmake.xml --- a/xml/cmake.xml +++ b/xml/cmake.xml @@ -31,7 +31,7 @@ unset variable_watch while + add_compile_definitions add_compile_options add_custom_command add_custom_target @@ -269,6 +270,7 @@ APPEND CONDITION + CONFIGURE_DEPENDS CONTENT COPY DESTINATION @@ -336,6 +338,8 @@ TIMESTAMP TLS_CAINFO TLS_VERIFY + TOUCH + TOUCH_NOCREATE TO_CMAKE_PATH TO_NATIVE_PATH UPLOAD @@ -541,19 +545,30 @@ APPEND + AT EXCLUDE FILTER FIND + FOR + GENEX_STRIP GET INCLUDE INSERT + JOIN LENGTH + OUTPUT_VARIABLE + PREPEND REGEX REMOVE_AT REMOVE_DUPLICATES REMOVE_ITEM + REPLACE REVERSE SORT + STRIP + SUBLIST + TOLOWER + TRANSFORM CLEAR @@ -618,6 +633,7 @@ GENEX_STRIP GREATER GREATER_EQUAL + JOIN LENGTH LESS LESS_EQUAL @@ -822,6 +838,7 @@ INCLUDES LIBRARY MESSAGE_NEVER + NAMELINK_COMPONENT NAMELINK_ONLY NAMELINK_SKIP NAMESPACE @@ -865,11 +882,14 @@ DESCRIPTION + HOMEPAGE_URL LANGUAGES VERSION + ASM C + CUDA CXX Fortran NONE @@ -957,6 +977,7 @@ cxx_std_11 cxx_std_14 cxx_std_17 + cxx_std_20 cxx_std_98 cxx_strong_enums cxx_template_template_parameters @@ -1213,6 +1234,7 @@ CMAKE_DEPENDS_IN_PROJECT_ONLY CMAKE_DIRECTORY_LABELS CMAKE_DL_LIBS + CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT CMAKE_ECLIPSE_MAKE_ARGUMENTS @@ -1247,6 +1269,7 @@ CMAKE_FIND_ROOT_PATH_MODE_LIBRARY CMAKE_FIND_ROOT_PATH_MODE_PACKAGE CMAKE_FIND_ROOT_PATH_MODE_PROGRAM + CMAKE_FOLDER CMAKE_FRAMEWORK_PATH CMAKE_Fortran_FORMAT CMAKE_Fortran_MODDIR_DEFAULT @@ -1379,7 +1402,13 @@ CMAKE_PREFIX_PATH CMAKE_PROGRAM_PATH CMAKE_PROJECT_DESCRIPTION + CMAKE_PROJECT_HOMEPAGE_URL CMAKE_PROJECT_NAME + CMAKE_PROJECT_VERSION + CMAKE_PROJECT_VERSION_MAJOR + CMAKE_PROJECT_VERSION_MINOR + CMAKE_PROJECT_VERSION_PATCH + CMAKE_PROJECT_VERSION_TWEAK CMAKE_RANLIB CMAKE_REQUIRED_DEFINITIONS CMAKE_REQUIRED_FLAGS @@ -1411,6 +1440,7 @@ CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE CMAKE_SUPPRESS_DEVELOPER_ERRORS CMAKE_SUPPRESS_DEVELOPER_WARNINGS + CMAKE_SUPPRESS_REGENERATION CMAKE_SWIG_FLAGS CMAKE_SWIG_OUTDIR CMAKE_SYSROOT @@ -1453,6 +1483,13 @@ CMAKE_VS_PLATFORM_TOOLSET CMAKE_VS_PLATFORM_TOOLSET_CUDA CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE + CMAKE_VS_SDK_EXCLUDE_DIRECTORIES + CMAKE_VS_SDK_EXECUTABLE_DIRECTORIES + CMAKE_VS_SDK_INCLUDE_DIRECTORIES + CMAKE_VS_SDK_LIBRARY_DIRECTORIES + CMAKE_VS_SDK_LIBRARY_WINRT_DIRECTORIES + CMAKE_VS_SDK_REFERENCE_DIRECTORIES + CMAKE_VS_SDK_SOURCE_DIRECTORIES CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION CMAKE_WARN_DEPRECATED CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION @@ -1593,14 +1630,33 @@ CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP CPACK_NSIS_PACKAGE_NAME CPACK_NSIS_URL_INFO_ABOUT + CPACK_NUGET_COMPONENT_INSTALL + CPACK_NUGET_PACKAGE_AUTHORS + CPACK_NUGET_PACKAGE_COPYRIGHT + CPACK_NUGET_PACKAGE_DEBUG + CPACK_NUGET_PACKAGE_DEPENDENCIES + CPACK_NUGET_PACKAGE_DESCRIPTION + CPACK_NUGET_PACKAGE_DESCRIPTION_SUMMARY + CPACK_NUGET_PACKAGE_HOMEPAGE_URL + CPACK_NUGET_PACKAGE_ICONURL + CPACK_NUGET_PACKAGE_LICENSEURL + CPACK_NUGET_PACKAGE_NAME + CPACK_NUGET_PACKAGE_OWNERS + CPACK_NUGET_PACKAGE_RELEASE_NOTES + CPACK_NUGET_PACKAGE_TAGS + CPACK_NUGET_PACKAGE_TITLE + CPACK_NUGET_PACKAGE_VERSION CPACK_OSX_PACKAGE_VERSION CPACK_OUTPUT_CONFIG_FILE CPACK_PACKAGE_CHECKSUM + CPACK_PACKAGE_CONTACT + CPACK_PACKAGE_DESCRIPTION CPACK_PACKAGE_DESCRIPTION_FILE CPACK_PACKAGE_DESCRIPTION_SUMMARY CPACK_PACKAGE_DIRECTORY CPACK_PACKAGE_EXECUTABLES CPACK_PACKAGE_FILE_NAME + CPACK_PACKAGE_HOMEPAGE_URL CPACK_PACKAGE_ICON CPACK_PACKAGE_INSTALL_DIRECTORY CPACK_PACKAGE_INSTALL_REGISTRY_KEY @@ -1823,6 +1879,7 @@ MSVC80 MSVC90 MSVC_IDE + MSVC_TOOLSET_VERSION MSVC_VERSION PACKAGE_FIND_NAME PACKAGE_FIND_VERSION @@ -1835,8 +1892,12 @@ PACKAGE_VERSION_COMPATIBLE PACKAGE_VERSION_EXACT PACKAGE_VERSION_UNSUITABLE + PKG_CONFIG_EXECUTABLE + PKG_CONFIG_USE_CMAKE_PREFIX_PATH + PKG_CONFIG_VERSION_STRING PROJECT_BINARY_DIR PROJECT_DESCRIPTION + PROJECT_HOMEPAGE_URL PROJECT_NAME PROJECT_SOURCE_DIR PROJECT_VERSION @@ -1919,6 +1980,7 @@ RULE_LAUNCH_LINK SOURCE_DIR SUBDIRECTORIES + TESTS TEST_INCLUDE_FILE TEST_INCLUDE_FILES VARIABLES @@ -1961,6 +2023,7 @@ BUILD_WITH_INSTALL_RPATH BUNDLE BUNDLE_EXTENSION + COMMON_LANGUAGE_RUNTIME COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN @@ -1986,10 +2049,12 @@ C_STANDARD_REQUIRED DEFINE_SYMBOL DEPLOYMENT_REMOTE_DIRECTORY + DOTNET_TARGET_FRAMEWORK_VERSION ENABLE_EXPORTS EXCLUDE_FROM_ALL EXCLUDE_FROM_DEFAULT_BUILD EXPORT_NAME + EXPORT_PROPERTIES EchoString FOLDER FRAMEWORK @@ -2001,6 +2066,7 @@ HAS_CXX IMPLICIT_DEPENDS_INCLUDE_TRANSFORM IMPORTED + IMPORTED_COMMON_LANGUAGE_RUNTIME IMPORTED_CONFIGURATIONS IMPORTED_GLOBAL IMPORTED_IMPLIB @@ -2079,6 +2145,7 @@ VERSION VISIBILITY_INLINES_HIDDEN VS_CONFIGURATION_TYPE + VS_DEBUGGER_COMMAND VS_DEBUGGER_WORKING_DIRECTORY VS_DESKTOP_EXTENSIONS_VERSION VS_DOTNET_REFERENCES @@ -2141,6 +2208,7 @@ VS_SHADER_ENTRYPOINT VS_SHADER_FLAGS VS_SHADER_MODEL + VS_SHADER_OBJECT_FILE_NAME VS_SHADER_OUTPUT_HEADER_FILE VS_SHADER_TYPE VS_SHADER_VARIABLE_NAME @@ -2166,6 +2234,7 @@ MEASUREMENT PASS_REGULAR_EXPRESSION PROCESSORS + PROCESSOR_AFFINITY REQUIRED_FILES RESOURCE_LOCK RUN_SERIAL @@ -2208,9 +2277,11 @@ C_COMPILER_ID C_COMPILER_VERSION EQUAL + GENEX_EVAL IF INSTALL_INTERFACE INSTALL_PREFIX + IN_LIST JOIN LINK_ONLY LOWER_CASE @@ -2223,13 +2294,16 @@ STREQUAL TARGET_BUNDLE_CONTENT_DIR TARGET_BUNDLE_DIR + TARGET_EXISTS TARGET_FILE TARGET_FILE_DIR TARGET_FILE_NAME + TARGET_GENEX_EVAL TARGET_LINKER_FILE TARGET_LINKER_FILE_DIR TARGET_LINKER_FILE_NAME TARGET_NAME + TARGET_NAME_IF_EXISTS TARGET_OBJECTS TARGET_PDB_FILE TARGET_PDB_FILE_DIR @@ -2297,6 +2371,7 @@ + @@ -2354,9 +2429,10 @@ - + + @@ -2768,6 +2844,13 @@ + + + + + + + @@ -3319,7 +3402,10 @@ + + + @@ -3446,6 +3532,22 @@ + + + + + + + + + + + + + + + + @@ -3488,6 +3590,7 @@ + @@ -3497,12 +3600,23 @@ + + + + + + + + + + + @@ -3533,7 +3647,7 @@ - + @@ -3578,6 +3692,7 @@ + diff --git a/xml/coffee.xml b/xml/coffee.xml --- a/xml/coffee.xml +++ b/xml/coffee.xml @@ -2,11 +2,11 @@ + @@ -173,6 +174,8 @@ + + @@ -187,44 +190,107 @@ + + + + - + - + - + - + - + - + + + + + + + + + + + - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -250,17 +316,23 @@ + + + + + + + - - + diff --git a/xml/cs.xml b/xml/cs.xml --- a/xml/cs.xml +++ b/xml/cs.xml @@ -1,5 +1,5 @@ - + abstract @@ -94,21 +94,10 @@ - - - + - - - - - - - - - - + @@ -126,6 +115,19 @@ + + + + + + + + + + + + + diff --git a/xml/css.xml b/xml/css.xml --- a/xml/css.xml +++ b/xml/css.xml @@ -1,1053 +1,1732 @@ - - -]> - - - - - - - - - azimuth - align-content - align-items - align-self - alignment-baseline - all - animation-name - animation-duration - animation-iteration-count - animation-direction - animation-delay - animation-play-state - animation-fill-mode - animation-timing-function - backface-visibility - background - background-attachment - background-blend-mode - background-break - background-clip - background-color - background-image - background-origin - background-position - background-repeat - background-size - baseline-shift - bookmark-label - bookmark-level - bookmark-level - border - border-bottom - border-bottom-color - border-bottom-image - border-bottom-style - border-bottom-width - border-bottom-left-image - border-bottom-left-radius - border-bottom-right-image - border-bottom-right-radius - border-boundary - border-collapse - border-color - border-corner-image - border-image - border-image-outset - border-image-repeat - border-image-slice - border-image-source - border-image-width - border-left - border-left-color - border-left-image - border-left-style - border-left-width - border-radius - border-right - border-right-color - border-right-image - border-right-style - border-right-width - border-spacing - border-style - border-top - border-top-color - border-top-image - border-top-style - border-top-width - border-top-left-image - border-top-left-radius - border-top-right-image - border-top-right-radius - border-width - bottom - box-align - box-decoration-break - box-direction - box-flex - box-shadow - box-sizing - box-snap - box-suppress - break-after - break-before - break-inside - caret-color - caption-side - chains - clear - clip - clip-path - clip-rule - color - color-interpolation-filters - column-count - column-fill - column-gap - column-rule - column-rule-color - column-rule-style - column-rule-width - column-span - column-width - columns - content - counter-increment - counter-reset - counter-set - cue - cue-after - cue-before - cursor - direction - display - dominant-baseline - elevation - empty-cells - filter - flex - flex-basis - flex-direction - flex-flow - flex-grow - flex-shrink - flex-wrap - float - flood-color - flood-opacity - flow - flow-from - flow-into - font - font-family - font-size - font-size-adjust - font-stretch - font-style - font-variant - font-weight - font-stretch - font-feature-settings - font-kerning - font-language-override - font-synthesis - font-variant-alternates - font-variant-caps - font-variant-east-asian - font-variant-ligatures - font-variant-numeric - font-variant-position - footnote-display - footnote-policy - glyph-orientation-vertical - grid - grid-area - grid-auto-columns - grid-auto-flow - grid-auto-rows - grid-column - grid-column-end - grid-column-gap - grid-column-start - grid-gap - grid-row - grid-row-end - grid-row-gap - grid-row-start - grid-template - grid-template-areas - grid-template-columns - grid-template-rows - hanging-punctuation - height - hyphens - image-orientation - image-rendering - image-resolution - initial-letter - initial-letter-align - initial-letter-wrap - isolation - justify-content - justify-items - justify-self - left - letter-spacing - lighting-color - linear-gradient - line-grid - line-height - line-snap - list-style - list-style-image - list-style-keyword - list-style-position - list-style-type - margin - margin-bottom - margin-left - margin-right - margin-top - marker-offset - marker-side - marquee-direction - marquee-loop - marquee-speed - marquee-style - mask - mask-border - mask-border-mode - mask-border-outset - mask-border-repeat - mask-border-slice - mask-border-source - mask-border-width - mask-clip - mask-composite - mask-image - mask-mode - mask-origin - mask-position - mask-repeat - mask-size - mask-type - max-height - max-lines - max-width - min-height - min-width - mix-blend-mode - nav-down - nav-left - nav-right - nav-up - object-fit - object-position - offset-after - offset-before - offset-end - offset-start - opacity - order - orphans - outline - outline-color - outline-offset - outline-style - outline-width - overflow - overflow-style - overflow-wrap - overflow-x - overflow-y - padding - padding-bottom - padding-left - padding-right - padding-top - page - page-break-after - page-break-before - page-break-inside - pause - pause-after - pause-before - perspective - perspective-origin - pitch - pitch-range - play-during - pointer-events - polar-anchor - polar-angle - polar-distance - polar-origin - position - presentation-level - quotes - resize - rest - rest-after - rest-before - richness - right - rotation - rotation-point - ruby-align - ruby-merge - ruby-position - running - scroll-behavior - scroll-snap-align - scroll-snap-margin - scroll-snap-margin-block - scroll-snap-margin-block-end - scroll-snap-margin-block-start - scroll-snap-margin-bottom - scroll-snap-margin-inline - scroll-snap-margin-inline-end - scroll-snap-margin-inline-start - scroll-snap-margin-left - scroll-snap-margin-right - scroll-snap-margin-top - scroll-snap-padding - scroll-snap-padding-block - scroll-snap-padding-block-end - scroll-snap-padding-block-start - scroll-snap-padding-bottom - scroll-snap-padding-inline - scroll-snap-padding-inline-end - scroll-snap-padding-inline-start - scroll-snap-padding-left - scroll-snap-padding-right - scroll-snap-padding-top - scroll-snap-stop - scroll-snap-type - shape-image-threshold - shape-inside - shape-margin - shape-outside - size - speak - speak-as - speak-header - speak-numeral - speak-punctuation - speech-rate - stress - string-set - tab-size - table-layout - text-align - text-align-last - text-combine-upright - text-decoration - text-decoration-color - text-decoration-line - text-decoration-skip - text-decoration-style - text-emphasis - text-emphasis-color - text-emphasis-position - text-emphasis-style - text-indent - text-justify - text-orientation - text-overflow - text-shadow - text-transform - text-underline-position - text-wrap - top - transform - transform-origin - transform-style - transition - transition-delay - transition-property - transition-duration - transition-timing-function - unicode-bidi - vertical-align - visibility - voice-balance - voice-duration - voice-family - voice-pitch - voice-range - voice-rate - voice-stress - voice-volume - volume - white-space - widows - width - will-change - word-break - word-spacing - word-wrap - wrap-flow - wrap-through - writing-mode - z-index - - - -moz-animation-name - -moz-animation-duration - -moz-animation-iteration - -moz-animation-direction - -moz-animation-delay - -moz-animation-play-state - -moz-animation-fill-mode - -moz-background-size - -moz-border-image - -moz-border-bottom-colors - -moz-border-left-colors - -moz-border-radius - -moz-border-radius-topleft - -moz-border-radius-topright - -moz-border-radius-bottomleft - -moz-border-radius-bottomright - -moz-border-right-colors - -moz-border-top-colors - -moz-box - -moz-box-flex - -moz-box-shadow - -moz-box-sizing - -moz-column-count - -moz-column-gap - -moz-hyphens - -moz-linear-gradient - -moz-opacity - -moz-outline-style - -moz-perspective - -moz-radial-gradient - -moz-resize - -moz-transform - -moz-transform-origin - -moz-transform-style - -moz-transition - -moz-transition-property - -moz-transition-duration - - - -o-background-size - -o-linear-gradient - -o-text-overflow - -o-transition - -o-transform-origin - - - konq_bgpos_x - konq_bgpos_y - -khtml-background-size - -khtml-border-top-left-radius - -khtml-border-top-right-radius - -khtml-border-bottom-left-radius - -khtml-border-bottom-right-radius - -khtml-border-radius - -khtml-box-shadow - -khtml-opacity - - - -webkit-appearance - -webkit-animation-name - -webkit-animation-duration - -webkit-animation-iteration - -webkit-animation-direction - -webkit-animation-delay - -webkit-animation-play-state - -webkit-animation-fill-mode - -webkit-background-size - -webkit-border-image - -webkit-border-bottom-colors - -webkit-border-left-colors - -webkit-border-radius - -webkit-border-right-colors - -webkit-border-top-colors - -webkit-border-top-left-radius - -webkit-border-top-right-radius - -webkit-border-bottom-left-radius - -webkit-border-bottom-right-radius - -webkit-border-radius-bottomleft - -webkit-border-radius-bottomright - -webkit-box-flex - -webkit-box-reflect - -webkit-box-shadow - -webkit-box-sizing - -webkit-column-count - -webkit-column-gap - -webkit-hyphens - -webkit-linear-gradient - -webkit-gradient - -webkit-perspective - -webkit-text-fill-color - -webkit-text-stroke-color - -webkit-text-stroke-width - -webkit-text-size-adjust - -webkit-transform - -webkit-transform-origin - -webkit-transform-style - -webkit-transition - -webkit-transition-property - -webkit-transition-duration - - - zoom - -ms-animation-name - -ms-animation-duration - -ms-animation-iteration - -ms-animation-direction - -ms-animation-delay - -ms-animation-play-state - -ms-animation-fill-mode - -ms-box-sizing - -ms-filter - -ms-interpolation-mode - -ms-linear-gradient - -ms-text-size-adjust - -ms-transform - -ms-transition - - - font-family - font-size - font-stretch - font-style - font-variant - font-weight - unicode-range - units-per-em - src - panose-1 - stemv - stemh - slope - cap-height - x-height - ascent - descent - widths - bbox - definition-src - baseline - centerline - mathline - topline - - - - inherit - none - hidden - dotted - dashed - solid - double - groove - ridge - inset - outset - xx-small - x-small - small - medium - large - x-large - xx-large - smaller - larger - italic - oblique - small-caps - normal - bold - bolder - lighter - light - 100 - 200 - 300 - 400 - 500 - 600 - 700 - 800 - 900 - transparent - repeat - repeat-x - repeat-y - no-repeat - baseline - sub - super - top - text-top - middle - bottom - text-bottom - left - right - center - justify - konq-center - disc - circle - square - box - decimal - decimal-leading-zero - lower-roman - upper-roman - lower-greek - lower-alpha - lower-latin - upper-alpha - upper-latin - hebrew - armenian - georgian - cjk-ideographic - hiragana - katakana - hiragana-iroha - katakana-iroha - inline - inline-block - block - list-item - run-in - compact - marker - table - inline-table - table-row-group - table-header-group - table-footer-group - table-row - table-column-group - table-column - table-cell - table-caption - auto - crosshair - default - pointer - move - e-resize - ne-resize - nw-resize - n-resize - se-resize - sw-resize - s-resize - w-resize - text - wait - help - above - absolute - always - avoid - below - bidi-override - blink - both - capitalize - caption - clip - close-quote - collapse - condensed - crop - cross - ellipsis - ellipsis-word - embed - expanded - extra-condensed - extra-expanded - fixed - hand - hide - higher - icon - inside - invert - landscape - level - line-through - loud - lower - lowercase - ltr - menu - message-box - mix - narrower - no-close-quote - no-open-quote - nowrap - open-quote - outside - overline - portrait - pre - pre-line - pre-wrap - relative - rtl - scroll - semi-condensed - semi-expanded - separate - show - small-caption - static - static-position - status-bar - thick - thin - ultra-condensed - ultra-expanded - underline - uppercase - visible - wider - break - serif - sans-serif - cursive - fantasy - monospace - border-box - content-box - -epub-hyphens - - - - aqua - black - blue - cyan - fuchsia - gray - green - lime - maroon - navy - olive - purple - red - silver - teal - white - yellow - ActiveBorder - ActiveCaption - AppWorkspace - Background - ButtonFace - ButtonHighlight - ButtonShadow - ButtonText - CaptionText - GrayText - Highlight - HighlightText - InactiveBorder - InactiveCaption - InactiveCaptionText - InfoBackground - InfoText - Menu - MenuText - Scrollbar - ThreeDDarkShadow - ThreeDFace - ThreeDHighlight - ThreeDLightShadow - ThreeDShadow - Window - WindowFrame - WindowText - - - - url - attr - rect - rgb - rgba - hsl - hsla - counter - counters - - - local - format - - - expression - - - - - all - aural - braille - embossed - handheld - print - projection - screen - speech - tty - tv - - - - width - min-width - max-width - height - min-height - max-height - device-width - min-device-width - max-device-width - device-height - min-device-height - max-device-height - orientation - aspect-ratio - min-aspect-ratio - max-aspect-ratio - device-aspect-ratio - min-device-aspect-ratio - max-device-aspect-ratio - color - min-color - max-color - color-index - min-color-index - max-color-index - monochrome - min-monochrome - max-monochrome - resolution - min-resolution - max-resolution - scan - grid - - - - hover - link - visited - active - focus - first-child - last-child - only-child - first-of-type - last-of-type - only-of-type - first-letter - first-line - before - after - selection - root - empty - target - enabled - disabled - checked - indeterminate - nth-child - nth-last-child - nth-of-type - nth-last-of-type - not - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +]> + + + + + + + + + align-content + align-items + alignment-baseline + align-self + all + animation + animation-delay + animation-direction + animation-duration + animation-fill-mode + animation-iteration-count + animation-name + animation-play-state + animation-timing-function + appearance + azimuth + backface-visibility + background + background-attachment + background-blend-mode + background-clip + background-color + background-image + background-image-transform + background-origin + background-position + background-repeat + background-size + baseline-shift + block-size + block-step + block-step-align + block-step-insert + block-step-round + block-step-size + bookmark-label + bookmark-level + bookmark-state + border + border-block + border-block-color + border-block-end + border-block-end-color + border-block-end-style + border-block-end-width + border-block-start + border-block-start-color + border-block-start-style + border-block-start-width + border-block-style + border-block-width + border-bottom + border-bottom-color + border-bottom-left-radius + border-bottom-right-radius + border-bottom-style + border-bottom-width + border-boundary + border-collapse + border-color + border-image + border-image-outset + border-image-repeat + border-image-slice + border-image-source + border-image-transform + border-image-width + border-inline + border-inline-color + border-inline-end + border-inline-end-color + border-inline-end-style + border-inline-end-width + border-inline-start + border-inline-start-color + border-inline-start-style + border-inline-start-width + border-inline-style + border-inline-width + border-left + border-left-color + border-left-style + border-left-width + border-radius + border-right + border-right-color + border-right-style + border-right-width + border-spacing + border-style + border-top + border-top-color + border-top-left-radius + border-top-right-radius + border-top-style + border-top-width + border-width + bottom + box-decoration-break + box-shadow + box-sizing + box-snap + break-after + break-before + break-inside + caption-side + caret + caret-color + caret-shape + clear + clip + clip-path + clip-rule + color + color-adjust + color-interpolation-filters + columns + column-count + column-fill + column-gap + column-rule + column-rule-color + column-rule-style + column-rule-width + column-span + column-width + contain + content + continue + counter-increment + counter-reset + counter-set + cue + cue-after + cue-before + cursor + direction + display + dominant-baseline + elevation + empty-cells + fill + fill-break + fill-color + fill-image + fill-opacity + fill-origin + fill-position + fill-repeat + fill-rule + fill-size + filter + flex + flex-basis + flex-direction + flex-flow + flex-grow + flex-shrink + flex-wrap + float + float-defer + float-offset + float-reference + flood-color + flood-opacity + flow-from + flow-into + font + font-family + font-feature-settings + font-kerning + font-language-override + font-max-size + font-min-size + font-optical-sizing + font-palette + font-size + font-size-adjust + font-stretch + font-style + font-synthesis + font-variant + font-variant-alternates + font-variant-caps + font-variant-east-asian + font-variant-emoji + font-variant-ligatures + font-variant-numeric + font-variant-position + font-variation-settings + font-weight + footnote-display + footnote-policy + gap + glyph-orientation-vertical + grid + grid-area + grid-auto-columns + grid-auto-flow + grid-auto-rows + grid-column + grid-column-end + grid-column-gap + grid-column-start + grid-gap + grid-row + grid-row-end + grid-row-gap + grid-row-start + grid-template + grid-template-areas + grid-template-columns + grid-template-rows + hanging-punctuation + height + hyphenate-character + hyphenate-limit-chars + hyphenate-limit-last + hyphenate-limit-lines + hyphenate-limit-zone + hyphens + image-orientation + image-rendering + image-resolution + initial-letter + initial-letter-align + initial-letter-wrap + inline-size + inset + inset-block + inset-block-end + inset-block-start + inset-inline + inset-inline-end + inset-inline-start + isolation + justify-content + justify-items + justify-self + left + letter-spacing + lighting-color + line-break + line-grid + line-height + line-height-step + line-snap + list-style + list-style-image + list-style-position + list-style-type + margin + margin-block + margin-block-end + margin-block-start + margin-bottom + margin-inline + margin-inline-end + margin-inline-start + margin-left + margin-right + margin-top + marker + marker-end + marker-knockout-left + marker-knockout-right + marker-mid + marker-pattern + marker-segment + marker-side + marker-start + marquee-direction + marquee-loop + marquee-speed + marquee-style + mask + mask-border + mask-border-mode + mask-border-outset + mask-border-repeat + mask-border-slice + mask-border-source + mask-border-width + mask-clip + mask-composite + mask-image + mask-mode + mask-origin + mask-position + mask-repeat + mask-size + mask-type + max-block-size + max-height + max-inline-size + max-lines + max-width + min-block-size + min-height + min-inline-size + min-width + mix-blend-mode + nav-up + nav-down + nav-left + nav-right + object-fit + object-position + offset + offset-after + offset-anchor + offset-before + offset-distance + offset-end + offset-path + offset-position + offset-rotate + offset-start + opacity + order + orphans + outline + outline-color + outline-offset + outline-style + outline-width + overflow + overflow-style + overflow-wrap + overflow-x + overflow-y + padding + padding-block + padding-block-end + padding-block-start + padding-bottom + padding-inline + padding-inline-end + padding-inline-start + padding-left + padding-right + padding-top + page + page-break-after + page-break-before + page-break-inside + pause + pause-after + pause-before + perspective + perspective-origin + pitch + pitch-range + place-content + place-items + place-self + play-during + pointer-events + position + quotes + region-fragment + resize + richness + right + rotation + rotation-point + row-gap + ruby-align + ruby-merge + ruby-position + running + scrollbar-gutter + shape-image-threshold + shape-inside + shape-margin + shape-outside + size + speak + speak-header + speak-numeral + speak-punctuation + speech-rate + stress + string-set + table-layout + tab-size + text-align-all + text-align + text-align-last + text-combine-upright + text-decoration-color + text-decoration + text-decoration-line + text-decoration-skip + text-decoration-skip-ink + text-decoration-style + text-decoration-width + text-emphasis + text-emphasis-color + text-emphasis-position + text-emphasis-skip + text-emphasis-style + text-indent + text-justify + text-orientation + text-overflow + text-shadow + text-space-collapse + text-space-trim + text-spacing + text-transform + text-underline-offset + text-underline-position + text-wrap + top + transform + transform-box + transform-origin + transform-style + transition + transition-delay + transition-duration + transition-property + transition-timing-function + unicode-bidi + user-select + vertical-align + visibility + voice-family + volume + white-space + widows + width + will-change + word-break + word-spacing + word-wrap + wrap-after + wrap-before + wrap-flow + wrap-inside + wrap-through + writing-mode + z-index + + + -moz-animation + -moz-animation-delay + -moz-animation-direction + -moz-animation-duration + -moz-animation-fill-mode + -moz-animation-iteration-count + -moz-animation-name + -moz-animation-play-state + -moz-animation-timing-function + -moz-appearance + -moz-background-clip + -moz-background-origin + -moz-background-size + -moz-border-image + -moz-border-radius + -moz-border-radius-bottomleft + -moz-border-radius-bottomright + -moz-border-radius-topleft + -moz-border-radius-topright + -moz-box-align + -moz-box-direction + -moz-box-flex + -moz-box-flex-group + -moz-box-ordinal-group + -moz-box-orient + -moz-box-pack + -moz-box-shadow + -moz-box-sizing + -moz-box + -moz-column-count + -moz-column-fill + -moz-column-gap + -moz-column-rule + -moz-column-rule-color + -moz-column-rule-style + -moz-column-rule-width + -moz-columns + -moz-column-width + -moz-hyphens + -moz-opacity + -moz-outline-style + -moz-perspective + -moz-resize + -moz-text-align-last + -moz-text-decoration-color + -moz-text-decoration-line + -moz-text-decoration-style + -moz-transform + -moz-transform-origin + -moz-transform-style + -moz-transition + -moz-transition-delay + -moz-transition-duration + -moz-transition-property + -moz-transition-timing-function + -moz-user-select + + + -o-background-size + -o-linear-gradient + -o-text-overflow + -o-transition + -o-transform-origin + + + konq_bgpos_x + konq_bgpos_y + -khtml-background-size + -khtml-border-top-left-radius + -khtml-border-top-right-radius + -khtml-border-bottom-left-radius + -khtml-border-bottom-right-radius + -khtml-border-radius + -khtml-box-shadow + -khtml-opacity + + + -webkit-appearance + -webkit-animation + -webkit-animation-name + -webkit-animation-duration + -webkit-animation-iteration + -webkit-animation-direction + -webkit-animation-delay + -webkit-animation-play-state + -webkit-animation-fill-mode + -webkit-background-size + -webkit-backface-visibility + -webkit-border-image + -webkit-border-bottom-colors + -webkit-border-left-colors + -webkit-border-radius + -webkit-border-right-colors + -webkit-border-top-colors + -webkit-border-top-left-radius + -webkit-border-top-right-radius + -webkit-border-bottom-left-radius + -webkit-border-bottom-right-radius + -webkit-border-radius-bottomleft + -webkit-border-radius-bottomright + -webkit-box-align + -webkit-box-direction + -webkit-box-flex + -webkit-box-ordinal-group + -webkit-box-orient + -webkit-box-pack + -webkit-box-reflect + -webkit-box-shadow + -webkit-box-sizing + -webkit-column-count + -webkit-column-gap + -webkit-hyphens + -webkit-linear-gradient + -webkit-gradient + -webkit-overflow-scrolling + -webkit-perspective + -webkit-text-decoration + -webkit-text-decoration-skip + -webkit-text-fill-color + -webkit-text-stroke-color + -webkit-text-stroke-width + -webkit-text-size-adjust + -webkit-tap-highlight-color + -webkit-transform + -webkit-transform-origin + -webkit-transform-style + -webkit-transition + -webkit-transition-property + -webkit-transition-delay + -webkit-transition-duration + -webkit-user-select + + + zoom + -ms-animation-name + -ms-animation-duration + -ms-animation-iteration + -ms-animation-direction + -ms-animation-delay + -ms-animation-play-state + -ms-animation-fill-mode + -ms-box-sizing + -ms-filter + -ms-flex + -ms-flex-align + -ms-flex-direction + -ms-flex-flow + -ms-flex-item-align + -ms-flex-line-pack + -ms-flex-negative + -ms-flex-order + -ms-flex-pack + -ms-flex-positive + -ms-flex-position + -ms-flex-preferred-size + -ms-flex-wrap + -ms-interpolation-mode + -ms-linear-gradient + -ms-overflow-style + -ms-text-size-adjust + -ms-transform + -ms-transition + -ms-user-select + + + + inherit + unset + auto + + + + + none + hidden + dotted + dashed + solid + double + groove + ridge + inset + outset + xx-small + x-small + small + medium + large + x-large + xx-large + smaller + larger + italic + oblique + small-caps + normal + bold + bolder + lighter + light + transparent + repeat + repeat-x + repeat-y + no-repeat + baseline + sub + super + top + text-top + middle + bottom + text-bottom + left + right + center + justify + konq-center + disc + circle + square + box + decimal + decimal-leading-zero + lower-roman + upper-roman + lower-greek + lower-alpha + lower-latin + upper-alpha + upper-latin + hebrew + armenian + georgian + cjk-ideographic + hiragana + katakana + hiragana-iroha + katakana-iroha + inline + inline-block + block + list-item + run-in + compact + marker + table + inline-table + table-row-group + table-header-group + table-footer-group + table-row + table-column-group + table-column + table-cell + table-caption + crosshair + default + pointer + move + e-resize + ne-resize + nw-resize + n-resize + se-resize + sw-resize + s-resize + w-resize + text + wait + help + above + absolute + always + avoid + below + bidi-override + blink + both + capitalize + caption + clip + close-quote + collapse + condensed + crop + cross + ellipsis + ellipsis-word + embed + expanded + extra-condensed + extra-expanded + fixed + hand + hide + higher + icon + inside + invert + landscape + level + line-through + loud + lower + lowercase + ltr + menu + message-box + mix + narrower + no-close-quote + no-open-quote + nowrap + open-quote + outside + overline + portrait + pre + pre-line + pre-wrap + relative + rtl + scroll + semi-condensed + semi-expanded + separate + show + small-caption + static + static-position + status-bar + thick + thin + ultra-condensed + ultra-expanded + underline + uppercase + visible + wider + break + serif + sans-serif + cursive + fantasy + monospace + border-box + content-box + -epub-hyphens + contain + cover + + + all + ease + ease-in + ease-out + ease-in-out + step-start + step-end + linear + + + infinite + reverse + alternate + alternate-reverse + forwards + backwards + running + paused + + + + black + silver + gray + white + maroon + red + purple + fuchsia + green + lime + olive + yellow + navy + blue + teal + aqua + orange + aliceblue + antiquewhite + aquamarine + azure + beige + bisque + blanchedalmond + blueviolet + brown + burlywood + cadetblue + chartreuse + chocolate + coral + cornflowerblue + cornsilk + crimson + cyan + aqua + darkblue + darkcyan + darkgoldenrod + darkgray + darkgreen + darkgrey + darkkhaki + darkmagenta + darkolivegreen + darkorange + darkorchid + darkred + darksalmon + darkseagreen + darkslateblue + darkslategray + darkslategrey + darkturquoise + darkviolet + deeppink + deepskyblue + dimgray + dimgrey + dodgerblue + firebrick + floralwhite + forestgreen + gainsboro + ghostwhite + gold + goldenrod + greenyellow + grey + honeydew + hotpink + indianred + indigo + ivory + khaki + lavender + lavenderblush + lawngreen + lemonchiffon + lightblue + lightcoral + lightcyan + lightgoldenrodyellow + lightgray + lightgreen + lightgrey + lightpink + lightsalmon + lightseagreen + lightskyblue + lightslategray + lightslategrey + lightsteelblue + lightyellow + limegreen + linen + magenta + fuchsia + mediumaquamarine + mediumblue + mediumorchid + mediumpurple + mediumseagreen + mediumslateblue + mediumspringgreen + mediumturquoise + mediumvioletred + midnightblue + mintcream + mistyrose + moccasin + navajowhite + oldlace + olivedrab + orangered + orchid + palegoldenrod + palegreen + paleturquoise + palevioletred + papayawhip + peachpuff + peru + pink + plum + powderblue + rosybrown + royalblue + saddlebrown + salmon + sandybrown + seagreen + seashell + sienna + skyblue + slateblue + slategray + slategrey + snow + springgreen + steelblue + tan + thistle + tomato + turquoise + violet + wheat + whitesmoke + yellowgreen + rebeccapurple + + ActiveBorder + ActiveCaption + AppWorkspace + Background + ButtonFace + ButtonHighlight + ButtonShadow + ButtonText + CaptionText + GrayText + Highlight + HighlightText + InactiveBorder + InactiveCaption + InactiveCaptionText + InfoBackground + InfoText + Menu + MenuText + Scrollbar + ThreeDDarkShadow + ThreeDFace + ThreeDHighlight + ThreeDLightShadow + ThreeDShadow + Window + WindowFrame + WindowText + + + + attr + calc + hsl + hsla + linear-gradient + radial-gradient + repeating-linear-gradient + repeating-radial-gradient + rgb + rgba + var + url + + + rect + + + inset + circle + ellipse + polygon + + + blur + brightness + contrast + drop-shadow + grayscale + hue-rotate + invert + opacity + saturate + sepia + + + max-content + min-content + minmax + fix-content + repeat + + + cubic-bezier + frames + steps + + + matrix + matrix3d + perspective + rotate + rotate3d + rotateX + rotateY + rotateZ + scale + scale3d + scaleX + scaleY + scaleZ + skew + skewX + skewY + translate + translate3d + translateX + translateY + translateZ + + + local + format + + + + + all + print + screen + speech + + + any-pointer + any-hover + aspect-ratio + color + color-gamut + color-index + display-mode + grid + height + hover + max-aspect-ratio + max-color + max-color-index + max-device-aspect-ratio + max-device-height + max-device-width + max-height + max-monochrome + max-resolution + max-width + min-aspect-ratio + min-color + min-color-index + min-device-aspect-ratio + min-device-height + min-device-width + min-height + min-monochrome + min-resolution + min-width + monochrome + orientation + pointer + resolution + scan + update + width + + + + + after + before + cue + first-letter + first-line + selection + + + backdrop + placeholder + + slotted + + + + + value + choices + repeat-item + repeat-index + + -moz-progress-bar + -moz-range-progress + -moz-range-thumb + -moz-range-track + -moz-selection + -ms-fill + -ms-fill-lower + -ms-fill-upper + -ms-thumb + -ms-track + -webkit-progress-bar + -webkit-progress-value + -webkit-slider-runnable-track + -webkit-slider-thumb + + + + + active + any-link + checked + default + defined + + disabled + empty + enabled + first-child + first-of-type + fullscreen + focus + focus-within + host + hover + in-range + indeterminate + invalid + lang + last-child + last-of-type + link + not + nth-child + nth-last-child + nth-last-of-type + nth-of-type + only-child + only-of-type + optional + out-of-range + placeholder-shown + read-only + read-write + required + root + scope + target + valid + visited + + + after + before + cue + first-letter + first-line + selection + + + + not + + + + blank + first + left + recto + right + verso + + + + @character + @charset + @import + @namespace + + + + @document + @media + @supports + + + + @viewport + + + + min-width + max-width + width + min-height + max-height + height + zoom + min-zoom + max-zoom + user-zoom + orientation + viewport-fit + + + + @page + + + + size + marks + bleed + + + + @font-face + + + + font-display + font-family + font-stretch + font-style + font-weight + font-variant + font-feature-settings + font-variation-settings + src + unicode-range + + + + @keyframes + + + + from + to + + + + and + only + not + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/dockerfile.xml b/xml/dockerfile.xml --- a/xml/dockerfile.xml +++ b/xml/dockerfile.xml @@ -1,7 +1,7 @@ - + ADD diff --git a/xml/email.xml b/xml/email.xml --- a/xml/email.xml +++ b/xml/email.xml @@ -1,6 +1,6 @@ - + Authentication-Results: @@ -51,8 +51,14 @@ + + + + + + diff --git a/xml/fortran.xml b/xml/fortran.xml --- a/xml/fortran.xml +++ b/xml/fortran.xml @@ -1,6 +1,6 @@ - + @@ -402,8 +402,12 @@ - - + + + + + + diff --git a/xml/gcc.xml b/xml/gcc.xml --- a/xml/gcc.xml +++ b/xml/gcc.xml @@ -13,7 +13,7 @@ --> __UINT_LEAST8_TYPE__ __USER_LABEL_PREFIX__ __USING_SJLJ_EXCEPTIONS__ - __VA_ARGS__ __VERSION__ __WCHAR_MAX__ __WCHAR_MIN__ @@ -532,14 +531,22 @@ - - + + - - + + + + + + + + + + @@ -550,6 +557,11 @@ + + + + + @@ -559,15 +571,32 @@ + + + + + + + + + + + + + + + + - + - - - - + + + + + diff --git a/xml/haskell.xml b/xml/haskell.xml --- a/xml/haskell.xml +++ b/xml/haskell.xml @@ -1,6 +1,6 @@ - + case @@ -9,6 +9,8 @@ deriving do else + family + forall if in infixl @@ -18,14 +20,13 @@ module newtype of + pattern primitive then type where - FilePath - IOError abs acos acosh @@ -477,6 +478,7 @@ + @@ -605,7 +607,7 @@ - + diff --git a/xml/ini.xml b/xml/ini.xml --- a/xml/ini.xml +++ b/xml/ini.xml @@ -1,6 +1,6 @@ - + diff --git a/xml/isocpp.xml b/xml/isocpp.xml --- a/xml/isocpp.xml +++ b/xml/isocpp.xml @@ -1,17 +1,28 @@ - - + + + + + + + + - + + + + + + + ]> asm auto class + concept + requires constexpr const_cast decltype @@ -97,6 +110,20 @@ or_eq xor xor_eq + + + + + + + noreturn carries_dependency - + deprecated + + fallthrough + nodiscard + maybe_unused + + likely + unlikely + no_unique_address + + + + + using + bool @@ -176,71 +221,81 @@ thread_local volatile + + __DATE__ __FILE__ __LINE__ - __DATE__ - __TIME__ - __STDC__ - __STDC_VERSION__ + __STDCPP_DEFAULT_NEW_ALIGNMENT__ + __STDCPP_STRICT_POINTER_SAFETY__ + __STDCPP_THREADS__ __STDC_HOSTED__ __STDC_ISO_10646__ __STDC_MB_MIGHT_NEQ_WC__ + __STDC_VERSION__ + __STDC__ + __TIME__ __cplusplus __func__ + assert + _Pragma + __has_include + + __VA_ARGS__ + __VA_OPT__ + + + if + + + ifdef + ifndef + + + elif + + + else + + + endif + + + cmakedefine01 + cmakedefine + define + + + include + + + error + line + pragma + undef + warning + - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - + + + + + + + + - - - - - - - - - - - + @@ -251,120 +306,278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + - - - - - - - - - - - - - - - - - - - + + + - - - - + + + + + + - - - - - - + + + - - - - - + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + - - + + + + - + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + - + - - - + + - + - + - + + + + + + + + + + + + + + + + - + @@ -380,128 +593,225 @@ - - + + + - - - - - - - + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - - + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + - - + + + + + + + + + + - + - - - + + + + + + + - - - - - + + + + + + - + - - + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - + + + - + - + + + + @@ -509,7 +819,7 @@ - + diff --git a/xml/java.xml b/xml/java.xml --- a/xml/java.xml +++ b/xml/java.xml @@ -1,6 +1,10 @@ - - + + +]> + ACTIVE @@ -3760,14 +3764,13 @@ - - - - - - - - + + + + + + + @@ -3822,9 +3825,12 @@ - + + + + @@ -3838,6 +3844,7 @@ + diff --git a/xml/javadoc.xml b/xml/javadoc.xml --- a/xml/javadoc.xml +++ b/xml/javadoc.xml @@ -1,6 +1,6 @@ - + @@ -29,6 +29,7 @@ + @@ -71,12 +72,14 @@ + + @@ -94,12 +97,12 @@ - - - - - - + + + + + + diff --git a/xml/javascript.xml b/xml/javascript.xml --- a/xml/javascript.xml +++ b/xml/javascript.xml @@ -1,9 +1,14 @@ - + +]> - + @@ -78,8 +83,10 @@ the very first line. --> - + + + @@ -87,8 +94,11 @@ - + + + + @@ -102,11 +112,13 @@ - + - + + + @@ -128,11 +140,11 @@ - + - + - + @@ -152,27 +164,35 @@ - + - - - + - - - + + + + + + + + + + + + + + - - + @@ -233,8 +253,10 @@ + + @@ -246,6 +268,7 @@ + diff --git a/xml/jsp.xml b/xml/jsp.xml --- a/xml/jsp.xml +++ b/xml/jsp.xml @@ -1,6 +1,6 @@ - + @@ -2912,21 +2912,10 @@ - - - + - - - - - - - - - - + @@ -2938,6 +2927,21 @@ + + + + + + + + + + + + + + + @@ -2945,21 +2949,10 @@ - - - + - - - - - - - - - - + diff --git a/xml/kotlin.xml b/xml/kotlin.xml --- a/xml/kotlin.xml +++ b/xml/kotlin.xml @@ -1,7 +1,7 @@ - + package @@ -114,18 +114,22 @@ - - - - - - + + + + + + + + + + diff --git a/xml/latex.xml b/xml/latex.xml --- a/xml/latex.xml +++ b/xml/latex.xml @@ -1,6 +1,6 @@ - + @@ -578,7 +578,6 @@ - diff --git a/xml/lua.xml b/xml/lua.xml --- a/xml/lua.xml +++ b/xml/lua.xml @@ -43,7 +43,7 @@ - NOTE, FIXME, TODO alerts added on comments - improved highlighting --> - + and @@ -490,8 +490,15 @@ - - + + + + + + + + + diff --git a/xml/mediawiki.xml b/xml/mediawiki.xml --- a/xml/mediawiki.xml +++ b/xml/mediawiki.xml @@ -6,7 +6,7 @@ ]> - + @@ -618,6 +618,5 @@ - diff --git a/xml/modelines.xml b/xml/modelines.xml --- a/xml/modelines.xml +++ b/xml/modelines.xml @@ -8,15 +8,15 @@ Copyright (c) 2012-2014 by Alex Turbov (i.zaufi@gmail.com) --> diff --git a/xml/modula-2.xml b/xml/modula-2.xml --- a/xml/modula-2.xml +++ b/xml/modula-2.xml @@ -1,187 +1,1191 @@ - - - - ASSEMBLER - ALLOCATE - DEALLOCATE - SIZE - Write - WriteString - WriteCard - WriteLn - WriteBf - WriteInt - WriteReal - WriteLongReal - Read - ReadString - ReadCard - ReadInt - ReadReal - ReadLongReal - Open - Close - OpenInput - OpenOutput - Accessible - Erase - EOF - Done - EmptyString - Assign - Append - Length - StrEq - Copy - Concat - pos - Delete - Insert - compare - CAPS - PutBf - GetArgs - GetEnv - ResetClock - UserTime - SystemTime - GetChar - GetInt - GetCard - GetString - GetReal - GetLongReal - PutChar - PutInt - PutCard - PutString - PutReal - PutLongReal - PutLn - - - AND - ARRAY - ASM - BEGIN - CASE - CONST - DIV - DO - ELSE - ELSIF - END - FOR - IF - IMPLEMENTATION - IN - SET - INCL - EXCL - ABS - BITSET - CAP - CHR - DEC - HALT - HIGH - INC - MAX - MIN - ODD - ORD - PROC - TRUNC - VAL - MOD - NIL - NOT - OF - OR - PROCEDURE - MODULE - DEFINITION - RECORD - REPEAT - THEN - TO - TYPE - UNTIL - LOOP - VAR - WHILE - WITH - EXIT - FALSE - TRUE - BY - FROM - IMPORT - EXPORT - QUALIFIED - RETURN - NEWPROCESS - TRANSFER - IOTRANSFER - FOREIGN - - - INTEGER - CARDINAL - SHORTINT - SHORTCARD - LONGINT - LONGREAL - CHAR - BOOLEAN - POINTER - ADDRESS - ADR - REAL - File - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + ??? + + + + + + AND + ARRAY + BEGIN + BY + CASE + CONST + DEFINITION + DIV + DO + ELSE + ELSIF + END + EXIT + FOR + FROM + IF + IMPLEMENTATION + IMPORT + IN + LOOP + MOD + MODULE + NOT + OF + OR + POINTER + PROCEDURE + RECORD + REPEAT + RETURN + SET + THEN + TO + TYPE + UNTIL + VAR + WHILE + + + + + FALSE + NIL + TRUE + + + + + BOOLEAN + CARDINAL + CHAR + INTEGER + LONGREAL + REAL + + + + + ABS + CHR + MAX + MIN + ODD + ORD + + + + + + ADDRESS + WORD + + ADR + + + + + + + + + InOut + MathLib0 + + + + + + + EXCEPT + FINALLY + PACKEDSET + REM + RETRY + + + + + INTERRUPTIBLE + UNINTERRUPTIBLE + + + + + + PROTECTION + + + + + CMPLX + IM + LFLOAT + RE + + + + + + BITSPERLOC + BITSPERWORD + + LOC + + ADDADR + DIFADR + MAKEADR + ROTATE + SHIFT + SUBADR + + + + + IOConsts + IOLink + IOResult + LongIO + WholeIO + RawIO + SIOResult + SLongIO + SWholeIO + SRealIO + SRawIO + ConvTypes + RealStr + WholeStr + WholeConv + + + + + + ALIAS + ARGLIST + BLUEPRINT + COPY + GENLIB + OPAQUE + READ + REFERENTIAL + RELEASE + RETAIN + WRITE + YIELD + + + + + + OCTET + UNICHAR + + + + + APPEND + CAPACITY + COUNT + INSERT + LOG2 + POW2 + PRED + PTR + REMOVE + SGN + SUCC + + + + + TLIMIT + TMAX + TMIN + + + + + + UNSAFE + + LONGWORD + OCTETSEQ + + BIT + BWAND + BWNOT + BWOR + SETBIT + SHL + SHR + + + + + PervasiveIO + UnsafeIO + + + + + + AND + ARRAY + BEGIN + BY + CASE + CONST + DEFINITION + DIV + DO + ELSE + ELSIF + END + EXIT + EXPORT + FOR + FROM + IF + IMPLEMENTATION + IMPORT + IN + LOOP + MOD + MODULE + NOT + OF + OR + POINTER + PROCEDURE + QUALIFIED + RECORD + REPEAT + RETURN + SET + THEN + TO + TYPE + UNTIL + VAR + WHILE + WITH + + + + + FALSE + NIL + TRUE + + + + + BOOLEAN + BITSET + CARDINAL + CHAR + INTEGER + LONGINT + LONGREAL + PROC + REAL + + + + + ABS + CAP + CHR + DEC + EXCL + FLOAT + HALT + HIGH + INC + INCL + MAX + MIN + ODD + ORD + SIZE + TRUNC + VAL + + + + + NEW + + ALLOCATE + DISPOSE + + DEALLOCATE + + + + + + SYSTEM + + ADDRESS + PROCESS + WORD + + ADR + NEWPROCESS + TRANSFER + TSIZE + + + + + + AND + ARRAY + BEGIN + BY + CASE + CONST + DEFINITION + DIV + DO + ELSE + ELSIF + END + EXIT + EXCEPT + EXPORT + FINALLY + FOR + FORWARD + FROM + IF + IMPLEMENTATION + IMPORT + IN + LOOP + MOD + MODULE + NOT + OF + OR + PACKEDSET + POINTER + PROCEDURE + QUALIFIED + RECORD + REM + REPEAT + RETRY + RETURN + SET + THEN + TO + TYPE + UNTIL + VAR + WHILE + WITH + + + + + FALSE + INTERRUPTIBLE + NIL + TRUE + UNINTERRUPTIBLE + + + + + BOOLEAN + BITSET + CARDINAL + COMPLEX + CHAR + INTEGER + LONGCOMPLEX + LONGREAL + PROC + PROTECTION + REAL + + + + + ABS + CAP + CHR + CMPLX + DEC + EXCL + FLOAT + HALT + HIGH + IM + INC + INCL + INT + LENGTH + LFLOAT + MAX + MIN + ODD + ORD + RE + SIZE + TRUNC + VAL + + + + + NEW + + ALLOCATE + DISPOSE + + DEALLOCATE + + + + + + SYSTEM + + BITSPERLOC + BITSPERWORD + + ADDRESS + LOC + WORD + + ADDADR + ADR + CAST + DIFADR + MAKEADR + ROTATE + SHIFT + SUBADR + TSIZE + + + + + + ALIAS + AND + ARGLIST + ARRAY + BEGIN + BLUEPRINT + BY + CASE + CONST + COPY + DEFINITION + DIV + DO + ELSE + ELSIF + END + EXIT + FOR + FROM + GENLIB + IF + IMPLEMENTATION + IMPORT + IN + LOOP + MOD + MODULE + NEW + NOT + OF + OPAQUE + OR + POINTER + PROCEDURE + READ + RECORD + REFERENTIAL + RELEASE + REPEAT + RETAIN + RETURN + SET + THEN + TO + TYPE + UNTIL + VAR + WHILE + WRITE + YIELD + + + + + FALSE + NIL + TRUE + + + + + BOOLEAN + CARDINAL + CHAR + INTEGER + LONGCARD + LONGINT + LONGREAL + OCTET + REAL + UNICHAR + + + + + ABS + APPEND + CAPACITY + CHR + COUNT + ENTIER + INSERT + LENGTH + LOG2 + MAX + MIN + ODD + ORD + POW2 + PRED + PTR + REMOVE + SGN + SUCC + + + + + TLIMIT + TMAX + TMIN + TSIZE + + + + + + CAST + + UNSAFE + + BitsPerAddress + BitsPerByte + BytesPerWord + BytesPerLongWord + + ADDRESS + BYTE + LONGWORD + OCTETSEQ + WORD + + ADD + ADR + BIT + BWAND + BWNOT + BWOR + HALT + SETBIT + SHL + SHR + SUB + + NOP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/objectivec.xml b/xml/objectivec.xml --- a/xml/objectivec.xml +++ b/xml/objectivec.xml @@ -1,6 +1,6 @@ - + break @@ -57,21 +57,10 @@ - - - + - - - - - - - - - - + @@ -79,6 +68,19 @@ + + + + + + + + + + + + + diff --git a/xml/objectivecpp.xml b/xml/objectivecpp.xml --- a/xml/objectivecpp.xml +++ b/xml/objectivecpp.xml @@ -1,6 +1,6 @@ - + break @@ -173,21 +173,10 @@ - - - + - - - - - - - - - - + @@ -203,6 +192,19 @@ + + + + + + + + + + + + + diff --git a/xml/opencl.xml b/xml/opencl.xml --- a/xml/opencl.xml +++ b/xml/opencl.xml @@ -1,7 +1,7 @@ - - - + - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/xml/perl.xml b/xml/perl.xml --- a/xml/perl.xml +++ b/xml/perl.xml @@ -39,7 +39,7 @@ Enhance tr/// and y/// support. --> - + if @@ -358,13 +358,14 @@ - + + - + @@ -423,9 +424,17 @@ - + + + + + + + + + - + @@ -517,6 +526,8 @@ + + @@ -532,17 +543,27 @@ + + + + + + + - + + + + @@ -605,15 +626,27 @@ + + + + + + + + + + + + @@ -622,8 +655,15 @@ + + + + + + + - + @@ -664,31 +704,36 @@ + + + - - + - + + + + + - - - + + diff --git a/xml/powershell.xml b/xml/powershell.xml --- a/xml/powershell.xml +++ b/xml/powershell.xml @@ -1,13 +1,13 @@ + license="MIT"> Begin diff --git a/xml/prolog.xml b/xml/prolog.xml --- a/xml/prolog.xml +++ b/xml/prolog.xml @@ -105,7 +105,7 @@ ]> - + - + - + @@ -777,7 +777,7 @@ - + @@ -785,7 +785,7 @@ - + diff --git a/xml/python.xml b/xml/python.xml --- a/xml/python.xml +++ b/xml/python.xml @@ -14,7 +14,7 @@ - + import @@ -346,9 +346,7 @@ - - - + @@ -368,6 +366,10 @@ + + + + @@ -446,26 +448,27 @@ + - + - + - + - + - + - + - + @@ -678,7 +681,6 @@ - diff --git a/xml/r.xml b/xml/r.xml --- a/xml/r.xml +++ b/xml/r.xml @@ -56,7 +56,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -104,8 +104,8 @@ - - + + diff --git a/xml/rest.xml b/xml/rest.xml --- a/xml/rest.xml +++ b/xml/rest.xml @@ -11,7 +11,7 @@ Copyright 2010 Matt Williams (matt@milliams.com) Copyright 2014 Matthew Woehlke (mw_triad@users.sourceforge.net) --> - + @@ -23,7 +23,7 @@ - + @@ -36,8 +36,7 @@ - - + diff --git a/xml/rhtml.xml b/xml/rhtml.xml --- a/xml/rhtml.xml +++ b/xml/rhtml.xml @@ -44,7 +44,7 @@ --> - + @@ -333,7 +333,7 @@ - + @@ -550,16 +550,17 @@ - + + - - - + + + - - - - + + + + @@ -583,8 +584,7 @@ - - + @@ -620,7 +620,7 @@ - + @@ -629,11 +629,11 @@ - + - + @@ -653,13 +653,14 @@ - + + - - + + @@ -668,14 +669,14 @@ - - + + - - + + @@ -687,7 +688,7 @@ - + @@ -782,34 +783,34 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -818,10 +819,14 @@ be careful to make this the last GDL ruleset, because the rule for the short form %?foo? will otherwise catch any of the other formats --> - - - - + + + + + + + + diff --git a/xml/ruby.xml b/xml/ruby.xml --- a/xml/ruby.xml +++ b/xml/ruby.xml @@ -31,7 +31,7 @@ - + @@ -287,7 +287,7 @@ - + @@ -364,22 +364,22 @@ - - + + - - + + - - + + @@ -391,7 +391,7 @@ - + @@ -473,42 +473,42 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -517,10 +517,14 @@ be careful to make this the last GDL ruleset, because the rule for the short form %?foo? will otherwise catch any of the other formats --> - - - - + + + + + + + + @@ -650,7 +654,7 @@ - + diff --git a/xml/rust.xml b/xml/rust.xml --- a/xml/rust.xml +++ b/xml/rust.xml @@ -28,13 +28,12 @@ --> - - + + + + ]> - + fn @@ -52,6 +51,7 @@ const continue crate + default do else enum @@ -85,6 +85,7 @@ trait type typeof + union unsafe unsized use @@ -94,6 +95,9 @@ yield + + AsMut + AsRef AsSlice CharExt Clone @@ -106,13 +110,16 @@ Drop Encodable Eq - Default + ExactSizeIterator Extend Fn FnMut FnOnce + From FromPrimitive Hash + Into + IntoIterator Iterator IteratorExt MutPtrExt @@ -121,6 +128,8 @@ PartialOrd PtrExt Rand + RustcDecodable + RustcEncodable Send Sized SliceConcatExt @@ -128,25 +137,25 @@ Str StrExt Sync + ToOwned ToString bool - int isize - uint usize i8 i16 i32 i64 + i128 u8 u16 u32 u64 + u128 f32 f64 - float char str Option @@ -155,6 +164,8 @@ Box Vec String + Path + PathBuf c_float @@ -261,11 +272,9 @@ - - - - - + + + @@ -273,10 +282,10 @@ - - - + + + @@ -300,31 +309,30 @@ - + - + + - - - - - - - - - + + + + + + + - - - - - + + + + + @@ -343,7 +351,7 @@ - + diff --git a/xml/scala.xml b/xml/scala.xml --- a/xml/scala.xml +++ b/xml/scala.xml @@ -1,6 +1,6 @@ - - + + + BEGIN + CASE + DO + ELSE + ELSEIF + END + FOR + IF + LOOP + RETURN + THEN + WHEN + WHILE + + + AND + BETWEEN + IN + IS + LIKE + NOT + OR + ACCESS ADD ALL ALTER ANALYZE - AND AS ASC AUTO_INCREMENT BDB BERKELEYDB - BETWEEN BOTH BY CASCADE - CASE CHANGE @@ -43,6 +64,7 @@ DAY_MINUTE DAY_SECOND DEC + DECLARE DEFAULT DELAYED DELETE @@ -51,13 +73,11 @@ DISTINCT DISTINCTROW DROP - ELSE ENCLOSED ESCAPED EXISTS EXPLAIN FIELDS - FOR FOREIGN FROM FULLTEXT @@ -66,9 +86,7 @@ GROUP HAVING HIGH_PRIORITY - IF IGNORE - IN INDEX INFILE INNER @@ -76,14 +94,12 @@ INSERT INTERVAL INTO - IS JOIN KEY KEYS KILL LEADING LEFT - LIKE LIMIT LINES LOAD @@ -94,14 +110,12 @@ MRG_MYISAM NATIONAL NATURAL - NOT NULL NUMERIC ON OPTIMIZE OPTION OPTIONALLY - OR ORDER OUTER OUTFILE @@ -136,7 +150,6 @@ TABLE TABLES TERMINATED - THEN TO TRAILING TRUNCATE @@ -152,35 +165,13 @@ USING VALUES VARYING - WHEN - WHERE - WHILE WITH + WHERE WRITE XOR YEAR_MONTH ZEROFILL - - + - - - * - / - || - = - != - <> - < - <= - > - >= - ~= - ^= - := - => - ** - .. - ASCII @@ -189,6 +180,7 @@ CHAR CHARACTER_LENGTH CHAR_LENGTH + COALESCE CONCAT CONCAT_WS CONV @@ -391,14 +383,26 @@ + + - + - + + + + + + + + + + + @@ -414,8 +418,6 @@ - - @@ -452,7 +454,9 @@ - + + + @@ -471,7 +475,7 @@ - + diff --git a/xml/sql-postgresql.xml b/xml/sql-postgresql.xml --- a/xml/sql-postgresql.xml +++ b/xml/sql-postgresql.xml @@ -3,24 +3,55 @@ - + + + BEGIN + CASE + ELSE + ELSIF + END + EXCEPTION + FOR + IF + LOOP + RETURN + THEN + WHEN + + + AND + BETWEEN + IN + IS + LIKE + NOT + OR + + A ABORT + ABSENT + ABSOLUTE ACCESS + ACCORDING ACTION + ADA ADD ADMIN AFTER AGGREGATE - ALIAS ALL ALLOCATE + ALSO ALTER - ANALYSE + ALWAYS ANALYZE ANY ARE + ARRAY + ARRAY_AGG + ARRAY_MAX_CARDINALITY AS ASC ASENSITIVE @@ -30,12 +61,19 @@ AT ATOMIC ATTACH + ATTRIBUTE + ATTRIBUTES AUTHORIZATION BACKWARD + BASE64 BEFORE - BEGIN - BETWEEN + BEGIN_FRAME + BEGIN_PARTITION + BERNOULLI BINARY + BLOB + BLOCKED + BOM BOTH BREADTH BY @@ -46,90 +84,106 @@ CARDINALITY CASCADE CASCADED - CASE CAST CATALOG CATALOG_NAME CHAIN CHARACTERISTICS - CHARACTER_LENGTH + CHARACTERS CHARACTER_SET_CATALOG CHARACTER_SET_NAME CHARACTER_SET_SCHEMA - CHAR_LENGTH CHECK - CHECKED CHECKPOINT CLASS CLASS_ORIGIN CLOB CLOSE CLUSTER - COALESCE COBOL COLLATE COLLATION COLLATION_CATALOG COLLATION_NAME COLLATION_SCHEMA + COLLECT COLUMN + COLUMNS COLUMN_NAME COMMAND_FUNCTION COMMAND_FUNCTION_CODE COMMENT + COMMENTS COMMIT COMMITTED - COMPLETION + CONCURRENTLY + CONDITION CONDITION_NUMBER + CONFIGURATION + CONFLICT CONNECT CONNECTION CONNECTION_NAME - CONSTRAINTS CONSTRAINT + CONSTRAINTS CONSTRAINT_CATALOG CONSTRAINT_NAME CONSTRAINT_SCHEMA CONSTRUCTOR CONTAINS + CONTENT CONTINUE - CONVERT + CONTROL + CONVERSION COPY + CORR CORRESPONDING - COUNT + COST + COVAR_POP + COVAR_SAMP CREATE - CREATEDB - CREATEUSER CROSS + CSV CUBE + CUME_DIST CURRENT + CURRENT_CATALOG CURRENT_DATE + CURRENT_DEFAULT_TRANSFORM_GROUP CURRENT_PATH CURRENT_ROLE + CURRENT_ROW CURRENT_TIME CURRENT_TIMESTAMP - CURRENT_USER + CURRENT_TRANSFORM_GROUP_FOR_TYPE CURSOR CURSOR_NAME CYCLE DATA DATABASE - DATE + DATALINK DATETIME_INTERVAL_CODE DATETIME_INTERVAL_PRECISION DAY + DB DEALLOCATE DEC - DECIMAL DECLARE DEFAULT + DEFAULTS DEFERRABLE DEFERRED DEFINED DEFINER + DEGREE DELETE + DELIMITER DELIMITERS + DENSE_RANK + DEPENDS DEPTH DEREF + DERIVED DESC DESCRIBE DESCRIPTOR @@ -139,49 +193,78 @@ DETERMINISTIC DIAGNOSTICS DICTIONARY + DISABLE + DISCARD DISCONNECT DISPATCH DISTINCT + DLNEWCOPY + DLPREVIOUSCOPY + DLURLCOMPLETE + DLURLCOMPLETEONLY + DLURLCOMPLETEWRITE + DLURLPATH + DLURLPATHONLY + DLURLPATHWRITE + DLURLSCHEME + DLURLSERVER + DLVALUE DO + DOCUMENT DOMAIN - DOUBLE DROP DYNAMIC DYNAMIC_FUNCTION DYNAMIC_FUNCTION_CODE EACH - ELSE + ELEMENT + EMPTY + ENABLE ENCODING ENCRYPTED - END END-EXEC + END_FRAME + END_PARTITION + ENFORCED + ENUM EQUALS ESCAPE - EVERY + EVENT EXCEPT - EXCEPTION + EXCLUDE + EXCLUDING EXCLUSIVE EXEC EXECUTE - EXISTING EXISTS EXPLAIN + EXPRESSION + EXTENSION EXTERNAL FALSE FETCH + FILE + FILTER FINAL FIRST - FOR + FIRST_VALUE + FLAG + FLOAT + FOLLOWING FORCE FOREIGN FORTRAN FORWARD FOUND + FRAME_ROW FREE FREEZE FROM + FS FULL FUNCTION + FUNCTIONS + FUSION G GENERAL GENERATED @@ -191,28 +274,37 @@ GOTO GRANT GRANTED + GREATEST GROUP GROUPING + GROUPS HANDLER HAVING + HEADER + HEX HIERARCHY HOLD - HOST HOUR + ID IDENTITY IGNORE ILIKE IMMEDIATE + IMMEDIATELY IMMUTABLE IMPLEMENTATION - IN + IMPLICIT + IMPORT + INCLUDING INCREMENT + INDENT INDEX + INDEXES INDICATOR - INFIX + INHERIT INHERITS - INITIALIZE INITIALLY + INLINE INNER INOUT INPUT @@ -221,31 +313,35 @@ INSTANCE INSTANTIABLE INSTEAD + INTEGRITY INTERSECT - INTERVAL + INTERSECTION INTO INVOKER - IS ISNULL ISOLATION - ITERATE JOIN K KEY KEY_MEMBER KEY_TYPE - LANCOMPILER + LABEL + LAG LANGUAGE LARGE LAST + LAST_VALUE LATERAL + LEAD LEADING + LEAKPROOF + LEAST LEFT - LENGTH - LESS LEVEL - LIKE + LIBRARY + LIKE_REGEX LIMIT + LINK LISTEN LOAD LOCAL @@ -254,49 +350,64 @@ LOCATION LOCATOR LOCK - LOWER + LOCKED + LOGGED M MAP + MAPPING MATCH - MAX + MATCHED + MATERIALIZED MAXVALUE + MAX_CARDINALITY + MEMBER + MERGE MESSAGE_LENGTH MESSAGE_OCTET_LENGTH MESSAGE_TEXT METHOD - MIN MINUTE MINVALUE - MOD MODE MODIFIES - MODIFY MODULE MONTH MORE MOVE + MULTISET MUMPS NAME NAMES + NAMESPACE NATIONAL NATURAL + NCHAR + NCLOB + NESTING NEW NEXT + NFC + NFD + NFKC + NFKD + NIL NO - NOCREATEDB - NOCREATEUSER NONE - NOT + NORMALIZE + NORMALIZED NOTHING NOTIFY NOTNULL + NOWAIT + NTH_VALUE + NTILE NULL NULLABLE - NULLIF + NULLS NUMBER - NUMERIC OBJECT - OCTET_LENGTH + OCCURRENCES_REGEX + OCTETS OF OFF OFFSET @@ -305,69 +416,105 @@ ON ONLY OPEN - OPERATION OPERATOR OPTION OPTIONS ORDER + ORDERING ORDINALITY + OTHERS OUT OUTER OUTPUT OVER OVERLAPS - OVERLAY OVERRIDING + OWNED OWNER + P PAD + PARALLEL PARAMETER - PARAMETERS PARAMETER_MODE PARAMETER_NAME PARAMETER_ORDINAL_POSITION PARAMETER_SPECIFIC_CATALOG PARAMETER_SPECIFIC_NAME PARAMETER_SPECIFIC_SCHEMA + PARSER PARTIAL PARTITION PASCAL + PASSING + PASSTHROUGH PASSWORD - PATH - PENDANT + PERCENT + PERCENTILE_CONT + PERCENTILE_DISC + PERCENT_RANK + PERIOD + PERMISSION + PLACING + PLANS PLI - POSITION - POSTFIX + POLICY + PORTION + POSITION_REGEX + PRECEDES + PRECEDING PRECISION - PREFIX - PREORDER PREPARE + PREPARED PRESERVE PRIMARY PRIOR PRIVILEGES PROCEDURAL PROCEDURE + PROGRAM PUBLIC RANGE + PUBLICATION + QUOTE + RANGE + RANK READ READS - REAL + REASSIGN + RECHECK + RECOVERY RECURSIVE REF REFERENCES REFERENCING + REFRESH + REGR_AVGX + REGR_AVGY + REGR_COUNT + REGR_INTERCEPT + REGR_R2 + REGR_SLOPE + REGR_SXX + REGR_SXY + REGR_SYY REINDEX RELATIVE + RELEASE RENAME REPEATABLE - REPLACE + REPLICA + REQUIRING RESET + RESPECT + RESTART + RESTORE RESTRICT RESULT - RETURN + RETURNED_CARDINALITY RETURNED_LENGTH RETURNED_OCTET_LENGTH RETURNED_SQLSTATE + RETURNING RETURNS REVOKE RIGHT @@ -381,25 +528,32 @@ ROW ROWS ROW_COUNT + ROW_NUMBER RULE SAVEPOINT SCALE SCHEMA + SCHEMAS SCHEMA_NAME SCOPE + SCOPE_CATALOG + SCOPE_NAME + SCOPE_SCHEMA SCROLL SEARCH SECOND SECTION SECURITY SELECT + SELECTIVE SELF SENSITIVE SEQUENCE + SEQUENCES SERIALIZABLE + SERVER SERVER_NAME SESSION - SESSION_USER SET SETOF SETS @@ -408,6 +562,8 @@ SIMILAR SIMPLE SIZE + SKIP + SNAPSHOT SOME SOURCE SPACE @@ -421,35 +577,46 @@ SQLSTATE SQLWARNING STABLE + STANDALONE START STATE STATEMENT STATIC STATISTICS + STDDEV_POP + STDDEV_SAMP STDIN STDOUT + STORAGE + STRICT + STRIP STRUCTURE STYLE SUBCLASS_ORIGIN - SUBLIST - SUBSTRING - SUM + SUBMULTISET + SUBSCRIPTION + SUBSTRING_REGEX + SUCCEEDS SYMMETRIC SYSID SYSTEM + SYSTEM_TIME SYSTEM_USER + T TABLE + TABLES + TABLESAMPLE + TABLESPACE TABLE_NAME TEMP TEMPLATE TEMPORARY - TERMINATE - THAN - THEN + TIES TIMEZONE_HOUR TIMEZONE_MINUTE TO - TOAST + TOKEN + TOP_LEVEL_COUNT TRAILING TRANSACTION TRANSACTIONS_COMMITTED @@ -457,119 +624,102 @@ TRANSACTION_ACTIVE TRANSFORM TRANSFORMS - TRANSLATE + TRANSLATE_REGEX TRANSLATION TREAT TRIGGER TRIGGER_CATALOG TRIGGER_NAME TRIGGER_SCHEMA - TRIM + TRIM_ARRAY TRUE TRUNCATE TRUSTED TYPE + TYPES + UESCAPE + UNBOUNDED UNCOMMITTED UNDER UNENCRYPTED UNION UNIQUE UNKNOWN + UNLINK UNLISTEN + UNLOGGED UNNAMED UNNEST UNTIL + UNTYPED UPDATE - UPPER + URI USAGE USER USER_DEFINED_TYPE_CATALOG + USER_DEFINED_TYPE_CODE USER_DEFINED_TYPE_NAME USER_DEFINED_TYPE_SCHEMA USING VACUUM VALID + VALIDATE + VALIDATOR VALUE VALUES - VARIABLE + VALUE_OF + VARBINARY + VARIADIC VARYING + VAR_POP + VAR_SAMP VERBOSE - VERSION + VERSIONING VIEW + VIEWS VOLATILE - WHEN WHENEVER WHERE - WHILE + WHITESPACE + WINDOW WITH + WITHIN WITHOUT WORK + WRAPPER WRITE + XMLAGG + XMLATTRIBUTES + XMLBINARY + XMLCAST + XMLCOMMENT + XMLCONCAT + XMLDECLARATION + XMLDOCUMENT + XMLELEMENT + XMLEXISTS + XMLFOREST + XMLITERATE + XMLNAMESPACES + XMLPARSE + XMLPI + XMLQUERY + XMLROOT + XMLSCHEMA + XMLSERIALIZE + XMLTABLE + XMLTEXT + XMLVALIDATE YEAR + YES ZONE - - + - - - * - / - || - |/ - ||/ - ! - !! - @ - & - | - # - << - >> - % - ^ - = - != - <> - < - <= - > - >= - ~ - ~* - !~ - !~* - ^= - := - => - ** - .. - AND - OR - NOT - - ## - && - &< - &> - <-> - <^ - >^ - ?# - ?- - ?-| - @-@ - ?| - ?|| - @@ - ~= - - <<= - >>= - ABS CBRT CEIL + CEILING DEGREES EXP FLOOR @@ -578,12 +728,15 @@ MOD PI POW + POWER RADIANS RANDOM ROUND + SETSEED SIGN SQRT TRUNC + WIDTH_BUCKET ACOS ASIN @@ -597,9 +750,14 @@ BIT_LENGTH CHAR_LENGTH CHARACTER_LENGTH + CONVERT + GET_BYTE + GET_BIT LOWER OCTET_LENGTH + OVERLAY POSITION + SET_BIT SUBSTRING TRIM UPPER @@ -607,21 +765,27 @@ ASCII BTRIM CHR - CONVERT + DECODE + ENCODE INITCAP LENGTH LPAD LTRIM + MD5 PG_CLIENT_ENCODING + QUOTE_IDENT + QUOTE_LITERAL + REGEXP_REPLACE REPEAT + REPLACE RPAD RTRIM + SPLIT_PART STRPOS SUBSTR TO_ASCII + TO_HEX TRANSLATE - ENCODE - DECODE TO_CHAR TO_DATE @@ -633,20 +797,20 @@ DATE_TRUNC EXTRACT ISFINITE + JUSTIFY_HOURS + JUSTIFY_DAYS NOW TIMEOFDAY TIMESTAMP - EXTRACT AREA - BOX CENTER DIAMETER HEIGHT ISCLOSED ISOPEN + NPOINTS PCLOSE - NPOINT POPEN RADIUS WIDTH @@ -657,37 +821,111 @@ PATH POINT POLYGON + + ARRAY_CAT + ARRAY_APPEND + ARRAY_PREPEND + ARRAY_DIMS + ARRAY_LOWER + ARRAY_UPPER + ARRAY_TO_STRING + STRING_TO_ARRAY BROADCAST HOST MASKLEN SET_MASKLEN NETMASK + HOSTMASK NETWORK + TEXT ABBREV + FAMILY NEXTVAL CURRVAL + LASTVAL SETVAL COALESCE NULLIF - - HAS_TABLE_PRIVILEGE - PG_GET_VIEWDEF - PG_GET_RULEDEF - PG_GET_INDEXDEF - PG_GET_USERBYID - OBJ_DESCRIPTION - COL_DESCRIPTION AVG + BIT_AND + BIT_OR + BOOL_AND + BOOL_OR COUNT + EVERY MAX MIN STDDEV SUM VARIANCE + + GENERATE_SERIES + + CURRENT_DATABASE + CURRENT_SCHEMA + CURRENT_SCHEMAS + CURRENT_USER + INET_CLIENT_ADDR + INET_CLIENT_PORT + INET_SERVER_ADDR + INET_SERVER_PORT + SESSION_USER + PG_POSTMASTER_START_TIME + VERSION + + HAS_TABLE_PRIVILEGE + HAS_DATABASE_PRIVILEGE + HAS_FUNCTION_PRIVILEGE + HAS_LANGUAGE_PRIVILEGE + PG_HAS_ROLE + HAS_SCHEMA_PRIVILEGE + HAS_TABLESPACE_PRIVILEGE + + PG_TABLE_IS_VISIBLE + PG_TYPE_IS_VISIBLE + PG_FUNCTION_IS_VISIBLE + PG_OPERATOR_IS_VISIBLE + PG_OPCLASS_IS_VISIBLE + PG_CONVERSION_IS_VISIBLE + + FORMAT_TYPE + PG_GET_CONSTRAINTDEF + PG_GET_EXPR + PG_GET_INDEXDEF + PG_GET_RULEDEF + PG_GET_SERIAL_SEQUENCE + PG_TABLESPACE_DATABASES + PG_GET_TRIGGERDEF + PG_GET_USERBYID + PG_GET_VIEWDEF + + OBJ_DESCRIPTION + COL_DESCRIPTION + + CURRENT_SETTING + SET_CONFIG + + PG_CANCEL_BACKEND + PG_RELOAD_CONF + PG_ROTATE_LOGFILE + + PG_START_BACKUP + PG_STOP_BACKUP + + PG_COLUMN_SIZE + PG_TABLESPACE_SIZE + PG_DATABASE_SIZE + PG_RELATION_SIZE + PG_TOTAL_RELATION_SIZE + PG_SIZE_PRETTY + + PG_LS_DIR + PG_READ_FILE + PG_STAT_FILE @@ -704,6 +942,7 @@ CIRCLE DATE DECIMAL + DOUBLE FLOAT4 FLOAT8 INET @@ -717,13 +956,12 @@ JSONB LINE LSEG - LZTEXT MACADDR MACADDR8 MONEY NUMERIC - OID PATH + PG_LSN POINT POLYGON REAL @@ -740,6 +978,7 @@ TIMETZ TSQUERY TSVECTOR + TXID_SNAPSHOT UUID VARBIT VARCHAR @@ -758,37 +997,38 @@ + - + + - - - - - - - - + - + + + + + + + - + - + @@ -807,19 +1047,21 @@ - - - - - - - + + + + + + + + + - + - - - + + + @@ -827,6 +1069,6 @@ - + diff --git a/xml/sql.xml b/xml/sql.xml --- a/xml/sql.xml +++ b/xml/sql.xml @@ -5,8 +5,31 @@ v3 fix comments by Gene Thomas --> - + + + BEGIN + CASE + ELSE + ELSIF + END + FOR + IF + LOOP + RETURN + THEN + WHEN + WHILE + + + AND + BETWEEN + IN + IS + LIKE + NOT + OR + ACCESS ACCOUNT @@ -22,7 +45,6 @@ ALTER ANALYZE ANCILLARY - AND ANY ARCHIVE ARCHIVELOG @@ -43,9 +65,7 @@ BACKUP BECOME BEFORE - BEGIN BEHALF - BETWEEN BINDING BITMAP BLOCK @@ -65,7 +85,6 @@ CALL CANCEL CASCADE - CASE CATEGORY CHAINED CHANGE @@ -80,7 +99,6 @@ CLOSE CLOSE_CACHED_OPEN_CURSORS CLUSTER - COALESCE COLUMN COLUMNS COLUMN_VALUE @@ -101,6 +119,7 @@ CONSTRAINT CONSTRAINTS CONTAINER + CONTAINS CONTENTS CONTEXT CONTINUE @@ -149,11 +168,8 @@ DROP DYNAMIC EACH - ELSE - ELSIF EMPTY ENABLE - END ENFORCE ENTRY ESCAPE @@ -185,7 +201,6 @@ FLASHBACK FLUSH FOLLOWING - FOR FORCE FOREIGN FREELIST @@ -214,9 +229,7 @@ IDENTIFIER IDGENERATORS IDLE_TIME - IF IMMEDIATE - IN INCLUDING INCREMENT INCREMENTAL @@ -239,7 +252,6 @@ INTERSECT INTO INVALIDATE - IS ISOLATION ISOLATION_LEVEL JAVA @@ -254,7 +266,6 @@ LESS LEVEL LIBRARY - LIKE LIMIT LINK LIST @@ -268,7 +279,6 @@ LOGICAL_READS_PER_SESSION LOGOFF LOGON - LOOP MANAGE MANAGED MANAGEMENT @@ -345,7 +355,6 @@ NORMAL NOSEGMENT NOSORT - NOT NOTHING NOVALIDATE NOWAIT @@ -368,7 +377,6 @@ OPTIMAL OPTIMIZER_GOAL OPTION - OR ORDER ORGANIZATION OUT @@ -538,7 +546,6 @@ TEMPORARY THAN THE - THEN THREAD THROUGH TIMEOUT @@ -584,35 +591,13 @@ VALIDATION VALUES VIEW - WHEN WHENEVER WHERE - WHILE WITH WITHOUT WORK WRITE - - + - - - * - / - || - = - != - <> - < - <= - > - >= - ~= - ^= - := - => - ** - .. - ABS ACOS @@ -894,8 +879,18 @@ + - + + + + + + + + + + @@ -911,7 +906,6 @@ - @@ -932,21 +926,23 @@ - - - - - - - - + + + + + + + + + + - + - - - - + + + + @@ -954,6 +950,6 @@ - + diff --git a/xml/tcl.xml b/xml/tcl.xml --- a/xml/tcl.xml +++ b/xml/tcl.xml @@ -28,7 +28,7 @@ - Fixed detection of varaibles with names containing serval namespace delimiters (::) --> - + after @@ -511,8 +511,8 @@ - - + + diff --git a/xml/vhdl.xml b/xml/vhdl.xml --- a/xml/vhdl.xml +++ b/xml/vhdl.xml @@ -8,7 +8,7 @@ ]> - + file @@ -508,10 +508,8 @@ - - + @@ -536,8 +534,8 @@ String="&bos;end(\s+(entity|component))?(\s+%1)?\s*;"/> - - + + diff --git a/xml/xml.xml b/xml/xml.xml --- a/xml/xml.xml +++ b/xml/xml.xml @@ -6,7 +6,7 @@ ]> - + @@ -145,6 +145,5 @@ - diff --git a/xml/xul.xml b/xml/xul.xml --- a/xml/xul.xml +++ b/xml/xul.xml @@ -4,7 +4,7 @@ ]> - + @@ -619,7 +619,6 @@ - diff --git a/xml/yaml.xml b/xml/yaml.xml --- a/xml/yaml.xml +++ b/xml/yaml.xml @@ -1,21 +1,55 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + +]> + - //--> + - + - + - - + + + + + @@ -23,26 +57,40 @@ - - - + + + + + + + - + + + + + + + + + - - + + + + @@ -55,120 +103,437 @@ - - - + + + + + + - + - + + + - + - + - + - - + + + - - - + + + + + + + + + + + - - + + + + + + + + + + + + + - - - + + + + + - - - - + + - + + + + + + - - - + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -186,7 +551,15 @@ + + + + + + + + diff --git a/xml/zsh.xml b/xml/zsh.xml --- a/xml/zsh.xml +++ b/xml/zsh.xml @@ -8,7 +8,7 @@ ]> - + @@ -598,7 +598,7 @@ - + @@ -642,7 +642,7 @@ - +