diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,37 @@ # Revision history for skylighting and skylighting-core +## 0.10.1 + + * Regex: handle `(?|)` modifier. This is used in bash.xml now. + It resets the numbers of capturing groups in alternatives. + + * Improve regex handling of `{` and `}` not in quantifiers: + - `{}` is literal (not a quantifier). + - loose unescaped `{` and `}` that are not part of a quantifier are + literal matchers. + + * Update xml syntax definitions from upstream. + For: abc, actionscript, ada, agda, alert, apache, asn1, asp, + ats, awk, bash, boo, c, clojure, cmake, coffee, coldfusion, + commonlisp, cs, css, curry, d, djangotemplate, dockerfile, + dot, doxygen, dtd, eiffel, elixir, elm, erlang, fasm, + fortran-fixed, fortran-free, fsharp, glsl, gnuassembler, go, + graphql, groovy, hamlet, haskell, haxe, html, idris, ini, + isocpp, j, java, javadoc, javascript, jsp, julia, kotlin, + latex, lex, lilypond, literate-curry, literate-haskell, + llvm, lua, m4, makefile, markdown, mathematica, matlab, + maxima, mediawiki, metafont, mips, modula-2, modula-3, + monobasic, mustache, nasm, nim, noweb, objectivec, + objectivecpp, ocaml, octave, opencl, pascal, perl, php, + pike, postscript, povray, powershell, prolog, protobuf, + pure, purebasic, python, r, relaxng, relaxngcompact, rest, + rhtml, roff, ruby, rust, scala, scheme, sci, sed, sgml, sml, + sql-mysql, sql-postgresql, sql, stata, tcl, tcsh, texinfo, + toml, verilog, vhdl, xml, xorg, xslt, xul, yacc, yaml, zsh. + Also added spdx-comments.xml and comments.xml, which are + needed for these. Closes #111 (latex bug in matrix). + + ## 0.10.0.3 * Add groovy syntax. 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.10.0.3 +version: 0.10.1 synopsis: syntax highlighting library description: Skylighting is a syntax highlighting library. It derives its tokenizers from XML syntax diff --git a/src/Regex/KDE/Compile.hs b/src/Regex/KDE/Compile.hs --- a/src/Regex/KDE/Compile.hs +++ b/src/Regex/KDE/Compile.hs @@ -1,4 +1,5 @@ {-# LANGUAGE CPP #-} +{-# LANGUAGE LambdaCase #-} {-# LANGUAGE BangPatterns #-} {-# LANGUAGE OverloadedStrings #-} module Regex.KDE.Compile @@ -57,9 +58,21 @@ pParenthesized :: Bool -> RParser Regex pParenthesized caseSensitive = (do _ <- lift (satisfy (== 40)) - modifier <- lift (satisfy (== 63) *> pGroupModifiers) - <|> (MatchCapture <$> (modify (+ 1) *> get)) - contents <- pRegex caseSensitive + -- pcrepattern says: A group that starts with (?| resets the capturing + -- parentheses numbers in each alternative. + resetCaptureNumbers <- option False (True <$ lift (string "?|")) + modifier <- if resetCaptureNumbers + then return id + else lift (satisfy (== 63) *> pGroupModifiers) + <|> (MatchCapture <$> (modify (+ 1) *> get)) + currentCaptureNumber <- get + contents <- option MatchNull $ + foldr MatchAlt + <$> (pAltPart caseSensitive) + <*> (many $ lift (char '|') *> + (((if resetCaptureNumbers + then put currentCaptureNumber + else return ()) >> pAltPart caseSensitive) <|> pure mempty)) _ <- lift (satisfy (== 41)) return $ modifier contents) <|> Recurse <$ (lift (string "(?R)" <|> string "(?0)")) @@ -84,12 +97,11 @@ maxn <- option Nothing $ char ',' *> (readMay . U.toString <$> A.takeWhile isDig) _ <- char '}' - return $! - case (minn, maxn) of - (Nothing, Nothing) -> atleast 0 re - (Just n, Nothing) -> atleast n re - (Nothing, Just n) -> atmost n re - (Just m, Just n) -> between m n re + case (minn, maxn) of + (Nothing, Nothing) -> mzero + (Just n, Nothing) -> return $! atleast n re + (Nothing, Just n) -> return $! atmost n re + (Just m, Just n) -> return $! between m n re _ -> fail "pSuffix encountered impossible byte") >>= pQuantifierModifier where atmost 0 _ = MatchNull @@ -242,7 +254,7 @@ isSpecial 63 = True -- '?' isSpecial 42 = True -- '*' isSpecial 43 = True -- '+' -isSpecial 123 = True -- '{' +-- isSpecial 123 = True -- '{' -- this is okay except in suffixes isSpecial 91 = True -- '[' isSpecial 93 = True -- ']' isSpecial 37 = True -- '%' diff --git a/test/test-skylighting.hs b/test/test-skylighting.hs --- a/test/test-skylighting.hs +++ b/test/test-skylighting.hs @@ -294,6 +294,12 @@ , ("\\w+?e", "aaaeeee", Just ("aaae", [])) , ("a+b??", "aaab", Just ("aaa", [])) , ("\\([a-z]+(?R)*\\)", "(aa(b(c)(d)))", Just ("(aa(b(c)(d)))", [])) + , ("a{}", "aaa", Nothing) + , ("a{}", "a{}", Just ("a{}", [])) + , ("a{3", "a{3", Just ("a{3", [])) + , ("(?|(abc)|(def))", "abc", Just ("abc", [(1,"abc")])) + , ("(?|(abc)|(def))", "def", Just ("def", [(1,"def")])) + , ("(?:(abc)|(def))", "def", Just ("def", [(2,"def")])) ] diff --git a/xml/abc.xml b/xml/abc.xml --- a/xml/abc.xml +++ b/xml/abc.xml @@ -2,7 +2,7 @@ - + @@ -39,8 +39,7 @@ - - + diff --git a/xml/actionscript.xml b/xml/actionscript.xml --- a/xml/actionscript.xml +++ b/xml/actionscript.xml @@ -1,6 +1,6 @@ - + @@ -300,13 +300,11 @@ - - + - - + diff --git a/xml/ada.xml b/xml/ada.xml --- a/xml/ada.xml +++ b/xml/ada.xml @@ -1,7 +1,7 @@ - - + diff --git a/xml/agda.xml b/xml/agda.xml --- a/xml/agda.xml +++ b/xml/agda.xml @@ -3,7 +3,7 @@ ]> - + abstract @@ -74,14 +74,12 @@ - - + - - + diff --git a/xml/alert.xml b/xml/alert.xml --- a/xml/alert.xml +++ b/xml/alert.xml @@ -1,6 +1,6 @@ - - - + diff --git a/xml/asp.xml b/xml/asp.xml --- a/xml/asp.xml +++ b/xml/asp.xml @@ -1,6 +1,6 @@ - + select @@ -293,8 +293,7 @@ - - + @@ -319,8 +318,7 @@ - - + @@ -361,12 +359,12 @@ - + - + diff --git a/xml/ats.xml b/xml/ats.xml --- a/xml/ats.xml +++ b/xml/ats.xml @@ -7,7 +7,7 @@ ]> - + abstype @@ -190,17 +190,14 @@ - - + - - + - - + diff --git a/xml/awk.xml b/xml/awk.xml --- a/xml/awk.xml +++ b/xml/awk.xml @@ -1,6 +1,6 @@ - @@ -182,8 +182,7 @@ - - + diff --git a/xml/bash.xml b/xml/bash.xml --- a/xml/bash.xml +++ b/xml/bash.xml @@ -1,1000 +1,1456 @@ - - - - - - -]> - - - - - - - else - for - function - in - select - until - while - elif - then - set - - - - : - source - alias - bg - bind - break - builtin - cd - caller - command - compgen - complete - continue - dirs - disown - echo - enable - eval - exec - exit - fc - fg - getopts - hash - help - history - jobs - kill - let - logout - popd - printf - pushd - pwd - return - set - shift - shopt - suspend - test - time - times - trap - type - ulimit - umask - unalias - wait - - - - export - unset - declare - typeset - local - read - readonly - - - - - arch - awk - bash - bunzip2 - bzcat - bzcmp - bzdiff - bzegrep - bzfgrep - bzgrep - bzip2 - bzip2recover - bzless - bzmore - cat - chattr - chgrp - chmod - chown - chvt - cp - date - dd - deallocvt - df - dir - dircolors - dmesg - dnsdomainname - domainname - du - dumpkeys - echo - ed - egrep - false - fgconsole - fgrep - fuser - gawk - getkeycodes - gocr - grep - groff - groups - gunzip - gzexe - gzip - hostname - igawk - install - kbd_mode - kbdrate - killall - last - lastb - link - ln - loadkeys - loadunimap - login - ls - lsattr - lsmod - lsmod.old - lzcat - lzcmp - lzdiff - lzegrep - lzfgrep - lzgrep - lzless - lzcat - lzma - lzmainfo - lzmore - mapscrn - mesg - mkdir - mkfifo - mknod - mktemp - more - mount - mv - nano - netstat - nisdomainname - nroff - openvt - pgawk - pidof - ping - ps - pstree - pwd - rbash - readlink - red - resizecons - rm - rmdir - run-parts - sash - sed - setfont - setkeycodes - setleds - setmetamode - setserial - sh - showkey - shred - sleep - ssed - stat - stty - su - sync - tar - tempfile - touch - troff - true - umount - uname - unicode_start - unicode_stop - unlink - unlzma - unxz - utmpdump - uuidgen - vdir - wall - wc - xz - xzcat - ypdomainname - zcat - zcmp - zdiff - zegrep - zfgrep - zforce - zgrep - zless - zmore - znew - zsh - - - aclocal - aconnect - aplay - apm - apmsleep - apropos - ar - arecord - as - as86 - autoconf - autoheader - automake - awk - basename - bc - bison - c++ - cal - cat - cc - cdda2wav - cdparanoia - cdrdao - cd-read - cdrecord - chfn - chgrp - chmod - chown - chroot - chsh - clear - cmp - co - col - comm - cp - cpio - cpp - cut - dc - dd - df - diff - diff3 - dir - dircolors - directomatic - dirname - du - env - expr - fbset - file - find - flex - flex++ - fmt - free - ftp - funzip - fuser - g++ - gawk - gc - gcc - clang - valgrind - xdg-open - cmake - qmake - svn - git - rsync - gdb - getent - getopt - gettext - gettextize - gimp - gimp-remote - gimptool - gmake - gs - head - hexdump - id - install - join - kill - killall - ld - ld86 - ldd - less - lex - ln - locate - lockfile - logname - lp - lpr - ls - lynx - m4 - make - man - mkdir - mknod - msgfmt - mv - namei - nasm - nawk - nice - nl - nm - nm86 - nmap - nohup - nop - od - passwd - patch - pcregrep - pcretest - perl - perror - pidof - pr - printf - procmail - prune - ps2ascii - ps2epsi - ps2frag - ps2pdf - ps2ps - psbook - psmerge - psnup - psresize - psselect - pstops - rcs - rev - rm - scp - sed - seq - setterm - shred - size - size86 - skill - slogin - snice - sort - sox - split - ssh - ssh-add - ssh-agent - ssh-keygen - ssh-keyscan - stat - strings - strip - sudo - suidperl - sum - tac - tail - tee - test - tr - uniq - unlink - unzip - updatedb - updmap - uptime - users - vmstat - w - wc - wget - whatis - whereis - which - who - whoami - write - xargs - yacc - yes - zip - zsoelim - - - dcop - kdialog - kfile - xhost - xmodmap - xset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + |&;])"> + + + |&;()"> + + + + + + + + + + + + + + + + + +]> + + + + + + + + case + continue + do + done + elif + else + esac + fi + for + function + if + in + return + select + then + until + while + + + + . + : + source + alias + bg + bind + break + builtin + cd + caller + command + compgen + complete + dirs + disown + echo + enable + eval + exec + exit + fc + fg + getopts + hash + help + history + jobs + kill + let + logout + popd + printf + pushd + pwd + set + shift + shopt + suspend + test + time + times + trap + type + ulimit + umask + unalias + wait + + + + export + unset + declare + typeset + local + read + readonly + + + + + arch + awk + bash + bunzip2 + bzcat + bzcmp + bzdiff + bzegrep + bzfgrep + bzgrep + bzip2 + bzip2recover + bzless + bzmore + cat + chattr + chgrp + chmod + chown + chvt + cp + date + dd + deallocvt + df + dir + dircolors + dmesg + dnsdomainname + domainname + du + dumpkeys + ed + egrep + false + fgconsole + fgrep + fuser + gawk + getkeycodes + gocr + grep + groff + groups + gunzip + gzexe + gzip + hostname + igawk + install + kbd_mode + kbdrate + killall + last + lastb + link + ln + loadkeys + loadunimap + login + ls + lsattr + lsmod + lsmod.old + lzcat + lzcmp + lzdiff + lzegrep + lzfgrep + lzgrep + lzless + lzma + lzmainfo + lzmore + mapscrn + mesg + mkdir + mkfifo + mknod + mktemp + more + mount + mv + nano + netstat + nisdomainname + nroff + openvt + pgawk + pidof + ping + ps + pstree + rbash + readlink + red + resizecons + rm + rmdir + run-parts + sash + sed + setfont + setkeycodes + setleds + setmetamode + setserial + sh + showkey + shred + sleep + ssed + stat + stty + su + sync + tar + tempfile + touch + troff + true + truncate + umount + uname + unicode_start + unicode_stop + unlink + unlzma + unxz + utmpdump + uuidgen + vdir + wall + wc + xz + xzcat + ypdomainname + zcat + zcmp + zdiff + zegrep + zfgrep + zforce + zgrep + zless + zmore + znew + zsh + + + aclocal + aconnect + aplay + apm + apmsleep + apropos + ar + arecord + as + as86 + autoconf + autoheader + automake + basename + bc + bison + c++ + cal + cc + cdda2wav + cdparanoia + cdrdao + cd-read + cdrecord + chfn + chroot + chsh + clear + cmp + co + col + comm + cpio + cpp + cut + dc + diff + diff3 + directomatic + dirname + env + expr + fbset + file + find + flex + flex++ + fmt + free + ftp + funzip + g++ + gc + gcc + clang + valgrind + xdg-open + cmake + qmake + svn + git + rsync + gdb + getent + getopt + gettext + gettextize + gimp + gimp-remote + gimptool + gmake + gs + head + hexdump + id + join + ld + ld86 + ldd + less + lex + locate + lockfile + logname + lp + lpr + lynx + m4 + make + man + msgfmt + namei + nasm + nawk + nice + nl + nm + nm86 + nmap + nohup + nop + od + passwd + patch + pcregrep + pcretest + perl + perror + pr + procmail + prune + ps2ascii + ps2epsi + ps2frag + ps2pdf + ps2ps + psbook + psmerge + psnup + psresize + psselect + pstops + rcs + rev + scp + seq + setterm + size + size86 + skill + slogin + snice + sort + sox + split + ssh + ssh-add + ssh-agent + ssh-keygen + ssh-keyscan + strings + strip + sudo + suidperl + sum + tac + tail + tee + tr + tsort + uniq + unzip + updatedb + updmap + uptime + users + vmstat + w + wget + whatis + whereis + which + who + whoami + write + xargs + yacc + yes + zip + zsoelim + + + dcop + kdialog + kfile + xhost + xmodmap + xset + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/boo.xml b/xml/boo.xml --- a/xml/boo.xml +++ b/xml/boo.xml @@ -2,7 +2,7 @@ - + import @@ -184,8 +184,8 @@ - - + + @@ -201,47 +201,46 @@ - + - - + + - + - + - + - + - - + @@ -273,8 +272,7 @@ - - + diff --git a/xml/c.xml b/xml/c.xml --- a/xml/c.xml +++ b/xml/c.xml @@ -10,7 +10,7 @@ ]> - - + - - + @@ -207,7 +205,7 @@ - + @@ -218,7 +216,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 @@ -741,14 +741,13 @@ - + - + - - + diff --git a/xml/cmake.xml b/xml/cmake.xml --- a/xml/cmake.xml +++ b/xml/cmake.xml @@ -16,7 +16,7 @@ CALL + CANCEL_CALL CODE + DEFER + DIRECTORY EVAL + GET_CALL + GET_CALL_IDS + ID + ID_VAR FATAL_ERROR @@ -199,6 +206,7 @@ COPYONLY ESCAPE_QUOTES NEWLINE_STYLE + NO_SOURCE_PERMISSIONS CRLF @@ -242,6 +250,7 @@ COMMAND COMMAND_ECHO + COMMAND_ERROR_IS_FATAL ECHO_ERROR_VARIABLE ECHO_OUTPUT_VARIABLE ENCODING @@ -261,7 +270,9 @@ ANSI + ANY AUTO + LAST NONE OEM STDERR @@ -273,6 +284,11 @@ APPEND ARCHIVE_CREATE ARCHIVE_EXTRACT + BASE_DIRECTORY + CHMOD + CHMOD_RECURSE + COMPRESSION + COMPRESSION_LEVEL CONDITION CONFIGURE CONFIGURE_DEPENDS @@ -328,6 +344,7 @@ PERMISSIONS READ READ_SYMLINK + REAL_PATH REGEX RELATIVE RELATIVE_PATH @@ -349,6 +366,7 @@ SIZE STATUS STRINGS + TARGET TIMEOUT TIMESTAMP TLS_CAINFO @@ -357,7 +375,6 @@ TOUCH_NOCREATE TO_CMAKE_PATH TO_NATIVE_PATH - TYPE UPLOAD USERPWD USE_SOURCE_PERMISSIONS @@ -662,6 +679,8 @@ NATIVE_COMMAND + PROGRAM + SEPARATE_ARGS UNIX_COMMAND WINDOWS_COMMAND @@ -704,13 +723,16 @@ CONCAT CONFIGURE EQUAL + ERROR_VARIABLE ESCAPE_QUOTES FIND GENEX_STRIP + GET GREATER GREATER_EQUAL HEX JOIN + JSON LENGTH LESS LESS_EQUAL @@ -718,6 +740,7 @@ MATCH MATCHALL MD5 + MEMBER NAME NAMESPACE NOTEQUAL @@ -725,9 +748,11 @@ RANDOM RANDOM_SEED REGEX + REMOVE REPEAT REPLACE REVERSE + SET SHA1 SHA224 SHA256 @@ -883,6 +908,7 @@ CUDA CXX Fortran + ISPC Java OBJC OBJCXX @@ -996,6 +1022,7 @@ CUDA CXX Fortran + ISPC Java NONE OBJC @@ -1347,6 +1374,7 @@ CMAKE_CACHE_MINOR_VERSION CMAKE_CACHE_PATCH_VERSION CMAKE_CFG_INTDIR + CMAKE_CLANG_VFS_OVERLAY CMAKE_CL_64 CMAKE_CODEBLOCKS_COMPILER_ID CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES @@ -1583,12 +1611,20 @@ CMAKE_NO_BUILTIN_CHRPATH CMAKE_NO_STD_NAMESPACE CMAKE_NO_SYSTEM_FROM_IMPORTED + CMAKE_OBJCXX_EXTENSIONS + CMAKE_OBJCXX_STANDARD + CMAKE_OBJCXX_STANDARD_REQUIRED + CMAKE_OBJC_EXTENSIONS + CMAKE_OBJC_STANDARD + CMAKE_OBJC_STANDARD_REQUIRED CMAKE_OBJECT_PATH_MAX + CMAKE_OPTIMIZE_DEPENDENCIES CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT CMAKE_PARENT_LIST_FILE CMAKE_PATCH_VERSION + CMAKE_PCH_INSTANTIATE_TEMPLATES CMAKE_PCH_WARN_INVALID CMAKE_PDB_OUTPUT_DIRECTORY CMAKE_POSITION_INDEPENDENT_CODE @@ -1689,12 +1725,15 @@ CMAKE_VS_SDK_REFERENCE_DIRECTORIES CMAKE_VS_SDK_SOURCE_DIRECTORIES CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION + CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM CMAKE_WARN_DEPRECATED CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_WIN32_EXECUTABLE CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS + CMAKE_XCODE_BUILD_SYSTEM CMAKE_XCODE_GENERATE_SCHEME CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY + CMAKE_XCODE_LINK_BUILD_PHASE_MODE CMAKE_XCODE_PLATFORM_TOOLSET CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN @@ -1782,6 +1821,7 @@ CPACK_DMG_SLA_LANGUAGES CPACK_DMG_VOLUME_NAME CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION + CPACK_EXTERNAL_BUILT_PACKAGES CPACK_EXTERNAL_ENABLE_STAGING CPACK_EXTERNAL_PACKAGE_SCRIPT CPACK_EXTERNAL_REQUESTED_VERSIONS @@ -1883,6 +1923,7 @@ CPACK_PACKAGE_DESCRIPTION_SUMMARY CPACK_PACKAGE_DIRECTORY CPACK_PACKAGE_EXECUTABLES + CPACK_PACKAGE_FILES CPACK_PACKAGE_FILE_NAME CPACK_PACKAGE_HOMEPAGE_URL CPACK_PACKAGE_ICON @@ -1897,6 +1938,8 @@ CPACK_PACKAGING_INSTALL_PREFIX CPACK_PKGBUILD_IDENTITY_NAME CPACK_PKGBUILD_KEYCHAIN_PATH + CPACK_POST_BUILD_SCRIPTS + CPACK_PRE_BUILD_SCRIPTS CPACK_PRODUCTBUILD_BACKGROUND CPACK_PRODUCTBUILD_BACKGROUND_ALIGNMENT CPACK_PRODUCTBUILD_BACKGROUND_DARKAQUA @@ -1989,6 +2032,7 @@ CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CPACK_WIX_CMAKE_PACKAGE_REGISTRY CPACK_WIX_CULTURES + CPACK_WIX_CUSTOM_XMLNS CPACK_WIX_EXTENSIONS CPACK_WIX_EXTRA_OBJECTS CPACK_WIX_EXTRA_SOURCES @@ -2452,10 +2496,18 @@ NAME NO_SONAME NO_SYSTEM_FROM_IMPORTED + OBJCXX_EXTENSIONS + OBJCXX_STANDARD + OBJCXX_STANDARD_REQUIRED + OBJC_EXTENSIONS + OBJC_STANDARD + OBJC_STANDARD_REQUIRED + OPTIMIZE_DEPENDENCIES OSX_ARCHITECTURES OSX_COMPATIBILITY_VERSION OSX_CURRENT_VERSION OUTPUT_NAME + PCH_INSTANTIATE_TEMPLATES PCH_WARN_INVALID PDB_NAME PDB_OUTPUT_DIRECTORY @@ -2528,6 +2580,7 @@ WINDOWS_EXPORT_ALL_SYMBOLS XCODE_EXPLICIT_FILE_TYPE XCODE_GENERATE_SCHEME + XCODE_LINK_BUILD_PHASE_MODE XCODE_PRODUCT_TYPE XCODE_SCHEME_ADDRESS_SANITIZER XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN @@ -3876,6 +3929,8 @@ + + @@ -4132,10 +4187,20 @@ - - - - + + + + + + + + + + + + + + @@ -4157,8 +4222,7 @@ - - + @@ -4170,8 +4234,7 @@ - - + @@ -4215,6 +4278,7 @@ + @@ -4238,7 +4302,7 @@ - + diff --git a/xml/coffee.xml b/xml/coffee.xml --- a/xml/coffee.xml +++ b/xml/coffee.xml @@ -2,7 +2,7 @@ - - + - - + @@ -268,7 +266,7 @@ - + diff --git a/xml/coldfusion.xml b/xml/coldfusion.xml --- a/xml/coldfusion.xml +++ b/xml/coldfusion.xml @@ -1,6 +1,6 @@ - + @@ -595,23 +595,21 @@ - - + - - + - + - + diff --git a/xml/comments.xml b/xml/comments.xml new file mode 100644 --- /dev/null +++ b/xml/comments.xml @@ -0,0 +1,27 @@ + + + + diff --git a/xml/commonlisp.xml b/xml/commonlisp.xml --- a/xml/commonlisp.xml +++ b/xml/commonlisp.xml @@ -1,6 +1,6 @@ - + < @@ -1133,8 +1133,7 @@ - - + @@ -1151,8 +1150,7 @@ - - + diff --git a/xml/cs.xml b/xml/cs.xml --- a/xml/cs.xml +++ b/xml/cs.xml @@ -1,5 +1,5 @@ - + abstract @@ -137,13 +137,11 @@ - - + - - + diff --git a/xml/css.xml b/xml/css.xml --- a/xml/css.xml +++ b/xml/css.xml @@ -38,7 +38,7 @@ --> - + @@ -822,6 +822,7 @@ static static-position status-bar + sticky thick thin ultra-condensed @@ -1584,8 +1585,7 @@ - - + diff --git a/xml/curry.xml b/xml/curry.xml --- a/xml/curry.xml +++ b/xml/curry.xml @@ -30,7 +30,7 @@ ]> - @@ -229,8 +229,7 @@ - - + @@ -238,8 +237,7 @@ - - + diff --git a/xml/d.xml b/xml/d.xml --- a/xml/d.xml +++ b/xml/d.xml @@ -99,7 +99,7 @@ ======================================================================== --> - + @@ -720,8 +720,8 @@ - - + + @@ -736,21 +736,18 @@ - - + - - + - - + @@ -766,7 +763,7 @@ - + @@ -777,7 +774,7 @@ - + diff --git a/xml/djangotemplate.xml b/xml/djangotemplate.xml --- a/xml/djangotemplate.xml +++ b/xml/djangotemplate.xml @@ -4,7 +4,7 @@ ]> - + - + ADD @@ -36,7 +36,7 @@ - + diff --git a/xml/dot.xml b/xml/dot.xml --- a/xml/dot.xml +++ b/xml/dot.xml @@ -1,7 +1,7 @@ - + @@ -134,15 +134,13 @@ - - + - - + diff --git a/xml/doxygen.xml b/xml/doxygen.xml --- a/xml/doxygen.xml +++ b/xml/doxygen.xml @@ -6,7 +6,7 @@ ]> - + @@ -239,7 +239,7 @@ - + @@ -335,7 +335,7 @@ - + @@ -354,7 +354,7 @@ - + @@ -382,16 +382,16 @@ - - + + - - + + @@ -401,7 +401,7 @@ - + @@ -409,8 +409,8 @@ - - + + @@ -498,7 +498,7 @@ - + @@ -514,7 +514,7 @@ - + @@ -532,8 +532,8 @@ - - + + @@ -549,7 +549,7 @@ - + @@ -594,7 +594,7 @@ - + diff --git a/xml/dtd.xml b/xml/dtd.xml --- a/xml/dtd.xml +++ b/xml/dtd.xml @@ -3,7 +3,7 @@ ]> - + @@ -45,8 +45,7 @@ - - + @@ -78,7 +77,7 @@ - + diff --git a/xml/eiffel.xml b/xml/eiffel.xml --- a/xml/eiffel.xml +++ b/xml/eiffel.xml @@ -10,7 +10,7 @@ Author of version 1.02: Sebastian Vuorinen --> - + agent @@ -99,8 +99,7 @@ - - + diff --git a/xml/elixir.xml b/xml/elixir.xml --- a/xml/elixir.xml +++ b/xml/elixir.xml @@ -24,13 +24,13 @@ + version="9"> catch @@ -127,7 +127,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -157,15 +157,15 @@ - - + + - - + + @@ -181,8 +181,7 @@ - - + diff --git a/xml/elm.xml b/xml/elm.xml --- a/xml/elm.xml +++ b/xml/elm.xml @@ -1,6 +1,6 @@ - + type @@ -66,26 +66,24 @@ - + - - + - - + - + diff --git a/xml/erlang.xml b/xml/erlang.xml --- a/xml/erlang.xml +++ b/xml/erlang.xml @@ -36,7 +36,7 @@ - fixed highlighting problem when '@' at end of atom/variable --> - + @@ -219,8 +219,7 @@ - - + diff --git a/xml/fasm.xml b/xml/fasm.xml --- a/xml/fasm.xml +++ b/xml/fasm.xml @@ -12,7 +12,7 @@ ]> - + @@ -1714,8 +1714,7 @@ - - + diff --git a/xml/fortran-fixed.xml b/xml/fortran-fixed.xml --- a/xml/fortran-fixed.xml +++ b/xml/fortran-fixed.xml @@ -1,6 +1,6 @@ - + @@ -412,8 +412,7 @@ - - + diff --git a/xml/fortran-free.xml b/xml/fortran-free.xml --- a/xml/fortran-free.xml +++ b/xml/fortran-free.xml @@ -1,6 +1,6 @@ - + @@ -148,8 +148,7 @@ - - + diff --git a/xml/fsharp.xml b/xml/fsharp.xml --- a/xml/fsharp.xml +++ b/xml/fsharp.xml @@ -9,7 +9,7 @@ ]> - + @@ -192,16 +192,14 @@ - - + - - + @@ -241,7 +239,7 @@ - + diff --git a/xml/glsl.xml b/xml/glsl.xml --- a/xml/glsl.xml +++ b/xml/glsl.xml @@ -1,6 +1,6 @@ - + break @@ -1176,14 +1176,12 @@ - - + - - + diff --git a/xml/gnuassembler.xml b/xml/gnuassembler.xml --- a/xml/gnuassembler.xml +++ b/xml/gnuassembler.xml @@ -43,7 +43,7 @@ --> - + .abort @@ -257,13 +257,11 @@ - - + - - + diff --git a/xml/go.xml b/xml/go.xml --- a/xml/go.xml +++ b/xml/go.xml @@ -26,7 +26,7 @@ --> - + @@ -125,16 +125,14 @@ - - + - - + diff --git a/xml/graphql.xml b/xml/graphql.xml --- a/xml/graphql.xml +++ b/xml/graphql.xml @@ -5,7 +5,7 @@ Synatx: https://github.com/graphql/graphql-spec/blob/master/spec/Section%202%20- -%20Language.md and: https://github.com/graphql/graphql-spec/blob/master/spec/Appendix%20B%20- -%20Grammar%20Summary.md --> - + enum @@ -63,8 +63,7 @@ - - + diff --git a/xml/groovy.xml b/xml/groovy.xml --- a/xml/groovy.xml +++ b/xml/groovy.xml @@ -3,7 +3,7 @@ - + ACTIVE @@ -3853,14 +3853,12 @@ - - + - - + diff --git a/xml/hamlet.xml b/xml/hamlet.xml --- a/xml/hamlet.xml +++ b/xml/hamlet.xml @@ -5,19 +5,19 @@ word character *or* a number, hence the lookahead --> ]> - + - + - + - + - + @@ -50,7 +50,7 @@ - + @@ -63,8 +63,8 @@ - - + + diff --git a/xml/haskell.xml b/xml/haskell.xml --- a/xml/haskell.xml +++ b/xml/haskell.xml @@ -1,6 +1,6 @@ - + case @@ -492,7 +492,7 @@ - + @@ -512,15 +512,13 @@ - - + - - + @@ -575,14 +573,14 @@ - - - - - - - - + + + + + + + + @@ -590,7 +588,7 @@ - + diff --git a/xml/haxe.xml b/xml/haxe.xml --- a/xml/haxe.xml +++ b/xml/haxe.xml @@ -12,7 +12,7 @@ ======================================================================== --> - + @@ -148,14 +148,12 @@ - - + - - + diff --git a/xml/html.xml b/xml/html.xml --- a/xml/html.xml +++ b/xml/html.xml @@ -5,7 +5,7 @@ ]> - + @@ -92,8 +92,7 @@ - - + @@ -195,7 +194,7 @@ - + diff --git a/xml/idris.xml b/xml/idris.xml --- a/xml/idris.xml +++ b/xml/idris.xml @@ -1,7 +1,7 @@ - + abstract @@ -137,19 +137,17 @@ - + - - + - - + diff --git a/xml/ini.xml b/xml/ini.xml --- a/xml/ini.xml +++ b/xml/ini.xml @@ -1,6 +1,6 @@ - + @@ -48,8 +48,7 @@ - - + diff --git a/xml/isocpp.xml b/xml/isocpp.xml --- a/xml/isocpp.xml +++ b/xml/isocpp.xml @@ -24,7 +24,7 @@ - - + @@ -604,8 +603,7 @@ - - + @@ -736,8 +734,7 @@ - - + @@ -781,8 +778,7 @@ - - + diff --git a/xml/j.xml b/xml/j.xml --- a/xml/j.xml +++ b/xml/j.xml @@ -62,7 +62,7 @@ --> - - + diff --git a/xml/java.xml b/xml/java.xml --- a/xml/java.xml +++ b/xml/java.xml @@ -4,7 +4,7 @@ ]> - + ACTIVE @@ -3827,14 +3827,12 @@ - - + - - + diff --git a/xml/javadoc.xml b/xml/javadoc.xml --- a/xml/javadoc.xml +++ b/xml/javadoc.xml @@ -1,6 +1,6 @@ - + @@ -29,7 +29,7 @@ - + @@ -72,14 +72,14 @@ - + - + diff --git a/xml/javascript.xml b/xml/javascript.xml --- a/xml/javascript.xml +++ b/xml/javascript.xml @@ -17,7 +17,7 @@ * QML * CoffeeScript (embedded) --> - @@ -1865,14 +1865,12 @@ - - + - - + diff --git a/xml/jsp.xml b/xml/jsp.xml --- a/xml/jsp.xml +++ b/xml/jsp.xml @@ -1,6 +1,6 @@ - + @@ -63,7 +63,7 @@ - + @@ -88,8 +88,7 @@ - - + @@ -209,7 +208,7 @@ - + @@ -217,8 +216,7 @@ - - + diff --git a/xml/julia.xml b/xml/julia.xml --- a/xml/julia.xml +++ b/xml/julia.xml @@ -33,7 +33,7 @@ ]> - + @@ -654,15 +654,13 @@ - - + - - + diff --git a/xml/kotlin.xml b/xml/kotlin.xml --- a/xml/kotlin.xml +++ b/xml/kotlin.xml @@ -1,7 +1,7 @@ - + package @@ -134,7 +134,7 @@ - + @@ -198,15 +198,15 @@ - + - - + + @@ -261,14 +261,12 @@ - - + - - + diff --git a/xml/latex.xml b/xml/latex.xml --- a/xml/latex.xml +++ b/xml/latex.xml @@ -4,7 +4,7 @@ ]> - + - @@ -969,8 +967,7 @@ - - + diff --git a/xml/lex.xml b/xml/lex.xml --- a/xml/lex.xml +++ b/xml/lex.xml @@ -20,7 +20,7 @@ ======================================================================== --> - + @@ -47,8 +47,7 @@ - - + @@ -60,7 +59,7 @@ - + @@ -92,7 +91,7 @@ - + diff --git a/xml/lilypond.xml b/xml/lilypond.xml --- a/xml/lilypond.xml +++ b/xml/lilypond.xml @@ -56,7 +56,7 @@ ]> @@ -104,7 +104,7 @@ Changes: - better recognition of being inside lyrics, drums, notes, chords and markup sections - detect block comments %{ %} - - links to ##Alerts in comments (e.g. TODO, FIXME) + - links to ##Comments in comments (e.g. TODO, FIXME) - detect lilypond inside scheme #{ #} - detect \score inside \markup, etc. - helps with some often made errors like forgetting spaces around lyric extenders and hyphens @@ -821,15 +821,13 @@ - - + - - + @@ -896,13 +894,13 @@ - + - + - @@ -31,7 +31,7 @@ - + diff --git a/xml/literate-haskell.xml b/xml/literate-haskell.xml --- a/xml/literate-haskell.xml +++ b/xml/literate-haskell.xml @@ -1,6 +1,6 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/xml/llvm.xml b/xml/llvm.xml --- a/xml/llvm.xml +++ b/xml/llvm.xml @@ -1,7 +1,7 @@ - - + diff --git a/xml/lua.xml b/xml/lua.xml --- a/xml/lua.xml +++ b/xml/lua.xml @@ -48,7 +48,7 @@ - NOTE, FIXME, TODO alerts added on comments - improved highlighting --> - + and @@ -500,7 +500,7 @@ - + @@ -509,14 +509,12 @@ - - + - - + @@ -525,19 +523,19 @@ - + - + - + diff --git a/xml/m4.xml b/xml/m4.xml --- a/xml/m4.xml +++ b/xml/m4.xml @@ -38,7 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> - + __gnu__ @@ -172,8 +172,7 @@ - - + diff --git a/xml/makefile.xml b/xml/makefile.xml --- a/xml/makefile.xml +++ b/xml/makefile.xml @@ -9,8 +9,10 @@ improve comments handling --> + @@ -177,7 +179,7 @@ - + @@ -475,8 +477,7 @@ - - + diff --git a/xml/markdown.xml b/xml/markdown.xml --- a/xml/markdown.xml +++ b/xml/markdown.xml @@ -90,7 +90,7 @@ ]> - + @@ -293,8 +293,7 @@ - - + @@ -336,7 +335,7 @@ - + diff --git a/xml/mathematica.xml b/xml/mathematica.xml --- a/xml/mathematica.xml +++ b/xml/mathematica.xml @@ -1,6 +1,6 @@ - @@ -3265,8 +3265,7 @@ - - + diff --git a/xml/matlab.xml b/xml/matlab.xml --- a/xml/matlab.xml +++ b/xml/matlab.xml @@ -57,7 +57,7 @@ - + @@ -113,16 +113,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -136,8 +136,7 @@ - - + diff --git a/xml/maxima.xml b/xml/maxima.xml --- a/xml/maxima.xml +++ b/xml/maxima.xml @@ -21,7 +21,7 @@ - + @@ -1868,8 +1868,7 @@ - - + diff --git a/xml/mediawiki.xml b/xml/mediawiki.xml --- a/xml/mediawiki.xml +++ b/xml/mediawiki.xml @@ -6,7 +6,7 @@ ]> - + @@ -144,8 +144,7 @@ - - + @@ -257,7 +256,7 @@ - + @@ -268,7 +267,7 @@ - + @@ -276,7 +275,7 @@ - + @@ -287,7 +286,7 @@ - + @@ -306,13 +305,13 @@ - + - - + + @@ -330,7 +329,7 @@ - + @@ -433,27 +432,27 @@ - + - + - + - + @@ -466,13 +465,13 @@ - + - + @@ -483,7 +482,7 @@ - + @@ -494,7 +493,7 @@ - + @@ -534,12 +533,12 @@ - + - + diff --git a/xml/metafont.xml b/xml/metafont.xml --- a/xml/metafont.xml +++ b/xml/metafont.xml @@ -6,7 +6,7 @@ --> - @@ -903,7 +903,7 @@ - + @@ -925,7 +925,7 @@ - + @@ -941,9 +941,8 @@ - + - diff --git a/xml/mips.xml b/xml/mips.xml --- a/xml/mips.xml +++ b/xml/mips.xml @@ -1,6 +1,6 @@ - + .align @@ -331,8 +331,7 @@ - - + diff --git a/xml/modula-2.xml b/xml/modula-2.xml --- a/xml/modula-2.xml +++ b/xml/modula-2.xml @@ -1,6 +1,6 @@ - - - + @@ -1126,8 +1125,7 @@ char="*" char1=")" endRegion="FoldableComment"/> - - + diff --git a/xml/modula-3.xml b/xml/modula-3.xml --- a/xml/modula-3.xml +++ b/xml/modula-3.xml @@ -6,7 +6,7 @@ - + @@ -286,8 +286,7 @@ - - + diff --git a/xml/monobasic.xml b/xml/monobasic.xml --- a/xml/monobasic.xml +++ b/xml/monobasic.xml @@ -10,7 +10,7 @@ License: GNU General Public License --> - + Option @@ -194,8 +194,7 @@ - - + diff --git a/xml/mustache.xml b/xml/mustache.xml --- a/xml/mustache.xml +++ b/xml/mustache.xml @@ -43,7 +43,7 @@ * v1 [2019-02-10]: Initial version --> - - - + - - + @@ -280,8 +278,7 @@ - - + @@ -388,7 +385,7 @@ - + diff --git a/xml/nasm.xml b/xml/nasm.xml --- a/xml/nasm.xml +++ b/xml/nasm.xml @@ -61,7 +61,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> - + @@ -2726,8 +2726,7 @@ - - + diff --git a/xml/nim.xml b/xml/nim.xml --- a/xml/nim.xml +++ b/xml/nim.xml @@ -20,7 +20,7 @@ - - + @@ -265,8 +264,7 @@ - - + diff --git a/xml/noweb.xml b/xml/noweb.xml --- a/xml/noweb.xml +++ b/xml/noweb.xml @@ -1,6 +1,6 @@ - + - + @@ -2773,22 +2773,22 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + @@ -2804,8 +2804,7 @@ - - + diff --git a/xml/opencl.xml b/xml/opencl.xml --- a/xml/opencl.xml +++ b/xml/opencl.xml @@ -1,7 +1,7 @@ - - + - - + @@ -215,7 +213,7 @@ - + @@ -226,7 +224,7 @@ - + diff --git a/xml/pascal.xml b/xml/pascal.xml --- a/xml/pascal.xml +++ b/xml/pascal.xml @@ -2,7 +2,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 @@ -465,7 +465,7 @@ - + @@ -508,7 +508,7 @@ - + @@ -767,7 +767,7 @@ - + @@ -803,7 +803,7 @@ - + @@ -847,8 +847,7 @@ - - + diff --git a/xml/php.xml b/xml/php.xml --- a/xml/php.xml +++ b/xml/php.xml @@ -73,7 +73,7 @@ ]> - - - + diff --git a/xml/verilog.xml b/xml/verilog.xml --- a/xml/verilog.xml +++ b/xml/verilog.xml @@ -1,6 +1,6 @@ - + macromodule @@ -188,14 +188,12 @@ - - + - - + @@ -207,7 +205,7 @@ - + diff --git a/xml/vhdl.xml b/xml/vhdl.xml --- a/xml/vhdl.xml +++ b/xml/vhdl.xml @@ -8,7 +8,7 @@ ]> - + file @@ -600,8 +600,7 @@ - - + diff --git a/xml/xml.xml b/xml/xml.xml --- a/xml/xml.xml +++ b/xml/xml.xml @@ -6,7 +6,7 @@ ]> - + @@ -41,8 +41,7 @@ - - + diff --git a/xml/xorg.xml b/xml/xorg.xml --- a/xml/xorg.xml +++ b/xml/xorg.xml @@ -1,6 +1,6 @@ - + @@ -35,8 +35,7 @@ - - + diff --git a/xml/xslt.xml b/xml/xslt.xml --- a/xml/xslt.xml +++ b/xml/xslt.xml @@ -52,7 +52,7 @@ --> - + xsl:value-of @@ -313,7 +313,7 @@ - + @@ -362,8 +362,7 @@ - - + diff --git a/xml/xul.xml b/xml/xul.xml --- a/xml/xul.xml +++ b/xml/xul.xml @@ -4,7 +4,7 @@ ]> - + @@ -425,8 +425,7 @@ - - + @@ -521,8 +520,7 @@ - - + @@ -541,13 +539,13 @@ - + - + @@ -561,7 +559,7 @@ - + diff --git a/xml/yacc.xml b/xml/yacc.xml --- a/xml/yacc.xml +++ b/xml/yacc.xml @@ -32,7 +32,7 @@ ======================================================================== --> - + @@ -201,13 +201,11 @@ - - + - - + diff --git a/xml/yaml.xml b/xml/yaml.xml --- a/xml/yaml.xml +++ b/xml/yaml.xml @@ -37,7 +37,7 @@ - @@ -323,8 +323,7 @@ - - + diff --git a/xml/zsh.xml b/xml/zsh.xml --- a/xml/zsh.xml +++ b/xml/zsh.xml @@ -8,7 +8,7 @@ ]> - + @@ -149,358 +149,7 @@ - - arch - awk - bash - bunzip2 - bzcat - bzcmp - bzdiff - bzegrep - bzfgrep - bzgrep - bzip2 - bzip2recover - bzless - bzmore - cat - chattr - chgrp - chmod - chown - chvt - cp - date - dd - deallocvt - df - dir - dircolors - dmesg - dnsdomainname - domainname - du - dumpkeys - echo - ed - egrep - false - fgconsole - fgrep - fuser - gawk - getkeycodes - gocr - grep - groff - groups - gunzip - gzexe - gzip - hostname - igawk - install - kbd_mode - kbdrate - killall - last - lastb - link - ln - loadkeys - loadunimap - login - ls - lsattr - lsmod - lsmod.old - lzcat - lzcmp - lzdiff - lzegrep - lzfgrep - lzgrep - lzless - lzcat - lzma - lzmainfo - lzmore - mapscrn - mesg - mkdir - mkfifo - mknod - mktemp - more - mount - mv - nano - netstat - nisdomainname - nroff - openvt - pgawk - pidof - ping - ps - pstree - pwd - rbash - readlink - red - resizecons - rm - rmdir - run-parts - sash - sed - setfont - setkeycodes - setleds - setmetamode - setserial - sh - showkey - shred - sleep - ssed - stat - stty - su - sync - tar - tempfile - touch - troff - true - umount - uname - unicode_start - unicode_stop - unlink - unlzma - unxz - utmpdump - uuidgen - vdir - wall - wc - xz - xzcat - ypdomainname - zcat - zcmp - zdiff - zegrep - zfgrep - zforce - zgrep - zless - zmore - znew - zsh - - - aclocal - aconnect - aplay - apm - apmsleep - apropos - ar - arecord - as - as86 - autoconf - autoheader - automake - awk - basename - bc - bison - c++ - cal - cat - cc - cdda2wav - cdparanoia - cdrdao - cd-read - cdrecord - chfn - chgrp - chmod - chown - chroot - chsh - clear - cmp - co - col - comm - cp - cpio - cpp - cut - dc - dd - df - diff - diff3 - dir - dircolors - directomatic - dirname - du - env - expr - fbset - file - find - flex - flex++ - fmt - free - ftp - funzip - fuser - g++ - gawk - gc - gcc - gdb - getent - getopt - gettext - gettextize - gimp - gimp-remote - gimptool - gmake - gs - head - hexdump - id - install - join - kill - killall - ld - ld86 - ldd - less - lex - ln - locate - lockfile - logname - lp - lpr - ls - lynx - m4 - make - man - mkdir - mknod - msgfmt - mv - namei - nasm - nawk - nice - nl - nm - nm86 - nmap - nohup - nop - od - passwd - patch - pcregrep - pcretest - perl - perror - pidof - pr - printf - procmail - prune - ps2ascii - ps2epsi - ps2frag - ps2pdf - ps2ps - psbook - psmerge - psnup - psresize - psselect - pstops - rcs - rev - rm - scp - sed - seq - setterm - shred - size - size86 - skill - slogin - snice - sort - sox - split - ssh - ssh-add - ssh-agent - ssh-keygen - ssh-keyscan - stat - strings - strip - sudo - suidperl - sum - tac - tail - tee - test - tr - uniq - unlink - unzip - updatedb - updmap - uptime - users - vmstat - w - wc - wget - whatis - whereis - which - who - whoami - write - xargs - yacc - yes - zip - zsoelim - - - dcop - kdialog - kfile - xhost - xmodmap - xset + unixcommands##Bash @@ -535,8 +184,7 @@ - - + @@ -546,7 +194,7 @@ - + @@ -556,7 +204,7 @@ - + @@ -900,7 +548,7 @@ - + @@ -908,23 +556,23 @@ - + - + - + - +