diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -8,6 +8,10 @@ a Haskell syntax highlighting library with support for KDE XML syntax highlighting descriptions. +Formatters are no longer included in this package: see +`skylighting-format-ansi`, `skylighting-format-blaze-html`, and +`skylighting-format-latex`. + For details on how to use this package, see the Haddock documentation and the [Skylighting README](https://github.com/jgm/skylighting/blob/master/skylighting/README.md). diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,21 @@ # Revision history for skylighting and skylighting-core +## 0.13 + + * Update syntax definitions from upstream: bash, cmake, diff, + ini, perl, php, sgml, xml. + + * Split out formatters into separate packages (#152). API changes: + - Skylighting.Core no longer exports Skylighting.Format.ANSI, + Skylighting.Format.HTML, Skylighting.Format.LaTeX. These are + now provided by separate packages, skylighting-format-ansi, + skylighting-format-blaze-html, skylighting-format-latex. + - Skylighting.Types no longer exports XTerm256ColorCode. + This has been moved to skylighting-format-ansi. + + * Change Makefile to use cabal instead of stack. + + ## 0.12.3.1 * Allow mtl 2.3. 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.12.3.1 +version: 0.13 synopsis: syntax highlighting library description: Skylighting is a syntax highlighting library. It derives its tokenizers from XML syntax @@ -108,9 +108,6 @@ Skylighting.Styles Skylighting.Loader Skylighting.Tokenizer - Skylighting.Format.ANSI - Skylighting.Format.HTML - Skylighting.Format.LaTeX other-modules: Regex.KDE Regex.KDE.Regex Regex.KDE.Compile @@ -131,10 +128,8 @@ xml-conduit >= 1.9.1.0 && < 1.10, safe, base64-bytestring, - blaze-html >= 0.5, - containers >= 0.6.0.1, - ansi-terminal >= 0.7, - colour >= 2.0 + colour >= 2.0, + containers >= 0.6.0.1 hs-source-dirs: src ghc-prof-options: -fprof-auto-exported default-language: Haskell2010 diff --git a/src/Skylighting/Core.hs b/src/Skylighting/Core.hs --- a/src/Skylighting/Core.hs +++ b/src/Skylighting/Core.hs @@ -10,9 +10,6 @@ , module Skylighting.Regex , module Skylighting.Styles , module Skylighting.Loader - , module Skylighting.Format.ANSI - , module Skylighting.Format.HTML - , module Skylighting.Format.LaTeX ) where import Control.Monad import Data.List (tails) @@ -20,9 +17,6 @@ import Data.Maybe (listToMaybe) import Data.Text (Text) import qualified Data.Text as Text -import Skylighting.Format.ANSI -import Skylighting.Format.HTML -import Skylighting.Format.LaTeX import Skylighting.Loader import Skylighting.Parser import Skylighting.Regex diff --git a/src/Skylighting/Format/ANSI.hs b/src/Skylighting/Format/ANSI.hs deleted file mode 100644 --- a/src/Skylighting/Format/ANSI.hs +++ /dev/null @@ -1,80 +0,0 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE OverloadedStrings #-} -module Skylighting.Format.ANSI ( - formatANSI - ) where -import Control.Monad (mplus) -import qualified Data.Map as Map -import Data.Maybe (fromMaybe, isNothing, maybeToList) -import Data.Text (Text) -import qualified Data.Text as Text -import Skylighting.Types -import qualified System.Console.ANSI.Codes as ANSI -#if !MIN_VERSION_base(4,11,0) -import Data.Semigroup -#endif - -formatANSI :: FormatOptions -> Style -> [SourceLine] -> Text -formatANSI opts sty = (beforeText <>) - . (<> afterText) - . Text.intercalate (Text.singleton '\n') - . zipWith (sourceLineToANSI opts sty) [startNum..] - where beforeText = ansiResetText <> ansiStyleText clv (defaultColor sty) (backgroundColor sty) False False False - afterText = ansiResetText - startNum = LineNo $ startNumber opts - clv = ansiColorLevel opts - -sourceLineToANSI :: FormatOptions -> Style -> LineNo -> SourceLine -> Text -sourceLineToANSI opts sty lno = prependLineNoText - . mconcat - . map (tokenToANSI clv sty) - where prependLineNoText = if numberLines opts - then (lineNoText <>) - else id - lineNoText = ansiStyleText clv lineNoFgc lineNoBgc False False False - <> Text.pack (show $ lineNo lno) - <> ansiStyleText clv (defaultColor sty) (backgroundColor sty) False False False - <> "\t" - lineNoFgc = lineNumberColor sty `mplus` defaultColor sty - lineNoBgc = lineNumberBackgroundColor sty `mplus` backgroundColor sty - clv = ansiColorLevel opts - -tokenToANSI :: ANSIColorLevel -> Style -> Token -> Text -tokenToANSI clv sty (tokTy, tokText) = ansiStyleText clv tokFgc tokBgc tokB tokI tokU - <> tokText - <> ansiStyleText clv (defaultColor sty) (backgroundColor sty) False False False - where TokenStyle tokFgcRaw tokBgcRaw tokB tokI tokU = fromMaybe defStyle . Map.lookup tokTy $ tokenStyles sty - tokFgc = tokFgcRaw `mplus` defaultColor sty - tokBgc = tokBgcRaw `mplus` backgroundColor sty - -ansiStyleText :: ANSIColorLevel -- ^ color support level - -> Maybe Color -- ^ foreground - -> Maybe Color -- ^ background - -> Bool -- ^ bold - -> Bool -- ^ italic - -> Bool -- ^ underlined - -> Text -ansiStyleText clv fgc bgc b i u = optReset <> sgrTextFg <> sgrTextBg - <> (Text.pack . ANSI.setSGRCode $ concat [sgrCodeFg, - sgrCodeBg, - sgrCodeBold, - sgrCodeItal, - sgrCodeUndl]) - -- FIXME: the @ansi-terminal@ library should do the 256-color parts more cleanly someday - where (sgrCodeFg, sgrTextFg) = case clv of - ANSITrueColor -> (maybeToList $ fmap (ANSI.SetRGBColor ANSI.Foreground . fromColor) fgc, "") - ANSI256Color -> ([], fromMaybe "" $ fmap (\c -> Text.pack $ ANSI.csi [38, 5, - fromIntegral . getXterm256ColorCode $ fromColor c] "m") fgc) - ANSI16Color -> (maybeToList $ fmap (uncurry (ANSI.SetColor ANSI.Foreground) . fromColor) fgc, "") - (sgrCodeBg, sgrTextBg) = case clv of - ANSITrueColor -> (maybeToList $ fmap (ANSI.SetRGBColor ANSI.Background . fromColor) bgc, "") - ANSI256Color -> ([], fromMaybe "" $ fmap (\c -> Text.pack $ ANSI.csi [48, 5, - fromIntegral . getXterm256ColorCode $ fromColor c] "m") bgc) - ANSI16Color -> (maybeToList $ fmap (uncurry (ANSI.SetColor ANSI.Background) . fromColor) bgc, "") - optReset = if isNothing fgc && isNothing bgc then ansiResetText else "" - sgrCodeBold = [ANSI.SetConsoleIntensity $ if b then ANSI.BoldIntensity else ANSI.NormalIntensity] - sgrCodeItal = [ANSI.SetItalicized i] -- FIXME: Not very widely supported in terminals - sgrCodeUndl = [ANSI.SetUnderlining $ if u then ANSI.SingleUnderline else ANSI.NoUnderline] - -ansiResetText :: Text -ansiResetText = Text.pack $ ANSI.setSGRCode [ANSI.Reset] diff --git a/src/Skylighting/Format/HTML.hs b/src/Skylighting/Format/HTML.hs deleted file mode 100644 --- a/src/Skylighting/Format/HTML.hs +++ /dev/null @@ -1,216 +0,0 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE NoOverloadedStrings #-} -module Skylighting.Format.HTML ( - formatHtmlInline - , formatHtmlBlock - , styleToCss - ) where - -import Data.List (intersperse, sort) -import qualified Data.Map as Map -import qualified Data.Text as Text -import Skylighting.Types -import Text.Blaze.Html -import qualified Text.Blaze.Html5 as H -import qualified Text.Blaze.Html5.Attributes as A -import Data.String (fromString) -#if !MIN_VERSION_base(4,11,0) -import Data.Semigroup -#endif - --- | Format tokens using HTML spans inside @code@ tags. For example, --- A @KeywordTok@ is rendered as a span with class @kw@. --- Short class names correspond to 'TokenType's as follows: --- 'KeywordTok' = @kw@, --- 'DataTypeTok' = @dt@, --- 'DecValTok' = @dv@, --- 'BaseNTok' = @bn@, --- 'FloatTok' = @fl@, --- 'CharTok' = @ch@, --- 'StringTok' = @st@, --- 'CommentTok' = @co@, --- 'OtherTok' = @ot@, --- 'AlertTok' = @al@, --- 'FunctionTok' = @fu@, --- 'RegionMarkerTok' = @re@, --- 'ErrorTok' = @er@, --- 'ConstantTok' = @cn@, --- 'SpecialCharTok' = @sc@, --- 'VerbatimStringTok' = @vs@, --- 'SpecialStringTok' = @ss@, --- 'ImportTok' = @im@, --- 'DocumentationTok' = @do@, --- 'AnnotationTok' = @an@, --- 'CommentVarTok' = @cv@, --- 'VariableTok' = @va@, --- 'ControlFlowTok' = @cf@, --- 'OperatorTok' = @op@, --- 'BuiltInTok' = @bu@, --- 'ExtensionTok' = @ex@, --- 'PreprocessorTok' = @pp@, --- 'AttributeTok' = @at@, --- 'InformationTok' = @in@, --- 'WarningTok' = @wa@. --- A 'NormalTok' is not marked up at all. -formatHtmlInline :: FormatOptions -> [SourceLine] -> Html -formatHtmlInline opts = wrapCode opts - . mconcat . intersperse (toHtml "\n") - . map (mapM_ (tokenToHtml opts)) - --- | Format tokens as an HTML @pre@ block. Each line is wrapped in an a --- element with the class ‘source-line’. If line numbering --- is selected, the surrounding pre is given the class ‘numberSource’, --- and the resulting html will display line numbers thanks to the included --- CSS. See the documentation for 'formatHtmlInline' for information about how --- tokens are encoded. -formatHtmlBlock :: FormatOptions -> [SourceLine] -> Html -formatHtmlBlock opts ls = - H.div ! A.class_ (toValue "sourceCode") $ - H.pre ! A.class_ (toValue $ Text.unwords classes) - $ wrapCode opts - $ mconcat . intersperse (toHtml "\n") - $ zipWith (sourceLineToHtml opts) [startNum..] ls - where classes = Text.pack "sourceCode" : - [Text.pack "numberSource" | numberLines opts] ++ - [x | x <- containerClasses opts - , x /= Text.pack "sourceCode"] - startNum = LineNo $ startNumber opts - -wrapCode :: FormatOptions -> Html -> Html -wrapCode opts h = H.code ! A.class_ (toValue $ Text.unwords - $ Text.pack "sourceCode" - : codeClasses opts) - !? (startZero /= 0, A.style (toValue counterOverride)) - $ h - where counterOverride = "counter-reset: source-line " <> show startZero <> ";" - startZero = startNumber opts - 1 - --- | Each line of source is wrapped in an (inline-block) anchor that makes --- subsequent per-line processing (e.g. adding line numnbers) possible. -sourceLineToHtml :: FormatOptions -> LineNo -> SourceLine -> Html -sourceLineToHtml opts lno cont = - H.span ! A.id lineNum - $ do - H.a ! A.href lineRef - ! (if numberLines opts - 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 - lineRef = toValue ('#':prefixedLineNo) - prefixedLineNo = Text.unpack (lineIdPrefix opts) <> show (lineNo lno) - -tokenToHtml :: FormatOptions -> Token -> Html -tokenToHtml _ (NormalTok, txt) = toHtml txt -tokenToHtml opts (toktype, txt) = - if titleAttributes opts - then sp ! A.title (toValue $ show toktype) - else sp - where sp = H.span ! A.class_ (toValue $ short toktype) $ toHtml txt - -short :: TokenType -> String -short KeywordTok = "kw" -short DataTypeTok = "dt" -short DecValTok = "dv" -short BaseNTok = "bn" -short FloatTok = "fl" -short CharTok = "ch" -short StringTok = "st" -short CommentTok = "co" -short OtherTok = "ot" -short AlertTok = "al" -short FunctionTok = "fu" -short RegionMarkerTok = "re" -short ErrorTok = "er" -short ConstantTok = "cn" -short SpecialCharTok = "sc" -short VerbatimStringTok = "vs" -short SpecialStringTok = "ss" -short ImportTok = "im" -short DocumentationTok = "do" -short AnnotationTok = "an" -short CommentVarTok = "cv" -short VariableTok = "va" -short ControlFlowTok = "cf" -short OperatorTok = "op" -short BuiltInTok = "bu" -short ExtensionTok = "ex" -short PreprocessorTok = "pp" -short AttributeTok = "at" -short InformationTok = "in" -short WarningTok = "wa" -short NormalTok = "" - --- | Returns CSS for styling highlighted code according to the given style. -styleToCss :: Style -> String -styleToCss f = unlines $ - divspec ++ numberspec ++ colorspec ++ linkspec ++ - sort (map toCss (Map.toList (tokenStyles f))) - where colorspec = pure . unwords $ [ - "div.sourceCode\n {" - , maybe "" (\c -> "color: " ++ fromColor c ++ ";") (defaultColor f) - , maybe "" (\c -> "background-color: " ++ fromColor c ++ ";") (backgroundColor f) - , "}" - ] - numberspec = [ - "pre.numberSource code" - , " { counter-reset: source-line 0; }" - , "pre.numberSource code > span" - , " { position: relative; left: -4em; counter-increment: source-line; }" - , "pre.numberSource code > span > a:first-child::before" - , " { content: counter(source-line);" - , " position: relative; left: -1em; text-align: right; vertical-align: baseline;" - , " border: none; display: inline-block;" - , " -webkit-touch-callout: none; -webkit-user-select: none;" - , " -khtml-user-select: none; -moz-user-select: none;" - , " -ms-user-select: none; user-select: none;" - , " padding: 0 4px; width: 4em;" - , maybe "" (\c -> " background-color: " ++ fromColor c ++ ";\n") - (lineNumberBackgroundColor f) ++ - maybe "" (\c -> " color: " ++ fromColor c ++ ";\n") - (lineNumberColor f) ++ - " }" - , "pre.numberSource { margin-left: 3em; " ++ - maybe "" (\c -> "border-left: 1px solid " ++ fromColor c ++ "; ") (lineNumberColor f) ++ - " padding-left: 4px; }" - ] - divspec = [ - "pre > code.sourceCode { white-space: pre; position: relative; }" -- position relative needed for relative contents - , "pre > code.sourceCode > span { display: inline-block; line-height: 1.25; }" - , "pre > code.sourceCode > span:empty { height: 1.2em; }" -- correct empty line height - , ".sourceCode { overflow: visible; }" -- needed for line numbers - , "code.sourceCode > span { color: inherit; text-decoration: inherit; }" - , "div.sourceCode { margin: 1em 0; }" -- Collapse neighbours correctly - , "pre.sourceCode { margin: 0; }" -- Collapse neighbours correctly - , "@media screen {" - , "div.sourceCode { overflow: auto; }" -- do not overflow on screen - , "}" - , "@media print {" - , "pre > code.sourceCode { white-space: pre-wrap; }" - , "pre > code.sourceCode > span { text-indent: -5em; padding-left: 5em; }" - , "}" - ] - linkspec = [ "@media screen {" - , "pre > code.sourceCode > span > a:first-child::before { text-decoration: underline; }" - , "}" - ] - -toCss :: (TokenType, TokenStyle) -> String -toCss (t,tf) = "code span" ++ (if null (short t) then "" else ('.' : short t)) ++ " { " - ++ colorspec ++ backgroundspec ++ weightspec ++ stylespec - ++ decorationspec ++ "} /* " ++ showTokenType t ++ " */" - where colorspec = maybe "" (\col -> "color: " ++ fromColor col ++ "; ") $ tokenColor tf - backgroundspec = maybe "" (\col -> "background-color: " ++ fromColor col ++ "; ") $ tokenBackground tf - weightspec = if tokenBold tf then "font-weight: bold; " else "" - stylespec = if tokenItalic tf then "font-style: italic; " else "" - decorationspec = if tokenUnderline tf then "text-decoration: underline; " else "" - showTokenType t' = case reverse (show t') of - 'k':'o':'T':xs -> reverse xs - _ -> "" - diff --git a/src/Skylighting/Format/LaTeX.hs b/src/Skylighting/Format/LaTeX.hs deleted file mode 100644 --- a/src/Skylighting/Format/LaTeX.hs +++ /dev/null @@ -1,152 +0,0 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE ScopedTypeVariables #-} -module Skylighting.Format.LaTeX ( - formatLaTeXInline - , formatLaTeXBlock - , styleToLaTeX - ) where - -import Control.Monad (mplus) -import Data.Char (isSpace) -import Data.List (sort) -import qualified Data.Map as Map -import Data.Text (Text) -import qualified Data.Text as Text -import Skylighting.Types -import Text.Printf -#if !MIN_VERSION_base(4,11,0) -import Data.Semigroup -#endif - -formatLaTeX :: Bool -> [SourceLine] -> Text -formatLaTeX inline = Text.intercalate (Text.singleton '\n') - . map (sourceLineToLaTeX inline) - --- | Formats tokens as LaTeX using custom commands inside --- @|@ characters. Assumes that @|@ is defined as a short verbatim --- command by the macros produced by 'styleToLaTeX'. --- A @KeywordTok@ is rendered using @\\KeywordTok{..}@, and so on. -formatLaTeXInline :: FormatOptions -> [SourceLine] -> Text -formatLaTeXInline _opts ls = "\\VERB|" <> formatLaTeX True ls <> "|" - -sourceLineToLaTeX :: Bool -> SourceLine -> Text -sourceLineToLaTeX inline = mconcat . map (tokenToLaTeX inline) - -tokenToLaTeX :: Bool -> Token -> Text -tokenToLaTeX inline (NormalTok, txt) - | Text.all isSpace txt = escapeLaTeX inline txt -tokenToLaTeX inline (toktype, txt) = Text.cons '\\' - (Text.pack (show toktype) <> "{" <> escapeLaTeX inline txt <> "}") - -escapeLaTeX :: Bool -> Text -> Text -escapeLaTeX inline = Text.concatMap escapeLaTeXChar - where escapeLaTeXChar c = - case c of - '\\' -> "\\textbackslash{}" - '{' -> "\\{" - '}' -> "\\}" - '|' | inline -> "\\VerbBar{}" -- used in inline verbatim - '_' -> "\\_" - '&' -> "\\&" - '%' -> "\\%" - '#' -> "\\#" - '`' -> "\\textasciigrave{}" - '\'' -> "\\textquotesingle{}" - '-' -> "{-}" -- prevent ligatures - '~' -> "\\textasciitilde{}" - '^' -> "\\^{}" - '>' -> "\\textgreater{}" - '<' -> "\\textless{}" - _ -> Text.singleton c - --- LaTeX - --- | Format tokens as a LaTeX @Highlighting@ environment inside a --- @Shaded@ environment. @Highlighting@ and @Shaded@ are --- defined by the macros produced by 'styleToLaTeX'. @Highlighting@ --- is a verbatim environment using @fancyvrb@; @\\@, @{@, and @}@ --- have their normal meanings inside this environment, so that --- formatting commands work. @Shaded@ is either nothing --- (if the style's background color is default) or a @snugshade@ --- environment from @framed@, providing a background color --- for the whole code block, even if it spans multiple pages. -formatLaTeXBlock :: FormatOptions -> [SourceLine] -> Text -formatLaTeXBlock opts ls = Text.unlines - ["\\begin{Shaded}" - ,"\\begin{Highlighting}[" <> - (if numberLines opts - then "numbers=left," <> - (if startNumber opts == 1 - then "" - else ",firstnumber=" <> - Text.pack (show (startNumber opts))) <> "," - else Text.empty) <> "]" - ,formatLaTeX False ls - ,"\\end{Highlighting}" - ,"\\end{Shaded}"] - --- | Converts a 'Style' to a set of LaTeX macro definitions, --- which should be placed in the document's preamble. --- Note: default LaTeX setup doesn't allow boldface typewriter font. --- To make boldface work in styles, you need to use a different typewriter --- font. This will work for computer modern: --- --- > \DeclareFontShape{OT1}{cmtt}{bx}{n}{<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>cmttb10}{} --- --- Or, with xelatex: --- --- > \usepackage{fontspec} --- > \setmainfont[SmallCapsFont={* Caps}]{Latin Modern Roman} --- > \setsansfont{Latin Modern Sans} --- > \setmonofont[SmallCapsFont={Latin Modern Mono Caps}]{Latin Modern Mono Light} --- -styleToLaTeX :: Style -> Text -styleToLaTeX f = Text.unlines $ - [ "\\usepackage{color}" - , "\\usepackage{fancyvrb}" - , "\\newcommand{\\VerbBar}{|}" - , "\\newcommand{\\VERB}{\\Verb[commandchars=\\\\\\{\\}]}" - , "\\DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\\\\{\\}}" - , "% Add ',fontsize=\\small' for more characters per line" - ] ++ - (case backgroundColor f of - Nothing -> ["\\newenvironment{Shaded}{}{}"] - Just (RGB r g b) -> ["\\usepackage{framed}" - ,Text.pack - (printf "\\definecolor{shadecolor}{RGB}{%d,%d,%d}" r g b) - ,"\\newenvironment{Shaded}{\\begin{snugshade}}{\\end{snugshade}}"]) - ++ sort (map (macrodef (defaultColor f) (Map.toList (tokenStyles f))) - (enumFromTo KeywordTok NormalTok)) - -macrodef :: Maybe Color -> [(TokenType, TokenStyle)] -> TokenType -> Text -macrodef defaultcol tokstyles tokt = "\\newcommand{\\" - <> Text.pack (show tokt) - <> "}[1]{" - <> Text.pack (co . ul . bf . it . bg $ "#1") - <> "}" - where tokf = case lookup tokt tokstyles of - Nothing -> defStyle - Just x -> x - ul x = if tokenUnderline tokf - then "\\underline{" <> x <> "}" - else x - it x = if tokenItalic tokf - then "\\textit{" <> x <> "}" - else x - bf x = if tokenBold tokf - then "\\textbf{" <> x <> "}" - else x - bcol = fromColor `fmap` tokenBackground tokf - :: Maybe (Double, Double, Double) - bg x = case bcol of - Nothing -> x - Just (r, g, b) -> - printf "\\colorbox[rgb]{%0.2f,%0.2f,%0.2f}{%s}" r g b x - col = fromColor `fmap` (tokenColor tokf `mplus` defaultcol) - :: Maybe (Double, Double, Double) - co x = case col of - Nothing -> x - Just (r, g, b) -> - printf "\\textcolor[rgb]{%0.2f,%0.2f,%0.2f}{%s}" r g b x - diff --git a/src/Skylighting/Types.hs b/src/Skylighting/Types.hs --- a/src/Skylighting/Types.hs +++ b/src/Skylighting/Types.hs @@ -36,7 +36,6 @@ , FromColor(..) , Style(..) , ANSIColorLevel(..) - , Xterm256ColorCode(..) -- * Format options , FormatOptions(..) , defaultFormatOpts @@ -51,11 +50,8 @@ import Data.Colour.SRGB (Colour, sRGB24, toSRGB24) import qualified Data.Colour.SRGB as Colour import Data.Data (Data) -import Data.Int -import Data.List (minimumBy) import qualified Data.Map as Map import Data.Maybe (fromMaybe) -import Data.Ord (comparing) import qualified Data.Set as Set import Data.Text (Text) import qualified Data.Text as Text @@ -64,7 +60,6 @@ import GHC.Generics (Generic) import Safe (readMay) import Skylighting.Regex -import qualified System.Console.ANSI.Types as ANSI import Text.Printf -- | Full name of a context: the first member of the pair is the full @@ -337,297 +332,6 @@ instance (RealFrac a, Floating a) => ToColor (Colour a) where toColor c = let (Colour.RGB r g b) = toSRGB24 c in toColor (r, g, b) -instance ToColor (ANSI.ColorIntensity, ANSI.Color) where - toColor = flip lookup ansi16ColorList -- cannot actually fail - --- | Standard values taken from https://jonasjacek.github.io/colors/ -ansi16ColorList :: [((ANSI.ColorIntensity, ANSI.Color), Color)] -ansi16ColorList = [ ((ANSI.Dull , ANSI.Black ), RGB 0 0 0 ) - , ((ANSI.Dull , ANSI.Red ), RGB 128 0 0 ) - , ((ANSI.Dull , ANSI.Green ), RGB 0 128 0 ) - , ((ANSI.Dull , ANSI.Yellow ), RGB 128 128 0 ) - , ((ANSI.Dull , ANSI.Blue ), RGB 0 0 128) - , ((ANSI.Dull , ANSI.Magenta), RGB 128 0 128) - , ((ANSI.Dull , ANSI.Cyan ), RGB 0 128 128) - , ((ANSI.Dull , ANSI.White ), RGB 192 192 192) - , ((ANSI.Vivid, ANSI.Black ), RGB 128 128 128) - , ((ANSI.Vivid, ANSI.Red ), RGB 255 0 0 ) - , ((ANSI.Vivid, ANSI.Green ), RGB 0 255 0 ) - , ((ANSI.Vivid, ANSI.Yellow ), RGB 255 255 0 ) - , ((ANSI.Vivid, ANSI.Blue ), RGB 0 0 255) - , ((ANSI.Vivid, ANSI.Magenta), RGB 255 0 255) - , ((ANSI.Vivid, ANSI.Cyan ), RGB 0 255 255) - , ((ANSI.Vivid, ANSI.White ), RGB 255 255 255) - ] - -newtype Xterm256ColorCode = Xterm256ColorCode { getXterm256ColorCode :: Word8 } - deriving (Show, Read, Eq, Ord, Enum, Bounded, Data, Typeable, Generic) - -instance Binary Xterm256ColorCode - --- | Converted from https://jonasjacek.github.io/colors/data.json, then slightly rearranged -ansi256ColorList :: [(Xterm256ColorCode, Color)] -ansi256ColorList = [ (Xterm256ColorCode 232, RGB 8 8 8) -- grayscale colors - , (Xterm256ColorCode 233, RGB 18 18 18) - , (Xterm256ColorCode 234, RGB 28 28 28) - , (Xterm256ColorCode 235, RGB 38 38 38) - , (Xterm256ColorCode 236, RGB 48 48 48) - , (Xterm256ColorCode 237, RGB 58 58 58) - , (Xterm256ColorCode 238, RGB 68 68 68) - , (Xterm256ColorCode 239, RGB 78 78 78) - , (Xterm256ColorCode 240, RGB 88 88 88) - , (Xterm256ColorCode 241, RGB 98 98 98) - , (Xterm256ColorCode 242, RGB 108 108 108) - , (Xterm256ColorCode 243, RGB 118 118 118) - , (Xterm256ColorCode 244, RGB 128 128 128) - , (Xterm256ColorCode 245, RGB 138 138 138) - , (Xterm256ColorCode 246, RGB 148 148 148) - , (Xterm256ColorCode 247, RGB 158 158 158) - , (Xterm256ColorCode 248, RGB 168 168 168) - , (Xterm256ColorCode 249, RGB 178 178 178) - , (Xterm256ColorCode 250, RGB 188 188 188) - , (Xterm256ColorCode 251, RGB 198 198 198) - , (Xterm256ColorCode 252, RGB 208 208 208) - , (Xterm256ColorCode 253, RGB 218 218 218) - , (Xterm256ColorCode 254, RGB 228 228 228) - , (Xterm256ColorCode 255, RGB 238 238 238) - , (Xterm256ColorCode 16, RGB 0 0 0) -- RGB cube colors - , (Xterm256ColorCode 17, RGB 0 0 95) - , (Xterm256ColorCode 18, RGB 0 0 135) - , (Xterm256ColorCode 19, RGB 0 0 175) - , (Xterm256ColorCode 20, RGB 0 0 215) - , (Xterm256ColorCode 21, RGB 0 0 255) - , (Xterm256ColorCode 22, RGB 0 95 0) - , (Xterm256ColorCode 23, RGB 0 95 95) - , (Xterm256ColorCode 24, RGB 0 95 135) - , (Xterm256ColorCode 25, RGB 0 95 175) - , (Xterm256ColorCode 26, RGB 0 95 215) - , (Xterm256ColorCode 27, RGB 0 95 255) - , (Xterm256ColorCode 28, RGB 0 135 0) - , (Xterm256ColorCode 29, RGB 0 135 95) - , (Xterm256ColorCode 30, RGB 0 135 135) - , (Xterm256ColorCode 31, RGB 0 135 175) - , (Xterm256ColorCode 32, RGB 0 135 215) - , (Xterm256ColorCode 33, RGB 0 135 255) - , (Xterm256ColorCode 34, RGB 0 175 0) - , (Xterm256ColorCode 35, RGB 0 175 95) - , (Xterm256ColorCode 36, RGB 0 175 135) - , (Xterm256ColorCode 37, RGB 0 175 175) - , (Xterm256ColorCode 38, RGB 0 175 215) - , (Xterm256ColorCode 39, RGB 0 175 255) - , (Xterm256ColorCode 40, RGB 0 215 0) - , (Xterm256ColorCode 41, RGB 0 215 95) - , (Xterm256ColorCode 42, RGB 0 215 135) - , (Xterm256ColorCode 43, RGB 0 215 175) - , (Xterm256ColorCode 44, RGB 0 215 215) - , (Xterm256ColorCode 45, RGB 0 215 255) - , (Xterm256ColorCode 46, RGB 0 255 0) - , (Xterm256ColorCode 47, RGB 0 255 95) - , (Xterm256ColorCode 48, RGB 0 255 135) - , (Xterm256ColorCode 49, RGB 0 255 175) - , (Xterm256ColorCode 50, RGB 0 255 215) - , (Xterm256ColorCode 51, RGB 0 255 255) - , (Xterm256ColorCode 52, RGB 95 0 0) - , (Xterm256ColorCode 53, RGB 95 0 95) - , (Xterm256ColorCode 54, RGB 95 0 135) - , (Xterm256ColorCode 55, RGB 95 0 175) - , (Xterm256ColorCode 56, RGB 95 0 215) - , (Xterm256ColorCode 57, RGB 95 0 255) - , (Xterm256ColorCode 58, RGB 95 95 0) - , (Xterm256ColorCode 59, RGB 95 95 95) - , (Xterm256ColorCode 60, RGB 95 95 135) - , (Xterm256ColorCode 61, RGB 95 95 175) - , (Xterm256ColorCode 62, RGB 95 95 215) - , (Xterm256ColorCode 63, RGB 95 95 255) - , (Xterm256ColorCode 64, RGB 95 135 0) - , (Xterm256ColorCode 65, RGB 95 135 95) - , (Xterm256ColorCode 66, RGB 95 135 135) - , (Xterm256ColorCode 67, RGB 95 135 175) - , (Xterm256ColorCode 68, RGB 95 135 215) - , (Xterm256ColorCode 69, RGB 95 135 255) - , (Xterm256ColorCode 70, RGB 95 175 0) - , (Xterm256ColorCode 71, RGB 95 175 95) - , (Xterm256ColorCode 72, RGB 95 175 135) - , (Xterm256ColorCode 73, RGB 95 175 175) - , (Xterm256ColorCode 74, RGB 95 175 215) - , (Xterm256ColorCode 75, RGB 95 175 255) - , (Xterm256ColorCode 76, RGB 95 215 0) - , (Xterm256ColorCode 77, RGB 95 215 95) - , (Xterm256ColorCode 78, RGB 95 215 135) - , (Xterm256ColorCode 79, RGB 95 215 175) - , (Xterm256ColorCode 80, RGB 95 215 215) - , (Xterm256ColorCode 81, RGB 95 215 255) - , (Xterm256ColorCode 82, RGB 95 255 0) - , (Xterm256ColorCode 83, RGB 95 255 95) - , (Xterm256ColorCode 84, RGB 95 255 135) - , (Xterm256ColorCode 85, RGB 95 255 175) - , (Xterm256ColorCode 86, RGB 95 255 215) - , (Xterm256ColorCode 87, RGB 95 255 255) - , (Xterm256ColorCode 88, RGB 135 0 0) - , (Xterm256ColorCode 89, RGB 135 0 95) - , (Xterm256ColorCode 90, RGB 135 0 135) - , (Xterm256ColorCode 91, RGB 135 0 175) - , (Xterm256ColorCode 92, RGB 135 0 215) - , (Xterm256ColorCode 93, RGB 135 0 255) - , (Xterm256ColorCode 94, RGB 135 95 0) - , (Xterm256ColorCode 95, RGB 135 95 95) - , (Xterm256ColorCode 96, RGB 135 95 135) - , (Xterm256ColorCode 97, RGB 135 95 175) - , (Xterm256ColorCode 98, RGB 135 95 215) - , (Xterm256ColorCode 99, RGB 135 95 255) - , (Xterm256ColorCode 100, RGB 135 135 0) - , (Xterm256ColorCode 101, RGB 135 135 95) - , (Xterm256ColorCode 102, RGB 135 135 135) - , (Xterm256ColorCode 103, RGB 135 135 175) - , (Xterm256ColorCode 104, RGB 135 135 215) - , (Xterm256ColorCode 105, RGB 135 135 255) - , (Xterm256ColorCode 106, RGB 135 175 0) - , (Xterm256ColorCode 107, RGB 135 175 95) - , (Xterm256ColorCode 108, RGB 135 175 135) - , (Xterm256ColorCode 109, RGB 135 175 175) - , (Xterm256ColorCode 110, RGB 135 175 215) - , (Xterm256ColorCode 111, RGB 135 175 255) - , (Xterm256ColorCode 112, RGB 135 215 0) - , (Xterm256ColorCode 113, RGB 135 215 95) - , (Xterm256ColorCode 114, RGB 135 215 135) - , (Xterm256ColorCode 115, RGB 135 215 175) - , (Xterm256ColorCode 116, RGB 135 215 215) - , (Xterm256ColorCode 117, RGB 135 215 255) - , (Xterm256ColorCode 118, RGB 135 255 0) - , (Xterm256ColorCode 119, RGB 135 255 95) - , (Xterm256ColorCode 120, RGB 135 255 135) - , (Xterm256ColorCode 121, RGB 135 255 175) - , (Xterm256ColorCode 122, RGB 135 255 215) - , (Xterm256ColorCode 123, RGB 135 255 255) - , (Xterm256ColorCode 124, RGB 175 0 0) - , (Xterm256ColorCode 125, RGB 175 0 95) - , (Xterm256ColorCode 126, RGB 175 0 135) - , (Xterm256ColorCode 127, RGB 175 0 175) - , (Xterm256ColorCode 128, RGB 175 0 215) - , (Xterm256ColorCode 129, RGB 175 0 255) - , (Xterm256ColorCode 130, RGB 175 95 0) - , (Xterm256ColorCode 131, RGB 175 95 95) - , (Xterm256ColorCode 132, RGB 175 95 135) - , (Xterm256ColorCode 133, RGB 175 95 175) - , (Xterm256ColorCode 134, RGB 175 95 215) - , (Xterm256ColorCode 135, RGB 175 95 255) - , (Xterm256ColorCode 136, RGB 175 135 0) - , (Xterm256ColorCode 137, RGB 175 135 95) - , (Xterm256ColorCode 138, RGB 175 135 135) - , (Xterm256ColorCode 139, RGB 175 135 175) - , (Xterm256ColorCode 140, RGB 175 135 215) - , (Xterm256ColorCode 141, RGB 175 135 255) - , (Xterm256ColorCode 142, RGB 175 175 0) - , (Xterm256ColorCode 143, RGB 175 175 95) - , (Xterm256ColorCode 144, RGB 175 175 135) - , (Xterm256ColorCode 145, RGB 175 175 175) - , (Xterm256ColorCode 146, RGB 175 175 215) - , (Xterm256ColorCode 147, RGB 175 175 255) - , (Xterm256ColorCode 148, RGB 175 215 0) - , (Xterm256ColorCode 149, RGB 175 215 95) - , (Xterm256ColorCode 150, RGB 175 215 135) - , (Xterm256ColorCode 151, RGB 175 215 175) - , (Xterm256ColorCode 152, RGB 175 215 215) - , (Xterm256ColorCode 153, RGB 175 215 255) - , (Xterm256ColorCode 154, RGB 175 255 0) - , (Xterm256ColorCode 155, RGB 175 255 95) - , (Xterm256ColorCode 156, RGB 175 255 135) - , (Xterm256ColorCode 157, RGB 175 255 175) - , (Xterm256ColorCode 158, RGB 175 255 215) - , (Xterm256ColorCode 159, RGB 175 255 255) - , (Xterm256ColorCode 160, RGB 215 0 0) - , (Xterm256ColorCode 161, RGB 215 0 95) - , (Xterm256ColorCode 162, RGB 215 0 135) - , (Xterm256ColorCode 163, RGB 215 0 175) - , (Xterm256ColorCode 164, RGB 215 0 215) - , (Xterm256ColorCode 165, RGB 215 0 255) - , (Xterm256ColorCode 166, RGB 215 95 0) - , (Xterm256ColorCode 167, RGB 215 95 95) - , (Xterm256ColorCode 168, RGB 215 95 135) - , (Xterm256ColorCode 169, RGB 215 95 175) - , (Xterm256ColorCode 170, RGB 215 95 215) - , (Xterm256ColorCode 171, RGB 215 95 255) - , (Xterm256ColorCode 172, RGB 215 135 0) - , (Xterm256ColorCode 173, RGB 215 135 95) - , (Xterm256ColorCode 174, RGB 215 135 135) - , (Xterm256ColorCode 175, RGB 215 135 175) - , (Xterm256ColorCode 176, RGB 215 135 215) - , (Xterm256ColorCode 177, RGB 215 135 255) - , (Xterm256ColorCode 178, RGB 215 175 0) - , (Xterm256ColorCode 179, RGB 215 175 95) - , (Xterm256ColorCode 180, RGB 215 175 135) - , (Xterm256ColorCode 181, RGB 215 175 175) - , (Xterm256ColorCode 182, RGB 215 175 215) - , (Xterm256ColorCode 183, RGB 215 175 255) - , (Xterm256ColorCode 184, RGB 215 215 0) - , (Xterm256ColorCode 185, RGB 215 215 95) - , (Xterm256ColorCode 186, RGB 215 215 135) - , (Xterm256ColorCode 187, RGB 215 215 175) - , (Xterm256ColorCode 188, RGB 215 215 215) - , (Xterm256ColorCode 189, RGB 215 215 255) - , (Xterm256ColorCode 190, RGB 215 255 0) - , (Xterm256ColorCode 191, RGB 215 255 95) - , (Xterm256ColorCode 192, RGB 215 255 135) - , (Xterm256ColorCode 193, RGB 215 255 175) - , (Xterm256ColorCode 194, RGB 215 255 215) - , (Xterm256ColorCode 195, RGB 215 255 255) - , (Xterm256ColorCode 196, RGB 255 0 0) - , (Xterm256ColorCode 197, RGB 255 0 95) - , (Xterm256ColorCode 198, RGB 255 0 135) - , (Xterm256ColorCode 199, RGB 255 0 175) - , (Xterm256ColorCode 200, RGB 255 0 215) - , (Xterm256ColorCode 201, RGB 255 0 255) - , (Xterm256ColorCode 202, RGB 255 95 0) - , (Xterm256ColorCode 203, RGB 255 95 95) - , (Xterm256ColorCode 204, RGB 255 95 135) - , (Xterm256ColorCode 205, RGB 255 95 175) - , (Xterm256ColorCode 206, RGB 255 95 215) - , (Xterm256ColorCode 207, RGB 255 95 255) - , (Xterm256ColorCode 208, RGB 255 135 0) - , (Xterm256ColorCode 209, RGB 255 135 95) - , (Xterm256ColorCode 210, RGB 255 135 135) - , (Xterm256ColorCode 211, RGB 255 135 175) - , (Xterm256ColorCode 212, RGB 255 135 215) - , (Xterm256ColorCode 213, RGB 255 135 255) - , (Xterm256ColorCode 214, RGB 255 175 0) - , (Xterm256ColorCode 215, RGB 255 175 95) - , (Xterm256ColorCode 216, RGB 255 175 135) - , (Xterm256ColorCode 217, RGB 255 175 175) - , (Xterm256ColorCode 218, RGB 255 175 215) - , (Xterm256ColorCode 219, RGB 255 175 255) - , (Xterm256ColorCode 220, RGB 255 215 0) - , (Xterm256ColorCode 221, RGB 255 215 95) - , (Xterm256ColorCode 222, RGB 255 215 135) - , (Xterm256ColorCode 223, RGB 255 215 175) - , (Xterm256ColorCode 224, RGB 255 215 215) - , (Xterm256ColorCode 225, RGB 255 215 255) - , (Xterm256ColorCode 226, RGB 255 255 0) - , (Xterm256ColorCode 227, RGB 255 255 95) - , (Xterm256ColorCode 228, RGB 255 255 135) - , (Xterm256ColorCode 229, RGB 255 255 175) - , (Xterm256ColorCode 230, RGB 255 255 215) - , (Xterm256ColorCode 231, RGB 255 255 255) - , (Xterm256ColorCode 0, RGB 0 0 0) -- “system” colors - , (Xterm256ColorCode 1, RGB 128 0 0) - , (Xterm256ColorCode 2, RGB 0 128 0) - , (Xterm256ColorCode 3, RGB 128 128 0) - , (Xterm256ColorCode 4, RGB 0 0 128) - , (Xterm256ColorCode 5, RGB 128 0 128) - , (Xterm256ColorCode 6, RGB 0 128 128) - , (Xterm256ColorCode 7, RGB 192 192 192) - , (Xterm256ColorCode 8, RGB 128 128 128) - , (Xterm256ColorCode 9, RGB 255 0 0) - , (Xterm256ColorCode 10, RGB 0 255 0) - , (Xterm256ColorCode 11, RGB 255 255 0) - , (Xterm256ColorCode 12, RGB 0 0 255) - , (Xterm256ColorCode 13, RGB 255 0 255) - , (Xterm256ColorCode 14, RGB 0 255 255) - , (Xterm256ColorCode 15, RGB 255 255 255) - ] - -instance ToColor Xterm256ColorCode where - toColor = flip lookup ansi256ColorList -- cannot actually fail - -- | JSON @"#1aff2b"@ corresponds to the color @RGB 0x1a 0xff 0x2b@. instance FromJSON Color where parseJSON (String t) = maybe mempty return $ toColor (Text.unpack t) @@ -651,26 +355,6 @@ instance (Ord a, Floating a) => FromColor (Colour a) where fromColor (RGB r g b) = sRGB24 r g b - --- | Warning: this conversion is extremely approximate! -instance FromColor (ANSI.ColorIntensity, ANSI.Color) where - fromColor = findApproximateColor ansi16ColorList - --- | Warning: this conversion is noticeably approximate! -instance FromColor Xterm256ColorCode where - -- Same algorithm as above - fromColor = findApproximateColor ansi256ColorList - -colorDistance :: Color -> Color -> Int16 -colorDistance (RGB r1 g1 b1) (RGB r2 g2 b2) = abs (fromIntegral r1 - fromIntegral r2) - + abs (fromIntegral g1 - fromIntegral g2) - + abs (fromIntegral b1 - fromIntegral b2) - --- This is the most naïve possible nearest-neighbor search; --- it could almost certainly be optimized, if its speed matters at all. -findApproximateColor :: [(a, Color)] -> Color -> a -findApproximateColor acs c = let ranked = map (\ac -> (ac, colorDistance c $ snd ac)) acs - in fst . fst $ minimumBy (comparing snd) ranked -- | A rendering style. This determines how each kind of token -- is to be rendered, and sets a default color and background diff --git a/xml/bash.xml b/xml/bash.xml --- a/xml/bash.xml +++ b/xml/bash.xml @@ -39,7 +39,7 @@ ]> - + + @@ -1480,6 +1481,7 @@ + @@ -1665,37 +1667,37 @@ - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/xml/cmake.xml b/xml/cmake.xml --- a/xml/cmake.xml +++ b/xml/cmake.xml @@ -25,7 +25,7 @@ ctest_upload + ERROR_VARIABLE QUERY RESULT + SEPARATOR + SUBKEYS + VALUE + VALUE_NAMES + VIEW + WINDOWS_REGISTRY + 32 + 32_64 + 64 + 64_32 AVAILABLE_PHYSICAL_MEMORY AVAILABLE_VIRTUAL_MEMORY + BOTH DISTRIB_INFO FQDN HAS_AMD_3DNOW @@ -167,6 +179,7 @@ HAS_SSE2 HAS_SSE_FP HAS_SSE_MMX + HOST HOSTNAME IS_64BIT NUMBER_OF_LOGICAL_CORES @@ -178,6 +191,7 @@ PROCESSOR_DESCRIPTION PROCESSOR_NAME PROCESSOR_SERIAL_NUMBER + TARGET TOTAL_PHYSICAL_MEMORY TOTAL_VIRTUAL_MEMORY @@ -192,7 +206,13 @@ GET_CALL_IDS ID ID_VAR + SET_DEPENDENCY_PROVIDER + SUPPORTED_METHODS + + FETCHCONTENT_MAKEAVAILABLE_SERIAL + FIND_PACKAGE + FATAL_ERROR VERSION @@ -205,7 +225,9 @@ APPEND APPEND_STRING BASE_DIRECTORY + COMPARE CONVERT + EQUAL EXTENSION FILENAME GET @@ -225,6 +247,7 @@ NATIVE_PATH NORMALIZE NORMAL_PATH + NOT_EQUAL OUTPUT_VARIABLE PARENT_PATH RELATIVE_PART @@ -286,6 +309,7 @@ MATCHES NOT OR + PATH_EQUAL POLICY STREQUAL STRGREATER @@ -410,6 +434,8 @@ POST_INCLUDE_REGEXES PRE_EXCLUDE_REGEXES PRE_INCLUDE_REGEXES + RANGE_END + RANGE_START READ READ_SYMLINK REAL_PATH @@ -501,6 +527,7 @@ NO_CACHE NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_FIND_ROOT_PATH + NO_CMAKE_INSTALL_PREFIX NO_CMAKE_PATH NO_CMAKE_SYSTEM_PATH NO_DEFAULT_PATH @@ -509,8 +536,18 @@ ONLY_CMAKE_FIND_ROOT_PATH PATHS PATH_SUFFIXES + REGISTRY_VIEW REQUIRED + + 32 + 32_64 + 64 + 64_32 + BOTH + HOST + TARGET + CMAKE_FIND_ROOT_PATH_BOTH DOC @@ -520,6 +557,7 @@ NO_CACHE NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_FIND_ROOT_PATH + NO_CMAKE_INSTALL_PREFIX NO_CMAKE_PATH NO_CMAKE_SYSTEM_PATH NO_DEFAULT_PATH @@ -528,19 +566,32 @@ ONLY_CMAKE_FIND_ROOT_PATH PATHS PATH_SUFFIXES + REGISTRY_VIEW REQUIRED + + 32 + 32_64 + 64 + 64_32 + BOTH + HOST + TARGET + + BYPASS_PROVIDER CMAKE_FIND_ROOT_PATH_BOTH COMPONENTS CONFIG CONFIGS EXACT + GLOBAL HINTS MODULE NAMES NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_FIND_ROOT_PATH + NO_CMAKE_INSTALL_PREFIX NO_CMAKE_PACKAGE_REGISTRY NO_CMAKE_PATH NO_CMAKE_SYSTEM_PACKAGE_REGISTRY @@ -555,8 +606,18 @@ PATHS PATH_SUFFIXES QUIET + REGISTRY_VIEW REQUIRED + + 32 + 32_64 + 64 + 64_32 + BOTH + HOST + TARGET + CMAKE_FIND_ROOT_PATH_BOTH DOC @@ -565,6 +626,7 @@ NO_CACHE NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_FIND_ROOT_PATH + NO_CMAKE_INSTALL_PREFIX NO_CMAKE_PATH NO_CMAKE_SYSTEM_PATH NO_DEFAULT_PATH @@ -573,8 +635,18 @@ ONLY_CMAKE_FIND_ROOT_PATH PATHS PATH_SUFFIXES + REGISTRY_VIEW REQUIRED + + 32 + 32_64 + 64 + 64_32 + BOTH + HOST + TARGET + CMAKE_FIND_ROOT_PATH_BOTH DOC @@ -584,6 +656,7 @@ NO_CACHE NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_FIND_ROOT_PATH + NO_CMAKE_INSTALL_PREFIX NO_CMAKE_PATH NO_CMAKE_SYSTEM_PATH NO_DEFAULT_PATH @@ -592,8 +665,18 @@ ONLY_CMAKE_FIND_ROOT_PATH PATHS PATH_SUFFIXES + REGISTRY_VIEW REQUIRED + + 32 + 32_64 + 64 + 64_32 + BOTH + HOST + TARGET + IN ITEMS @@ -661,6 +744,7 @@ MATCHES NOT OR + PATH_EQUAL POLICY STREQUAL STRGREATER @@ -869,6 +953,7 @@ MATCHES NOT OR + PATH_EQUAL POLICY STREQUAL STRGREATER @@ -1281,7 +1366,6 @@ LINK_LIBRARIES LINK_OPTIONS OUTPUT_VARIABLE - RESULT_VAR SOURCES @@ -1676,6 +1760,7 @@ DEPENDS DOWNLOAD_COMMAND DOWNLOAD_DIR + DOWNLOAD_EXTRACT_TIMESTAMP DOWNLOAD_NAME DOWNLOAD_NO_EXTRACT DOWNLOAD_NO_PROGRESS @@ -2091,13 +2176,12 @@ LINK_TO MODULE NAME + NO_IMPLICIT_LINK_TO_MATLAB_LIBRARIES OUTPUT_NAME - SHARED - SRC - - R2017b R2018a + SHARED + SRC GLOBAL @@ -2106,6 +2190,7 @@ NO_CMAKE_PATH QUIET REQUIRED + STATIC_TARGET GLOBAL @@ -2114,6 +2199,7 @@ NO_CMAKE_PATH QUIET REQUIRED + STATIC_TARGET DESCRIPTORS @@ -2250,6 +2336,7 @@ CMAKE_CODEBLOCKS_COMPILER_ID CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES CMAKE_CODELITE_USE_TARGETS + CMAKE_COLOR_DIAGNOSTICS CMAKE_COLOR_MAKEFILE CMAKE_COMMAND CMAKE_COMPILER_2005 @@ -2257,6 +2344,7 @@ CMAKE_COMPILER_IS_GNUCXX CMAKE_COMPILER_IS_GNUG77 CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY + CMAKE_COMPILE_WARNING_AS_ERROR CMAKE_CONFIGURATION_TYPES CMAKE_CROSSCOMPILING CMAKE_CROSSCOMPILING_EMULATOR @@ -2338,9 +2426,11 @@ CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_PREFER_CONFIG + CMAKE_FIND_PACKAGE_REDIRECTS_DIR CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS CMAKE_FIND_PACKAGE_SORT_DIRECTION CMAKE_FIND_PACKAGE_SORT_ORDER + CMAKE_FIND_PACKAGE_TARGETS_GLOBAL CMAKE_FIND_PACKAGE_WARN_NO_MODULE CMAKE_FIND_ROOT_PATH CMAKE_FIND_ROOT_PATH_MODE_INCLUDE @@ -2350,6 +2440,7 @@ CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH CMAKE_FIND_USE_CMAKE_PATH CMAKE_FIND_USE_CMAKE_SYSTEM_PATH + CMAKE_FIND_USE_INSTALL_PREFIX CMAKE_FIND_USE_PACKAGE_REGISTRY CMAKE_FIND_USE_PACKAGE_ROOT_PATH CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH @@ -2541,6 +2632,7 @@ CMAKE_PROJECT_INCLUDE CMAKE_PROJECT_INCLUDE_BEFORE CMAKE_PROJECT_NAME + CMAKE_PROJECT_TOP_LEVEL_INCLUDES CMAKE_PROJECT_VERSION CMAKE_PROJECT_VERSION_MAJOR CMAKE_PROJECT_VERSION_MINOR @@ -2600,6 +2692,7 @@ CMAKE_THREAD_PREFER_PTHREAD CMAKE_TOOLCHAIN_FILE CMAKE_TRY_COMPILE_CONFIGURATION + CMAKE_TRY_COMPILE_NO_PLATFORM_VARIABLES CMAKE_TRY_COMPILE_PLATFORM_VARIABLES CMAKE_TRY_COMPILE_TARGET_TYPE CMAKE_TWEAK_VERSION @@ -2611,6 +2704,7 @@ CMAKE_USE_SPROC_INIT CMAKE_USE_WIN32_THREADS_INIT CMAKE_VERBOSE_MAKEFILE + CMAKE_VERIFY_INTERFACE_HEADER_SETS CMAKE_VERSION CMAKE_VISIBILITY_INLINES_HIDDEN CMAKE_VS_DEVENV_COMMAND @@ -2634,8 +2728,10 @@ CMAKE_VS_SDK_SOURCE_DIRECTORIES CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM + CMAKE_VS_WINRT_BY_DEFAULT CMAKE_WARN_DEPRECATED CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION + CMAKE_WATCOM_RUNTIME_LIBRARY CMAKE_WIN32_EXECUTABLE CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS CMAKE_XCODE_BUILD_SYSTEM @@ -2662,6 +2758,7 @@ CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP CMAKE_XCODE_SCHEME_WORKING_DIRECTORY CMAKE_XCODE_SCHEME_ZOMBIE_OBJECTS + CMAKE_XCODE_XCCONFIG CPACK_ABSOLUTE_DESTINATION_FILES CPACK_ARCHIVE_COMPONENT_INSTALL CPACK_ARCHIVE_FILE_NAME @@ -2731,6 +2828,7 @@ CPACK_DMG_FORMAT CPACK_DMG_SLA_DIR CPACK_DMG_SLA_LANGUAGES + CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE CPACK_DMG_VOLUME_NAME CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CPACK_EXTERNAL_BUILT_PACKAGES @@ -2966,6 +3064,7 @@ CPACK_TOPLEVEL_TAG CPACK_VERBATIM_VARIABLES CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION + CPACK_WIX_ARCHITECTURE CPACK_WIX_CMAKE_PACKAGE_REGISTRY CPACK_WIX_CULTURES CPACK_WIX_CUSTOM_XMLNS @@ -3015,6 +3114,7 @@ CTEST_CUSTOM_PRE_MEMCHECK CTEST_CUSTOM_PRE_TEST CTEST_CUSTOM_TEST_IGNORE + CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION CTEST_CUSTOM_WARNING_EXCEPTION CTEST_CUSTOM_WARNING_MATCH CTEST_CVS_CHECKOUT @@ -3102,6 +3202,7 @@ ExternalData_URL_TEMPLATES FETCHCONTENT_FULLY_DISCONNECTED FETCHCONTENT_QUIET + FETCHCONTENT_TRY_FIND_PACKAGE_MODE FETCHCONTENT_UPDATES_DISCONNECTED FLEX_EXECUTABLE FLTK2_BASE_LIBRARY @@ -3494,6 +3595,7 @@ XINDY_COMPILER XalanC_LIBRARY XercesC_LIBRARY + ZLIB_USE_STATIC_LIBS wxWidgets_CONFIGURATION wxWidgets_CXX_FLAGS wxWidgets_DEFINITIONS @@ -3530,6 +3632,7 @@ CMAKE_APPLE_SILICON_PROCESSOR CMAKE_BUILD_PARALLEL_LEVEL CMAKE_BUILD_TYPE + CMAKE_COLOR_DIAGNOSTICS CMAKE_CONFIGURATION_TYPES CMAKE_CONFIG_TYPE CMAKE_EXPORT_COMPILE_COMMANDS @@ -3703,6 +3806,7 @@ COMPILE_OPTIONS COMPILE_PDB_NAME COMPILE_PDB_OUTPUT_DIRECTORY + COMPILE_WARNING_AS_ERROR CROSSCOMPILING_EMULATOR CUDA_ARCHITECTURES CUDA_EXTENSIONS @@ -3777,10 +3881,13 @@ INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS INTERFACE_HEADER_SETS + INTERFACE_HEADER_SETS_TO_VERIFY INTERFACE_INCLUDE_DIRECTORIES INTERFACE_LINK_DEPENDS INTERFACE_LINK_DIRECTORIES INTERFACE_LINK_LIBRARIES + INTERFACE_LINK_LIBRARIES_DIRECT + INTERFACE_LINK_LIBRARIES_DIRECT_EXCLUDE INTERFACE_LINK_OPTIONS INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_PRECOMPILE_HEADERS @@ -3866,6 +3973,7 @@ UNITY_BUILD_CODE_BEFORE_INCLUDE UNITY_BUILD_MODE UNITY_BUILD_UNIQUE_ID + VERIFY_INTERFACE_HEADER_SETS VERSION VISIBILITY_INLINES_HIDDEN VS_CONFIGURATION_TYPE @@ -3877,6 +3985,7 @@ VS_DOTNET_DOCUMENTATION_FILE VS_DOTNET_REFERENCES VS_DOTNET_REFERENCES_COPY_LOCAL + VS_DOTNET_STARTUP_OBJECT VS_DOTNET_TARGET_FRAMEWORK_VERSION VS_DPI_AWARE VS_GLOBAL_KEYWORD @@ -3887,6 +3996,7 @@ VS_JUST_MY_CODE_DEBUGGING VS_KEYWORD VS_MOBILE_EXTENSIONS_VERSION + VS_NO_COMPILE_BATCHING VS_NO_SOLUTION_DEPLOY VS_PACKAGE_REFERENCES VS_PLATFORM_TOOLSET @@ -3902,6 +4012,7 @@ VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES + WATCOM_RUNTIME_LIBRARY WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS XCODE_EXPLICIT_FILE_TYPE @@ -3930,6 +4041,7 @@ XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP XCODE_SCHEME_WORKING_DIRECTORY XCODE_SCHEME_ZOMBIE_OBJECTS + XCODE_XCCONFIG XCTEST @@ -4042,6 +4154,8 @@ VERSION_EQUAL VERSION_LESS_EQUAL VERSION_GREATER_EQUAL + PATH_EQUAL + PATH TARGET_EXISTS CONFIG PLATFORM_ID @@ -4061,6 +4175,8 @@ LINK_LANGUAGE DEVICE_LINK HOST_LINK + LINK_LIBRARY + LINK_GROUP ANGLE-R COMMA SEMICOLON @@ -4093,6 +4209,7 @@ TARGET_PDB_FILE_BASE_NAME TARGET_PDB_FILE_NAME TARGET_PDB_FILE_DIR + TARGET_BUNDLE_DIR_NAME TARGET_BUNDLE_DIR TARGET_BUNDLE_CONTENT_DIR TARGET_PROPERTY @@ -4688,6 +4805,7 @@ + @@ -4838,6 +4956,7 @@ + @@ -4847,6 +4966,7 @@ + @@ -4857,6 +4977,7 @@ + @@ -4866,6 +4987,7 @@ + @@ -4875,6 +4997,7 @@ + @@ -7240,7 +7363,6 @@ - @@ -7363,7 +7485,7 @@ - + diff --git a/xml/diff.xml b/xml/diff.xml --- a/xml/diff.xml +++ b/xml/diff.xml @@ -12,7 +12,7 @@ 2008-02-13: 1.11 Eduardo Robles Elvira Fixed folding. --> - + @@ -115,13 +115,13 @@ - - - - - - - + + + + + + + diff --git a/xml/ini.xml b/xml/ini.xml --- a/xml/ini.xml +++ b/xml/ini.xml @@ -1,6 +1,6 @@ - + @@ -65,14 +65,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 @@ -829,23 +829,23 @@ - - - - - + + + + + - - - - - + + + + + - - - + + + diff --git a/xml/php.xml b/xml/php.xml --- a/xml/php.xml +++ b/xml/php.xml @@ -77,7 +77,7 @@ ]> - - + diff --git a/xml/sgml.xml b/xml/sgml.xml --- a/xml/sgml.xml +++ b/xml/sgml.xml @@ -1,6 +1,6 @@ - + @@ -33,9 +33,9 @@ - - - + + + diff --git a/xml/xml.xml b/xml/xml.xml --- a/xml/xml.xml +++ b/xml/xml.xml @@ -6,7 +6,7 @@ ]> - + @@ -164,7 +164,7 @@ - +