diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,28 @@ # Revision history for skylighting and skylighting-core +## 0.10 + + * Add instructions for submitting patches upstream to KDE (#106). + + * Synced syntax definitions from KDE repo. Note that fortran + has split into two: `fortran-fixed` and `fortran-free`. + + * Add test to ensure that all regexes in rules compile. + + * Regex: allow unescaped `}`. + + * Regex: allow empty regexes and groups. + + * Regex: support lazy and possessive quantifiers (#109). + + * Regex: support recursive regexes `(?R)` (#108). + + * Hide invisible line numbers from keyboard focus (#107, d10n). + This fixes tabbing through elements on a page. + + * Remove some obsolete patches for xml definitions. + + ## 0.9 * Use a pure Haskell regex implementation (in unexported module 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.9 +version: 0.10 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 @@ -37,6 +37,7 @@ pRegex :: Bool -> RParser Regex pRegex caseSensitive = + option MatchNull $ foldr MatchAlt <$> (pAltPart caseSensitive) <*> (many $ lift (char '|') *> (pAltPart caseSensitive <|> pure mempty)) @@ -54,13 +55,14 @@ lift . pSuffix pParenthesized :: Bool -> RParser Regex -pParenthesized caseSensitive = do +pParenthesized caseSensitive = (do _ <- lift (satisfy (== 40)) modifier <- lift (satisfy (== 63) *> pGroupModifiers) <|> (MatchCapture <$> (modify (+ 1) *> get)) contents <- pRegex caseSensitive _ <- lift (satisfy (== 41)) - return $ modifier contents + return $ modifier contents) + <|> Recurse <$ (lift (string "(?R)" <|> string "(?0)")) pGroupModifiers :: Parser (Regex -> Regex) pGroupModifiers = @@ -88,7 +90,7 @@ (Just n, Nothing) -> atleast n re (Nothing, Just n) -> atmost n re (Just m, Just n) -> between m n re - _ -> fail "pSuffix encountered impossible byte") >>= pSuffix + _ -> fail "pSuffix encountered impossible byte") >>= pQuantifierModifier where atmost 0 _ = MatchNull atmost n r = MatchAlt (mconcat (replicate n r)) (atmost (n-1) r) @@ -98,6 +100,11 @@ atleast n r = mconcat (replicate n r) <> MatchAlt (MatchSome r) MatchNull +pQuantifierModifier :: Regex -> Parser Regex +pQuantifierModifier re = option re $ + (Possessive re <$ satisfy (== 43)) <|> + (Lazy re <$ satisfy (==63)) + pRegexChar :: Bool -> Parser Regex pRegexChar caseSensitive = do w <- satisfy $ const True @@ -236,7 +243,6 @@ isSpecial 42 = True -- '*' isSpecial 43 = True -- '+' isSpecial 123 = True -- '{' -isSpecial 125 = True -- '}' isSpecial 91 = True -- '[' isSpecial 93 = True -- ']' isSpecial 37 = True -- '%' diff --git a/src/Regex/KDE/Match.hs b/src/Regex/KDE/Match.hs --- a/src/Regex/KDE/Match.hs +++ b/src/Regex/KDE/Match.hs @@ -25,18 +25,20 @@ Match { matchBytes :: !ByteString , matchOffset :: !Int , matchCaptures :: !(M.IntMap (Int, Int)) - -- starting offset, length in bytes + -- starting offset, length in bytes } deriving (Show, Eq) --- longer matches are <= +-- preferred matches are <= instance Ord Match where - m1 <= m2 = matchOffset m1 >= matchOffset m2 && - matchCaptures m1 >= matchCaptures m2 + m1 <= m2 + | matchOffset m1 > matchOffset m2 = True + | matchOffset m1 < matchOffset m2 = False + | otherwise = matchCaptures m1 >= matchCaptures m2 mapMatching :: (Match -> Match) -> Set Match -> Set Match mapMatching f = Set.filter ((>= 0) . matchOffset) . Set.map f --- we take the n longest matches to avoid pathological slowdown +-- we take the n best matches to avoid pathological slowdown sizeLimit :: Int sizeLimit = 2000 @@ -46,60 +48,89 @@ then Set.take sizeLimit ms else ms -exec :: Direction -> Regex -> Set Match -> Set Match -exec _ MatchNull = id -exec dir (MatchDynamic n) = -- if this hasn't been replaced, match literal - exec dir (MatchChar (== '%') <> +-- first argument is the "top-level" regex, needed for Recurse. +exec :: Regex -> Direction -> Regex -> Set Match -> Set Match +exec _ _ MatchNull = id +exec top dir (Lazy re) = -- note: the action is below under Concat + exec top dir (MatchConcat (Lazy re) MatchNull) +exec top dir (Possessive re) = + foldr + (\elt s -> case Set.lookupMin (exec top dir re (Set.singleton elt)) of + Nothing -> s + Just m -> Set.insert m s) + mempty +exec top dir (MatchDynamic n) = -- if this hasn't been replaced, match literal + exec top dir (MatchChar (== '%') <> mconcat (map (\c -> MatchChar (== c)) (show n))) -exec _ AssertEnd = Set.filter (\m -> matchOffset m == B.length (matchBytes m)) -exec _ AssertBeginning = Set.filter (\m -> matchOffset m == 0) -exec _ (AssertPositive dir regex) = - Set.filter (\m -> not (null (exec dir regex (Set.singleton m)))) -exec _ (AssertNegative dir regex) = - Set.filter (\m -> null (exec dir regex (Set.singleton m))) -exec _ AssertWordBoundary = Set.filter atWordBoundary -exec Forward MatchAnyChar = mapMatching $ \m -> +exec _ _ AssertEnd = Set.filter (\m -> matchOffset m == B.length (matchBytes m)) +exec _ _ AssertBeginning = Set.filter (\m -> matchOffset m == 0) +exec top _ (AssertPositive dir regex) = + Set.filter (\m -> not (null (exec top dir regex (Set.singleton m)))) +exec top _ (AssertNegative dir regex) = + Set.filter (\m -> null (exec top dir regex (Set.singleton m))) +exec _ _ AssertWordBoundary = Set.filter atWordBoundary +exec _ Forward MatchAnyChar = mapMatching $ \m -> case U.decode (B.drop (matchOffset m) (matchBytes m)) of Nothing -> m{ matchOffset = - 1} Just (_,n) -> m{ matchOffset = matchOffset m + n } -exec Backward MatchAnyChar = mapMatching $ \m -> +exec _ Backward MatchAnyChar = mapMatching $ \m -> case lastCharOffset (matchBytes m) (matchOffset m) of Nothing -> m{ matchOffset = -1 } Just off -> m{ matchOffset = off } -exec Forward (MatchChar f) = mapMatching $ \m -> +exec _ Forward (MatchChar f) = mapMatching $ \m -> case U.decode (B.drop (matchOffset m) (matchBytes m)) of Just (c,n) | f c -> m{ matchOffset = matchOffset m + n } _ -> m{ matchOffset = -1 } -exec Backward (MatchChar f) = mapMatching $ \m -> +exec _ Backward (MatchChar f) = mapMatching $ \m -> case lastCharOffset (matchBytes m) (matchOffset m) of Nothing -> m{ matchOffset = -1 } Just off -> case U.decode (B.drop off (matchBytes m)) of Just (c,_) | f c -> m{ matchOffset = off } _ -> m{ matchOffset = -1 } -exec dir (MatchConcat (MatchConcat r1 r2) r3) = - exec dir (MatchConcat r1 (MatchConcat r2 r3)) -exec Forward (MatchConcat r1 r2) = -- TODO longest match first - exec Forward r2 . prune . exec Forward r1 -exec Backward (MatchConcat r1 r2) = exec Backward r1 . exec Backward r2 -exec dir (MatchAlt r1 r2) = \ms -> exec dir r1 ms <> exec dir r2 ms -exec dir (MatchSome re) = go +exec top dir (MatchConcat (MatchConcat r1 r2) r3) = + exec top dir (MatchConcat r1 (MatchConcat r2 r3)) +exec top Forward (MatchConcat (Lazy r1) r2) = + Set.foldl Set.union mempty . Set.map + (\m -> + let ms1 = exec top Forward r1 (Set.singleton m) + in if Set.null ms1 + then ms1 + else go ms1) where - go ms = case exec dir re ms of + go ms = case Set.lookupMax ms of -- find shortest match + Nothing -> Set.empty + Just m' -> + let s' = exec top Forward r2 (Set.singleton m') + in if Set.null s' + then go (Set.delete m' ms) + else s' +exec top Forward (MatchConcat r1 r2) = -- TODO longest match first + \ms -> + let ms1 = exec top Forward r1 ms + in if Set.null ms1 + then ms1 + else exec top Forward r2 (prune ms1) +exec top Backward (MatchConcat r1 r2) = + exec top Backward r1 . exec top Backward r2 +exec top dir (MatchAlt r1 r2) = \ms -> exec top dir r1 ms <> exec top dir r2 ms +exec top dir (MatchSome re) = go + where + go ms = case exec top dir re ms of ms' | Set.null ms' -> Set.empty | ms' == ms -> ms | otherwise -> let ms'' = prune ms' in ms'' <> go ms'' -exec dir (MatchCapture i re) = +exec top dir (MatchCapture i re) = Set.foldr Set.union Set.empty . Set.map (\m -> - Set.map (captureDifference m) (exec dir re (Set.singleton m))) + Set.map (captureDifference m) (exec top dir re (Set.singleton m))) where captureDifference m m' = let len = matchOffset m' - matchOffset m in m'{ matchCaptures = M.insert i (matchOffset m, len) (matchCaptures m') } -exec dir (MatchCaptured n) = mapMatching matchCaptured +exec _ dir (MatchCaptured n) = mapMatching matchCaptured where matchCaptured m = case M.lookup n (matchCaptures m) of @@ -114,7 +145,9 @@ -> m{ matchOffset = matchOffset m - B.length capture } _ -> m{ matchOffset = -1 } Nothing -> m{ matchOffset = -1 } - +exec top dir Recurse = \ms -> if Set.null ms + then ms + else exec top dir top ms atWordBoundary :: Match -> Bool atWordBoundary m = @@ -154,7 +187,7 @@ -> Maybe (ByteString, M.IntMap (Int, Int)) matchRegex re bs = toResult <$> Set.lookupMin - (exec Forward re (Set.singleton (Match bs 0 M.empty))) + (exec re Forward re (Set.singleton (Match bs 0 M.empty))) where toResult m = (B.take (matchOffset m) (matchBytes m), (matchCaptures m)) diff --git a/src/Regex/KDE/Regex.hs b/src/Regex/KDE/Regex.hs --- a/src/Regex/KDE/Regex.hs +++ b/src/Regex/KDE/Regex.hs @@ -28,6 +28,9 @@ AssertEnd | AssertPositive !Direction !Regex | AssertNegative !Direction !Regex | + Possessive !Regex | + Lazy !Regex | + Recurse | MatchNull instance Show Regex where @@ -48,6 +51,9 @@ show re <> ")" show (AssertNegative dir re) = "(AssertNegativeLookahead " <> show dir <> " " <> show re <> ")" + show (Possessive re) = "(Possessive " <> show re <> ")" + show (Lazy re) = "(Lazy " <> show re <> ")" + show Recurse = "Recurse" show MatchNull = "MatchNull" instance Semigroup Regex where diff --git a/src/Skylighting/Core.hs b/src/Skylighting/Core.hs --- a/src/Skylighting/Core.hs +++ b/src/Skylighting/Core.hs @@ -59,6 +59,8 @@ lookupSyntax lang syntaxmap -- special cases: | lang == Text.pack "csharp" = lookupSyntax (Text.pack "cs") syntaxmap + | lang == Text.pack "fortran" = lookupSyntax (Text.pack "for") + syntaxmap | otherwise = syntaxByName syntaxmap lang `mplus` syntaxByShortName syntaxmap lang `mplus` 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 @@ -95,6 +95,10 @@ then mempty else customAttribute (fromString "aria-hidden") (fromString "true")) -- see jgm/pandoc#6352 + ! (if numberLines opts + then mempty + else customAttribute (fromString "tabindex") + (fromString "-1")) $ mempty mapM_ (tokenToHtml opts) cont where lineNum = toValue prefixedLineNo diff --git a/test/expected/abc.d.native b/test/expected/abc.d.native --- a/test/expected/abc.d.native +++ b/test/expected/abc.d.native @@ -1,10 +1,11 @@ -[ [ ( KeywordTok , "import" ) - , ( NormalTok - , " std.stdio, std.ascii, std.algorithm, std.array, std.range;" +[ [ ( PreprocessorTok , "import" ) + , ( ImportTok + , " std.stdio, std.ascii, std.algorithm, std.array, std.range" ) + , ( NormalTok , ";" ) ] , [] -, [ ( KeywordTok , "alias" ) +, [ ( WarningTok , "alias" ) , ( NormalTok , " Block = " ) , ( DataTypeTok , "char" ) , ( NormalTok , "[" ) @@ -14,23 +15,23 @@ , [] , [ ( DataTypeTok , "bool" ) , ( NormalTok , " canMakeWord(" ) - , ( KeywordTok , "immutable" ) + , ( FunctionTok , "immutable" ) , ( NormalTok , " Block[] blocks, " ) - , ( KeywordTok , "in" ) + , ( AttributeTok , "in" ) , ( NormalTok , " " ) , ( BuiltInTok , "string" ) , ( NormalTok , " word) " ) - , ( KeywordTok , "pure" ) + , ( FunctionTok , "pure" ) , ( NormalTok , " " ) - , ( KeywordTok , "nothrow" ) + , ( FunctionTok , "nothrow" ) ] , [ ( KeywordTok , "in " ) , ( NormalTok , "{" ) ] , [ ( NormalTok , " " ) - , ( KeywordTok , "assert" ) + , ( AttributeTok , "assert" ) , ( NormalTok , "(blocks.all!(w => w[].all!isAlpha));" ) ] , [ ( NormalTok , " " ) - , ( KeywordTok , "assert" ) + , ( AttributeTok , "assert" ) , ( NormalTok , "(word.all!isAlpha);" ) ] , [ ( NormalTok , "} " ) @@ -42,13 +43,13 @@ , ( NormalTok , " inner(" ) , ( BuiltInTok , "size_t" ) , ( NormalTok , "[] indexes, " ) - , ( KeywordTok , "in" ) + , ( AttributeTok , "in" ) , ( NormalTok , " " ) , ( BuiltInTok , "string" ) , ( NormalTok , " w) " ) - , ( KeywordTok , "pure" ) + , ( FunctionTok , "pure" ) , ( NormalTok , " " ) - , ( KeywordTok , "nothrow" ) + , ( FunctionTok , "nothrow" ) , ( NormalTok , " {" ) ] , [ ( NormalTok , " " ) @@ -58,12 +59,12 @@ , [ ( NormalTok , " " ) , ( KeywordTok , "return" ) , ( NormalTok , " " ) - , ( KeywordTok , "true" ) + , ( AttributeTok , "true" ) , ( NormalTok , ";" ) ] , [] , [ ( NormalTok , " " ) - , ( KeywordTok , "immutable" ) + , ( FunctionTok , "immutable" ) , ( NormalTok , " c = w[" ) , ( DecValTok , "0" ) , ( NormalTok , "].toUpper;" ) @@ -71,7 +72,7 @@ , [ ( NormalTok , " " ) , ( KeywordTok , "foreach" ) , ( NormalTok , " (" ) - , ( KeywordTok , "ref" ) + , ( FunctionTok , "ref" ) , ( NormalTok , " idx; indexes) {" ) ] , [ ( NormalTok , " " ) @@ -103,7 +104,7 @@ , [ ( NormalTok , " " ) , ( KeywordTok , "return" ) , ( NormalTok , " " ) - , ( KeywordTok , "true" ) + , ( AttributeTok , "true" ) , ( NormalTok , ";" ) ] , [ ( NormalTok , " indexes[" ) @@ -115,7 +116,7 @@ , [ ( NormalTok , " " ) , ( KeywordTok , "return" ) , ( NormalTok , " " ) - , ( KeywordTok , "false" ) + , ( AttributeTok , "false" ) , ( NormalTok , ";" ) ] , [ ( NormalTok , " }" ) ] @@ -130,7 +131,7 @@ , [] , [ ( DataTypeTok , "void" ) , ( NormalTok , " main() {" ) ] , [ ( NormalTok , " " ) - , ( KeywordTok , "enum" ) + , ( WarningTok , "enum" ) , ( NormalTok , " Block[] blocks = " ) , ( StringTok , "\"BO XK DQ CP NA GT RE TG QD FS" ) ] @@ -155,7 +156,7 @@ , [] , [ ( NormalTok , " " ) , ( CommentTok , "// Extra test." ) ] , [ ( NormalTok , " " ) - , ( KeywordTok , "immutable" ) + , ( FunctionTok , "immutable" ) , ( NormalTok , " Block[] blocks2 = [" ) , ( StringTok , "\"AB\"" ) , ( NormalTok , ", " ) @@ -167,7 +168,7 @@ , ( NormalTok , "];" ) ] , [ ( NormalTok , " " ) - , ( KeywordTok , "immutable" ) + , ( FunctionTok , "immutable" ) , ( NormalTok , " word = " ) , ( StringTok , "\"abba\"" ) , ( NormalTok , ";" ) diff --git a/test/expected/abc.perl.native b/test/expected/abc.perl.native --- a/test/expected/abc.perl.native +++ b/test/expected/abc.perl.native @@ -10,17 +10,17 @@ , ( NormalTok , " " ) , ( DataTypeTok , "@blocks1" ) , ( NormalTok , " = " ) - , ( KeywordTok , "qw(" ) + , ( OtherTok , "qw(" ) , ( NormalTok , "BO XK DQ CP NA GT RE TG QD FS JW HU VI AN OB ER FS LY PC ZM" ) - , ( KeywordTok , ")" ) + , ( OtherTok , ")" ) , ( NormalTok , ";" ) ] , [ ( NormalTok , "is(can_make_word(" ) - , ( KeywordTok , "\"" ) + , ( OtherTok , "\"" ) , ( StringTok , "A" ) - , ( KeywordTok , "\"" ) + , ( OtherTok , "\"" ) , ( NormalTok , ", " ) , ( DataTypeTok , "@blocks1" ) , ( NormalTok , "), " ) @@ -28,9 +28,9 @@ , ( NormalTok , ");" ) ] , [ ( NormalTok , "is(can_make_word(" ) - , ( KeywordTok , "\"" ) + , ( OtherTok , "\"" ) , ( StringTok , "BARK" ) - , ( KeywordTok , "\"" ) + , ( OtherTok , "\"" ) , ( NormalTok , ", " ) , ( DataTypeTok , "@blocks1" ) , ( NormalTok , "), " ) @@ -38,9 +38,9 @@ , ( NormalTok , ");" ) ] , [ ( NormalTok , "is(can_make_word(" ) - , ( KeywordTok , "\"" ) + , ( OtherTok , "\"" ) , ( StringTok , "BOOK" ) - , ( KeywordTok , "\"" ) + , ( OtherTok , "\"" ) , ( NormalTok , ", " ) , ( DataTypeTok , "@blocks1" ) , ( NormalTok , "), " ) @@ -48,9 +48,9 @@ , ( NormalTok , ");" ) ] , [ ( NormalTok , "is(can_make_word(" ) - , ( KeywordTok , "\"" ) + , ( OtherTok , "\"" ) , ( StringTok , "TREAT" ) - , ( KeywordTok , "\"" ) + , ( OtherTok , "\"" ) , ( NormalTok , ", " ) , ( DataTypeTok , "@blocks1" ) , ( NormalTok , "), " ) @@ -58,9 +58,9 @@ , ( NormalTok , ");" ) ] , [ ( NormalTok , "is(can_make_word(" ) - , ( KeywordTok , "\"" ) + , ( OtherTok , "\"" ) , ( StringTok , "COMMON" ) - , ( KeywordTok , "\"" ) + , ( OtherTok , "\"" ) , ( NormalTok , ", " ) , ( DataTypeTok , "@blocks1" ) , ( NormalTok , "), " ) @@ -68,9 +68,9 @@ , ( NormalTok , ");" ) ] , [ ( NormalTok , "is(can_make_word(" ) - , ( KeywordTok , "\"" ) + , ( OtherTok , "\"" ) , ( StringTok , "SQUAD" ) - , ( KeywordTok , "\"" ) + , ( OtherTok , "\"" ) , ( NormalTok , ", " ) , ( DataTypeTok , "@blocks1" ) , ( NormalTok , "), " ) @@ -78,9 +78,9 @@ , ( NormalTok , ");" ) ] , [ ( NormalTok , "is(can_make_word(" ) - , ( KeywordTok , "\"" ) + , ( OtherTok , "\"" ) , ( StringTok , "CONFUSE" ) - , ( KeywordTok , "\"" ) + , ( OtherTok , "\"" ) , ( NormalTok , ", " ) , ( DataTypeTok , "@blocks1" ) , ( NormalTok , "), " ) @@ -92,15 +92,15 @@ , ( NormalTok , " " ) , ( DataTypeTok , "@blocks2" ) , ( NormalTok , " = " ) - , ( KeywordTok , "qw(" ) + , ( OtherTok , "qw(" ) , ( NormalTok , "US TZ AO QA" ) - , ( KeywordTok , ")" ) + , ( OtherTok , ")" ) , ( NormalTok , ";" ) ] , [ ( NormalTok , "is(can_make_word(" ) - , ( KeywordTok , "'" ) - , ( StringTok , "auto" ) - , ( KeywordTok , "'" ) + , ( OtherTok , "'" ) + , ( SpecialStringTok , "auto" ) + , ( OtherTok , "'" ) , ( NormalTok , ", " ) , ( DataTypeTok , "@blocks2" ) , ( NormalTok , "), " ) diff --git a/test/expected/abc.r.native b/test/expected/abc.r.native --- a/test/expected/abc.r.native +++ b/test/expected/abc.r.native @@ -1,89 +1,93 @@ -[ [ ( NormalTok , "canMakeNoRecursion <-" ) - , ( StringTok , " " ) +[ [ ( NormalTok , "canMakeNoRecursion " ) + , ( OtherTok , "<-" ) + , ( NormalTok , " " ) , ( ControlFlowTok , "function" ) , ( NormalTok , "(x) {" ) ] -, [ ( NormalTok , " x <-" ) - , ( StringTok , " " ) - , ( KeywordTok , "toupper" ) +, [ ( NormalTok , " x " ) + , ( OtherTok , "<-" ) + , ( NormalTok , " " ) + , ( FunctionTok , "toupper" ) , ( NormalTok , "(x)" ) ] -, [ ( NormalTok , " charList <-" ) - , ( StringTok , " " ) - , ( KeywordTok , "strsplit" ) +, [ ( NormalTok , " charList " ) + , ( OtherTok , "<-" ) + , ( NormalTok , " " ) + , ( FunctionTok , "strsplit" ) , ( NormalTok , "(x, " ) - , ( KeywordTok , "character" ) + , ( FunctionTok , "character" ) , ( NormalTok , "(" ) , ( DecValTok , "0" ) , ( NormalTok , "))" ) ] -, [ ( NormalTok , " getCombos <-" ) - , ( StringTok , " " ) +, [ ( NormalTok , " getCombos " ) + , ( OtherTok , "<-" ) + , ( NormalTok , " " ) , ( ControlFlowTok , "function" ) , ( NormalTok , "(chars) {" ) ] -, [ ( NormalTok , " charBlocks <-" ) - , ( StringTok , " " ) - , ( KeywordTok , "data.matrix" ) +, [ ( NormalTok , " charBlocks " ) + , ( OtherTok , "<-" ) + , ( NormalTok , " " ) + , ( FunctionTok , "data.matrix" ) , ( NormalTok , "(" ) - , ( KeywordTok , "expand.grid" ) + , ( FunctionTok , "expand.grid" ) , ( NormalTok , "(" ) - , ( KeywordTok , "lapply" ) + , ( FunctionTok , "lapply" ) , ( NormalTok , "(chars, " ) , ( ControlFlowTok , "function" ) , ( NormalTok , "(char) " ) - , ( KeywordTok , "which" ) + , ( FunctionTok , "which" ) , ( NormalTok , "(blocks " ) - , ( OperatorTok , "==" ) - , ( StringTok , " " ) - , ( NormalTok , "char, " ) - , ( DataTypeTok , "arr.ind=" ) - , ( OtherTok , "TRUE" ) + , ( SpecialCharTok , "==" ) + , ( NormalTok , " char, " ) + , ( AttributeTok , "arr.ind=" ) + , ( ConstantTok , "TRUE" ) , ( NormalTok , ")[, 1L])))" ) ] -, [ ( NormalTok , " charBlocks <-" ) - , ( StringTok , " " ) - , ( NormalTok , "charBlocks[" ) - , ( OperatorTok , "!" ) - , ( KeywordTok , "apply" ) +, [ ( NormalTok , " charBlocks " ) + , ( OtherTok , "<-" ) + , ( NormalTok , " charBlocks[" ) + , ( SpecialCharTok , "!" ) + , ( FunctionTok , "apply" ) , ( NormalTok , "(charBlocks, " ) , ( DecValTok , "1" ) , ( NormalTok , ", " ) , ( ControlFlowTok , "function" ) , ( NormalTok , "(row) " ) - , ( KeywordTok , "any" ) + , ( FunctionTok , "any" ) , ( NormalTok , "(" ) - , ( KeywordTok , "duplicated" ) - , ( NormalTok , "(row))), , drop=" ) - , ( OtherTok , "FALSE" ) + , ( FunctionTok , "duplicated" ) + , ( NormalTok , "(row))), , drop" ) + , ( OtherTok , "=" ) + , ( ConstantTok , "FALSE" ) , ( NormalTok , "]" ) ] , [ ( NormalTok , " " ) , ( ControlFlowTok , "if" ) , ( NormalTok , " (" ) - , ( KeywordTok , "dim" ) + , ( FunctionTok , "dim" ) , ( NormalTok , "(charBlocks)[1L] " ) - , ( OperatorTok , ">" ) - , ( StringTok , " " ) - , ( NormalTok , "0L) {" ) + , ( SpecialCharTok , ">" ) + , ( NormalTok , " 0L) {" ) ] , [ ( NormalTok , " " ) - , ( KeywordTok , "t" ) + , ( FunctionTok , "t" ) , ( NormalTok , "(" ) - , ( KeywordTok , "apply" ) + , ( FunctionTok , "apply" ) , ( NormalTok , "(charBlocks, " ) , ( DecValTok , "1" ) , ( NormalTok , ", " ) , ( ControlFlowTok , "function" ) , ( NormalTok , "(row) " ) - , ( KeywordTok , "apply" ) + , ( FunctionTok , "apply" ) , ( NormalTok , "(blocks[row, , " ) - , ( DataTypeTok , "drop=" ) - , ( OtherTok , "FALSE" ) + , ( AttributeTok , "drop=" ) + , ( ConstantTok , "FALSE" ) , ( NormalTok , "], " ) , ( DecValTok , "1" ) , ( NormalTok , ", paste, " ) - , ( DataTypeTok , "collapse=" ) + , ( AttributeTok , "collapse=" ) , ( StringTok , "\"\"" ) , ( NormalTok , ")))" ) ] @@ -92,7 +96,7 @@ , ( NormalTok , " {" ) ] , [ ( NormalTok , " " ) - , ( KeywordTok , "character" ) + , ( FunctionTok , "character" ) , ( NormalTok , "(" ) , ( DecValTok , "0" ) , ( NormalTok , ")" ) @@ -100,15 +104,15 @@ , [ ( NormalTok , " }" ) ] , [ ( NormalTok , " }" ) ] , [ ( NormalTok , " " ) - , ( KeywordTok , "setNames" ) + , ( FunctionTok , "setNames" ) , ( NormalTok , "(" ) - , ( KeywordTok , "lapply" ) + , ( FunctionTok , "lapply" ) , ( NormalTok , "(charList, getCombos), x)" ) ] , [ ( NormalTok , "}" ) ] -, [ ( KeywordTok , "canMakeNoRecursion" ) +, [ ( FunctionTok , "canMakeNoRecursion" ) , ( NormalTok , "(" ) - , ( KeywordTok , "c" ) + , ( FunctionTok , "c" ) , ( NormalTok , "(" ) , ( StringTok , "\"A\"" ) , ( NormalTok , "," ) diff --git a/test/expected/abc.ruby.native b/test/expected/abc.ruby.native --- a/test/expected/abc.ruby.native +++ b/test/expected/abc.ruby.native @@ -1,40 +1,66 @@ -[ [ ( NormalTok , "words =" ) +[ [ ( NormalTok , "words " ) + , ( KeywordTok , "=" ) , ( OtherTok , " %w(" ) , ( StringTok , "A BaRK BOoK tREaT COmMOn SqUAD CoNfuSE" ) , ( OtherTok , ")" ) - , ( NormalTok , " << " ) + , ( NormalTok , " " ) + , ( KeywordTok , "<<" ) + , ( NormalTok , " " ) , ( StringTok , "\"\"" ) ] , [] -, [ ( NormalTok , "words.each " ) - , ( KeywordTok , "do" ) - , ( NormalTok , " |word|" ) +, [ ( NormalTok , "words" ) + , ( AttributeTok , ".each" ) + , ( NormalTok , " " ) + , ( ControlFlowTok , "do" ) + , ( NormalTok , " " ) + , ( KeywordTok , "|" ) + , ( NormalTok , "word" ) + , ( KeywordTok , "|" ) ] -, [ ( NormalTok , " blocks = " ) +, [ ( NormalTok , " blocks " ) + , ( KeywordTok , "=" ) + , ( NormalTok , " " ) , ( StringTok , "\"BO XK DQ CP NA GT RE TG QD FS JW HU VI AN OB ER FS LY PC ZM\"" ) ] -, [ ( NormalTok , " res = word.each_char.all?{|c| blocks.sub!(" ) - , ( OtherTok , "/\\w?#{" ) +, [ ( NormalTok , " res " ) + , ( KeywordTok , "=" ) + , ( NormalTok , " word" ) + , ( AttributeTok , ".each_char.all?" ) + , ( KeywordTok , "{|" ) , ( NormalTok , "c" ) - , ( OtherTok , "}\\w?/i" ) + , ( KeywordTok , "|" ) + , ( NormalTok , " blocks" ) + , ( AttributeTok , ".sub!" ) + , ( NormalTok , "(" ) + , ( SpecialStringTok , "/\\w?" ) + , ( SpecialCharTok , "#{" ) + , ( NormalTok , "c" ) + , ( SpecialCharTok , "}" ) + , ( SpecialStringTok , "\\w?/i" ) , ( NormalTok , ", " ) , ( StringTok , "\"\"" ) - , ( NormalTok , ")} " ) + , ( NormalTok , ")" ) + , ( KeywordTok , "}" ) + , ( NormalTok , " " ) , ( CommentTok , "#regexps can be interpolated like strings" ) ] -, [ ( NormalTok , " puts " ) +, [ ( NormalTok , " " ) + , ( FunctionTok , "puts" ) + , ( NormalTok , " " ) , ( StringTok , "\"" ) - , ( OtherTok , "#{" ) - , ( NormalTok , "word.inspect" ) - , ( OtherTok , "}" ) + , ( SpecialCharTok , "#{" ) + , ( NormalTok , "word" ) + , ( AttributeTok , ".inspect" ) + , ( SpecialCharTok , "}" ) , ( StringTok , ": " ) - , ( OtherTok , "#{" ) + , ( SpecialCharTok , "#{" ) , ( NormalTok , "res" ) - , ( OtherTok , "}" ) + , ( SpecialCharTok , "}" ) , ( StringTok , "\"" ) ] -, [ ( KeywordTok , "end" ) ] +, [ ( ControlFlowTok , "end" ) ] , [] ] diff --git a/test/expected/abc.scheme.native b/test/expected/abc.scheme.native --- a/test/expected/abc.scheme.native +++ b/test/expected/abc.scheme.native @@ -81,13 +81,17 @@ , ( NormalTok , "(inner word-chars blocks tried-blocks)" ) ] , [ ( NormalTok , " (" ) , ( KeywordTok , "cond" ) ] -, [ ( NormalTok , " [(" ) +, [ ( NormalTok , " " ) + , ( OperatorTok , "[" ) + , ( NormalTok , "(" ) , ( KeywordTok , "null?" ) , ( NormalTok , " word-chars) " ) , ( DecValTok , "#t" ) - , ( NormalTok , "]" ) + , ( OperatorTok , "]" ) ] -, [ ( NormalTok , " [(usable-block blocks (" ) +, [ ( NormalTok , " " ) + , ( OperatorTok , "[" ) + , ( NormalTok , "(usable-block blocks (" ) , ( KeywordTok , "car" ) , ( NormalTok , " word-chars))" ) ] @@ -101,19 +105,24 @@ , ( KeywordTok , "cdr" ) , ( NormalTok , " word-chars) (" ) , ( KeywordTok , "append" ) - , ( NormalTok , " tried-blocks (remove b blocks)) null)" ) + , ( NormalTok , " tried-blocks (" ) + , ( KeywordTok , "remove" ) + , ( NormalTok , " b blocks)) null)" ) ] -, [ ( NormalTok - , " (inner word-chars (remove b blocks) (" - ) +, [ ( NormalTok , " (inner word-chars (" ) + , ( KeywordTok , "remove" ) + , ( NormalTok , " b blocks) (" ) , ( KeywordTok , "cons" ) - , ( NormalTok , " b tried-blocks))))]" ) + , ( NormalTok , " b tried-blocks))))" ) + , ( OperatorTok , "]" ) ] -, [ ( NormalTok , " [" ) +, [ ( NormalTok , " " ) + , ( OperatorTok , "[" ) , ( KeywordTok , "else" ) , ( NormalTok , " " ) , ( DecValTok , "#f" ) - , ( NormalTok , "]))" ) + , ( OperatorTok , "]" ) + , ( NormalTok , "))" ) ] , [ ( NormalTok , " (inner (" ) , ( KeywordTok , "string->list" ) diff --git a/test/expected/archive.rhtml.native b/test/expected/archive.rhtml.native --- a/test/expected/archive.rhtml.native +++ b/test/expected/archive.rhtml.native @@ -4,22 +4,22 @@ ] , [] , [] -, [ ( KeywordTok , "<%" ) +, [ ( DataTypeTok , "<%" ) , ( ExtensionTok , " form_for " ) - , ( StringTok , ":to_date" ) + , ( WarningTok , ":to_date" ) , ( ExtensionTok , ", " ) , ( OtherTok , "@to_date" ) , ( ExtensionTok , ", " ) - , ( StringTok , ":url" ) + , ( WarningTok , ":url" ) , ( ExtensionTok , " " ) , ( CharTok , "=>" ) , ( ExtensionTok , " " ) , ( CharTok , "{" ) - , ( StringTok , ":action" ) + , ( WarningTok , ":action" ) , ( ExtensionTok , " " ) , ( CharTok , "=>" ) , ( ExtensionTok , " " ) - , ( StringTok , "'archive'" ) + , ( VerbatimStringTok , "'archive'" ) , ( CharTok , "}" ) , ( ExtensionTok , " " ) , ( KeywordTok , "do" ) @@ -28,7 +28,7 @@ , ( ExtensionTok , "f" ) , ( CharTok , "|" ) , ( ExtensionTok , " " ) - , ( KeywordTok , "%>" ) + , ( DataTypeTok , "%>" ) ] , [ ( NormalTok , " " ) , ( KeywordTok , "

" ) ] , [ ( NormalTok , " " ) - , ( KeywordTok , "<%=" ) + , ( DataTypeTok , "<%=" ) , ( ExtensionTok , " " ) - , ( NormalTok , "select_date" ) + , ( FunctionTok , "select_date" ) , ( ExtensionTok , " " ) , ( OtherTok , "@from_date" ) , ( ExtensionTok , ", " ) - , ( StringTok , ":prefix" ) + , ( WarningTok , ":prefix" ) , ( ExtensionTok , " " ) , ( CharTok , "=>" ) , ( ExtensionTok , " " ) - , ( StringTok , "'from'" ) + , ( VerbatimStringTok , "'from'" ) , ( ExtensionTok , " " ) - , ( KeywordTok , "%>" ) + , ( DataTypeTok , "%>" ) ] , [ ( NormalTok , " " ) , ( KeywordTok , "" ) ] , [ ( NormalTok , " " ) - , ( KeywordTok , "<%=" ) + , ( DataTypeTok , "<%=" ) , ( ExtensionTok , " " ) - , ( NormalTok , "select_date" ) + , ( FunctionTok , "select_date" ) , ( ExtensionTok , " " ) , ( OtherTok , "@to_date" ) , ( ExtensionTok , ", " ) - , ( StringTok , ":prefix" ) + , ( WarningTok , ":prefix" ) , ( ExtensionTok , " " ) , ( CharTok , "=>" ) , ( ExtensionTok , " " ) - , ( StringTok , "'to'" ) + , ( VerbatimStringTok , "'to'" ) , ( ExtensionTok , ", " ) - , ( StringTok , ":start_year" ) + , ( WarningTok , ":start_year" ) , ( ExtensionTok , " " ) , ( CharTok , "=>" ) , ( ExtensionTok , " " ) , ( DecValTok , "2000" ) , ( ExtensionTok , " " ) - , ( KeywordTok , "%>

" ) + , ( DataTypeTok , "%>" ) + , ( KeywordTok , "

" ) ] , [ ( NormalTok , " " ) , ( KeywordTok , "

" ) ] , [ ( NormalTok , " " ) - , ( KeywordTok , "<%=" ) + , ( DataTypeTok , "<%=" ) , ( ExtensionTok , " " ) - , ( NormalTok , "select_tag" ) + , ( FunctionTok , "select_tag" ) , ( ExtensionTok , " " ) , ( StringTok , "\"series\"" ) , ( ExtensionTok , ", " ) - , ( NormalTok , "options_for_select" ) + , ( FunctionTok , "options_for_select" ) , ( ExtensionTok , "(series_list(" ) - , ( StringTok , "'All'" ) + , ( VerbatimStringTok , "'All'" ) , ( ExtensionTok , "), " ) , ( OtherTok , "@series" ) , ( ExtensionTok , ") " ) - , ( KeywordTok , "%>" ) + , ( DataTypeTok , "%>" ) ] , [ ( NormalTok , " " ) - , ( KeywordTok , "<%=" ) + , ( DataTypeTok , "<%=" ) , ( ExtensionTok , " f" ) - , ( NormalTok , ".submit" ) + , ( AttributeTok , ".submit" ) , ( ExtensionTok , " " ) - , ( StringTok , "'Show events'" ) + , ( VerbatimStringTok , "'Show events'" ) , ( ExtensionTok , " " ) - , ( KeywordTok , "%>" ) + , ( DataTypeTok , "%>" ) ] , [ ( NormalTok , " " ) , ( KeywordTok , "

" ) ] -, [ ( KeywordTok , "<%" ) +, [ ( DataTypeTok , "<%" ) , ( ExtensionTok , " " ) , ( KeywordTok , "end" ) , ( ExtensionTok , " " ) - , ( KeywordTok , "%>" ) + , ( DataTypeTok , "%>" ) ] , [] , [ ( KeywordTok , "" ) ] ] diff --git a/test/expected/life.lua.native b/test/expected/life.lua.native --- a/test/expected/life.lua.native +++ b/test/expected/life.lua.native @@ -1,7 +1,7 @@ [ [ ( CommentTok , "-- life.lua" ) ] -, [ ( CommentTok , "-- original by Dave Bollinger " ) - , ( KeywordTok , "" ) - , ( CommentTok , " posted to lua-l" ) +, [ ( CommentTok + , "-- original by Dave Bollinger posted to lua-l" + ) ] , [ ( CommentTok , "-- modified to use ANSI terminal escape sequences" @@ -53,9 +53,9 @@ , ( ControlFlowTok , "end" ) ] , [ ( NormalTok , " " ) - , ( CommentTok , "-- local i=os.clock()+1 while(os.clock()" ) - , ( KeywordTok , " take 1 fp /= ".") <$> getDirectoryContents ("test" "cases") allcases <- mapM (fmap (Text.take 240) @@ -88,6 +93,19 @@ , testGroup "Doesn't hang or drop text on fuzz" $ map (\syn -> testProperty (Text.unpack (sName syn)) (p_no_drop defConfig syn)) syntaxes + , testGroup "All regexes compile" $ + map + (\syn -> testGroup ("syntax " <> sFilename syn) + (map + (\regex -> + testCase ("regex " <> + (Text.unpack $ TE.decodeUtf8 regex) <> " in " + <> sFilename syn) + $ assertBool "regex does not compile" + $ case compileRegex True regex of + Right _ -> True + Left _ -> False) $ getRegexesFromSyntax syn)) + syntaxes , testGroup "Regex module" $ map regexTest regexTests , testGroup "Regression tests" $ let perl = maybe (error "could not find Perl syntax") id @@ -97,43 +115,36 @@ c = maybe (error "could not find C syntax") id (lookupSyntax "c" sMap) in [ testCase "perl NUL case" $ Right - [[(KeywordTok,"s\NUL") - ,(OtherTok,"b") - ,(KeywordTok,"\NUL") + [[(OtherTok,"s\NULb\NUL") ,(StringTok,"c") - ,(KeywordTok,"\NUL")]] + ,(OtherTok,"\NUL")]] @=? tokenize defConfig perl "s\0b\0c\0" , testCase "perl backslash case 1" $ Right - [ [ ( KeywordTok , "m\\" ) - , ( OtherTok , "'" ) ] - ] @=? tokenize defConfig perl + [[(OtherTok,"m\\'")]] + @=? tokenize defConfig perl "m\\'" , testCase "perl backslash case 2" $ Right - [ [ ( KeywordTok , "m\\" ) - , ( OtherTok , "a" ) - , ( KeywordTok , "\\" ) ] - ] @=? tokenize defConfig perl + [[(OtherTok,"m\\a\\")]] + @=? tokenize defConfig perl "m\\a\\" , testCase "perl quoting case" $ Right - [ [ ( KeywordTok , "my" ) - , ( NormalTok , " " ) - , ( DataTypeTok , "$foo" ) - , ( NormalTok , " = " ) - , ( KeywordTok , "q/" ) - , ( StringTok , "bar" ) - , ( KeywordTok , "/" ) - , ( NormalTok , ";" ) - ] - , [ ( KeywordTok , "my" ) - , ( NormalTok , " " ) - , ( DataTypeTok , "$baz" ) - , ( NormalTok , " = " ) - , ( KeywordTok , "'" ) - , ( StringTok , "quux" ) - , ( KeywordTok , "'" ) - , ( NormalTok , ";" ) - ] - ] @=? tokenize defConfig perl + [[(KeywordTok,"my") + ,(NormalTok," ") + ,(DataTypeTok,"$foo") + ,(NormalTok," = ") + ,(OtherTok,"q/") + ,(SpecialStringTok,"bar") + ,(OtherTok,"/") + ,(NormalTok,";")] + ,[(KeywordTok,"my") + ,(NormalTok," ") + ,(DataTypeTok,"$baz") + ,(NormalTok," = ") + ,(OtherTok,"'") + ,(SpecialStringTok,"quux") + ,(OtherTok,"'") + ,(NormalTok,";")]] + @=? tokenize defConfig perl "my $foo = q/bar/;\nmy $baz = 'quux';\n" , testCase "cpp floats" $ Right [ [ (FloatTok,"0.1") , (BuiltInTok,"f")] @@ -271,6 +282,11 @@ ,(2,replicate 398 'a') ,(3,"a") ,(4,"a")])) + , ("a++a", "aaaaa", Nothing) + , ("\\w+e", "aaaeeee", Just ("aaaeeee", [])) + , ("\\w+?e", "aaaeeee", Just ("aaae", [])) + , ("a+b??", "aaab", Just ("aaa", [])) + , ("\\([a-z]+(?R)*\\)", "(aa(b(c)(d)))", Just ("(aa(b(c)(d)))", [])) ] diff --git a/xml/abc.xml b/xml/abc.xml --- a/xml/abc.xml +++ b/xml/abc.xml @@ -2,7 +2,7 @@ - + @@ -38,7 +38,10 @@ - + + + + @@ -79,8 +82,9 @@ - + + diff --git a/xml/actionscript.xml b/xml/actionscript.xml --- a/xml/actionscript.xml +++ b/xml/actionscript.xml @@ -1,6 +1,6 @@ - + @@ -247,6 +247,8 @@ + + @@ -266,12 +268,14 @@ - - + + + + @@ -293,15 +297,16 @@ - - - - - + + + + + - + + @@ -329,8 +334,9 @@ - + + diff --git a/xml/ada.xml b/xml/ada.xml --- a/xml/ada.xml +++ b/xml/ada.xml @@ -1,7 +1,7 @@ - + + + + @@ -193,7 +196,7 @@ - + diff --git a/xml/agda.xml b/xml/agda.xml --- a/xml/agda.xml +++ b/xml/agda.xml @@ -3,7 +3,7 @@ ]> - + abstract @@ -75,11 +75,13 @@ + + @@ -110,7 +112,7 @@ - + + diff --git a/xml/alert_indent.xml b/xml/alert_indent.xml deleted file mode 100644 --- a/xml/alert_indent.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/xml/apache.xml b/xml/apache.xml --- a/xml/apache.xml +++ b/xml/apache.xml @@ -13,7 +13,7 @@ --> @@ -585,6 +585,7 @@ + @@ -631,3 +632,4 @@ + diff --git a/xml/asn1.xml b/xml/asn1.xml --- a/xml/asn1.xml +++ b/xml/asn1.xml @@ -13,7 +13,7 @@ You'll find the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php --> - + DEFINITIONS @@ -54,6 +54,8 @@ + + @@ -64,6 +66,11 @@ + + + + + diff --git a/xml/ats.xml b/xml/ats.xml --- a/xml/ats.xml +++ b/xml/ats.xml @@ -1,165 +1,165 @@ - + + ]> - + - abstype - abst0ype - absprop - absview - absvtype - absviewtype - absvt0ype - absviewt0ype - and - as - assume - begin - break - case - continue - classdec - datasort - datatype - dataprop - dataview - datavtype - dataviewtype - do - dynload - else - end - exception - extern - extype - extval - if - in - infix - infixl - infixr - prefix - postfix - let - local - macdef - macrodef - nonfix - overload - of - op - rec - scase - sif - sortdef - sta - stacst - stadef - stavar - staload - symelim - symintr - then - try - tkindef - type - typedef - propdef - viewdef - vtypedef - viewtypedef - val - prval - var - prvar - when - where - for - while - with - withtype - withprop - withview - withvtype - withviewtype + abstype + abst0ype + absprop + absview + absvtype + absviewtype + absvt0ype + absviewt0ype + and + as + assume + begin + break + case + continue + classdec + datasort + datatype + dataprop + dataview + datavtype + dataviewtype + do + dynload + else + end + exception + extern + extype + extval + if + in + infix + infixl + infixr + prefix + postfix + let + local + macdef + macrodef + nonfix + overload + of + op + rec + scase + sif + sortdef + sta + stacst + stadef + stavar + staload + symelim + symintr + then + try + tkindef + type + typedef + propdef + viewdef + vtypedef + viewtypedef + val + prval + var + prvar + when + where + for + while + with + withtype + withprop + withview + withvtype + withviewtype - $arrpsz - $arrptrsize - $delay - $ldelay - $effmask - $effmask_ntm - $effmask_exn - $effmask_ref - $effmask_wrt - $effmask_all - $extern - $extkind - $extype - $extype_struct - $extval - $lst - $lst_t - $lst_vt - $list - $list_t - $list_vt - $rec - $rec_t - $rec_vt - $record - $record_t - $record_vt - $tup - $tup_t - $tup_vt - $tuple - $tuple_t - $tuple_vt - $raise - $showtype - $myfilename - $mylocation - $myfunction - #assert - #define - #elif - #elifdef - #elifndef - #else - #endif - #error - #if - #ifdef - #ifndef - #include - #print - #then - #undef + $arrpsz + $arrptrsize + $delay + $ldelay + $effmask + $effmask_ntm + $effmask_exn + $effmask_ref + $effmask_wrt + $effmask_all + $extern + $extkind + $extype + $extype_struct + $extval + $lst + $lst_t + $lst_vt + $list + $list_t + $list_vt + $rec + $rec_t + $rec_vt + $record + $record_t + $record_vt + $tup + $tup_t + $tup_vt + $tuple + $tuple_t + $tuple_vt + $raise + $showtype + $myfilename + $mylocation + $myfunction + #assert + #define + #elif + #elifdef + #elifndef + #else + #endif + #error + #if + #ifdef + #ifndef + #include + #print + #then + #undef - fn - fnx - fun - prfn - prfun - praxi - castfn - implmnt - implement - primplmnt - primplement - lam - llam - fix + fn + fnx + fun + prfn + prfun + praxi + castfn + implmnt + implement + primplmnt + primplement + lam + llam + fix @@ -190,28 +190,27 @@ + + + + - - - - - - - - + + + - - - - + + + + @@ -236,8 +235,6 @@ - - @@ -247,9 +244,7 @@ - - - + diff --git a/xml/awk.xml b/xml/awk.xml --- a/xml/awk.xml +++ b/xml/awk.xml @@ -1,6 +1,6 @@ - @@ -134,128 +134,129 @@ xdigit - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - - - - + + + + - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - + + @@ -286,3 +287,4 @@ + diff --git a/xml/bash.xml.patch b/xml/bash.xml.patch deleted file mode 100644 --- a/xml/bash.xml.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/skylighting-core/xml/bash.xml -+++ b/skylighting-core/xml/bash.xml -@@ -482,7 +482,7 @@ - - - -- -+ - - - - diff --git a/xml/boo.xml b/xml/boo.xml --- a/xml/boo.xml +++ b/xml/boo.xml @@ -2,7 +2,7 @@ - + import @@ -171,7 +171,7 @@ - + @@ -201,11 +201,13 @@ + + @@ -238,6 +240,8 @@ + + @@ -267,6 +271,11 @@ + + + + + @@ -295,8 +304,8 @@ - - + + @@ -304,3 +313,4 @@ + diff --git a/xml/c.xml b/xml/c.xml --- a/xml/c.xml +++ b/xml/c.xml @@ -10,7 +10,7 @@ ]> - + - - @@ -137,9 +135,7 @@ - - - + @@ -149,17 +145,32 @@ + + + + + + + + + + + + + + + @@ -187,27 +198,19 @@ - - - + - - - - - - - + @@ -218,9 +221,7 @@ - - - + @@ -280,8 +281,9 @@ - + + 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,13 +741,14 @@ - + - + - + + @@ -859,19 +860,18 @@ - - + - - - + + + @@ -881,3 +881,4 @@ + diff --git a/xml/cmake.xml b/xml/cmake.xml --- a/xml/cmake.xml +++ b/xml/cmake.xml @@ -4,35 +4,20 @@ ]> - - - + @@ -4134,11 +4117,13 @@ - + + + + - - - + + @@ -4147,42 +4132,62 @@ - - + + + + + - + + + + + + + + + + + + - + - + + - + + + + + + - + @@ -4211,10 +4216,10 @@ - + - - + + @@ -4230,11 +4235,12 @@ - + + - + diff --git a/xml/cmake.xml.patch b/xml/cmake.xml.patch deleted file mode 100644 --- a/xml/cmake.xml.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- cmake.xml.orig 2018-06-08 10:09:39.000000000 -0700 -+++ cmake.xml 2018-06-08 09:49:50.000000000 -0700 -@@ -3304,6 +3304,10 @@ - - - -+ -+ - - - diff --git a/xml/coffee.xml b/xml/coffee.xml --- a/xml/coffee.xml +++ b/xml/coffee.xml @@ -2,7 +2,7 @@ - + @@ -357,3 +357,4 @@ + diff --git a/xml/coldfusion.xml b/xml/coldfusion.xml --- a/xml/coldfusion.xml +++ b/xml/coldfusion.xml @@ -1,6 +1,6 @@ - + @@ -510,111 +510,109 @@ - - - - - + + + + + - - - - - - + + + + + + + + + + + + + + + + + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - + + + + - + + + - + + - + + + @@ -623,49 +621,49 @@ - + - - + + - + - + - + - - + + - + - + - + - + - + @@ -674,41 +672,42 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -718,9 +717,7 @@ - - - + @@ -729,3 +726,4 @@ + diff --git a/xml/commonlisp.xml b/xml/commonlisp.xml --- a/xml/commonlisp.xml +++ b/xml/commonlisp.xml @@ -1,6 +1,6 @@ - + < @@ -1114,8 +1114,8 @@ - - + + @@ -1125,13 +1125,16 @@ + + - - + + + @@ -1147,6 +1150,10 @@ + + + + @@ -1171,7 +1178,8 @@ - + + diff --git a/xml/cs.xml b/xml/cs.xml --- a/xml/cs.xml +++ b/xml/cs.xml @@ -1,5 +1,5 @@ - + abstract @@ -100,9 +100,8 @@ - - - + + @@ -110,11 +109,11 @@ - - + + - - + + @@ -137,10 +136,21 @@ - + + + + - + + + + + + + + + @@ -161,8 +171,9 @@ - + + diff --git a/xml/css.xml b/xml/css.xml --- a/xml/css.xml +++ b/xml/css.xml @@ -38,7 +38,7 @@ --> - + @@ -1585,6 +1585,7 @@ + @@ -1731,8 +1732,9 @@ - + + diff --git a/xml/curry.xml b/xml/curry.xml --- a/xml/curry.xml +++ b/xml/curry.xml @@ -30,7 +30,7 @@ ]> - @@ -229,13 +229,18 @@ + + - + + + + @@ -356,9 +361,10 @@ - + + diff --git a/xml/d.xml b/xml/d.xml --- a/xml/d.xml +++ b/xml/d.xml @@ -99,7 +99,7 @@ ======================================================================== --> - + @@ -737,17 +737,20 @@ + + - - - + + + + @@ -864,14 +867,14 @@ - - - + + + - - + + - + @@ -879,20 +882,20 @@ - - + + - - + + - - - - + + + + - + @@ -917,10 +920,10 @@ - - - - + + + + @@ -932,3 +935,4 @@ + diff --git a/xml/diff.xml b/xml/diff.xml --- a/xml/diff.xml +++ b/xml/diff.xml @@ -2,9 +2,6 @@ - - - ]> - + - - + + + - - - + + + + - - + + - + - + + - + - + + - + - - + + + - + - + - + - - + + + - - + + + @@ -101,6 +105,13 @@ + + + + + + + diff --git a/xml/djangotemplate.xml b/xml/djangotemplate.xml --- a/xml/djangotemplate.xml +++ b/xml/djangotemplate.xml @@ -4,7 +4,7 @@ ]> - + diff --git a/xml/dot.xml b/xml/dot.xml --- a/xml/dot.xml +++ b/xml/dot.xml @@ -1,7 +1,7 @@ - + @@ -133,12 +133,16 @@ + + + + @@ -162,7 +166,7 @@ - + @@ -170,3 +174,4 @@ + diff --git a/xml/doxygen.xml b/xml/doxygen.xml --- a/xml/doxygen.xml +++ b/xml/doxygen.xml @@ -2,9 +2,11 @@ + + ]> \endrtfonly @endrtfonly \endsecreflist @endsecreflist \endxmlonly @endxmlonly - \f[ @f[ - \f] @f] - \f$ @f$ - \hideinitializer @hideinitializer \htmlonly @htmlonly @@ -84,21 +82,6 @@ \test @test \version @version \xmlonly @xmlonly - - \# @# - \$ @$ - \% @% - \& @& - \> @> - \< @< - \" @" - \:: @:: - \@ @@ - \\ @\ - \~ @~ - \. @. - \-- @-- - \--- @--- @@ -202,6 +185,12 @@ \var @var \vhdlflow @vhdlflow + + \endcode @endcode + \endverbatim @endverbatim + \endmsc @endmsc + \enddot @enddot + \note @note @@ -231,8 +220,8 @@ TODO Not all commands are handled properly nowadays :( Need few more contexts... --> - - + + @@ -242,38 +231,21 @@ - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - - - - - - + + + + + - - - - - - - - + + - + - + - - + + + + + + + + - + - + + - + + + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - - + + + + - - - - - - - - + - + - - + + + + - + + + + - + @@ -411,52 +514,90 @@ - - - - - - - - - - - + + + + + - - - - + + + - - - + + + - - - + + + + + - - - + + + - - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -480,10 +621,11 @@ + - + diff --git a/xml/doxygenlua.xml b/xml/doxygenlua.xml --- a/xml/doxygenlua.xml +++ b/xml/doxygenlua.xml @@ -2,20 +2,22 @@ + ]> \endrtfonly @endrtfonly \endsecreflist @endsecreflist \endxmlonly @endxmlonly - \f[ @f[ - \f] @f] - \f$ @f$ - \hideinitializer @hideinitializer \htmlonly @htmlonly @@ -94,21 +92,6 @@ \test @test \version @version \xmlonly @xmlonly - - \# @# - \$ @$ - \% @% - \& @& - \> @> - \< @< - \" @" - \:: @:: - \@ @@ - \\ @\ - \~ @~ - \. @. - \-- @-- - \--- @--- @@ -212,6 +195,12 @@ \var @var \vhdlflow @vhdlflow + + \endcode @endcode + \endverbatim @endverbatim + \endmsc @endmsc + \enddot @enddot + \note @note @@ -241,174 +230,98 @@ TODO Not all commands are handled properly nowadays :( Need few more contexts... --> + + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + - - - - + + - - - - - + + + + - - - - - - - - + - + - - + + + + - + + + + - + @@ -419,59 +332,96 @@ - - - - - - - - - - - + + + + - - - - + + + - - - + + + - - - + + + + + - - - + + + - - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -488,10 +438,11 @@ + - + diff --git a/xml/dtd.xml b/xml/dtd.xml --- a/xml/dtd.xml +++ b/xml/dtd.xml @@ -3,7 +3,7 @@ ]> - + @@ -46,6 +46,7 @@ + @@ -101,10 +102,9 @@ - + - - + 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 @@ -97,7 +97,11 @@ - + + + + + @@ -118,8 +122,9 @@ - + + diff --git a/xml/elixir.xml b/xml/elixir.xml --- a/xml/elixir.xml +++ b/xml/elixir.xml @@ -30,7 +30,7 @@ name="Elixir" section="Sources" style="elixir" - version="5"> + version="6"> catch @@ -180,6 +180,9 @@ + + + @@ -223,3 +226,4 @@ + diff --git a/xml/elm.xml b/xml/elm.xml --- a/xml/elm.xml +++ b/xml/elm.xml @@ -1,6 +1,6 @@ - + type @@ -38,9 +38,9 @@ - + - + @@ -69,10 +69,16 @@ + + + - - + + + + + @@ -108,7 +114,7 @@ - + @@ -135,9 +141,10 @@ - - + + + 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 --> - + @@ -220,6 +220,7 @@ + diff --git a/xml/fasm.xml b/xml/fasm.xml --- a/xml/fasm.xml +++ b/xml/fasm.xml @@ -1,897 +1,1750 @@ - - - - - - - - rax - eax - ax - ah - al - rbx - ebx - bx - bh - bl - rcx - ecx - cx - ch - cl - rdx - edx - dx - dh - dl - rbp - ebp - bp - rsi - esi - si - rdi - edi - di - rsp - esp - sp - r8 - r9 - r10 - r11 - r12 - r13 - r14 - r15 - - cs - ds - es - fs - gs - ss - - cr0 - - cr2 - cr3 - cr4 - - dr0 - dr1 - dr2 - dr3 - dr6 - dr7 - - st - - mm0 - mm1 - mm2 - mm3 - mm4 - mm5 - mm6 - mm7 - - xmm0 - xmm1 - xmm2 - xmm3 - xmm4 - xmm5 - xmm6 - xmm7 - - - aaa - aad - aam - aas - adc - add - addpd - addps - addsd - addss - addsubpd - addsubps - and - andnpd - andnps - andpd - andps - arpl - bound - bsf - bsr - bswap - bt - btc - btr - bts - call - cbw - cwde - cwd - cdq - cdqe - cqo - clc - cld - clgi - cli - clts - clflush - cmc - cmova - cmovae - cmovb - cmovbe - cmovc - cmove - cmovg - cmovge - cmovl - cmovle - cmovna - cmovnae - cmovnb - cmovnbe - cmovnc - cmovne - cmovng - cmovnge - cmovnl - cmovnle - cmovno - cmovnp - cmovns - cmovnz - cmovo - cmovp - cmovpe - cmovpo - cmovs - cmovz - cmp - cmpeqpd - cmpeqps - cmpeqsd - cmpeqss - cmplepd - cmpleps - cmplesd - cmpless - cmpltpd - cmpltps - cmpltsd - cmpltss - cmpneqpd - cmpneqps - cmpneqsd - cmpneqss - cmpnlepd - cmpnleps - cmpnlesd - cmpnless - cmpnltpd - cmpnltps - cmpnltsd - cmpnltss - cmpordpd - cmpordps - cmpordsd - cmpordss - cmppd - cmpps - cmps - cmpsb - cmpsd - cmpss - cmpsw - cmpunordpd - cmpunordps - cmpunordsd - cmpunordss - cmpxchg - cmpxchg486 - cmpxchg8b - cmpxchg16b - comisd - comiss - cpuid - cvtdq2pd - cvtdq2ps - cvtpd2dq - cvtpd2pi - cvtpd2ps - cvtpi2pd - cvtpi2ps - cvtps2dq - cvtps2pd - cvtps2pi - cvtsd2si - cvtsd2ss - cvtsi2sd - cvtsi2ss - cvtss2sd - cvtss2si - cvttpd2dq - cvttpd2pi - cvttps2dq - cvttps2pi - cvttsd2si - cvttss2si - daa - das - dec - div - divpd - divps - divsd - divss - emms - enter - f2xm1 - fabs - fadd - faddp - fbld - fbstp - fchs - fclex - fnclex - fcmovb - fcmovbe - fcmove - fcmovnb - fcmovnbe - fcmovne - fcmovnu - fcmovu - fcom - fcomp - fcompp - fcomi - fcomip - fcos - fdecstp - fdisi - feni - fdiv - fdivr - fdivp - fdivrp - femms - ffree - ffreep - fiadd - ficom - ficomp - fidiv - fidivr - fild - fimul - fincstp - finit - fist - fistp - fisttp - fisub - fisubr - fld - fld1 - fldl2e - fldl2t - fldlg2 - fldln2 - fldcw - fldenv - fldpi - fldz - fmul - fmulp - fndisi - fneni - fninit - fnop - fnsave - fnstcw - fnstenv - fnstsw - fnwait - fpatan - fptan - fprem - fprem1 - frndint - frstor - fsave - fscale - fsetpm - fsin - fsincos - fsqrt - fst - fstp - fstcw - fstenv - fstsw - fsub - fsubr - fsubp - fsubrp - ftst - fucom - fucomp - fucompp - fucomi - fucomip - fwait - fxam - fxch - fxrstor - fxsave - fxtract - fyl2x - fyl2xp1 - haddpd - haddps - hlt - hsubpd - hsubps - ibts - idiv - imul - in - inc - ins - insb - insd - insw - int - int1 - int3 - into - invd - invlpg - invlpga - iret - iretd - iretq - iretw - ja - jae - jb - jbe - jc - je - jg - jge - jl - jle - jna - jnae - jnb - jnbe - jnc - jne - jng - jnge - jnl - jnle - jno - jnp - jns - jnz - jo - jp - jpe - jpo - js - jz - jcxz - jecxz - jrcxz - jmp - lahf - lar - lddqu - ldmxcsr - lds - les - lea - leave - lfence - lfs - lgdt - lgs - lidt - lldt - lmsw - loadall - loadall286 - lods - lodsb - lodsd - lodsq - lodsw - loop - loope - loopne - loopnz - loopz - lsl - lss - ltr - maskmovdqu - maskmovq - maxpd - maxps - maxsd - maxss - mfence - minpd - minps - minsd - minss - monitor - mov - movapd - movaps - movd - movddup - movdq2q - movdqa - movdqu - movhlps - movhpd - movhps - movlhps - movlpd - movlps - movmskpd - movmskps - movntdq - movnti - movntpd - movntps - movntq - movq - movq2dq - movs - movsb - movsd - movshdup - movsldup - movsq - movss - movsx - movsxd - movsw - movupd - movups - movzx - mul - mulpd - mulps - mulsd - mulss - mwait - neg - nop - not - or - orpd - orps - out - outs - outsb - outsw - outsd - packssdw - packsswb - packuswb - paddb - paddd - paddq - paddsb - paddsw - paddusb - paddusw - paddw - pand - pandn - pause - pavgb - pavgusb - pavgw - pcmpeqb - pcmpeqw - pcmpeqd - pcmpgtb - pcmpgtw - pcmpgtd - pdistib - pextrw - pf2id - pf2iw - pfacc - pfadd - pfcmpeq - pfcmpge - pfcmpgt - pfmax - pfmin - pfmul - pfnacc - pfpnacc - pfrcp - pfrcpit1 - pfrcpit2 - pfrsqit1 - pfrsqrt - pfsub - pfsubr - pi2fd - pi2fw - pinsrw - pmachriw - pmaddwd - pmagw - pmaxsw - pmaxub - pminsw - pminub - pmovmskb - pmulhrw - pmulhuw - pmulhw - pmullw - pmuludq - pmvgezb - pmvlzb - pmvnzb - pmvzb - pop - popa - popaw - popad - popf - popfw - popfd - popfq - por - prefetch - prefetchnta - prefetcht0 - prefetcht1 - prefetcht2 - prefetchw - psadbw - pshufd - pshufhw - pshuflw - pshufw - pslld - pslldq - psllq - psllw - psrad - psraw - psrld - psrldq - psrlq - psrlw - psubb - psubd - psubq - psubsb - psubsiw - psubsw - psubusb - psubusw - psubw - pswapd - punpckhbw - punpckhdq - punpckhqdq - punpckhwd - punpcklbw - punpckldq - punpcklqdq - punpcklwd - push - pusha - pushad - pushaw - pushf - pushfd - pushfq - pushfw - pxor - rcl - rcr - rcpps - rcpss - rdmsr - rdpmc - rdshr - rdtsc - rdtscp - ret - retf - retn - rol - ror - rsdc - rsldt - rsm - rsqrtps - rsqrtss - rsts - sahf - sal - sar - salc - sbb - scas - scasb - scasd - scasq - scasw - seta - setae - setb - setbe - setc - sete - setg - setge - setl - setle - setna - setnae - setnb - setnbe - setnc - setne - setng - setnge - setnl - setnle - setno - setnp - setns - setnz - seto - setp - setpe - setpo - sets - setz - sfence - sgdt - shl - shld - shr - shrd - shufpd - shufps - sidt - skinit - sldt - smi - smint - smintold - smsw - sqrtpd - sqrtps - sqrtsd - sqrtss - stc - std - stgi - sti - stmxcsr - stos - stosb - stosd - stosq - stosw - str - sub - subpd - subps - subsd - subss - svdc - svldt - svts - swapgs - syscall - sysenter - sysexit - sysret - test - ucomisd - ucomiss - ud0 - ud1 - ud2 - umov - unpckhpd - unpckhps - unpcklpd - unpcklps - verr - verw - vmload - vmmcall - vmrun - vmsave - wait - wbinvd - wrmsr - wrshr - xadd - xbts - xchg - xlat - xlatb - xor - xorpd - xorps - - - - - db - dw - du - dd - dp - df - dq - dt - - rb - rw - rd - rp - rf - rq - rt - - file - - byte - word - dword - pword - qword - tbyte - tword - dqword - ptr - - - - append - at - break - common - display - else - end - equ - fix - foward - if - irp - irps - label - local - match - macro - purge - repeat - rept - reverse - restore - struc - times - while - virtual - - - - align - entry - extrn - format - include - invoke - data - load - from - heap - org - proc - public - section - segment - stack - store - use16 - use32 - use64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + +]> + + + + + rax + eax + ax + ah + al + rbx + ebx + bx + bh + bl + rcx + ecx + cx + ch + cl + rdx + edx + dx + dh + dl + rbp + ebp + bp + rsi + esi + si + rdi + edi + di + rsp + esp + sp + r8 + r9 + r10 + r11 + r12 + r13 + r14 + r15 + + cs + ds + es + fs + gs + ss + + cr0 + + cr2 + cr3 + cr4 + + dr0 + dr1 + dr2 + dr3 + dr6 + dr7 + + st0 + st1 + st2 + st3 + st4 + st5 + st6 + st7 + + mm0 + mm1 + mm2 + mm3 + mm4 + mm5 + mm6 + mm7 + + xmm0 + xmm1 + xmm2 + xmm3 + xmm4 + xmm5 + xmm6 + xmm7 + + ymm0 + ymm1 + ymm2 + ymm3 + ymm4 + ymm5 + ymm6 + ymm7 + + zmm0 + zmm1 + zmm2 + zmm3 + zmm4 + zmm5 + zmm6 + zmm7 + + k0 + k1 + k2 + k3 + k4 + k5 + k6 + k7 + + bnd0 + bnd1 + bnd2 + bnd3 + + + + call + ja + jae + jb + jbe + jc + je + jg + jge + jl + jle + jmp + jna + jnae + jnb + jnbe + jnc + jne + jng + jnge + jnl + jnle + jno + jnp + jns + jnz + jo + jp + jpe + jpo + js + jz + jcxz + jecxz + loop + loopd + loope + looped + loopew + loopne + loopned + loopnew + loopnz + loopnzd + loopnzw + loopw + loopz + loopzd + loopzw + loopnz + loopnzd + loopnzw + loopz + loopzw + ret + retd + retf + retfd + retfw + retn + retnd + retnw + retw + iret + iretd + iretq + iretw + rsm + syscall + sysenter + sysexit + sysret + syscallq + sysretq + + + + aaa + aad + aam + aas + adc + add + addpd + addps + addsd + addss + addsubpd + addsubps + aesdec + aesdeclast + aesenc + aesenclast + aesimc + aeskeygenassist + and + andn + andnpd + andnps + andpd + andps + arpl + bextr + blcfill + blci + blcic + blcmsk + blcs + blendpd + blendps + blendvpd + blendvps + blsfill + blsi + blsic + blsmsk + blsr + bndldx + bndmk + bndstx + bound + bsf + bsr + bswap + bt + btc + btr + bts + bzhi + cbw + cdq + cdqe + clc + cld + clflush + clgi + cli + clts + cmc + cmov + cmova + cmovae + cmovb + cmovbe + cmovc + cmove + cmovg + cmovge + cmovl + cmovle + cmovna + cmovnae + cmovnb + cmovnbe + cmovnc + cmovne + cmovng + cmovnge + cmovnl + cmovnle + cmovno + cmovnp + cmovns + cmovnz + cmovo + cmovp + cmovpe + cmovpo + cmovs + cmovz + cmp + cmpeq + cmpeqpd + cmpeqps + cmpeqsd + cmpeqss + cmple + cmplepd + cmpleps + cmplesd + cmpless + cmplt + cmpltpd + cmpltps + cmpltsd + cmpltss + cmpneq + cmpneqpd + cmpneqps + cmpneqsd + cmpneqss + cmpnle + cmpnlepd + cmpnleps + cmpnlesd + cmpnless + cmpnlt + cmpnltpd + cmpnltps + cmpnltsd + cmpnltss + cmpord + cmpordpd + cmpordps + cmpordsd + cmpordss + cmppd + cmpps + cmps + cmpsb + cmpsd + cmpsq + cmpss + cmpsw + cmpunord + cmpunordpd + cmpunordps + cmpunordsd + cmpunordss + cmpxchg16b + cmpxchg486 + cmpxchg8b + cmpxchg + comisd + comiss + compare + cpuid + cqo + crc32 + cvtdq2pd + cvtdq2ps + cvtpd2dq + cvtpd2pi + cvtpd2ps + cvtpi2pd + cvtpi2ps + cvtps2dq + cvtps2pd + cvtps2pi + cvtsd2si + cvtsd2ss + cvtsi2sd + cvtsi2ss + cvtss2sd + cvtss2si + cvttpd2dq + cvttpd2pi + cvttps2dq + cvttps2pi + cvttsd2si + cvttss2si + cwd + cwde + daa + das + dec + div + divpd + divps + divsd + divss + dppd + dpps + emms + enter + extractps + extrq + f2xm1 + fabs + fadd + faddp + fbld + fbstp + fchs + fclex + fcmovb + fcmovbe + fcmove + fcmovnb + fcmovnbe + fcmovne + fcmovnu + fcmovu + fcom + fcomi + fcomip + fcomp + fcompp + fcos + fdecstp + fdisi + fdiv + fdivp + fdivr + fdivrp + femms + feni + ffree + ffreep + fiadd + ficom + ficomp + fidiv + fidivr + fild + fimul + fincstp + finit + fist + fistp + fisttp + fisub + fisubr + fld1 + fld + fldcw + fldenv + fldenvd + fldenvw + fldl2e + fldl2t + fldlg2 + fldln2 + fldpi + fldz + fmul + fmulp + fnclex + fndisi + fneni + fninit + fnop + fnsave + fnsaved + fnsavew + fnstcw + fnstenv + fnstenvd + fnstenvw + fnstsw + fnwait + fpatan + fprem1 + fprem + fptan + frndint + frstor + frstord + frstorw + fsave + fsaved + fsavew + fscale + fsetpm + fsin + fsincos + fsqrt + fst + fstcw + fstenv + fstenvd + fstenvw + fstp + fstsw + fsub + fsubp + fsubr + fsubrp + ftst + fucom + fucomi + fucomip + fucomp + fucompp + fwait + fxam + fxch + fxrstor64 + fxrstor + fxsave64 + fxsave + fxtract + fyl2x + fyl2xp1 + getsec + haddpd + haddps + hlt + hsubpd + hsubps + ibts + idiv + imul + in + inc + ins + insb + insd + insertps + insertq + insw + int1 + int3 + int + into + invd + invept + invlpg + invlpga + invpcid + invvpid + lahf + lar + lddqu + ldmxcsr + lds + lea + leave + les + lfence + lfs + lgdt + lgs + lidt + lldt + lmsw + loadall286 + loadall + lock + lods + lodsb + lodsd + lodsq + lodsw + lsl + lss + ltr + lzcnt + maskmovdqu + maskmovq + maxpd + maxps + maxsd + maxss + mfence + minpd + minps + minsd + minss + monitor + mov + movapd + movaps + movbe + movd + movddup + movdq2q + movdqa + movdqu + movhlps + movhpd + movhps + movlhps + movlpd + movlps + movmskpd + movmskps + movntdq + movntdqa + movnti + movntpd + movntps + movntq + movntsd + movntss + movq2dq + movq + movs + movsb + movsd + movshdup + movsldup + movsq + movss + movsw + movsx + movsxd + movupd + movups + movzx + mpsadbw + mul + mulpd + mulps + mulsd + mulss + mulx + mwait + neg + nop + not + or + orpd + orps + out + outs + outsb + outsd + outsw + pabsb + pabsd + pabsw + packssdw + packsswb + packusdw + packuswb + paddb + paddd + paddq + paddsb + paddsw + paddusb + paddusw + paddw + palignr + pand + pandn + pause + pavgb + pavgusb + pavgw + pblendvb + pblendw + pclmulqdq + pcmpeqb + pcmpeqd + pcmpeqq + pcmpeqw + pcmpestri + pcmpestrm + pcmpgtb + pcmpgtd + pcmpgtq + pcmpgtw + pcmpistri + pcmpistrm + pdep + pdistib + pext + pextrb + pextrd + pextrq + pextrw + pf2id + pf2iw + pfacc + pfadd + pfcmpeq + pfcmpge + pfcmpgt + pfmax + pfmin + pfmul + pfnacc + pfpnacc + pfrcp + pfrcpit1 + pfrcpit2 + pfrsqit1 + pfrsqrt + pfsub + pfsubr + phaddd + phaddsw + phaddw + phminposuw + phsubd + phsubsw + phsubw + pi2fd + pi2fw + pinsrb + pinsrd + pinsrq + pinsrw + pmachriw + pmaddubsw + pmaddwd + pmagw + pmaxsb + pmaxsd + pmaxsw + pmaxub + pmaxud + pmaxuw + pminsb + pminsd + pminsw + pminub + pminud + pminuw + pmovmskb + pmovsxbd + pmovsxbq + pmovsxbw + pmovsxdq + pmovsxwd + pmovsxwq + pmovzxbd + pmovzxbq + pmovzxbw + pmovzxdq + pmovzxwd + pmovzxwq + pmuldq + pmulhrsw + pmulhrw + pmulhuw + pmulhw + pmulld + pmullw + pmuludq + pmvgezb + pmvlzb + pmvnzb + pmvzb + pop + popa + popad + popaw + popcnt + popd + popf + popfd + popfq + popfw + popw + por + prefetch + prefetchnta + prefetcht0 + prefetcht1 + prefetcht2 + prefetchw + psadbw + pshufb + pshufd + pshufhw + pshuflw + pshufw + psignb + psignd + psignw + pslld + pslldq + psllq + psllw + psrad + psraw + psrld + psrldq + psrlq + psrlw + psubb + psubd + psubq + psubsb + psubsiw + psubsw + psubusb + psubusw + psubw + pswapd + ptest + punpckhbw + punpckhdq + punpckhqdq + punpckhwd + punpcklbw + punpckldq + punpcklqdq + punpcklwd + push + pusha + pushad + pushaw + pushd + pushf + pushfd + pushfq + pushfw + pushw + pxor + rcl + rcpps + rcpss + rcr + rdfsbase + rdgsbase + rdmsr + rdmsrq + rdpmc + rdrand + rdshr + rdtsc + rdtscp + rol + ror + rorx + roundpd + roundps + roundsd + roundss + rsdc + rsldt + rsm + rsqrtps + rsqrtss + rsts + sahf + sal + salc + sar + sarx + sbb + scas + scasb + scasd + scasq + scasw + set + seta + setae + setb + setbe + setc + sete + setg + setge + setl + setle + setna + setnae + setnb + setnbe + setnc + setne + setng + setnge + setnl + setnle + setno + setnp + setns + setnz + seto + setp + setpe + setpo + sets + setz + sfence + sgdt + shl + shld + shlx + shr + shrd + shrx + shufpd + shufps + sidt + skinit + sldt + smi + smint + smintold + smsw + sqrtpd + sqrtps + sqrtsd + sqrtss + stc + std + stgi + sti + stmxcsr + stos + stosb + stosd + stosq + stosw + str + sub + subpd + subps + subsd + subss + svdc + svldt + svts + swapgs + t1mskc + test + tzcnt + tzmsk + ucomisd + ucomiss + ud0 + ud1 + ud2 + umov + unpckhpd + unpckhps + unpcklpd + unpcklps + vaesenc + vaesenclast + vaesimc + vblendvpd + vblendvps + vbroadcastf128 + vbroadcasti128 + vbroadcastsd + vbroadcastss + vcomisd + vcomiss + vcvtdq2pd + vcvtdq2ps + vcvtpd2dq + vcvtpd2ps + vcvtph2ps + vcvtps2dq + vcvtps2pd + vcvtps2ph + vcvtsd2si + vcvtsd2ss + vcvtsi2sd + vcvtsi2ss + vcvtss2sd + vcvtss2si + vcvttpd2dq + vcvttps2dq + vcvttsd2si + vcvttss2si + vdppd + verr + verw + vextractf128 + vextracti128 + vextractps + vfm132pd + vfm132ps + vfm132sd + vfm132ss + vfm213pd + vfm213ps + vfm213sd + vfm213ss + vfm231pd + vfm231ps + vfm231sd + vfm231ss + vfmaddpd + vfmaddsub132pd + vfmaddsub132ps + vfmaddsub213pd + vfmaddsub213ps + vfmaddsub231pd + vfmaddsub231ps + vfmsubadd132pd + vfmsubadd132ps + vfmsubadd213pd + vfmsubadd213ps + vfmsubadd231pd + vfmsubadd231ps + vfmsubss + vfnm132pd + vfnm132ps + vfnm132sd + vfnm132ss + vfnm213pd + vfnm213ps + vfnm213sd + vfnm213ss + vfnm231pd + vfnm231ps + vfnm231sd + vfnm231ss + vfrczpd + vfrczps + vfrczsd + vfrczss + vgatherdpd + vgatherdps + vgatherqpd + vgatherqps + vinsertf128 + vinserti128 + vinsertps + vlddqu + vldmxcsr + vmaskmovdqu + vmaskmovpd + vmaskmovps + vmcall + vmclear + vmlaunch + vmload + vmmcall + vmovapd + vmovaps + vmovd + vmovddup + vmovdqa + vmovdqu + vmovhlps + vmovhpd + vmovhps + vmovlhps + vmovlpd + vmovlps + vmovmskpd + vmovmskps + vmovntdq + vmovntdqa + vmovntpd + vmovntps + vmovq + vmovsd + vmovshdup + vmovsldup + vmovss + vmovupd + vmovups + vmptrld + vmptrst + vmread + vmresume + vmrun + vmsave + vmwrite + vmxoff + vmxon + vpabsb + vpabsd + vpabsw + vpackssdw + vpacksswb + vpackusdw + vpackuswb + vpaddb + vpaddd + vpaddq + vpaddsb + vpaddsw + vpaddusb + vpaddusw + vpaddw + vpalignr + vpand + vpandn + vpause + vpavgb + vpavgusb + vpavgw + vpblendvb + vpblendw + vpbroadcastb + vpbroadcastd + vpbroadcastq + vpbroadcastw + vpclmulqdq + vpcmov + vpcmpeqb + vpcmpeqd + vpcmpeqq + vpcmpeqw + vpcmpestri + vpcmpestrm + vpcmpgtb + vpcmpgtd + vpcmpgtq + vpcmpgtw + vpcmpistri + vpcmpistrm + vpcomb + vpcomd + vfmadd132ps + vfnmadd132ps + vfmsub132ps + vfnmsub132ps + vfmadd213ps + vfnmadd213ps + vfmsub213ps + vfnmsub213ps + vfmadd231ps + vfnmadd231ps + vfmsub231ps + vfnmsub231ps + vfmadd132pd + vfnmadd132pd + vfmsub132pd + vfnmsub132pd + vfmadd213pd + vfnmadd213pd + vfmsub213pd + vfnmsub213pd + vfmadd231pd + vfnmadd231pd + vfmsub231pd + vfnmsub231pd + vfmadd132ss + vfnmadd132ss + vfmsub132ss + vfnmsub132ss + vfmadd213ss + vfnmadd213ss + vfmsub213ss + vfnmsub213ss + vfmadd231ss + vfnmadd231ss + vfmsub231ss + vfnmsub231ss + vfmadd132sd + vfnmadd132sd + vfmsub132sd + vfnmsub132sd + vfmadd213sd + vfnmadd213sd + vfmsub213sd + vfnmsub213sd + vfmadd231sd + vfnmadd231sd + vfmsub231sd + vfnmsub231sd + vpcomeqb + vpcomeqd + vpcomeqq + vpcomequb + vpcomequd + vpcomequq + vpcomequw + vpcomeqw + vpcomfalseb + vpcomfalsed + vpcomfalseq + vpcomfalseub + vpcomfalseud + vpcomfalseuq + vpcomfalseuw + vpcomfalsew + vpcomgeb + vpcomged + vpcomgeq + vpcomgeub + vpcomgeud + vpcomgeuq + vpcomgeuw + vpcomgew + vpcomgtb + vpcomgtd + vpcomgtq + vpcomgtub + vpcomgtud + vpcomgtuq + vpcomgtuw + vpcomgtw + vpcomleb + vpcomled + vpcomleq + vpcomleub + vpcomleud + vpcomleuq + vpcomleuw + vpcomlew + vpcomltb + vpcomltd + vpcomltq + vpcomltub + vpcomltud + vpcomltuq + vpcomltuw + vpcomltw + vpcomneqb + vpcomneqd + vpcomneqq + vpcomnequb + vpcomnequd + vpcomnequq + vpcomnequw + vpcomneqw + vpcomq + vpcomtrueb + vpcomtrued + vpcomtrueq + vpcomtrueub + vpcomtrueud + vpcomtrueuq + vpcomtrueuw + vpcomtruew + vpcomub + vpcomud + vpcomuq + vpcomuw + vpcomw + vpdep + vpdistib + vperm2f128 + vperm2i128 + vpermd + vpermil2pd + vpermil2ps + vpermilpd + vpermilps + vpermpd + vpermps + vpermq + vpext + vpextrb + vpextrd + vpextrq + vpextrw + vpf2id + vpf2iw + vpfacc + vpfadd + vpfcmpeq + vpfcmpge + vpfcmpgt + vpfmax + vpfmin + vpfmul + vpfnacc + vpfpnacc + vpfrcp + vpfrcpit1 + vpfrcpit2 + vpfrsqit1 + vpfrsqrt + vpfsub + vpfsubr + vpgatherdd + vscatterdpd + vscatterdps + vscatterqpd + vscatterqps + vpscatterdd + vpscatterdq + vpscatterqd + vpscatterqq + vpgatherdq + vpgatherqd + vpgatherqq + vphaddbd + vphaddbq + vphaddbw + vphaddd + vphadddq + vphaddsw + vphaddubd + vphaddubq + vphaddubw + vphaddudq + vphadduwd + vphadduwq + vphaddw + vphaddwd + vphaddwq + vphminposuw + vphsubbw + vphsubd + vphsubdq + vphsubsw + vphsubw + vphsubwd + vpi2fd + vpi2fw + vpinsrb + vpinsrd + vpinsrq + vpinsrw + vpmachriw + vpmacsdd + vpmacsdqh + vpmacsdql + vpmacssdd + vpmacssdqh + vpmacssdql + vpmacsswd + vpmacssww + vpmacswd + vpmacsww + vpmadcsswd + vpmadcswd + vpmaddubsw + vpmaddwd + vpmagw + vpmaskmovd + vpmaskmovq + vpmaxsb + vpmaxsd + vpmaxsw + vpmaxub + vpmaxud + vpmaxuw + vpminsb + vpminsd + vpminsw + vpminub + vpminud + vpminuw + vpmovmskb + vpmovsxbd + vpmovsxbq + vpmovsxbw + vpmovsxdq + vpmovsxwd + vpmovsxwq + vpmovzxbd + vpmovzxbq + vpmovzxbw + vpmovzxdq + vpmovzxwd + vpmovzxwq + vpmuldq + vpmulhrsw + vpmulhrw + vpmulhuw + vpmulhw + vpmulld + vpmullw + vpmuludq + vpmvgezb + vpmvlzb + vpmvnzb + vpmvzb + vpor + vpperm + vprefetch + vprefetchnta + vprefetcht0 + vprefetcht1 + vprefetcht2 + vprefetchw + vprotb + vprotd + vprotq + vprotw + vpsadbw + vpshab + vpshad + vpshaq + vpshaw + vpshlb + vpshld + vpshlq + vpshlw + vpshufb + vpshufd + vpshufhw + vpshuflw + vpshufw + vpsignb + vpsignd + vpsignw + vpslld + vpslldq + vpsllq + vpsllvd + vpsllvq + vpsllw + vpsrad + vpsravd + vpsraw + vpsrld + vpsrldq + vpsrlq + vpsrlvd + vpsrlvq + vpsrlw + vpsubb + vpsubd + vpsubq + vpsubsb + vpsubsiw + vpsubsw + vpsubusb + vpsubusw + vpsubw + vpswapd + vptest + vpunpckhbw + vpunpckhdq + vpunpckhqdq + vpunpckhwd + vpunpcklbw + vpunpckldq + vpunpcklqdq + vpunpcklwd + vpxor + vrcpps + vroundpd + vroundps + vrsqrtps + vsqrtpd + vsqrtps + vstmxcsr + vtestpd + vtestps + vzeroall + vzeroupper + wait + wbinvd + wrfsbase + wrgsbase + wrmsr + wrmsrq + wrshr + xabort + xacquire + xadd + xbegin + xbts + xchg + xend + xgetbv + xlat + xlatb + xor + xorpd + xorps + xrelease + xrstor64 + xrstor + xsave64 + xsave + xsaveopt64 + xsaveopt + xsetbv + xtest + + + + rep + repe + repz + repne + repnz + + + + used + defined + + mod + and + or + xor + not + shl + shr + bsf + bsr + rva + plt + + far + near + short + + + + + db + dw + du + dd + dp + df + dq + dt + + rb + rw + rd + rp + rf + rq + rt + + file + + byte + word + dword + fword + pword + qword + tbyte + tword + dqword + xword + qqword + yword + dqqword + zword + ptr + + + + assert + append + at + break + calminstruction + common + display + else + end + equ + err + fix + foward + if + iterate + irp + irps + label + local + match + macro + postpone + purge + repeat + rept + reverse + restore + restruc + struc + times + while + virtual + namespace + + + + align + entry + extrn + format + include + invoke + data + load + from + heap + org + proc + public + section + segment + stack + store + use16 + use32 + use64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/fortran-fixed.xml b/xml/fortran-fixed.xml new file mode 100644 --- /dev/null +++ b/xml/fortran-fixed.xml @@ -0,0 +1,592 @@ + + + + + + + + + + + + allocate + break + call + common + continue + cycle + deallocate + forall + where + elsewhere + equivalence + exit + external + for + go + goto + if + implicit + include + interface + intrinsic + namelist + none + nullify + operator + assignment + pause + procedure + pure + elemental + record + recursive + result + return + stop + to + use + only + entry + while + + + + access + backspace + close + inquire + open + print + read + rewind + write + format + + + + unit + end + err + fmt + iostat + status + advance + size + eor + + + + unit + iostat + err + file + status + access + form + recl + blank + position + action + delim + pad + + + + unit + iostat + err + file + exist + opened + number + named + name + access + sequential + direct + form + formatted + unformatted + recl + nextrec + blank + position + action + read + write + readwrite + delim + pad + + + parameter + save + pointer + public + private + target + allocatable + optional + sequence + + + + + + + + + abs + cabs + dabs + iabs + aimag + aint + dint + anint + dnint + ceiling + cmplx + dcmplx + dimag + floor + nint + idnint + int + idint + ifix + real + float + sngl + dble + dreal + aprime + dconjg + dfloat + ddmim + rand + + modulo + conjg + dprod + dim + ddim + idim + max + amax0 + amax1 + max0 + max1 + dmax1 + min + amin0 + amin1 + min0 + min1 + dmin1 + mod + amod + dmod + sign + dsign + isign + + acos + dacos + asin + dasin + atan + datan + atan2 + datan2 + cos + ccos + dcos + cosh + dcosh + exp + cexp + dexp + log + alog + dlog + clog + log10 + alog10 + dlog10 + sin + csin + dsin + sinh + dsinh + sqrt + csqrt + dsqrt + tan + dtan + tanh + dtanh + + + achar + char + iachar + ichar + + lge + lgt + lle + llt + + adjustl + adjustr + index + len_trim + scan + verify + + logical + + exponent + fraction + nearest + rrspacing + scale + set_exponent + spacing + + btest + iand + ibclr + ibits + ibset + ieor + ior + ishft + ishftc + not + + mvbits + + merge + + + + + + associated + present + kind + + len + + digits + epsilon + huge + maxexponent + minexponent + precision + radix + range + tiny + + bit_size + + allocated + lbound + ubound + shape + size + + + + + + repeat + trim + + selected_int_kind + selected_real_kind + + transfer + + dot_product + matmul + + all + any + count + maxval + minval + product + sum + + pack + unpack + + reshape + + spread + + cshift + eoshift + + transpose + + maxloc + minloc + + + + + + date_and_time + system_clock + + random_number + random_seed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/fortran-free.xml b/xml/fortran-free.xml new file mode 100644 --- /dev/null +++ b/xml/fortran-free.xml @@ -0,0 +1,311 @@ + + + + + + + + + + + + keywords##Fortran (Fixed Format) + associate + import + impure + + + io_functions##Fortran (Fixed Format) + + + + io_keywords##Fortran (Fixed Format) + + + + open_keywords##Fortran (Fixed Format) + + + + inquire_keywords##Fortran (Fixed Format) + + + types##Fortran (Fixed Format) + abstract + asynchronous + bind + contiguous + deferred + enum + enumerator + final + generic + nopass + non_overridable + protected + value + volatile + + + + + + + elemental_procs##Fortran (Fixed Format) + + acosh + asinh + atanh + bessel_j0 + bessel_j1 + bessel_jn + bessel_y0 + bessel_y1 + bessel_yn + erf + erfc + erfc_scaled + gamma + log_gamma + hypot + + + + + inquiry_fn##Fortran (Fixed Format) + + extends_type_of + same_type_as + storage_size + + lcobound + ucobound + image_index + + + + + transform_fn##Fortran (Fixed Format) + + selected_char_kind + + parity + iall + iany + iparity + + num_images + this_image + + + + + non_elem_subr##Fortran (Fixed Format) + + cpu_time + + execute_command_line + get_environment_variable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/fortran.xml b/xml/fortran.xml deleted file mode 100644 --- a/xml/fortran.xml +++ /dev/null @@ -1,584 +0,0 @@ - - - - - - - - - - - allocate - break - call - case - common - - continue - cycle - deallocate - default - - forall - where - elsewhere - - - equivalence - exit - external - for - go - goto - if - implicit - include - interface - intrinsic - namelist - none - nullify - operator - assignment - pause - procedure - pure - elemental - record - recursive - result - return - select - selectcase - stop - - to - use - only - entry - while - - - access - backspace - close - inquire - open - print - read - rewind - write - format - - - - unit - end - err - fmt - iostat - status - advance - size - eor - - - - unit - iostat - err - file - status - access - form - recl - blank - position - action - delim - pad - - - - unit - iostat - err - file - exist - opened - number - named - name - access - sequential - direct - form - formatted - unformatted - recl - nextrec - blank - position - action - read - write - readwrite - delim - pad - - - double - precision - parameter - save - pointer - public - private - target - allocatable - optional - sequence - - - - - - - - abs - cabs - dabs - iabs - aimag - aint - dint - anint - dnint - ceiling - cmplx - dcmplx - dimag - floor - nint - idnint - int - idint - ifix - real - float - sngl - dble - dreal - aprime - dconjg - dfloat - ddmim - rand - - modulo - conjg - dprod - dim - ddim - idim - max - amax0 - amax1 - max0 - max1 - dmax1 - min - amin0 - amin1 - min0 - min1 - dmin1 - mod - amod - dmod - sign - dsign - isign - - acos - dacos - asin - dasin - atan - datan - atan2 - datan2 - cos - ccos - dcos - cosh - dcosh - exp - cexp - dexp - log - alog - dlog - clog - log10 - alog10 - dlog10 - sin - csin - dsin - sinh - dsinh - sqrt - csqrt - dsqrt - tan - dtan - tanh - dtanh - - - achar - char - iachar - ichar - - lge - lgt - lle - llt - - adjustl - adjustr - index - len_trim - scan - verify - - logical - - exponent - fraction - nearest - rrspacing - scale - set_exponent - spacing - - btest - iand - ibclr - ibits - ibset - ieor - ior - ishft - ishftc - not - - mvbits - - merge - - - - - - associated - present - kind - - len - - digits - epsilon - huge - maxexponent - minexponent - precision - radix - range - tiny - - bit_size - - allocated - lbound - ubound - shape - size - - - - - - repeat - trim - - selected_int_kind - selected_real_kind - - transfer - - dot_product - matmul - - all - any - count - maxval - minval - product - sum - - pack - unpack - - reshape - - spread - - cshift - eoshift - - transpose - - maxloc - minloc - - - - - - date_and_time - system_clock - - random_number - random_seed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xml/fsharp.xml b/xml/fsharp.xml --- a/xml/fsharp.xml +++ b/xml/fsharp.xml @@ -9,7 +9,7 @@ ]> - + @@ -190,11 +190,18 @@ - + + + + + + + + @@ -275,8 +282,7 @@ - - + diff --git a/xml/glsl.xml b/xml/glsl.xml --- a/xml/glsl.xml +++ b/xml/glsl.xml @@ -1,6 +1,6 @@ - + break @@ -176,11 +176,6 @@ readonly writeonly - - FIXME - TODO - BUG - abs @@ -1180,11 +1175,15 @@ - + + + - + + + @@ -1204,14 +1203,14 @@ - - + + diff --git a/xml/gnuassembler.xml b/xml/gnuassembler.xml --- a/xml/gnuassembler.xml +++ b/xml/gnuassembler.xml @@ -43,7 +43,7 @@ --> - + .abort @@ -250,16 +250,20 @@ - + + + - + + + @@ -293,11 +297,10 @@ - - + + + diff --git a/xml/go.xml b/xml/go.xml --- a/xml/go.xml +++ b/xml/go.xml @@ -26,7 +26,7 @@ --> - + @@ -111,7 +111,7 @@ - + @@ -126,6 +126,7 @@ + @@ -133,6 +134,7 @@ + @@ -173,3 +175,4 @@ + 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 @@ -62,7 +62,9 @@ + + @@ -80,4 +82,10 @@ + + + + + + diff --git a/xml/hamlet.xml b/xml/hamlet.xml --- a/xml/hamlet.xml +++ b/xml/hamlet.xml @@ -5,7 +5,7 @@ word character *or* a number, hence the lookahead --> ]> - + @@ -96,9 +96,7 @@ - - - + diff --git a/xml/haskell.xml b/xml/haskell.xml --- a/xml/haskell.xml +++ b/xml/haskell.xml @@ -1,6 +1,6 @@ - + case @@ -459,8 +459,8 @@ - - + + @@ -484,7 +484,7 @@ - + @@ -512,11 +512,15 @@ + + - - + + + + @@ -535,8 +539,8 @@ - - + + @@ -642,8 +646,9 @@ - + + diff --git a/xml/haskell.xml.patch b/xml/haskell.xml.patch deleted file mode 100644 --- a/xml/haskell.xml.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/haskell.xml b/haskell.xml -index a71d649..84f4f85 100644 ---- a/haskell.xml -+++ b/haskell.xml -@@ -482,7 +482,7 @@ - - - -- -+ - - - -@@ -605,9 +605,9 @@ - - - -- -- -- -+ -+ -+ - - - diff --git a/xml/haxe.xml b/xml/haxe.xml --- a/xml/haxe.xml +++ b/xml/haxe.xml @@ -12,7 +12,7 @@ ======================================================================== --> - + @@ -146,9 +146,16 @@ - + + + + + + + + @@ -174,8 +181,9 @@ - + + diff --git a/xml/html.xml b/xml/html.xml --- a/xml/html.xml +++ b/xml/html.xml @@ -5,7 +5,7 @@ ]> - + @@ -91,9 +91,10 @@ + + - @@ -193,6 +194,7 @@ + @@ -314,3 +316,4 @@ + diff --git a/xml/idris.xml b/xml/idris.xml --- a/xml/idris.xml +++ b/xml/idris.xml @@ -1,105 +1,105 @@ - + - abstract - auto - case - class - codata - constructor - covering - data - default - do - dsl - else - export - if - implementation - implicit - import - impossible - in - index_first - index_next - infix - infixl - infixr - instance - interface - lambda - let - module - mutual - namespace - of - parameters - partial - pattern - postulate - prefix - private - proof - public - record - rewrite - static - syntax - tactics - term - then - total - using - variable - where - with + abstract + auto + case + class + codata + constructor + covering + data + default + do + dsl + else + export + if + implementation + implicit + import + impossible + in + index_first + index_next + infix + infixl + infixr + instance + interface + lambda + let + module + mutual + namespace + of + parameters + partial + pattern + postulate + prefix + private + proof + public + record + rewrite + static + syntax + tactics + term + then + total + using + variable + where + with - access - assert_total - default - dynamic - elim - error_handlers - error_reverse - flag - hide - include - language - lib - link - name - provide - reflection + access + assert_total + default + dynamic + elim + error_handlers + error_reverse + flag + hide + include + language + lib + link + name + provide + reflection - applyTactic - attack - compute - exact - fill - focus - induction - intro - intros - let - refine - reflect - rewrite - solve - trivial - try + applyTactic + attack + compute + exact + fill + focus + induction + intro + intros + let + refine + reflect + rewrite + solve + trivial + try + String="---*(?=[^!#\$%&\*\+/<=>\?\@\^\|~\.:]|$)" /> - + String="\|\|\|(?=[^\-!#\$%&\*\+/<=>\?\@\^\|~\.:]|$)" /> + @@ -139,10 +139,17 @@ - + + + + + - - + + + + + @@ -167,7 +174,7 @@ - + diff --git a/xml/ini.xml b/xml/ini.xml --- a/xml/ini.xml +++ b/xml/ini.xml @@ -1,6 +1,6 @@ - + @@ -49,6 +49,7 @@ + @@ -69,10 +70,10 @@ - + diff --git a/xml/isocpp.xml b/xml/isocpp.xml --- a/xml/isocpp.xml +++ b/xml/isocpp.xml @@ -24,7 +24,7 @@ - - + diff --git a/xml/j.xml b/xml/j.xml --- a/xml/j.xml +++ b/xml/j.xml @@ -62,7 +62,7 @@ --> - + + + + + @@ -117,3 +121,4 @@ + diff --git a/xml/java.xml b/xml/java.xml --- a/xml/java.xml +++ b/xml/java.xml @@ -4,7 +4,7 @@ ]> - + ACTIVE @@ -3826,11 +3826,15 @@ + + + + @@ -3858,8 +3862,9 @@ - + + 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) --> - @@ -1852,12 +1852,16 @@ - - + + + + + + - - + + diff --git a/xml/json.xml b/xml/json.xml --- a/xml/json.xml +++ b/xml/json.xml @@ -12,7 +12,7 @@ ** http://tools.ietf.org/html/rfc4627 *************************************************************************** --> - + null diff --git a/xml/jsp.xml b/xml/jsp.xml --- a/xml/jsp.xml +++ b/xml/jsp.xml @@ -1,6 +1,6 @@ - + @@ -27,9 +27,9 @@ - - - + + + @@ -63,6 +63,7 @@ + @@ -70,8 +71,8 @@ - - + + @@ -79,26 +80,29 @@ - - + + - + + + + - - + + - - + + @@ -106,8 +110,8 @@ - - + + @@ -115,8 +119,8 @@ - - + + @@ -125,34 +129,34 @@ - - + + - - + + - - + + - - + + - + @@ -167,14 +171,14 @@ - - + + - - + + @@ -184,24 +188,24 @@ - - + + - - + + - - + + @@ -209,10 +213,12 @@ - - + + - + + + @@ -238,8 +244,9 @@ - + + diff --git a/xml/julia.xml b/xml/julia.xml --- a/xml/julia.xml +++ b/xml/julia.xml @@ -33,7 +33,7 @@ ]> - + @@ -697,7 +697,7 @@ - + diff --git a/xml/kotlin.xml b/xml/kotlin.xml --- a/xml/kotlin.xml +++ b/xml/kotlin.xml @@ -1,7 +1,7 @@ - + package @@ -260,11 +260,15 @@ - + + + - + + + @@ -291,8 +295,9 @@ - + + diff --git a/xml/latex.xml b/xml/latex.xml --- a/xml/latex.xml +++ b/xml/latex.xml @@ -4,7 +4,7 @@ ]> - + diff --git a/xml/lex.xml b/xml/lex.xml --- a/xml/lex.xml +++ b/xml/lex.xml @@ -20,7 +20,7 @@ ======================================================================== --> - + @@ -31,7 +31,7 @@ - + @@ -45,7 +45,10 @@ - + + + + @@ -142,3 +145,4 @@ + diff --git a/xml/lilypond.xml b/xml/lilypond.xml --- a/xml/lilypond.xml +++ b/xml/lilypond.xml @@ -56,7 +56,7 @@ ]> @@ -820,12 +820,16 @@ + + + + @@ -891,11 +895,13 @@ + + diff --git a/xml/literate-curry.xml b/xml/literate-curry.xml --- a/xml/literate-curry.xml +++ b/xml/literate-curry.xml @@ -1,6 +1,6 @@ - @@ -17,7 +17,7 @@ - + @@ -29,7 +29,9 @@ - + + + @@ -47,4 +49,9 @@ + + + + + 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 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,9 @@ - + + + @@ -35,4 +37,9 @@ + + + + + diff --git a/xml/llvm.xml b/xml/llvm.xml --- a/xml/llvm.xml +++ b/xml/llvm.xml @@ -1,189 +1,189 @@ - begin - end - true - false - declare - define - global - constant - gc - module - asm - target - datalayout - null - undef - blockaddress - sideeffect - alignstack - to - unwind - nuw - nsw - inbounds - tail - triple - type - align - alias + begin + end + true + false + declare + define + global + constant + gc + module + asm + target + datalayout + null + undef + blockaddress + sideeffect + alignstack + to + unwind + nuw + nsw + inbounds + tail + triple + type + align + alias - private - internal - available_externally - linkonce - weak - common - appending - extern_weak - linkonce_odr - weak_odr - dllimport - dllexport + private + internal + available_externally + linkonce + weak + common + appending + extern_weak + linkonce_odr + weak_odr + dllimport + dllexport - ccc - fastcc - coldcc - cc + ccc + fastcc + coldcc + cc - default - hidden - protected + default + hidden + protected - zeroext - signext - inreg - byval - sret - noalias - nocapture - nest + zeroext + signext + inreg + byval + sret + noalias + nocapture + nest - alignstack - alwaysinline - inlinehint - naked - noimplicitfloat - noinline - noredzone - noreturn - nounwind - optnone - optsize - readnone - readonly - ssp - sspreq - sspstrong + alignstack + alwaysinline + inlinehint + naked + noimplicitfloat + noinline + noredzone + noreturn + nounwind + optnone + optsize + readnone + readonly + ssp + sspreq + sspstrong - float - double - fp128 - x86_fp80 - ppc_fp128 - x86mmx - void - label - metadata - opaque + float + double + fp128 + x86_fp80 + ppc_fp128 + x86mmx + void + label + metadata + opaque - llvm.used - llvm.compiler.used - llvm.global_ctors - llvm.global_dtors + llvm.used + llvm.compiler.used + llvm.global_ctors + llvm.global_dtors - ret - br - switch - indirectbr - invoke - unwind - unreachable - add - fadd - sub - fsub - mul - fmul - udiv - sdiv - fdiv - urem - srem - frem - shl - lshr - ashr - and - or - xor - extractelement - insertelement - shufflevector - extractvalue - insertvalue - alloca - load - store - getelementptr - trunc - zext - sext - fptrunc - fpext - fptoui - fptosi - uitofp - sitofp - ptrtoint - inttoptr - bitcast - addrspacecast - icmp - fcmp - phi - select - call - va_arg + ret + br + switch + indirectbr + invoke + unwind + unreachable + add + fadd + sub + fsub + mul + fmul + udiv + sdiv + fdiv + urem + srem + frem + shl + lshr + ashr + and + or + xor + extractelement + insertelement + shufflevector + extractvalue + insertvalue + alloca + load + store + getelementptr + trunc + zext + sext + fptrunc + fpext + fptoui + fptosi + uitofp + sitofp + ptrtoint + inttoptr + bitcast + addrspacecast + icmp + fcmp + phi + select + call + va_arg - eq - ne - ugt - uge - ult - ule - sgt - sge - slt - sle - oeq - ogt - oge - olt - ole - one - ord - ueq - une - uno + eq + ne + ugt + uge + ult + ule + sgt + sge + slt + sle + oeq + ogt + oge + olt + ole + one + ord + ueq + une + uno @@ -227,6 +227,7 @@ + @@ -235,11 +236,8 @@ - - - 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 @@ -460,16 +460,15 @@ - + - - + - + @@ -501,6 +500,25 @@ + + + + + + + + + + + + + + + + + + + @@ -514,14 +532,14 @@ - + - + @@ -589,7 +607,7 @@ - + diff --git a/xml/lua.xml.patch b/xml/lua.xml.patch --- a/xml/lua.xml.patch +++ b/xml/lua.xml.patch @@ -1,6 +1,8 @@ ---- lua.xml.orig 2020-07-29 11:31:42.000000000 -0700 -+++ lua.xml 2020-07-29 11:31:57.000000000 -0700 -@@ -582,7 +582,7 @@ +diff --git a/skylighting-core/xml/lua.xml b/skylighting-core/xml/lua.xml +index 3021ba8..89e5a31 100644 +--- a/skylighting-core/xml/lua.xml ++++ b/skylighting-core/xml/lua.xml +@@ -600,7 +600,7 @@ 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__ @@ -161,7 +161,7 @@ - + @@ -170,6 +170,11 @@ + + + + + @@ -191,3 +196,4 @@ + diff --git a/xml/makefile.xml b/xml/makefile.xml --- a/xml/makefile.xml +++ b/xml/makefile.xml @@ -512,4 +512,4 @@ - + diff --git a/xml/markdown.xml b/xml/markdown.xml --- a/xml/markdown.xml +++ b/xml/markdown.xml @@ -90,7 +90,7 @@ ]> - + @@ -320,7 +320,7 @@ - + diff --git a/xml/markdown.xml.patch b/xml/markdown.xml.patch --- a/xml/markdown.xml.patch +++ b/xml/markdown.xml.patch @@ -1,16 +1,23 @@ diff --git a/skylighting-core/xml/markdown.xml b/skylighting-core/xml/markdown.xml -index f888487..1cf6b14 100644 +index d836d1c..63da066 100644 --- a/skylighting-core/xml/markdown.xml +++ b/skylighting-core/xml/markdown.xml -@@ -51,8 +51,9 @@ - - - -- -- -+ -+ -+ - - +@@ -325,7 +325,6 @@ + + + +- + + + +@@ -433,10 +432,6 @@ + + +- +- +- +- + + + diff --git a/xml/mathematica.xml b/xml/mathematica.xml --- a/xml/mathematica.xml +++ b/xml/mathematica.xml @@ -1,12 +1,13 @@ - + A AbelianGroup - All ArcSinh Abort AllowGroupClose @@ -94,7 +95,6 @@ AutoItalicWords AiryBiPrime AppendTo - Automatic AiryBiZero Apply AutoMultiplicationSymbol @@ -116,7 +116,6 @@ AlgebraicNumberTrace ArcCsch AxesLabel - Algebraics ArcSec AxesOrigin AlgebraicUnitQ @@ -142,7 +141,6 @@ BooleanMinterms Backward BilateralFilter - Booleans Band Binarize BooleanTable @@ -366,6 +364,7 @@ CellFrame ColorSeparate CoordinatesToolOptions + CellFrameColor CellFrameMargins ColorSetter CoprimeQ @@ -430,7 +429,6 @@ Complex CountryData Character - Complexes Covariance CharacterEncoding ComplexExpand @@ -910,7 +908,6 @@ FactorTermsList FindMaxValue FourierSinCoefficient - False FindMinimum FourierSinSeries FeedbackType @@ -1008,7 +1005,6 @@ FrontEndTokenExecute Find FontFamily - Full FindArgMax FontSize FullDefinition @@ -1260,7 +1256,6 @@ Information InverseErfc ImageClip - Inherited InverseFourier ImageColorSpace Initialization @@ -1350,7 +1345,6 @@ IntegerQ InverseWaveletTransform ImageRotate - Integers InverseWeierstrassP ImageScaled IntegerString @@ -1683,7 +1677,6 @@ MantissaExponent MaxStepSize Modal - Manual MaxValue ModularLambda Map @@ -1875,7 +1868,6 @@ NSum NextPrime NotebookSelection - Null NHoldAll NotebookWrite NullRecords @@ -1927,7 +1919,6 @@ NonConstants NotLess NumberPadding - None NotLessEqual NumberPoint NonlinearModelFit @@ -1952,6 +1943,7 @@ NotNestedLessLess NumericQ NormalDistribution + Nothing NotPrecedes NyquistGridLines Normalize @@ -2122,7 +2114,6 @@ PrimeQ ParallelTable PlotRange - Primes ParallelTry PlotRangeClipping PrimeZetaP @@ -2324,7 +2315,6 @@ Rationalize RescalingTransform RootSum - Rationals ResetDirectory Rotate Ratios @@ -2363,7 +2353,6 @@ RealExponent ReverseBiorthogonalSplineWavelet RowLines - Reals ReverseElement RowMinHeight Reap @@ -2856,7 +2845,6 @@ TrimmedMean Thin TotalVariationFilter - True Thinning TotalWidth TrueQ @@ -3080,6 +3068,8 @@ ZipfDistribution Zeta ZTest + + $ $Aborted $Inspector @@ -3198,32 +3188,133 @@ $InputFileName $Output + + + True + False + Automatic + All + None + Full + Inherited + Manual + Null + Anonymous + + + + Reals + Integers + Complexes + Algebraics + Primes + Rationals + Booleans + PositiveReals + NegativeReals + NonNegativeReals + NonPositiveReals + PositiveRationals + NegativeRationals + NonNegativeRationals + NonPositiveRationals + PositiveIntegers + NegativeIntegers + NonNegativeIntegers + NonPositiveIntegers + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + - - - - + + + + + + + - + - + + diff --git a/xml/matlab.xml b/xml/matlab.xml --- a/xml/matlab.xml +++ b/xml/matlab.xml @@ -56,8 +56,8 @@ --> - - + + @@ -105,8 +105,8 @@ - - + + @@ -134,6 +134,14 @@ + + + + + + + + @@ -155,9 +163,10 @@ - + + diff --git a/xml/maxima.xml b/xml/maxima.xml --- a/xml/maxima.xml +++ b/xml/maxima.xml @@ -21,7 +21,7 @@ - + @@ -42,11 +42,6 @@ while - - FIXME - TODO - - abasep abs @@ -1871,9 +1866,10 @@ - + + @@ -1888,16 +1884,16 @@ - - + + diff --git a/xml/mediawiki.xml b/xml/mediawiki.xml --- a/xml/mediawiki.xml +++ b/xml/mediawiki.xml @@ -6,7 +6,7 @@ ]> - + @@ -37,7 +37,7 @@ - + @@ -143,6 +143,9 @@ + + + @@ -623,8 +626,9 @@ - + + diff --git a/xml/metafont.xml b/xml/metafont.xml --- a/xml/metafont.xml +++ b/xml/metafont.xml @@ -6,7 +6,7 @@ --> - @@ -940,8 +940,10 @@ + + @@ -977,10 +979,10 @@ - + - + diff --git a/xml/mips.xml b/xml/mips.xml --- a/xml/mips.xml +++ b/xml/mips.xml @@ -1,6 +1,6 @@ - + .align @@ -317,7 +317,7 @@ - + @@ -329,6 +329,11 @@ + + + + + @@ -352,8 +357,9 @@ - + + diff --git a/xml/modelines.xml b/xml/modelines.xml --- a/xml/modelines.xml +++ b/xml/modelines.xml @@ -8,7 +8,7 @@ Copyright (c) 2012-2014 by Alex Turbov (i.zaufi@gmail.com) --> - - + - + @@ -139,7 +138,6 @@ - @@ -147,28 +145,24 @@ - - - - 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 @@ - + + + @@ -1121,6 +1124,10 @@ + + + + @@ -1182,10 +1189,9 @@ - - + - + diff --git a/xml/modula-3.xml b/xml/modula-3.xml --- a/xml/modula-3.xml +++ b/xml/modula-3.xml @@ -6,259 +6,259 @@ - + - - ANY - ARRAY - AS - BEGIN - BITS - BRANDED - BY - CASE - CONST - - DO - ELSE - ELSIF - END - EVAL - EXCEPT - EXCEPTION - EXIT - EXPORTS - FINALLY - FOR - FROM - GENERIC - IF - IMPORT - - INTERFACE - LOCK - LOOP - METHODS - - MODULE - - OBJECT - OF - - OVERRIDES - PROCEDURE - RAISE - RAISES - READONLY - RECORD - REF - REPEAT - RETURN - REVEAL - ROOT - SET - THEN - TO - TRY - TYPE - TYPECASE - UNSAFE - UNTIL - UNTRACED - VALUE - VAR - WHILE - WITH + + ANY + ARRAY + AS + BEGIN + BITS + BRANDED + BY + CASE + CONST + + DO + ELSE + ELSIF + END + EVAL + EXCEPT + EXCEPTION + EXIT + EXPORTS + FINALLY + FOR + FROM + GENERIC + IF + IMPORT + + INTERFACE + LOCK + LOOP + METHODS + + MODULE + + OBJECT + OF + + OVERRIDES + PROCEDURE + RAISE + RAISES + READONLY + RECORD + REF + REPEAT + RETURN + REVEAL + ROOT + SET + THEN + TO + TRY + TYPE + TYPECASE + UNSAFE + UNTIL + UNTRACED + VALUE + VAR + WHILE + WITH - AND - DIV - IN - MOD - NOT - OR - + - < - # - = - ; - .. - : - - - > - { - } - | - := - <: - * - <= - ( - ) - ^ - , - => - / - >= - [ - ] - . - & + AND + DIV + IN + MOD + NOT + OR + + + < + # + = + ; + .. + : + - + > + { + } + | + := + <: + * + <= + ( + ) + ^ + , + => + / + >= + [ + ] + . + & - ADDRESS - BOOLEAN - CARDINAL - CHAR - EXTENDED - INTEGER - LONGREAL - MUTEX - NULL - REAL - REFANY - T - TEXT + ADDRESS + BOOLEAN + CARDINAL + CHAR + EXTENDED + INTEGER + LONGREAL + MUTEX + NULL + REAL + REFANY + T + TEXT - FALSE - NIL - TRUE + FALSE + NIL + TRUE - ABS - ADR - ADRSIZE - BITSIZE - BYTESIZE - CEILING - DEC - DISPOSE - FIRST - FLOAT - FLOOR - INC - ISTYPE - LAST - LOOPHOLE - MAX - MIN - NARROW - NEW - NUMBER - ORD - ROUND - SUBARRAY - TRUNC - TYPECODE - VAL + ABS + ADR + ADRSIZE + BITSIZE + BYTESIZE + CEILING + DEC + DISPOSE + FIRST + FLOAT + FLOOR + INC + ISTYPE + LAST + LOOPHOLE + MAX + MIN + NARROW + NEW + NUMBER + ORD + ROUND + SUBARRAY + TRUNC + TYPECODE + VAL - Text - Text.Length - Text.Empty - Text.Equal - Text.Compare - Text.Cat - Text.Sub - Text.Hash - Text.HasWideChar - Text.GetChar - Text.GetWideChar - Text.SetChars - Text.SetWideChars - Text.FromChars - Text.FromWideChars - Text.FindChar - Text.FindWideChar - Text.FindCharR - Text.FindWideCharR - Fmt - Fmt.Bool - Fmt.Char - Fmt.Int - Fmt.Unsigned - Fmt.Real - Fmt.LongReal - Fmt.Extended - Fmt.Pad - Fmt.F - Fmt.FN - Scan - Scan.Bool - Scan.Int - Scan.Unsigned - Scan.Real - Scan.LongReal - Scan.Extended - IO - IO.Put - IO.PutChar - IO.PutWideChar - IO.PutInt - IO.PutReal - IO.EOF - IO.GetLine - IO.GetChar - IO.GetWideChar - IO.GetInt - IO.GetReal - IO.OpenRead - IO.OpenWrite - Rd - Rd.GetChar - Rd.GetWideChar - Rd.EOF - Rd.UnGetChar - Rd.CharsReady - Rd.GetSub - Rd.GetWideSub - Rd.GetSubLine - Rd.GetWideSubLine - Rd.GetText - Rd.GetWideText - Rd.GetLine - Rd.GetWideLine - Rd.Seek - Rd.Close - Rd.Index - Rd.Length - Rd.Intermittend - Rd.Seekable - Rd.Closed - Wr - Wr.PutChar - Wr.PutWideChar - Wr.PutText - Wr.PutWideText - Wr.PutString - Wr.PutWideString - Wr.Seek - Wr.Flush - Wr.Close - Wr.Length - Wr.Index - Wr.Seekable - Wr.Closed - Wr.Buffered - Lex - Lex.Scan - Lex.Skip - Lex.Match - Lex.Bool - Lex.Int - Lex.Unsigned - Lex.Real - Lex.LongReal - Lex.Extended - Params - Params.Count - Params.Get - Env - Env.Count - Env.Get - Env.GetNth + Text + Text.Length + Text.Empty + Text.Equal + Text.Compare + Text.Cat + Text.Sub + Text.Hash + Text.HasWideChar + Text.GetChar + Text.GetWideChar + Text.SetChars + Text.SetWideChars + Text.FromChars + Text.FromWideChars + Text.FindChar + Text.FindWideChar + Text.FindCharR + Text.FindWideCharR + Fmt + Fmt.Bool + Fmt.Char + Fmt.Int + Fmt.Unsigned + Fmt.Real + Fmt.LongReal + Fmt.Extended + Fmt.Pad + Fmt.F + Fmt.FN + Scan + Scan.Bool + Scan.Int + Scan.Unsigned + Scan.Real + Scan.LongReal + Scan.Extended + IO + IO.Put + IO.PutChar + IO.PutWideChar + IO.PutInt + IO.PutReal + IO.EOF + IO.GetLine + IO.GetChar + IO.GetWideChar + IO.GetInt + IO.GetReal + IO.OpenRead + IO.OpenWrite + Rd + Rd.GetChar + Rd.GetWideChar + Rd.EOF + Rd.UnGetChar + Rd.CharsReady + Rd.GetSub + Rd.GetWideSub + Rd.GetSubLine + Rd.GetWideSubLine + Rd.GetText + Rd.GetWideText + Rd.GetLine + Rd.GetWideLine + Rd.Seek + Rd.Close + Rd.Index + Rd.Length + Rd.Intermittend + Rd.Seekable + Rd.Closed + Wr + Wr.PutChar + Wr.PutWideChar + Wr.PutText + Wr.PutWideText + Wr.PutString + Wr.PutWideString + Wr.Seek + Wr.Flush + Wr.Close + Wr.Length + Wr.Index + Wr.Seekable + Wr.Closed + Wr.Buffered + Lex + Lex.Scan + Lex.Skip + Lex.Match + Lex.Bool + Lex.Int + Lex.Unsigned + Lex.Real + Lex.LongReal + Lex.Extended + Params + Params.Count + Params.Get + Env + Env.Count + Env.Get + Env.GetNth @@ -285,6 +285,9 @@ + + + @@ -309,7 +312,8 @@ - + + 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 @@ -192,7 +192,11 @@ - + + + + + diff --git a/xml/mustache.xml b/xml/mustache.xml --- a/xml/mustache.xml +++ b/xml/mustache.xml @@ -36,13 +36,14 @@ (via IncludeRules) in the HTML highlighter. Change log: + * v5 [2020-08-15]: Use Handlebars comment en the group. * v3 [2019-10-03]: Minor fixes. * v2 [2019-02-24]: Also highlight template files (HTML). Improve support for Handlebars. * v1 [2019-02-10]: Initial version --> - - + @@ -161,13 +162,17 @@ - - + + + + + + @@ -274,7 +279,9 @@ + + @@ -380,6 +387,8 @@ + + @@ -463,7 +472,7 @@ - + diff --git a/xml/nasm.xml b/xml/nasm.xml --- a/xml/nasm.xml +++ b/xml/nasm.xml @@ -1,5 +1,26 @@ - + + + + + + + + + + + + + + + + + + + +]> - + @@ -248,6 +269,7 @@ zmm30 zmm31 + aaa aad @@ -309,7 +331,6 @@ btr bts bzhi - call cbw cdq cdqe @@ -321,10 +342,41 @@ clflushopt clgi cli + clrssbsy clts clwb clzero cmc + cmova + cmovae + cmovb + cmovbe + cmovc + cmove + cmovg + cmovge + cmovl + cmovle + cmovna + cmovnae + cmovnb + cmovnbe + cmovnc + cmovne + cmovng + cmovnge + cmovnl + cmovnle + cmovno + cmovnp + cmovns + cmovnz + cmovo + cmovp + cmovpe + cmovpo + cmovs + cmovz cmp cmpeqpd cmpeqps @@ -376,8 +428,6 @@ cpu_write cqo crc32 - cwd - cwde cvtdq2pd cvtdq2ps cvtpd2dq @@ -400,6 +450,8 @@ cvttps2pi cvttsd2si cvttss2si + cwd + cwde daa das dec @@ -415,8 +467,11 @@ encls enclu enclv + endbr32 + endbr64 + enqcmd + enqcmds enter - equ extractps extrq f2xm1 @@ -602,6 +657,8 @@ imul in inc + incsspd + incsspq insb insd insertps @@ -619,62 +676,66 @@ invlpga invpcid invvpid - iret - iretd - iretq - iretw - jcxz - jecxz - jmp - jmpe - jrcxz + kadd kaddb kaddd kaddq kaddw + kand kandb kandd + kandn kandnb kandnd kandnq kandnw kandq kandw + kmov kmovb kmovd kmovq kmovw + knot knotb knotd knotq knotw + kor korb kord korq + kortest kortestb kortestd kortestq kortestw korw + kshiftl kshiftlb kshiftld kshiftlq kshiftlw + kshiftr kshiftrb kshiftrd kshiftrq kshiftrw + ktest ktestb ktestd ktestq ktestw + kunpck kunpckbw kunpckdq kunpckwd + kxnor kxnorb kxnord kxnorq kxnorw + kxor kxorb kxord kxorq @@ -684,6 +745,7 @@ lddqu ldmxcsr lds + ldtilecfg lea leave les @@ -779,7 +841,6 @@ neg nop not - october or orpd orps @@ -811,8 +872,8 @@ pavgb pavgusb pavgw - pblendw pblendvb + pblendw pclmulhqhqdq pclmulhqlqdq pclmullqhqdq @@ -995,20 +1056,10 @@ rdrand rdseed rdshr + rdsspd + rdsspq rdtsc rdtscp - ret - retd - retf - retfd - retfq - retfw - retn - retnd - retnq - retnw - retq - retw rol ror rorx @@ -1021,17 +1072,51 @@ rsm rsqrtps rsqrtss + rstorssp rsts sahf sal salc sar sarx + saveprevssp sbb scasb scasd scasq scasw + serialize + seta + setae + setb + setbe + setc + sete + setg + setge + setl + setle + setna + setnae + setnb + setnbe + setnc + setne + setng + setnge + setnl + setnle + setno + setnp + setns + setnz + seto + setp + setpe + setpo + sets + setssbsy + setz sfence sgdt sha1msg1 @@ -1072,21 +1157,32 @@ stosq stosw str + sttilecfg sub subpd subps subsd subss - swapgs svdc svldt svts + swapgs syscall sysenter sysexit sysret t1mskc + tdpbf16ps + tdpbssd + tdpbsud + tdpbusd + tdpbuud test + tileloadd + tileloaddt1 + tilerelease + tilestored + tilezero tpause tzcnt tzmsk @@ -1128,14 +1224,12 @@ vandnps vandpd vandps - wbinvd vblendmpd vblendmps vblendpd vblendps vblendvpd vblendvps - wbnoinvd vbroadcastf128 vbroadcastf32x2 vbroadcastf32x4 @@ -1150,14 +1244,18 @@ vbroadcasti64x4 vbroadcastsd vbroadcastss - vcmpeq_ospd - vcmpeq_osps - vcmpeq_ossd - vcmpeq_osss vcmpeqpd vcmpeqps vcmpeqsd vcmpeqss + vcmpeq_oqpd + vcmpeq_oqps + vcmpeq_oqsd + vcmpeq_oqss + vcmpeq_ospd + vcmpeq_osps + vcmpeq_ossd + vcmpeq_osss vcmpeq_uqpd vcmpeq_uqps vcmpeq_uqsd @@ -1166,6 +1264,10 @@ vcmpeq_usps vcmpeq_ussd vcmpeq_usss + vcmpfalsepd + vcmpfalseps + vcmpfalsesd + vcmpfalsess vcmpfalse_oqpd vcmpfalse_oqps vcmpfalse_oqsd @@ -1174,10 +1276,10 @@ vcmpfalse_osps vcmpfalse_ossd vcmpfalse_osss - vcmpfalsepd - vcmpfalseps - vcmpfalsesd - vcmpfalsess + vcmpgepd + vcmpgeps + vcmpgesd + vcmpgess vcmpge_oqpd vcmpge_oqps vcmpge_oqsd @@ -1186,10 +1288,10 @@ vcmpge_osps vcmpge_ossd vcmpge_osss - vcmpgepd - vcmpgeps - vcmpgesd - vcmpgess + vcmpgtpd + vcmpgtps + vcmpgtsd + vcmpgtss vcmpgt_oqpd vcmpgt_oqps vcmpgt_oqsd @@ -1198,10 +1300,10 @@ vcmpgt_osps vcmpgt_ossd vcmpgt_osss - vcmpgtpd - vcmpgtps - vcmpgtsd - vcmpgtss + vcmplepd + vcmpleps + vcmplesd + vcmpless vcmple_oqpd vcmple_oqps vcmple_oqsd @@ -1210,10 +1312,10 @@ vcmple_osps vcmple_ossd vcmple_osss - vcmplepd - vcmpleps - vcmplesd - vcmpless + vcmpltpd + vcmpltps + vcmpltsd + vcmpltss vcmplt_oqpd vcmplt_oqps vcmplt_oqsd @@ -1222,10 +1324,10 @@ vcmplt_osps vcmplt_ossd vcmplt_osss - vcmpltpd - vcmpltps - vcmpltsd - vcmpltss + vcmpneqpd + vcmpneqps + vcmpneqsd + vcmpneqss vcmpneq_oqpd vcmpneq_oqps vcmpneq_oqsd @@ -1234,10 +1336,6 @@ vcmpneq_osps vcmpneq_ossd vcmpneq_osss - vcmpneqpd - vcmpneqps - vcmpneqsd - vcmpneqss vcmpneq_uqpd vcmpneq_uqps vcmpneq_uqsd @@ -1296,14 +1394,14 @@ vcmpnlt_usss vcmpordpd vcmpordps + vcmpordsd + vcmpordss vcmpord_qpd vcmpord_qps vcmpord_qsd vcmpord_qss - vcmpordsd vcmpord_spd vcmpord_sps - vcmpordss vcmpord_ssd vcmpord_sss vcmppd @@ -1324,14 +1422,14 @@ vcmptrue_usss vcmpunordpd vcmpunordps + vcmpunordsd + vcmpunordss vcmpunord_qpd vcmpunord_qps vcmpunord_qsd vcmpunord_qss - vcmpunordsd vcmpunord_spd vcmpunord_sps - vcmpunordss vcmpunord_ssd vcmpunord_sss vcomisd @@ -1340,6 +1438,7 @@ vcompressps vcvtdq2pd vcvtdq2ps + vcvtne2ps2bf16 vcvtpd2dq vcvtpd2ps vcvtpd2qq @@ -1385,6 +1484,7 @@ vdivps vdivsd vdivss + vdpbf16ps vdppd vdpps verr @@ -1664,6 +1764,7 @@ vmxon vorpd vorps + vp2intersectd vpabsb vpabsd vpabsq @@ -1694,8 +1795,8 @@ vpblendmd vpblendmq vpblendmw - vpblendw vpblendvb + vpblendw vpbroadcastb vpbroadcastd vpbroadcastmb2q @@ -1713,15 +1814,79 @@ vpcmpeqb vpcmpeqd vpcmpeqq + vpcmpequb + vpcmpequd + vpcmpequq + vpcmpequw vpcmpeqw vpcmpestri vpcmpestrm + vpcmpgeb + vpcmpged + vpcmpgeq + vpcmpgeub + vpcmpgeud + vpcmpgeuq + vpcmpgeuw + vpcmpgew vpcmpgtb vpcmpgtd vpcmpgtq + vpcmpgtub + vpcmpgtud + vpcmpgtuq + vpcmpgtuw vpcmpgtw vpcmpistri vpcmpistrm + vpcmpleb + vpcmpled + vpcmpleq + vpcmpleub + vpcmpleud + vpcmpleuq + vpcmpleuw + vpcmplew + vpcmpltb + vpcmpltd + vpcmpltq + vpcmpltub + vpcmpltud + vpcmpltuq + vpcmpltuw + vpcmpltw + vpcmpneqb + vpcmpneqd + vpcmpneqq + vpcmpnequb + vpcmpnequd + vpcmpnequq + vpcmpnequw + vpcmpneqw + vpcmpngtb + vpcmpngtd + vpcmpngtq + vpcmpngtub + vpcmpngtud + vpcmpngtuq + vpcmpngtuw + vpcmpngtw + vpcmpnleb + vpcmpnled + vpcmpnleq + vpcmpnleub + vpcmpnleud + vpcmpnleuq + vpcmpnleuw + vpcmpnlew + vpcmpnltb + vpcmpnltd + vpcmpnltq + vpcmpnltub + vpcmpnltud + vpcmpnltuq + vpcmpnltuw + vpcmpnltw vpcmpq vpcmpub vpcmpud @@ -1923,18 +2088,18 @@ vpshld vpshldd vpshldq - vpshldw vpshldvd vpshldvq vpshldvw + vpshldw vpshlq vpshlw vpshrdd vpshrdq - vpshrdw vpshrdvd vpshrdvq vpshrdvw + vpshrdw vpshufb vpshufbitqmb vpshufd @@ -1946,23 +2111,23 @@ vpslld vpslldq vpsllq - vpsllw vpsllvd vpsllvq vpsllvw + vpsllw vpsrad vpsraq - vpsraw vpsravd vpsravq vpsravw + vpsraw vpsrld vpsrldq vpsrlq - vpsrlw vpsrlvd vpsrlvq vpsrlvw + vpsrlw vpsubb vpsubd vpsubq @@ -2011,9 +2176,6 @@ vreduceps vreducesd vreducess - wrfsbase - wrgsbase - wrmsr vrndscalepd vrndscaleps vrndscalesd @@ -2022,8 +2184,6 @@ vroundps vroundsd vroundss - wrpkru - wrshr vrsqrt14pd vrsqrt14ps vrsqrt14sd @@ -2077,6 +2237,17 @@ vxorps vzeroall vzeroupper + wbinvd + wbnoinvd + wrfsbase + wrgsbase + wrmsr + wrpkru + wrshr + wrssd + wrssq + wrussd + wrussq xabort xadd xbegin @@ -2094,6 +2265,7 @@ xor xorpd xorps + xresldtrk xrstor xrstor64 xrstors @@ -2110,8 +2282,141 @@ xsha1 xsha256 xstore + xsusldtrk xtest + + + call + iret + iretd + iretq + iretw + ja + jae + jb + jbe + jc + jcxz + je + jecxz + jg + jge + jl + jle + jmp + jmpe + jna + jnae + jnb + jnbe + jnc + jne + jng + jnge + jnl + jnle + jno + jnp + jns + jnz + jo + jp + jpe + jpo + jrcxz + js + jz + ret + retd + retf + retfd + retfq + retfw + retn + retnd + retnq + retnw + retq + retw + + + + arg + assign + clear + defalias + define + defstr + deftok + depend + elif + elifctx + elifdef + elifempty + elifenv + elifidn + elifidni + elifn + elifnctx + elifndef + elifnempty + elifnenv + elifnidn + elifnidni + elifntoken + eliftoken + else + exitrep + endif + endmacro + endrep + error + fatal + idefine + if + ifctx + ifdef + ifempty + ifid + ifidn + ifidni + ifmacro + ifn + ifnctx + ifndef + ifnempty + ifnenv + ifnidn + ifnidni + ifnmacro + ifntoken + ifnum + ifstr + iftoken + imacro + include + line + local + macro + pathsearch + pop + pragma + push + rep + repl + rotate + stacksize + strcat + strlen + substr + undef + unmacro + use + warning + xdefine + + times @@ -2123,12 +2428,18 @@ dd dq dt + do + dy + dz resb resw resd resq rest + reso + resy + resz incbin @@ -2136,24 +2447,50 @@ word dword qword + tword + oword + yword + zword short ptr + + + abs + a32 + as + bnd + cs + lock + nobnd + rel + rep + repe + repne + repnz + repz + xacquire + xrelease + absolute bits common + default + cpu extern global org section seg segment + static strict use16 use32 wrt + struc endstruc @@ -2163,52 +2500,262 @@ align alignb - __SECT__ - __NASM_MAJOR__ - __NASM_MINOR__ - __NASM_SUBMINOR__ - ___NASM_PATCHLEVEL__ - __NASM_VERSION_ID__ - __NASM_VER__ - __FILE__ - __LINE__ + __?BITS?__ + __?SECT?__ + __?NASM_MAJOR?__ + __?NASM_MINOR?__ + __?NASM_SUBMINOR?__ + __?NASM_PATCHLEVEL?__ + __?NASM_SNAPSHOT?__ + __?NASM_VERSION_ID?__ + __?NASM_VER?__ + __?FILE?__ + __?LINE?__ + __?OUTPUT_FORMAT?__ + __?DEBUG_FORMAT?__ + __?DATE?__ + __?TIME?__ + __?DATE_NUM?__ + __?TIME_NUM?__ + __?UTC_DATE?__ + __?UTC_TIME?__ + __?UTC_DATE_NUM?__ + __?UTC_TIME_NUM?__ + __?POSIX_TIME?__ + __?PASS?__ + __?USE_ALTREG?__ + __?ALIGNMODE?__ + + __?utf16?__ + __?utf16le?__ + __?utf16be?__ + __?utf32?__ + __?utf32le?__ + __?utf32be?__ + __?float8?__ + __?float16?__ + __?bfloat16?__ + __?float32?__ + __?float64?__ + __?float80m?__ + __?float80e?__ + __?float128l?__ + __?float128h?__ + __?Infinity?__ + __?QNaN?__ + __?NaN?__ + __?SNaN?__ + __?FLOAT_DAZ?__ + __?FLOAT_ROUND?__ + __?FLOAT?__ + __?FLOAT?__ + + + got + gotoff + gotpc + gotpcrel + gottpoff + imagebase + plt + start + sym + tlsie + tlvp + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + @@ -2216,15 +2763,20 @@ + + + + + - + - + diff --git a/xml/nim.xml b/xml/nim.xml --- a/xml/nim.xml +++ b/xml/nim.xml @@ -10,6 +10,7 @@ - added multiline comments (with stacking!) - added support for hex, binary, and octal numbers - added support for numerical literal suffixes (e.g. 'f64) +- added triple-quote strings, raw strings and regex strings - made escape sequences in strings work slightly better (still needs work) - changed pragma syntax highlighting to dsAttribute instead of dsDataType - doc comments @@ -19,174 +20,199 @@ - const - export - import - include - lambda - let - var + const + export + import + include + lambda + let + var - assert - asm - atomic - block - break - case - cast - compiles - continue - declared - declaredinscope - defined - discard - do - echo - elif - else - end - except - finally - for - from - if - mixin - bind - new - raise - return - sizeof - try - when - while - quit - using - yield + assert + asm + atomic + block + break + case + cast + compiles + continue + declared + declaredinscope + defined + discard + do + echo + elif + else + end + except + finally + for + from + if + mixin + bind + new + raise + return + sizeof + try + when + while + quit + using + yield - addr - and - as - div - in - is - isnot - mod - not - notin - of - or - shl - shr - xor + addr + and + as + div + in + is + isnot + mod + not + notin + of + or + shl + shr + xor - array - bool - byte - cchar - cdouble - char - cfloat - cint - clong - cshort - cstring - cuint - distinct - expr - float - float32 - float64 - generic - int - int8 - int16 - int32 - int64 - interface - openarray - pointer - set - seq - stmt - string - tuple - typedesc - uint - uint8 - uint16 - uint32 - uint64 - varargs - void - untyped - typed + array + bool + byte + cchar + cdouble + char + cfloat + cint + clong + cshort + cstring + cuint + distinct + expr + float + float32 + float64 + generic + int + int8 + int16 + int32 + int64 + interface + openarray + pointer + set + seq + stmt + string + tuple + typedesc + uint + uint8 + uint16 + uint32 + uint64 + varargs + void + untyped + typed - out - ptr - ref - shared - static + out + ptr + ref + shared + static - false - inf - nil - true - on - off + false + inf + nil + true + on + off - result + result + + converter + iterator + macro + method + proc + func + template + + + + type + concept + object + enum + + + - + - + - - - - - - - - - - - + + - - - - - + + + + + + + + + + + + + + + + + + + + @@ -195,70 +221,83 @@ - - - - - - - - - + - - - + + + - - + + + + + + + + + + + + + + - - - + + - + - - + + - + - - - - + + + + + + + + - + + + + + + + - + - + @@ -275,19 +314,21 @@ - + - - - + + + + + - + @@ -296,22 +337,20 @@ - - - - - - + + + - + + - - + + diff --git a/xml/noweb.xml b/xml/noweb.xml --- a/xml/noweb.xml +++ b/xml/noweb.xml @@ -1,6 +1,6 @@ - + diff --git a/xml/objectivecpp.xml b/xml/objectivecpp.xml --- a/xml/objectivecpp.xml +++ b/xml/objectivecpp.xml @@ -1,6 +1,6 @@ - + break @@ -164,8 +164,6 @@ - - @@ -179,20 +177,31 @@ - - + + - - - + + + + + + + + + + + + + + @@ -212,16 +221,15 @@ + + - - - - - + + @@ -236,9 +244,7 @@ - - - + @@ -250,9 +256,7 @@ - - - + @@ -262,9 +266,7 @@ - - - + @@ -293,8 +295,9 @@ - + + diff --git a/xml/ocaml.xml b/xml/ocaml.xml --- a/xml/ocaml.xml +++ b/xml/ocaml.xml @@ -17,7 +17,7 @@ extensions="*.ml;*.mli" mimetype="text/x-ocaml" section="Sources" - version="6" + version="7" priority="10" kateversion="2.4" author="Glyn Webster (glynwebster@orcon.net.nz) and Vincent Hugot (vincent.hugot@gmail.com)" @@ -431,6 +431,10 @@ + + + + diff --git a/xml/octave.xml b/xml/octave.xml --- a/xml/octave.xml +++ b/xml/octave.xml @@ -20,8 +20,8 @@ Thanks to Luis Silvestre for previous version and suggestions --> - - + + @@ -2765,7 +2765,8 @@ - + + @@ -2801,6 +2802,13 @@ + + + + + + + @@ -2823,8 +2831,7 @@ - - + diff --git a/xml/opencl.xml b/xml/opencl.xml --- a/xml/opencl.xml +++ b/xml/opencl.xml @@ -1,7 +1,7 @@ - + - - @@ -140,12 +138,23 @@ - - - + + + + + + + + + + + + + + @@ -172,12 +181,16 @@ + + + + @@ -193,27 +206,19 @@ - - - + - - - - - - - + @@ -224,9 +229,7 @@ - - - + @@ -253,8 +256,9 @@ - + + diff --git a/xml/pascal.xml b/xml/pascal.xml --- a/xml/pascal.xml +++ b/xml/pascal.xml @@ -2,7 +2,7 @@ File Text - - FIXME - TODO - NOTE - ### - @@ -185,15 +179,21 @@ - + + + - + + + - + + + @@ -206,14 +206,14 @@ - - - + + + 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 @@ -534,7 +534,7 @@ - + @@ -552,8 +552,12 @@ + + + + - + @@ -570,7 +574,7 @@ - + @@ -592,7 +596,7 @@ - + @@ -658,7 +662,7 @@ - + @@ -838,30 +842,33 @@ - + + + + - + - + - + diff --git a/xml/php.xml b/xml/php.xml --- a/xml/php.xml +++ b/xml/php.xml @@ -73,7 +73,7 @@ ]> - + + + + + + @@ -10923,10 +10928,12 @@ + + @@ -11046,8 +11053,9 @@ - + + diff --git a/xml/pike.xml b/xml/pike.xml --- a/xml/pike.xml +++ b/xml/pike.xml @@ -1,7 +1,7 @@ - + break @@ -66,24 +66,28 @@ - + + + + - + + - + - + @@ -105,16 +109,14 @@ - - - + diff --git a/xml/postscript.xml b/xml/postscript.xml --- a/xml/postscript.xml +++ b/xml/postscript.xml @@ -1,6 +1,6 @@ - + abs @@ -405,10 +405,14 @@ - + - + + + + + @@ -432,3 +436,4 @@ + diff --git a/xml/povray.xml b/xml/povray.xml --- a/xml/povray.xml +++ b/xml/povray.xml @@ -5,7 +5,7 @@ - + aa_threshold @@ -923,45 +923,50 @@ + + - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + + + diff --git a/xml/powershell.xml b/xml/powershell.xml --- a/xml/powershell.xml +++ b/xml/powershell.xml @@ -1,7 +1,7 @@ - @@ -907,9 +906,16 @@ - + + + + + + + + @@ -938,3 +944,4 @@ + diff --git a/xml/prolog.xml b/xml/prolog.xml --- a/xml/prolog.xml +++ b/xml/prolog.xml @@ -105,7 +105,7 @@ ]> + @@ -786,6 +787,7 @@ + @@ -1029,3 +1031,4 @@ your home directory. You have to open a new instance of kwrite/kate to use the new syntax file. --> + diff --git a/xml/protobuf.xml b/xml/protobuf.xml --- a/xml/protobuf.xml +++ b/xml/protobuf.xml @@ -1,6 +1,6 @@ - + message @@ -82,12 +82,16 @@ + + + + @@ -113,8 +117,9 @@ - + + diff --git a/xml/pure.xml b/xml/pure.xml --- a/xml/pure.xml +++ b/xml/pure.xml @@ -32,69 +32,69 @@ Boston, MA 02111-1307, USA. --> - + - case - when - with + case + when + with - end + end - const - def - else - extern - if - infix - infixl - infixr - interface - let - namespace - nonfix - of - otherwise - outfix - postfix - prefix - private - public - then - type - using + const + def + else + extern + if + infix + infixl + infixr + interface + let + namespace + nonfix + of + otherwise + outfix + postfix + prefix + private + public + then + type + using - catch - throw - __break__ - __trace__ + catch + throw + __break__ + __trace__ - bigint - bool - char - float - double - expr - short - int - long - string - pointer - void - int8 - int16 - int32 - int64 - matrix - dmatrix - cmatrix - imatrix - smatrix - nmatrix + bigint + bool + char + float + double + expr + short + int + long + string + pointer + void + int8 + int16 + int32 + int64 + matrix + dmatrix + cmatrix + imatrix + smatrix + nmatrix @@ -108,7 +108,7 @@ - + @@ -118,12 +118,17 @@ - - + + + - + + + + + @@ -140,7 +145,8 @@ - + + diff --git a/xml/purebasic.xml b/xml/purebasic.xml --- a/xml/purebasic.xml +++ b/xml/purebasic.xml @@ -1,5 +1,5 @@ - + Break @@ -1738,6 +1738,7 @@ + @@ -1760,7 +1761,7 @@ - + diff --git a/xml/python.xml b/xml/python.xml --- a/xml/python.xml +++ b/xml/python.xml @@ -19,7 +19,7 @@ - + import @@ -447,6 +447,7 @@ + diff --git a/xml/qml.xml b/xml/qml.xml --- a/xml/qml.xml +++ b/xml/qml.xml @@ -4,7 +4,7 @@ ]> - @@ -130,7 +130,6 @@ - @@ -141,9 +140,7 @@ - - @@ -168,10 +165,10 @@ - + - - + + @@ -180,7 +177,7 @@ - + diff --git a/xml/r.xml b/xml/r.xml --- a/xml/r.xml +++ b/xml/r.xml @@ -8,7 +8,7 @@ R : http://www.r-project.org/ RKWard : http://rkward.kde.org/ --> - + @@ -56,7 +56,7 @@ - + @@ -79,22 +79,32 @@ - - - + + - + + + + + + + + + + + + @@ -105,48 +115,56 @@ - - - - + + + + - - + + + + + + + + + + + - - + - - - - - + + + + - + - - - - - - - - + + + + + + + + - + + diff --git a/xml/relaxng.xml b/xml/relaxng.xml --- a/xml/relaxng.xml +++ b/xml/relaxng.xml @@ -16,7 +16,7 @@ - Namespace rules --> - + @@ -112,8 +113,9 @@ - + + diff --git a/xml/relaxngcompact.xml b/xml/relaxngcompact.xml --- a/xml/relaxngcompact.xml +++ b/xml/relaxngcompact.xml @@ -1,6 +1,6 @@ - + default @@ -81,6 +81,9 @@ + + + @@ -104,5 +107,8 @@ + + + diff --git a/xml/rest.xml b/xml/rest.xml --- a/xml/rest.xml +++ b/xml/rest.xml @@ -14,7 +14,7 @@ Copyright 2010 Matt Williams (matt@milliams.com) Copyright 2014 Matthew Woehlke (mw_triad@users.sourceforge.net) --> - + @@ -70,6 +70,7 @@ + @@ -117,3 +118,4 @@ + diff --git a/xml/rhtml.xml b/xml/rhtml.xml --- a/xml/rhtml.xml +++ b/xml/rhtml.xml @@ -2,7 +2,7 @@ - + ]> - + @@ -315,12 +315,6 @@ word_wrap - - TODO - FIXME - NOTE - - @@ -332,22 +326,22 @@ - - + + - - - - - + + + + + - - - + + + @@ -371,15 +365,16 @@ - + + + - @@ -414,21 +409,21 @@ - + - + - + @@ -437,28 +432,28 @@ - + - + - + - + @@ -467,14 +462,14 @@ - + - + - + @@ -483,9 +478,9 @@ - + - + @@ -496,7 +491,7 @@ - + @@ -504,7 +499,7 @@ - + @@ -512,14 +507,14 @@ - + - + @@ -533,26 +528,36 @@ + + + + + + + + + + + + - - - + - + - + - + - + @@ -562,16 +567,16 @@ - + - + - + @@ -584,18 +589,18 @@ - + - + - - - - - + + + + + @@ -650,9 +655,11 @@ + + - + @@ -711,10 +718,10 @@ - - - - + + + + @@ -727,13 +734,18 @@ + + + - - + + - + + + @@ -885,7 +897,7 @@ --> - + @@ -950,7 +962,7 @@ --> - + @@ -1014,7 +1026,7 @@ --> - + @@ -1078,7 +1090,7 @@ --> - + @@ -1144,7 +1156,7 @@ --> - + @@ -1165,73 +1177,74 @@ - + + - - - - - + + + + + - - - - - - + + + + + + - + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - + - - + + - - - - - - - - + + + + + + + + - + + diff --git a/xml/roff.xml b/xml/roff.xml --- a/xml/roff.xml +++ b/xml/roff.xml @@ -7,7 +7,7 @@ ]> - + @@ -79,7 +79,9 @@ + + @@ -195,3 +197,4 @@ + diff --git a/xml/ruby.xml b/xml/ruby.xml --- a/xml/ruby.xml +++ b/xml/ruby.xml @@ -31,7 +31,7 @@ + @@ -431,7 +432,9 @@ + + @@ -891,24 +894,24 @@ - + - - - - - + + + + + - - - + + + - - - + + + @@ -916,15 +919,15 @@ - + - - + + - + diff --git a/xml/rust.xml b/xml/rust.xml --- a/xml/rust.xml +++ b/xml/rust.xml @@ -33,7 +33,7 @@ ]> - + fn @@ -451,6 +451,7 @@ + diff --git a/xml/scala.xml b/xml/scala.xml --- a/xml/scala.xml +++ b/xml/scala.xml @@ -1,6 +1,6 @@ - - + + + + + + + + @@ -3498,8 +3505,9 @@ - + + diff --git a/xml/scheme.xml b/xml/scheme.xml --- a/xml/scheme.xml +++ b/xml/scheme.xml @@ -1,394 +1,1393 @@ - - - - - <= - < - = - => - >= - > - - - / - *,* - *) - + - - - #\nul - #\soh - #\stx - #\etx - #\eot - #\enq - #\ack - #\bel - #\bs - #\ht - #\nl - #\vt - #\np - #\cr - #\so - #\si - #\dle - #\dc1 - #\dc2 - #\dc3 - #\dc4 - #\nak - #\syn - #\etb - #\can - #\em - #\sub - #\esc - #\fs - #\gs - #\rs - #\us - #\space - #\sp - #\newline - #\nl - #\tab - #\ht - #\backspace - #\bs - #\return - #\cr - #\page - #\np - #\null - #\nul - - - define - define* - define-accessor - define-class - defined? - define-generic - define-macro - define-method - define-module - define-private - define-public - define*-public - define-reader-ctor - define-syntax - define-syntax-macro - defmacro - defmacro* - defmacro*-public - - - abs - acos - and - angle - append - applymap - asin - assoc - assq - assv - atan - begin - boolean? - break - caaaar - caaadr - caaar - caadar - caaddr - caadr - caar - cadaar - cadadr - cadar - caddar - cadddr - caddr - cadr - call/cc - call-with-current-continuation - call-with-input-file - call-with-output-file - call-with-values - car - case - catch - cdaaar - cdaadr - cdaar - cdadar - cdaddr - cdadr - cdar - cddaar - cddadr - cddar - cdddar - cddddr - cdddr - cddr - cdr - ceiling - char-alphabetic? - char-ci>=? - char-ci>? - char-ci=? - char-ci<=? - char-downcase - char->integer - char>=? - char>? - char=? - char? - char-lower-case? - char<?c - char<=? - char-numeric? - char-ready? - char-upcase - char-upper-case? - char-whitespace? - close-input-port - close-output-port - complex? - cond - cons - continue - cos - current-input-port - current-output-port - denominator - display - do - dynamic-wind - else - eof-object? - eq? - equal? - eqv? - eval - even? - exact->inexact - exact? - exp - expt - floor - force - for-each - gcd - har-ci<? - if - imag-part - inexact->exact - inexact? - input-port? - integer->char - integer? - interaction-environment - lambda - lcm - length - let - let* - letrec - letrec-syntax - let-syntax - list->string - list - list? - list-ref - list-tail - load - log - magnitude - make-polar - make-rectangular - make-string - make-vector - max - member - memq - memv - min - modulo - negative? - newline - not - null-environment - null? - number? - number->string - numerator - odd? - open-input-file - open-output-file - or - output-port? - pair? - peek-char - port? - positive? - procedure? - quotient - rational? - rationalize - read-char - read - real? - real-part - remainder - reverse - round - scheme-report-environment - set-car! - set-cdr! - sin - sqrt - string-append - string-ci>=? - string-ci>? - string-ci=? - string-ci<=? - string-ci<? - string-copy - string-fill! - string>=? - string>? - string->list - string->number - string->symbol - string=? - string - string? - string-length - string<=? - string<? - string-ref - string-set! - substring - symbol->string - symbol? - syntax-rules - tan - transcript-off - transcript-on - truncate - values - vector-fill! - vector->listlist->vector - vector - vector? - vector-length - vector-ref - vector-set! - while - with-input-from-file - with-output-to-file - write-char - write - zero? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +]++|"[^"]*+")*+"> + + + + + + + + + +]> + + + + + <= + < + = + => + >= + > + - + / + *,* + + + ! + $ + % + * + / + = + > + ? + ^ + _ + ~ + . + ... + + + alarm + backspace + delete + esc + linefeed + newline + page + return + space + tab + vtab + + nul + soh + stx + etx + eot + enq + ack + bel + bs + ht + nl + vt + np + cr + so + si + dle + dc1 + dc2 + dc3 + dc4 + nak + syn + etb + can + em + sub + fs + gs + rs + us + sp + nl + ht + bs + cr + np + null + nul + + + define + define* + define-accessor + define-class + defined? + define-generic + define-macro + define-method + define-module + define-private + define-public + define*-public + define-reader-ctor + define-syntax + define-syntax-macro + defmacro + defmacro* + defmacro*-public + + + &assertion + &condition + &error + &i/o-decoding + &i/o-encoding + &i/o-file-already-exists + &i/o-file-does-not-exist + &i/o-file-is-read-only + &i/o-file-protection + &i/o-filename + &i/o-invalid-position + &i/o-port + &i/o-read + &i/o-write + &i/o + &implementation-restriction + &implementation-violation + &irritants + &lexical + &message + &mistake + &no-infinities + &no-nans + &non-continuable + &serious + &syntax + &undefined + &violation + &warning + &who + &xcond + abs + acos + and + angle + append + applymap + asin + assert + assertion-violation + assertion-violation? + assoc + assp + assq + assv + atan + begin + binary-port? + bitwise-and + bitwise-arithmetic-shift-left + bitwise-arithmetic-shift-right + bitwise-arithmetic-shift + bitwise-bit-count + bitwise-bit-field + bitwise-bit-set? + bitwise-copy-bit-field + bitwise-copy-bit + bitwise-first-bit-set + bitwise-if + bitwise-ior + bitwise-length + bitwise-not + bitwise-reverse-bit-field + bitwise-rotate-bit-field + bitwise-xor + boolean=? + boolean? + bound-identifier=? + break + buffer-mode + buffer-mode? + bytevector->sint-list + bytevector->string + bytevector->u8-list + bytevector->uint-list + bytevector-copy! + bytevector-copy + bytevector-fill! + bytevector-ieee-double-native-ref + bytevector-ieee-double-native-set! + bytevector-ieee-double-ref + bytevector-ieee-double-set! + bytevector-ieee-single-native-ref + bytevector-ieee-single-native-set! + bytevector-ieee-single-ref + bytevector-ieee-single-set! + bytevector-length + bytevector-s16-native-ref + bytevector-s16-native-set! + bytevector-s16-ref + bytevector-s16-set! + bytevector-s32-native-ref + bytevector-s32-native-set! + bytevector-s32-ref + bytevector-s32-set! + bytevector-s64-native-ref + bytevector-s64-native-set! + bytevector-s64-ref + bytevector-s64-set! + bytevector-s8-ref + bytevector-s8-set! + bytevector-sint-ref + bytevector-sint-set! + bytevector-u16-native-ref + bytevector-u16-native-set! + bytevector-u16-ref + bytevector-u16-set! + bytevector-u32-native-ref + bytevector-u32-native-set! + bytevector-u32-ref + bytevector-u32-set! + bytevector-u64-native-ref + bytevector-u64-native-set! + bytevector-u64-ref + bytevector-u64-set! + bytevector-u8-ref + bytevector-u8-set! + bytevector-uint-ref + bytevector-uint-set! + bytevector=? + bytevector? + caaaar + caaadr + caaar + caadar + caaddr + caadr + caar + cadaar + cadadr + cadar + caddar + cadddr + caddr + cadr + call-with-bytevector-output-port + call-with-current-continuation + call-with-input-file + call-with-output-file + call-with-port + call-with-string-output-port + call-with-values + call/cc + car + case-lambda + case + catch + cdaaar + cdaadr + cdaar + cdadar + cdaddr + cdadr + cdar + cddaar + cddadr + cddar + cdddar + cddddr + cdddr + cddr + cdr + ceiling + char>=? + char>? + char<=? + char<? + char<?c + char->integer + char-alphabetic? + char-ci>=? + char-ci>? + char-ci<=? + char-ci<? + char-ci=? + char-downcase + char-foldcase + char-general-category + char-lower-case? + char-numeric? + char-ready? + char-title-case? + char-titlecase + char-upcase + char-upper-case? + char-whitespace? + char=? + char? + close-input-port + close-output-port + close-port + complex? + cond + condition-accessor + condition-irritants + condition-message + condition-predicate + condition-who + condition + condition? + cons* + cons + continue + cos + current-error-port + current-input-port + current-output-port + datum->syntax + define-condition-type + define-enumeration + define-record-type + delete-file + denominator + display + div-and-mod + div0-and-mod0 + div0 + div + do + dynamic-wind + else + endianness + enum-set->list + enum-set-complement + enum-set-constructor + enum-set-difference + enum-set-indexer + enum-set-intersection + enum-set-member? + enum-set-projection + enum-set-subset? + enum-set-union + enum-set-universe + enum-set=? + eof-object + eof-object? + eol-style + eq? + equal-hash + equal? + eqv? + error-handling-mode + error + error? + eval + even? + exact->inexact + exact->inexact + exact-integer-sqrt + exact + exact? + exp + expt + file-exists? + file-options + filter + find + finite? + fixnum->flonum + fixnum-width + fixnum? + fl>=? + fl>? + fl<=? + fl<? + fl* + fl+ + fl- + fl/ + fl=? + flabs + flacos + flasin + flatan + flceiling + flcos + fldenominator + fldiv-and-mod + fldiv0-and-mod0 + fldiv0 + fldiv + fleven? + flexp + flexpt + flfinite? + flfloor + flinfinite? + flinteger? + fllog + flmax + flmin + flmod0 + flmod + flnan? + flnegative? + flnumerator + flodd? + flonum? + floor + flpositive? + flround + flsin + flsqrt + fltan + fltruncate + flush-output-port + flzero? + for-each + force + free-identifier=? + fx>=? + fx>? + fx<=? + fx<? + fx*/carry + fx* + fx+/carry + fx+ + fx-/carry + fx- + fx=? + fxand + fxarithmetic-shift-left + fxarithmetic-shift-right + fxarithmetic-shift + fxbit-count + fxbit-field + fxbit-set? + fxcopy-bit-field + fxcopy-bit + fxdiv-and-mod + fxdiv0-and-mod0 + fxdiv0 + fxdiv + fxeven? + fxfirst-bit-set + fxif + fxior + fxlength + fxmax + fxmin + fxmod0 + fxmod + fxnegative? + fxnot + fxodd? + fxpositive? + fxreverse-bit-field + fxrotate-bit-field + fxxor + fxzero? + gcd + generate-temporaries + get-bytevector-all + get-bytevector-n! + get-bytevector-n + get-bytevector-some + get-char + get-datum + get-line + get-string-all + get-string-n! + get-string-n + get-u8 + greatest-fixnum + guard + har-ci<? + hashtable-clear! + hashtable-contains? + hashtable-copy + hashtable-delete! + hashtable-entries + hashtable-equivalence-function + hashtable-hash-function + hashtable-keys + hashtable-mutable? + hashtable-ref + hashtable-set! + hashtable-size + hashtable-update! + hashtable? + i/o-decoding-error? + i/o-encoding-error-char + i/o-encoding-error? + i/o-error-filename + i/o-error-port + i/o-error-position + i/o-error? + i/o-file-already-exists-error? + i/o-file-does-not-exist-error? + i/o-file-is-read-only-error? + i/o-file-protection-error? + i/o-filename-error? + i/o-invalid-position-error? + i/o-port-error? + i/o-read-error? + i/o-write-error? + identifier-syntax + identifier? + if + imag-part + implementation-restriction-violation? + inexact->exact + inexact + inexact? + infinite? + input-port? + integer->char + integer-valued? + integer? + interaction-environment + irritants-condition? + lambda + latin-1-codec + lcm + least-fixnum + length + let*-values + let* + let-syntax + let-values + let + letrec* + letrec-syntax + letrec + lexical-violation? + list->string + list->vector + list-ref + list-sort + list-tail + list + list? + load + log + lookahead-char + lookahead-u8 + magnitude + make-assertion-violation + make-bytevector + make-custom-binary-input-port + make-custom-binary-input/output-port + make-custom-binary-output-port + make-custom-textual-input-port + make-custom-textual-input/output-port + make-custom-textual-output-port + make-enumeration + make-eq-hashtable + make-eqv-hashtable + make-error + make-hashtable + make-i/o-decoding-error + make-i/o-encoding-error + make-i/o-error + make-i/o-file-already-exists-error + make-i/o-file-does-not-exist-error + make-i/o-file-is-read-only-error + make-i/o-file-protection-error + make-i/o-filename-error + make-i/o-invalid-position-error + make-i/o-port-error + make-i/o-read-error + make-i/o-write-error + make-implementation-restriction-violation + make-irritants-condition + make-lexical-violation + make-message-condition + make-no-infinities-violation + make-no-nans-violation + make-non-continuable-violation + make-polar + make-record-constructor-descriptor + make-record-type-descriptor + make-rectangular + make-serious-condition + make-string + make-syntax-violation + make-transcoder + make-undefined-violation + make-variable-transformer + make-vector + make-violation + make-warning + make-who-condition + max + member + memp + memq + memv + message-condition? + min + mod0 + mod + modulo + nan? + native-endianness + native-eol-style + native-transcoder + negative? + newline + no-infinities-violation? + no-nans-violation? + non-continuable-violation? + not + null-environment + null? + number->string + number->string + number? + numerator + odd? + open-bytevector-input-port + open-bytevector-output-port + open-file-input-port + open-file-input/output-port + open-file-output-port + open-input-file + open-output-file + open-string-input-port + open-string-output-port + or + output-port-buffer-mode + output-port? + pair? + partition + peek-char + port-eof? + port-has-port-position? + port-has-set-port-position!? + port-position + port-transcoder + port? + positive? + procedure? + put-bytevector + put-char + put-datum + put-string + put-u8 + quasiquote + quasisyntax + quote + quotient + raise-continuable + raise + rational-valued? + rational? + rationalize + read-char + read + real->flonum + real-part + real-valued? + real? + record-accessor + record-constructor-descriptor + record-constructor + record-field-mutable? + record-mutator + record-predicate + record-rtd + record-type-descriptor + record-type-descriptor? + record-type-field-names + record-type-generative? + record-type-name + record-type-opaque? + record-type-parent + record-type-sealed? + record-type-uid + record? + remainder + remove + remp + remq + remv + reverse + round + scheme-report-environment + serious-condition? + set! + set-car! + set-cdr! + set-port-position! + simple-conditions + sin + sint-list->bytevector + sqrt + standard-error-port + standard-input-port + standard-output-port + string>=? + string>? + string<=? + string<? + string->bytevector + string->list + string->number + string->symbol + string->utf16 + string->utf32 + string->utf8 + string-append + string-ci>=? + string-ci>? + string-ci<=? + string-ci<? + string-ci-hash + string-ci=? + string-copy + string-downcase + string-fill! + string-foldcase + string-hash + string-length + string-normalize-nfc + string-normalize-nfd + string-normalize-nfkc + string-normalize-nfkd + string-ref + string-set! + string-titlecase + string-upcase + string + string=? + string? + substring + symbol->string + symbol-hash + symbol=? + symbol? + syntax->datum + syntax-case + syntax-rules + syntax-violation-form + syntax-violation-subform + syntax-violation + syntax-violation? + syntax + tan + textual-port? + transcoded-port + transcoder-codec + transcoder-eol-style + transcoder-error-handling-mode + transcript-off + transcript-on + truncate + u8-list->bytevector + uint-list->bytevector + undefined-violation? + unquote-splicing + unquote + unsyntax-splicing + unsyntax + utf-16-codec + utf-8-codec + utf16->string + utf32->string + utf8->string + values + vector->list + vector->listlist->vector + vector-fill! + vector-length + vector-ref + vector-set! + vector-sort! + vector-sort + vector + vector? + violation? + warning? + while + who-condition? + with-exception-handler + with-input-from-file + with-output-to-file + with-syntax + write-char + write + zero? + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/sci.xml b/xml/sci.xml --- a/xml/sci.xml +++ b/xml/sci.xml @@ -1,6 +1,6 @@ - + do @@ -1164,9 +1164,14 @@ - + + + + + + @@ -1184,7 +1189,7 @@ - + diff --git a/xml/sed.xml b/xml/sed.xml --- a/xml/sed.xml +++ b/xml/sed.xml @@ -1,6 +1,6 @@ - + @@ -220,7 +220,11 @@ - + + + + + @@ -265,3 +269,4 @@ + diff --git a/xml/sgml.xml b/xml/sgml.xml --- a/xml/sgml.xml +++ b/xml/sgml.xml @@ -1,10 +1,10 @@ - + - + @@ -25,7 +25,10 @@ - + + + + @@ -39,7 +42,7 @@ - + diff --git a/xml/sml.xml b/xml/sml.xml --- a/xml/sml.xml +++ b/xml/sml.xml @@ -1,6 +1,6 @@ - + abstype @@ -65,7 +65,7 @@ - + @@ -77,7 +77,10 @@ - + + + + @@ -98,7 +101,8 @@ - + + diff --git a/xml/sql-mysql.xml b/xml/sql-mysql.xml --- a/xml/sql-mysql.xml +++ b/xml/sql-mysql.xml @@ -6,7 +6,7 @@ modifications by Milian Wolff (mail@milianw.de) v3 fix comments by Gene Thomas --> - + BEGIN @@ -381,7 +381,7 @@ - + @@ -443,10 +443,17 @@ - + + + + + + + + @@ -472,10 +479,11 @@ - - + + + diff --git a/xml/sql-postgresql.xml b/xml/sql-postgresql.xml --- a/xml/sql-postgresql.xml +++ b/xml/sql-postgresql.xml @@ -3,7 +3,7 @@ - + BEGIN @@ -991,7 +991,7 @@ - + @@ -1036,10 +1036,17 @@ - + + + + + + + + @@ -1066,9 +1073,10 @@ - - + + + diff --git a/xml/sql.xml b/xml/sql.xml --- a/xml/sql.xml +++ b/xml/sql.xml @@ -5,7 +5,7 @@ v3 fix comments by Gene Thomas --> - + BEGIN @@ -877,7 +877,7 @@ - + @@ -915,11 +915,20 @@ - + + + + + + + + - + + + @@ -947,8 +956,8 @@ - - + + diff --git a/xml/stata.xml b/xml/stata.xml --- a/xml/stata.xml +++ b/xml/stata.xml @@ -1,6 +1,6 @@ - @@ -3175,12 +3175,16 @@ + + + + @@ -3214,10 +3218,11 @@ - - + + + 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 @@ -532,7 +532,11 @@ - + + + + + @@ -563,3 +567,4 @@ + diff --git a/xml/tcsh.xml b/xml/tcsh.xml --- a/xml/tcsh.xml +++ b/xml/tcsh.xml @@ -8,7 +8,7 @@ ]> - + @@ -815,3 +817,4 @@ + diff --git a/xml/texinfo.xml b/xml/texinfo.xml --- a/xml/texinfo.xml +++ b/xml/texinfo.xml @@ -1,6 +1,6 @@ - + - + @@ -26,12 +26,16 @@ - - + + + + + - + + @@ -55,9 +59,10 @@ - - + + + diff --git a/xml/toml.xml b/xml/toml.xml --- a/xml/toml.xml +++ b/xml/toml.xml @@ -5,13 +5,13 @@ - + ]> - + true @@ -60,6 +60,7 @@ + @@ -111,7 +112,7 @@ - + @@ -122,14 +123,15 @@ - + - + + diff --git a/xml/verilog.xml b/xml/verilog.xml --- a/xml/verilog.xml +++ b/xml/verilog.xml @@ -1,6 +1,6 @@ - + macromodule @@ -187,21 +187,27 @@ + + - + + + - + - + + + @@ -244,9 +250,10 @@ - + + diff --git a/xml/vhdl.xml b/xml/vhdl.xml --- a/xml/vhdl.xml +++ b/xml/vhdl.xml @@ -8,7 +8,7 @@ ]> - + file @@ -599,7 +599,9 @@ + + @@ -635,22 +637,23 @@ - + - - - - + + + + - + + diff --git a/xml/xml.xml b/xml/xml.xml --- a/xml/xml.xml +++ b/xml/xml.xml @@ -147,3 +147,4 @@ + diff --git a/xml/xorg.xml b/xml/xorg.xml --- a/xml/xorg.xml +++ b/xml/xorg.xml @@ -1,6 +1,6 @@ - + @@ -36,6 +36,7 @@ + @@ -63,3 +64,4 @@ + diff --git a/xml/xslt.xml b/xml/xslt.xml --- a/xml/xslt.xml +++ b/xml/xslt.xml @@ -1,9 +1,9 @@ - - + + + ]> - + xsl:value-of @@ -362,7 +362,8 @@ - + + @@ -406,35 +407,35 @@ - - + + - - - - - - - - - - + + + + + + + + + - - - + + + - - - - + + + + - + + diff --git a/xml/xul.xml b/xml/xul.xml --- a/xml/xul.xml +++ b/xml/xul.xml @@ -4,7 +4,7 @@ ]> - + @@ -426,6 +426,7 @@ + @@ -519,7 +520,7 @@ - + @@ -544,8 +545,9 @@ + + - @@ -562,7 +564,7 @@ - + @@ -615,10 +617,9 @@ - - - + + diff --git a/xml/yacc.xml b/xml/yacc.xml --- a/xml/yacc.xml +++ b/xml/yacc.xml @@ -32,7 +32,7 @@ ======================================================================== --> - + @@ -199,11 +199,13 @@ + + diff --git a/xml/yaml.xml b/xml/yaml.xml --- a/xml/yaml.xml +++ b/xml/yaml.xml @@ -37,7 +37,7 @@ - @@ -322,6 +322,7 @@ + @@ -633,3 +634,4 @@ + diff --git a/xml/zsh.xml b/xml/zsh.xml --- a/xml/zsh.xml +++ b/xml/zsh.xml @@ -8,7 +8,7 @@ ]> - + @@ -534,7 +534,9 @@ + + @@ -958,3 +960,4 @@ +