diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,60 @@ +50200.8.0 +========= + +New features: + * Support for Personal Access Tokens and OAuth tokens was added. To + take advantage of this feature, paste either type of token in the + new "Access Token" field of the login user interface or set up the + new `tokencmd` configuration file setting. See the "Authentication" + section of the README for help and see `docs/sample-config.ini` for + documentation on `tokencmd`. Thanks to @ftilde for early work on this + feature! + * The attribute used to render the current user's username can now be + customized. By default the attribute still uses the same color as + before (chosen based on the username) but is bold. The new theme + attribute `currentUser` can be customized just like other attributes; + for details, see `/help themes`. + * The `focus-next-unread` (default: `M-a`) and + `focus-next-unread-user-or-channel` (default: no binding) events can + now be repeatedly triggered to cycle through channels with unread + activity and then return to the original channel where you started, + which is now marked with `~` in the channel sidebar. + * Matterhorn got a new `--check-config` argument that triggers a + configuration file validation check (thanks @glguy). + * The Matterhorn login user interface was greatly improved and + simplified. Now, instead of providing individual fields for server + hostname and port, the user interface provides a single "Server URL" + field that is capable of accepting server hostnames with or without + ports as well as full Mattermost web client browser URLs, complete + with team names and URL paths. This adds support for servers that run + at URL paths other than "/" and auto-detects teams in URLs to improve + the web client user's migration experience. As part of this change, + the configuration got a new setting, `urlPath`, that corresponds to + the URL path of the server URL in the login interface. Thanks, @glguy + and @immindich! + +Other improvements: + * The XML syntax highlighting descriptions were updated. + * Channels with unread join or leave messages now appear as unread in + the sidebar as intended. + * The format-specific command-line options for markdown and plain text + for generated command and keybinding tables were merged. The old + interface was: + + * `-k`/`-K` to output configured keybindings in plain and markdown + formats, respectively + * `-m`/`-M` to output commands in plain and markdown formats, + respectively + + And the new interface is: + + * `-f` to set the output format (default: plain) + * `-k` to output configured keybindings in the active format + * `-m` to output commands in the active format + * The macOS example notification script was improved (thanks Geir + Skjotskift) + 50200.7.0 ========= diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -35,15 +35,71 @@ $ matterhorn --help $ matterhorn -When you run Matterhorn you'll be prompted for your server information -and credentials. At present `matterhorn` supports only username/password -authentication. +When you run Matterhorn you'll be prompted for your server URL and +credentials. To connect, just paste your web client's Mattermost URL +into the Server URL box and enter your credentials. See the next section +on the details for providing each kind of supported credentials. Note: Version `ABBCC.X.Y` matches Mattermost server version `A.BB.CC`. For example, if your Mattermost server version is `3.6.0` then you would download matterhorn version `30600.2.4`. See [Our Versioning Scheme](#our-versioning-scheme) for details. +# Authentication + +`matterhorn` supports username/password authentication as well as +authentication by Personal Access Token or session token. The following +subsections provide details on using each method. + +## Username / Password Authentication + +Matterhorn's start-up login user interface will allow you to provide +a username and password for authentication. We recommend that you +put the username in your Matterhorn configuration file and configure +Matterhorn to obtain your password from your system keychain. See the +`docs/sample-config.ini` file for documentation on the `user` and +`passcmd` settings, respectively. + +## Personal Access Token Authentication + +Matterhorn's start-up login user interface will also allow you to +provide an session or Personal Access Token. If a token is provided, it +will take precedence over a username and password. + +We recommend Personal Access Tokens because they don't expire except +when revoked. To use a Personal Access Token: + +* Ask your Mattermost server administrator to enable Personal Access + Tokens on your Mattermost account. +* Create a Personal Access Token. +* Add the new token to your system keychain. (Details on how to do this + depend on your platform.) +* Configure Matterhorn's `tokencmd` configuration option to query the + system keychain to get the token. See `docs/sample-config.ini` for + examples of how to do this with `passcmd` and `tokencmd`. + +The steps for configuring Personal Access Tokens can be found in [the +Mattermost documentation](https://docs.mattermost.com/developer/personal-access-tokens.html). + +## Token Cookie Authentication + +If your server does not support username and password authentication +(e.g. if GitLab authentication is the only supported method), you can +use your browser client's token cookie to authenticate: + +* Authenticate to GitLab (or other identity provider) using the + Mattermost web client. +* Once your browser has returned to the Mattermost interace, obtain the + value of the `MMAUTHTOKEN` browser cookie. +* Start Matterhorn and enter the value of the `MMAUTHTOKEN` token in the + login interface field labeled `Access token:` or add the token to the + system keychain as described above. + +Please note that unlike a Personal Access Token, the web client's token +cookie will expire, so these steps will need to be repeated each time +you log in with Matterhorn. As a result, we strongly recommend the use +of a Personal Access Token instead if at all possible. + # Configuring For configuration options you have two choices: @@ -79,14 +135,14 @@ * The `/help` command within Matterhorn. * The `F1` key within Matterhorn. -* Running matterhorn with the `-k` argument to get a text table of available keybindings. -* Running matterhorn with the `-K` argument to get a [Markdown table of available keybindings](docs/keybindings.md). -* Running matterhorn with the `-M` argument to get a [Markdown table of available commands](docs/commands.md). +* Running matterhorn with the `-k` or `-m` arguments to get a text table of available keybindings or commands respectively. +* Running matterhorn with the `-k` or `-m` arguments with `-f markdown` to get a [Markdown table of available keybindings](docs/keybindings.md) or [Markdown table of available commands](docs/commands.md). - Note: The latter three commands do not start the client but simply - print to stdout and exit. The keybindings shown include any user - overrides from the config files; use the `-i` flag to skip loading - the local config files and see the Matterhorn default keybindings. + Note: The keyboard and command output commands do not start the + client but simply print to stdout and exit. The keybindings shown + include any user overrides from the config files; use the `-i` + flag to skip loading the local config files and see the Matterhorn + default keybindings. Keybindings may include modifiers such as Control (indicated with a `C-` prefix) or Meta (indicated with a `M-` prefix). If your keyboard @@ -131,7 +187,11 @@ the channel list with a "`<`" indicator. To switch to the next channel with unread messages, use the default -binding `M-a`. +binding `M-a`. Pressing `M-a` repeatedly will visit other channels with +unread messages, and the channel you started in when first pressing +`M-a` will be marked with `~` in the sidebar. Pressing `M-a` will return +to that channel after other channels with unread messages have been +visited. To quickly show a list of URLs mentioned in the current channel and then open one in your local browser, use the default binding of `C-o` and @@ -167,6 +227,8 @@ * Markdown rendering * Convenient URL-opening with local browser * Secure password entry via external command (e.g. OSX keychain) +* Secure authentication token entry via external command (e.g. OSX + keychain) * Yank verbatim content from messages into the system clipboard * Optional live preview during message editing * Optional smart quoting for efficient Markdown entry @@ -293,6 +355,9 @@ If you decide to contribute, that's great! Here are some guidelines you should consider to make submitting patches easier for all concerned: + - Please base all patches against the `develop` branch unless you are + specifically fixing a bug in a released version, in which case + `master` is a fine place to start. - If you want to take on big things, let's have a design/vision discussion before you start coding. Create a GitHub issue and we can use that as the place to hash things out. We'll be interested to @@ -307,10 +372,14 @@ ## Does matterhorn support Gitlab authentication? -No. But we would be happy to work with contributors who are interested -in investigating what this would take and/or implementing it. See the -Contributing section for details. +Matterhorn supports GitLab authentication indirectly. In order to use +Matterhorn with GitLab authentication, see the Authentication section on +Matterhorn details for use of session tokens. +## Does matterhorn support Mattermost Personal Access Tokens? + +Yes. See the Authentication section above. + ## How can I get Matterhorn to render emphasized Markdown text with an italic font? In `~/.config/matterhorn/theme.ini`, @@ -352,3 +421,23 @@ terminal emulators. Results may vary, and use of emoji characters may cause terminal rendering issues depending on the terminal emulator in use. + +## I'm running Matterhorn in Tmux. How can I paste tmux buffers into Matterhorn's editor? + +By default, `tmux`'s `paste-buffer` binding, `prefix-]`, pastes buffer +text by replaying it as terminal input. This will cause unwanted +behavior when Matterhorn receives that text and sends out each input +line as a separate message. But `tmux` supports bracketed paste mode +to make a `tmux` paste a block of text as *one* Matterhorn message. +It can be enabled by changing the behavior of `prefix-]` in the Tmux +configuration: + +``` +unbind-key -T prefix ] +bind-key -T prefix ] paste-buffer -p +``` + +## I'm using Mattermost through an Nginx proxy and I keep getting disconnected. + +You might need to adjust your Nginx proxy settings. +For context, see [this potentially related report](https://github.com/matterhorn-chat/matterhorn/issues/578). diff --git a/docs/commands.md b/docs/commands.md --- a/docs/commands.md +++ b/docs/commands.md @@ -18,7 +18,7 @@ | `/join <~channel>` | Join the specified channel | | `/leave` | Leave the current channel | | `/left` | Focus on the previous channel | -| `/log-mark ` | Add marker message to the current log | +| `/log-mark ` | Add a custom marker message to the Matterhorn log | | `/log-snapshot ` | Dump the current log buffer to the specified path | | `/log-start ` | Begin logging to the specified path | | `/log-status` | Show current logging status | diff --git a/docs/keybindings.md b/docs/keybindings.md --- a/docs/keybindings.md +++ b/docs/keybindings.md @@ -25,7 +25,7 @@ | `C-o` | `enter-url-open` | Select and open a URL posted to the current channel | | `M-s` | `focus-last-channel` | Change to the most recently-focused channel | | `C-n` | `focus-next-channel` | Change to the next channel in the channel list | -| `M-a` | `focus-next-unread` | Change to the next channel with unread messages | +| `M-a` | `focus-next-unread` | Change to the next channel with unread messages or return to the channel marked '~' | | `C-p` | `focus-prev-channel` | Change to the previous channel in the channel list | | `M-k` | `invoke-editor` | Invoke *$EDITOR* to edit the current message | | `PgUp` | `page-up` | Page up in the channel message list (enters message select mode) | diff --git a/matterhorn.cabal b/matterhorn.cabal --- a/matterhorn.cabal +++ b/matterhorn.cabal @@ -1,5 +1,5 @@ name: matterhorn -version: 50200.7.0 +version: 50200.8.0 synopsis: Terminal client for the Mattermost chat system description: This is a terminal client for the Mattermost chat system. Please see the README for a list of @@ -12,7 +12,7 @@ category: Chat build-type: Simple cabal-version: >= 1.18 -tested-with: GHC == 7.10.3, GHC == 8.0.1, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.3 +tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.3 data-files: syntax/*.xml syntax/language.dtd @@ -41,6 +41,7 @@ hs-source-dirs: src main-is: Main.hs other-modules: Config + Config.Schema Command Connection App @@ -134,49 +135,50 @@ ScopedTypeVariables, NoImplicitPrelude ghc-options: -Wall -threaded -with-rtsopts=-I0 -Wcompat - build-depends: base >=4.8 && <5 - , mattermost-api == 50200.4.0 - , base-compat >= 0.9 && < 0.11 - , unordered-containers >= 0.2 && < 0.3 - , containers >= 0.5.7 && < 0.7 - , data-clist >= 0.1.2 && < 0.2 - , semigroups >= 0.18 && < 0.19 - , connection >= 0.2 && < 0.4 - , text >= 1.2 && < 1.3 - , bytestring >= 0.10 && < 0.11 - , stm >= 2.4 && < 2.6 + build-depends: base >=4.8 && <5 + , mattermost-api == 50200.5.0 + , base-compat >= 0.9 && < 0.12 + , unordered-containers >= 0.2 && < 0.3 + , containers >= 0.5.7 && < 0.7 + , data-clist >= 0.1.2 && < 0.2 + , semigroups >= 0.18 && < 0.20 + , connection >= 0.2 && < 0.4 + , text >= 1.2 && < 1.3 + , bytestring >= 0.10 && < 0.11 + , stm >= 2.4 && < 2.6 , config-ini >= 0.2.2.0 && < 0.3 - , process >= 1.4 && < 1.7 - , microlens-platform >= 0.3 && < 0.5 - , brick >= 0.52 && < 0.53 - , brick-skylighting >= 0.2 && < 0.4 - , vty >= 5.28 && < 5.29 - , word-wrap >= 0.4.0 && < 0.5 - , transformers >= 0.4 && < 0.6 - , text-zipper >= 0.10 && < 0.11 - , time >= 1.6 && < 2.0 - , xdg-basedir >= 0.2 && < 0.3 - , filepath >= 1.4 && < 1.5 - , directory >= 1.3 && < 1.4 + , process >= 1.4 && < 1.7 + , microlens-platform >= 0.3 && < 0.5 + , brick >= 0.52.1 && < 0.53 + , brick-skylighting >= 0.2 && < 0.4 + , vty >= 5.28 && < 5.29 + , word-wrap >= 0.4.0 && < 0.5 + , transformers >= 0.4 && < 0.6 + , text-zipper >= 0.10 && < 0.11 + , time >= 1.6 && < 2.0 + , xdg-basedir >= 0.2 && < 0.3 + , filepath >= 1.4 && < 1.5 + , directory >= 1.3 && < 1.4 , vector < 0.13 - , strict >= 0.3 && < 0.4 - , hashable >= 1.2 && < 1.4 - , cheapskate >= 0.1 && < 0.2 - , utf8-string >= 1.0 && < 1.1 - , temporary >= 1.2 && < 1.4 - , gitrev >= 1.3 && < 1.4 - , Hclip >= 3.0 && < 3.1 - , mtl >= 2.2 && < 2.3 - , aspell-pipe >= 0.3 && < 0.4 - , stm-delay >= 0.1 && < 0.2 + , strict >= 0.3 && < 0.4 + , hashable >= 1.2 && < 1.4 + , cheapskate >= 0.1 && < 0.2 + , utf8-string >= 1.0 && < 1.1 + , temporary >= 1.2 && < 1.4 + , gitrev >= 1.3 && < 1.4 + , Hclip >= 3.0 && < 3.1 + , mtl >= 2.2 && < 2.3 + , aspell-pipe >= 0.4 && < 0.5 + , stm-delay >= 0.1 && < 0.2 , unix >= 2.7.1.0 && < 2.7.3.0 - , skylighting-core >= 0.7 && < 0.9 + , skylighting-core >= 0.8 && < 0.9 , timezone-olson >= 0.1.7 && < 0.2 , timezone-series >= 0.1.6.1 && < 0.2 , aeson >= 1.2.3.0 && < 1.5 , async >= 2.2 && < 2.3 , uuid >= 1.3 && < 1.4 , random >= 1.1 && < 1.2 + , network-uri >= 2.6 && < 2.7 default-language: Haskell2010 test-suite test_messages @@ -196,41 +198,41 @@ , ScopedTypeVariables ghc-options: -Wall -fno-warn-orphans -Wcompat hs-source-dirs: src, test - build-depends: base >=4.7 && <5 - , base-compat >= 0.9 && < 0.11 - , brick >= 0.52 && < 0.53 - , bytestring >= 0.10 && < 0.11 - , cheapskate >= 0.1 && < 0.2 - , checkers >= 0.4 && < 0.6 + build-depends: base >=4.7 && <5 + , base-compat >= 0.9 && < 0.12 + , brick >= 0.52.1 && < 0.53 + , bytestring >= 0.10 && < 0.11 + , cheapskate >= 0.1 && < 0.2 + , checkers >= 0.4 && < 0.6 , config-ini >= 0.2.2.0 && < 0.3 - , connection >= 0.2 && < 0.4 - , containers >= 0.5.7 && < 0.7 - , directory >= 1.3 && < 1.4 - , filepath >= 1.4 && < 1.5 - , hashable >= 1.2 && < 1.4 - , Hclip >= 3.0 && < 3.1 - , mattermost-api == 50200.4.0 - , mattermost-api-qc == 50200.4.0 - , microlens-platform >= 0.3 && < 0.5 - , mtl >= 2.2 && < 2.3 - , process >= 1.4 && < 1.7 - , quickcheck-text >= 0.1 && < 0.2 - , stm >= 2.4 && < 2.6 - , strict >= 0.3 && < 0.4 - , string-conversions >= 0.4 && < 0.5 - , tasty >= 0.11 && < 1.3 - , tasty-hunit >= 0.9 && < 0.12 - , tasty-quickcheck >= 0.8 && < 0.12 - , text >= 1.2 && < 1.3 - , text-zipper >= 0.10 && < 0.11 - , time >= 1.6 && < 2.0 - , timezone-olson >= 0.1.7 && < 0.2 + , connection >= 0.2 && < 0.4 + , containers >= 0.5.7 && < 0.7 + , directory >= 1.3 && < 1.4 + , filepath >= 1.4 && < 1.5 + , hashable >= 1.2 && < 1.4 + , Hclip >= 3.0 && < 3.1 + , mattermost-api == 50200.5.0 + , mattermost-api-qc == 50200.5.0 + , microlens-platform >= 0.3 && < 0.5 + , mtl >= 2.2 && < 2.3 + , process >= 1.4 && < 1.7 + , quickcheck-text >= 0.1 && < 0.2 + , stm >= 2.4 && < 2.6 + , strict >= 0.3 && < 0.4 + , string-conversions >= 0.4 && < 0.5 + , tasty >= 0.11 && < 1.3 + , tasty-hunit >= 0.9 && < 0.12 + , tasty-quickcheck >= 0.8 && < 0.12 + , text >= 1.2 && < 1.3 + , text-zipper >= 0.10 && < 0.11 + , time >= 1.6 && < 2.0 + , timezone-olson >= 0.1.7 && < 0.2 , timezone-series >= 0.1.6.1 && < 0.2 - , transformers >= 0.4 && < 0.6 - , Unique >= 0.4 && < 0.5 - , unordered-containers >= 0.2 && < 0.3 + , transformers >= 0.4 && < 0.6 + , Unique >= 0.4 && < 0.5 + , unordered-containers >= 0.2 && < 0.3 , vector < 0.13 - , vty >= 5.28 && < 5.29 - , xdg-basedir >= 0.2 && < 0.3 - , semigroups >= 0.18 && < 0.19 - , uuid >= 1.3 && < 1.4 + , vty >= 5.28 && < 5.29 + , xdg-basedir >= 0.2 && < 0.3 + , semigroups >= 0.18 && < 0.20 + , uuid >= 1.3 && < 1.4 diff --git a/notification-scripts/notify b/notification-scripts/notify --- a/notification-scripts/notify +++ b/notification-scripts/notify @@ -56,5 +56,5 @@ if [ ! -z "$urgency" ] then test "$urgency" = "none" || - notify-send -u "$urgency" -c "$notify_CATEGORY" "$notify_HEAD" "$notify_BODY" + notify-send -u "$urgency" -c "$notify_CATEGORY" -- "$notify_HEAD" "$notify_BODY" fi diff --git a/src/Command.hs b/src/Command.hs --- a/src/Command.hs +++ b/src/Command.hs @@ -176,8 +176,8 @@ NoArg $ \ () -> stopLogging - , Cmd "log-mark" "Add marker message to the current log" - (LineArg "log marking message") $ \ markMsg -> + , Cmd "log-mark" "Add a custom marker message to the Matterhorn log" + (LineArg "message") $ \ markMsg -> mhLog LogUserMark markMsg , Cmd "log-status" "Show current logging status" diff --git a/src/Config.hs b/src/Config.hs --- a/src/Config.hs +++ b/src/Config.hs @@ -5,8 +5,8 @@ ( Config(..) , PasswordSource(..) , findConfig - , getCredentials , defaultConfig + , configConnectionType ) where @@ -15,8 +15,7 @@ import Control.Monad.Trans.Except import Control.Monad.Trans.Class ( lift ) -import Control.Monad.IO.Class ( liftIO ) -import Data.Ini.Config +import Config.Schema import qualified Data.Map.Strict as M import qualified Data.Text as T import qualified Data.Text.IO as T @@ -24,6 +23,7 @@ import System.Environment ( getExecutablePath ) import System.FilePath ( (), takeDirectory, splitPath, joinPath ) import System.Process ( readProcess ) +import Network.Mattermost.Types (ConnectionType(..)) import FilePaths import IOUtil @@ -71,6 +71,7 @@ configHost <- fieldMbOf "host" stringField configTeam <- fieldMbOf "team" stringField configPort <- fieldDefOf "port" number (configPort defaultConfig) + configUrlPath <- fieldMbOf "urlPath" stringField configChannelListWidth <- fieldDefOf "channelListWidth" number (configChannelListWidth defaultConfig) configCpuUsagePolicy <- fieldDefOf "cpuUsagePolicy" cpuUsagePolicy @@ -104,9 +105,11 @@ (configActivityBell defaultConfig) configHyperlinkingMode <- fieldFlagDef "hyperlinkURLs" (configHyperlinkingMode defaultConfig) - configPass <- (Just . PasswordCommand <$> field "passcmd") <|> - (Just . PasswordString <$> field "pass") <|> + configPass <- (Just . PasswordCommand <$> field "passcmd") + (Just . PasswordString <$> field "pass") pure Nothing + configToken <- (Just . TokenCommand <$> field "tokencmd") + pure Nothing configUnsafeUseHTTP <- fieldFlagDef "unsafeUseUnauthenticatedConnection" False configValidateServerCertificate <- @@ -152,13 +155,13 @@ "multiple" -> return MultipleCPUs _ -> Left $ "Invalid CPU usage policy value: " <> show t -stringField :: Text -> Either String Text +stringField :: Text -> Either e Text stringField t = case isQuoted t of True -> Right $ parseQuotedString t False -> Right t -filePathField :: Text -> Either String FilePath +filePathField :: Text -> Either e FilePath filePathField t = let path = T.unpack t in Right path parseQuotedString :: Text -> Text @@ -182,7 +185,9 @@ , configHost = Nothing , configTeam = Nothing , configPort = defaultPort + , configUrlPath = Nothing , configPass = Nothing + , configToken = Nothing , configTimeFormat = Nothing , configDateFormat = Nothing , configTheme = Nothing @@ -211,14 +216,19 @@ , configDefaultAttachmentPath = Nothing } -findConfig :: Maybe FilePath -> IO (Either String Config) +findConfig :: Maybe FilePath -> IO (Either String ([String], Config)) findConfig Nothing = runExceptT $ do cfg <- lift $ locateConfig configFileName - fixupPaths =<< case cfg of - Nothing -> return defaultConfig + (warns, config) <- + case cfg of + Nothing -> return ([], defaultConfig) Just path -> getConfig path + config' <- fixupPaths config + return (warns, config') findConfig (Just path) = - runExceptT $ fixupPaths =<< getConfig path + runExceptT $ do (warns, config) <- getConfig path + config' <- fixupPaths config + return (warns, config') -- | Fix path references in the configuration: -- @@ -255,7 +265,7 @@ return $ c { configSyntaxDirs = newDirs } -getConfig :: FilePath -> ExceptT String IO Config +getConfig :: FilePath -> ExceptT String IO ([String], Config) getConfig fp = do absPath <- convertIOException $ makeAbsolute fp t <- (convertIOException $ T.readFile absPath) `catchE` @@ -274,8 +284,8 @@ case parseIniFile t' fromIni of Left err -> do - throwE $ "Unable to parse " ++ absPath ++ ":" ++ err - Right conf -> do + throwE $ "Unable to parse " ++ absPath ++ ":" ++ fatalString err + Right (warns, conf) -> do actualPass <- case configPass conf of Just (PasswordCommand cmdString) -> do let (cmd:rest) = T.unpack <$> T.words cmdString @@ -285,23 +295,23 @@ Just (PasswordString pass) -> return $ Just pass Nothing -> return Nothing - return conf { configPass = PasswordString <$> actualPass - , configAbsPath = Just absPath - } + actualToken <- case configToken conf of + Just (TokenCommand cmdString) -> do + let (cmd:rest) = T.unpack <$> T.words cmdString + output <- convertIOException (readProcess cmd rest "") `catchE` + (\e -> throwE $ "Could not execute token command: " <> e) + return $ Just $ T.pack (takeWhile (/= '\n') output) + Just (TokenString _) -> error $ "BUG: getConfig: token in the Config was already a TokenString" + Nothing -> return Nothing --- | Returns the hostname, username, and password from the config. Only --- returns Just if all three have been provided. The idea is that if --- this returns Nothing, we're missing at least some of these values. -getCredentials :: Config -> Maybe ConnectionInfo -getCredentials config = do - pass <- configPass config - passStr <- case pass of - PasswordString p -> return p - PasswordCommand _ -> - error $ "BUG: unexpected credentials state: " <> - show (configPass config) + let conf' = conf + { configPass = PasswordString <$> actualPass + , configToken = TokenString <$> actualToken + , configAbsPath = Just absPath + } + return (map warningString warns, conf') - ConnectionInfo <$> configHost config - <*> (pure $ configPort config) - <*> configUser config - <*> (pure passStr) +configConnectionType :: Config -> ConnectionType +configConnectionType config + | configUnsafeUseHTTP config = ConnectHTTP + | otherwise = ConnectHTTPS (configValidateServerCertificate config) diff --git a/src/Config/Schema.hs b/src/Config/Schema.hs new file mode 100644 --- /dev/null +++ b/src/Config/Schema.hs @@ -0,0 +1,203 @@ +{- | + +This module provides an INI schema validator that is able to track unused +sections and fields in order to report warning messages to the user. + + + -} +module Config.Schema + ( IniParser + , parseIniFile + , () + + , Fatal(..) + , fatalString + + , Warning(..) + , warningString + + , section + , sectionMb + , fieldMbOf + , fieldMb + , field + , fieldDefOf + , fieldFlagDef + + -- * Re-exports + , number + , string + , listWithSeparator + ) where + +import Prelude () +import Prelude.MH + +import Data.Map (Map) +import qualified Data.Map as Map +import Data.List.NonEmpty (NonEmpty) +import qualified Data.List.NonEmpty as NonEmpty +import qualified Data.Text as T +import Control.Monad +import Data.Ini.Config (flag, number, listWithSeparator, string) +import Data.Ini.Config.Raw + + +------------------------------------------------------------------------ + +newtype Parser e t a = Parser { unParser :: e -> Map NormalizedText (NonEmpty t) -> Either Fatal (Map NormalizedText (NonEmpty t), [Warning], a) } + +instance Functor (Parser e t) where + fmap = liftM + +instance Applicative (Parser e t) where + pure x = Parser $ \_ s -> Right (s, [], x) + (<*>) = ap + +instance Monad (Parser e t) where + m >>= f = Parser $ \e s0 -> + do (s1, ws1, x1) <- unParser m e s0 + (s2, ws2, x2) <- unParser (f x1) e s1 + Right (s2, ws1++ws2, x2) + + + +() :: Parser e t a -> Parser e t a -> Parser e t a +p q = Parser $ \e s -> + case unParser p e s of + Right r -> Right r + Left {} -> unParser q e s + +getenv :: Parser e t e +getenv = Parser $ \e s -> Right (s, [], e) + +request :: Text -> Parser e t (Maybe t) +request name = Parser $ \_ s -> + let name' = normalize name in + Right $! + case Map.lookup name' s of + Nothing -> (s , [], Nothing) + Just (x NonEmpty.:| xs) -> (s', [], Just x) + where + s' = case NonEmpty.nonEmpty xs of + Nothing -> Map.delete name' s + Just ne -> Map.insert name' ne s + +fatal :: Fatal -> Parser e t a +fatal e = Parser $ \_ _ -> Left e + +warnings :: [Warning] -> IniParser () +warnings ws = Parser $ \_ s -> Right (s, ws, ()) + +------------------------------------------------------------------------ + +type IniParser = Parser RawIni IniSection + +type SectionParser = Parser IniSection IniValue + +data Fatal + = NoSection Text + | MissingField IniSection Text + | BadField IniSection IniValue String + | ParseError String + deriving Show + +data Warning + = UnusedSection IniSection + | UnusedField IniSection IniValue + deriving Show + +------------------------------------------------------------------------ + +fatalString :: Fatal -> String +fatalString (NoSection name) = "No top-level section named " ++ show name +fatalString (MissingField sec name) = "Missing field " ++ show name ++ " in section " ++ show (isName sec) +fatalString (BadField sec val err) = + "Line " ++ show (vLineNo val) ++ + " in section " ++ show (isName sec) ++ + ": " ++ err +fatalString (ParseError err) = err + +warningString :: Warning -> String +warningString (UnusedSection sec) = "Unused section " ++ show (isName sec) +warningString (UnusedField sec val) = + "Line " ++ show (vLineNo val) ++ + " in section " ++ show (isName sec) ++ + ": unused field" + +------------------------------------------------------------------------ + +parseIniFile :: Text -> IniParser a -> Either Fatal ([Warning], a) +parseIniFile text parser = + case parseRawIni text of + Left e -> Left (ParseError e) + Right ini -> + let entries = Map.fromListWith (<>) + [ (k, pure v) | (k,v) <- toList (fromRawIni ini) ] + in + case unParser parser ini entries of + Left e -> Left e + Right (entries', ws, x) -> Right (ws ++ unused, x) + where + unused = [ UnusedSection e | e <- concatMap toList entries' ] + +------------------------------------------------------------------------ + +section :: Text -> SectionParser a -> IniParser a +section name parser = + do mb <- sectionMb name parser + case mb of + Nothing -> fatal (NoSection name) + Just x -> pure x + +sectionMb :: Text -> SectionParser a -> IniParser (Maybe a) +sectionMb name parser = + do mb <- request name + case mb of + Nothing -> pure Nothing + Just sec -> + let entries = Map.fromListWith (<>) + [ (k, pure v) | (k,v) <- toList (isVals sec) ] + in + case unParser parser sec entries of + Left e -> fatal e + Right (entries', ws, result) -> + do warnings (ws ++ [ UnusedField sec v | v <- concatMap toList entries' ]) + pure (Just result) + +------------------------------------------------------------------------ + +field :: Text -> SectionParser Text +field name = + do mb <- fieldMb name + case mb of + Just x -> pure x + Nothing -> + do s <- getenv + fatal (MissingField s name) + +fieldMbOf :: Text -> (Text -> Either String a) -> SectionParser (Maybe a) +fieldMbOf name validate = + do mb <- request name + case mb of + Nothing -> pure Nothing + Just val -> + case validate (getVal val) of + Left e -> + do sec <- getenv + fatal (BadField sec val e) + Right x -> pure (Just x) + +fieldMb :: Text -> SectionParser (Maybe Text) +fieldMb name = fmap getVal <$> request name + +fieldDefOf :: Text -> (Text -> Either String a) -> a -> SectionParser a +fieldDefOf name validate def = fromMaybe def <$> fieldMbOf name validate + +fieldFlagDef :: Text -> Bool -> SectionParser Bool +fieldFlagDef name def = fieldDefOf name flag def + +------------------------------------------------------------------------ + +getVal :: IniValue -> Text +getVal = T.strip . vValue diff --git a/src/Draw/Autocomplete.hs b/src/Draw/Autocomplete.hs --- a/src/Draw/Autocomplete.hs +++ b/src/Draw/Autocomplete.hs @@ -48,6 +48,7 @@ footer = case renderAutocompleteFooterFor curChan =<< selElem of Just w -> hBorderWithLabel w _ -> hBorder + curUser = myUsername st in if numResults == 0 then emptyWidget @@ -60,7 +61,7 @@ render $ translateBy (Location (0, rowOffset)) $ vBox [ hBorderWithLabel label , vLimit visibleHeight $ - renderList renderAutocompleteAlternative True matchList + renderList (renderAutocompleteAlternative curUser) True matchList , footer ] @@ -83,18 +84,18 @@ ] renderAutocompleteFooterFor _ _ = Nothing -renderAutocompleteAlternative :: Bool -> AutocompleteAlternative -> Widget Name -renderAutocompleteAlternative sel (EmojiCompletion e) = +renderAutocompleteAlternative :: Text -> Bool -> AutocompleteAlternative -> Widget Name +renderAutocompleteAlternative _ sel (EmojiCompletion e) = padRight Max $ renderEmojiCompletion sel e -renderAutocompleteAlternative sel (SpecialMention m) = +renderAutocompleteAlternative _ sel (SpecialMention m) = padRight Max $ renderSpecialMention m sel -renderAutocompleteAlternative sel (UserCompletion u inChan) = - padRight Max $ renderUserCompletion u inChan sel -renderAutocompleteAlternative sel (ChannelCompletion inChan c) = +renderAutocompleteAlternative curUser sel (UserCompletion u inChan) = + padRight Max $ renderUserCompletion curUser u inChan sel +renderAutocompleteAlternative _ sel (ChannelCompletion inChan c) = padRight Max $ renderChannelCompletion c inChan sel -renderAutocompleteAlternative _ (SyntaxCompletion t) = +renderAutocompleteAlternative _ _ (SyntaxCompletion t) = padRight Max $ txt t -renderAutocompleteAlternative _ (CommandCompletion n args desc) = +renderAutocompleteAlternative _ _ (CommandCompletion n args desc) = padRight Max $ renderCommandCompletion n args desc renderSpecialMention :: SpecialMention -> Bool -> Widget Name @@ -125,8 +126,8 @@ txt $ autocompleteAlternativeReplacement $ EmojiCompletion e -renderUserCompletion :: User -> Bool -> Bool -> Widget Name -renderUserCompletion u inChan selected = +renderUserCompletion :: Text -> User -> Bool -> Bool -> Widget Name +renderUserCompletion curUser u inChan selected = let usernameWidth = 18 fullNameWidth = 25 padTo n a = hLimit n $ vLimit 1 (a <+> fill ' ') @@ -143,7 +144,7 @@ txt $ userNotInChannelMarker <> " " in maybeForce $ hBox [ memberDisplay - , padTo usernameWidth $ colorUsername username ("@" <> username) + , padTo usernameWidth $ colorUsername curUser username ("@" <> username) , padTo fullNameWidth $ txt fullName , txt nickname ] diff --git a/src/Draw/ChannelList.hs b/src/Draw/ChannelList.hs --- a/src/Draw/ChannelList.hs +++ b/src/Draw/ChannelList.hs @@ -45,6 +45,7 @@ , entryHasUnread :: Bool , entryMentions :: Int , entryIsRecent :: Bool + , entryIsReturn :: Bool , entryIsCurrent :: Bool , entryUserStatus :: Maybe UserStatus } @@ -56,9 +57,9 @@ teamHeader = hCenter $ withDefAttr clientEmphAttr $ txt $ "Team: " <> teamNameStr - myUsername = MM.userUsername $ myUser st + myUsername_ = myUsername st selfHeader = hCenter $ - colorUsername myUsername (userSigil <> myUsername) + colorUsername myUsername_ myUsername_ (userSigil <> myUsername_) teamNameStr = sanitizeUserText $ MM.teamDisplayName $ st^.csMyTeam body = case appMode st of ChannelSelect -> @@ -76,7 +77,7 @@ vBox $ teamHeader : selfHeader : - (renderChannelListGroup st (\s e -> renderChannelListEntry $ mkChannelEntryData s e) <$> + (renderChannelListGroup st (\s e -> renderChannelListEntry myUsername_ $ mkChannelEntryData s e) <$> Z.toList (st^.csFocus)) renderChannelListGroupHeading :: ChannelListGroup -> Bool -> Widget Name @@ -108,12 +109,13 @@ -> ChannelListEntry -> ChannelListEntryData mkChannelEntryData st e = - ChannelListEntryData sigilWithSpace name unread mentions recent current status + ChannelListEntryData sigilWithSpace name unread mentions recent ret current status where cId = channelListEntryChannelId e Just chan = findChannelById cId (st^.csChannels) unread = hasUnread' chan recent = isRecentChannel st cId + ret = isReturnChannel st cId current = isCurrentChannel st cId (name, normalSigil, addSpace, status) = case e of CLChannel _ -> @@ -140,10 +142,10 @@ -- | Render an individual Channel List entry (in Normal mode) with -- appropriate visual decorations. -renderChannelListEntry :: ChannelListEntryData -> (Bool, Widget Name) -renderChannelListEntry entry = (entryHasUnread entry, body) +renderChannelListEntry :: Text -> ChannelListEntryData -> (Bool, Widget Name) +renderChannelListEntry myUName entry = (entryHasUnread entry, body) where - body = decorate $ decorateRecent entry $ decorateMentions $ padRight Max $ + body = decorate $ decorateEntry entry $ decorateMentions $ padRight Max $ entryWidget $ entrySigil entry <> entryLabel entry decorate = if | entryIsCurrent entry -> visible . forceAttr currentChannelNameAttr @@ -154,7 +156,7 @@ | otherwise -> id entryWidget = case entryUserStatus entry of Just Offline -> withDefAttr clientMessageAttr . txt - Just _ -> colorUsername (entryLabel entry) + Just _ -> colorUsername myUName (entryLabel entry) Nothing -> txt decorateMentions | entryMentions entry > 9 = @@ -174,16 +176,28 @@ else id entryData = mkChannelEntryData st entry in (False, maybeSelect $ - decorateRecent entryData $ + decorateEntry entryData $ padRight Max $ hBox [ txt $ entrySigil entryData <> preMatch , forceAttr channelSelectMatchAttr $ txt inMatch , txt postMatch ]) --- | If this channel is the most recently viewed channel (prior to the --- currently viewed channel), add a decoration to denote that. -decorateRecent :: ChannelListEntryData -> Widget n -> Widget n -decorateRecent entry = if entryIsRecent entry - then (<+> (withDefAttr recentMarkerAttr $ str "<")) - else id +-- If this channel is the return channel, add a decoration to denote +-- that. +-- +-- Otherwise, if this channel is the most recently viewed channel (prior +-- to the currently viewed channel), add a decoration to denote that. +decorateEntry :: ChannelListEntryData -> Widget n -> Widget n +decorateEntry entry = + if entryIsReturn entry + then (<+> (withDefAttr recentMarkerAttr $ str returnChannelSigil)) + else if entryIsRecent entry + then (<+> (withDefAttr recentMarkerAttr $ str recentChannelSigil)) + else id + +recentChannelSigil :: String +recentChannelSigil = "<" + +returnChannelSigil :: String +returnChannelSigil = "~" diff --git a/src/Draw/Main.hs b/src/Draw/Main.hs --- a/src/Draw/Main.hs +++ b/src/Draw/Main.hs @@ -255,6 +255,7 @@ , mdThreadState = NoThread , mdShowReactions = True , mdMessageWidthLimit = Nothing + , mdMyUsername = myUsername st } ] _ -> emptyWidget @@ -314,7 +315,7 @@ newlineToSpace c = c channelNamePair = mkChannelName (chan^.ccInfo) <> " - " <> (chan^.ccInfo.cdDisplayName) - in renderText' + in renderText' (myUsername st) hs (T.map newlineToSpace (channelNameString <> maybeTopic)) @@ -563,6 +564,7 @@ , mdThreadState = NoThread , mdShowReactions = True , mdMessageWidthLimit = Nothing + , mdMyUsername = myUsername st } in (maybePreviewViewport msgPreview) <=> hBorderWithLabel (withDefAttr clientEmphAttr $ str "[Preview ↑]") diff --git a/src/Draw/Messages.hs b/src/Draw/Messages.hs --- a/src/Draw/Messages.hs +++ b/src/Draw/Messages.hs @@ -13,7 +13,7 @@ import qualified Data.Foldable as F import qualified Graphics.Vty as Vty import Lens.Micro.Platform ( (.~), to ) -import Network.Mattermost.Types ( ServerTime(..) ) +import Network.Mattermost.Types ( ServerTime(..), userUsername ) import Prelude () import Prelude.MH @@ -74,6 +74,7 @@ , mdThreadState = threadState , mdShowReactions = True , mdMessageWidthLimit = Nothing + , mdMyUsername = userUsername $ myUser st } fullMsg = case msg^.mUser of diff --git a/src/Draw/ShowHelp.hs b/src/Draw/ShowHelp.hs --- a/src/Draw/ShowHelp.hs +++ b/src/Draw/ShowHelp.hs @@ -442,7 +442,7 @@ mkKeybindHelp :: Keybinding -> Widget Name mkKeybindHelp (KB desc ev _ _) = (withDefAttr helpEmphAttr $ txt $ padTo kbColumnWidth $ ppBinding $ eventToBinding ev) <+> - (vLimit 1 $ hLimit kbDescColumnWidth $ renderText desc <+> fill ' ') + (hLimit kbDescColumnWidth $ padRight Max $ renderText desc) mkKeybindEventSectionHelp :: ((Text, Text, [Text]) -> a) -> ([a] -> a) diff --git a/src/Draw/URLList.hs b/src/Draw/URLList.hs --- a/src/Draw/URLList.hs +++ b/src/Draw/URLList.hs @@ -38,7 +38,7 @@ let time = link^.linkTime in attr sel $ vLimit 2 $ (vLimit 1 $ - hBox [ let u = maybe "" id (link^.linkUser.to (nameForUserRef st)) in colorUsername u u + hBox [ let u = maybe "" id (link^.linkUser.to (nameForUserRef st)) in colorUsername (myUsername st) u u , if link^.linkName == link^.linkURL then emptyWidget else (txt ": " <+> (renderText $ link^.linkName)) diff --git a/src/Draw/UserListOverlay.hs b/src/Draw/UserListOverlay.hs --- a/src/Draw/UserListOverlay.hs +++ b/src/Draw/UserListOverlay.hs @@ -25,7 +25,7 @@ drawUserListOverlay st = let overlay = drawListOverlay (st^.csUserListOverlay) userSearchScopeHeader userSearchScopeNoResults userSearchScopePrompt - renderUser + (renderUser (myUsername st)) in joinBorders overlay : drawMain False st userSearchScopePrompt :: UserSearchScope -> Widget Name @@ -51,13 +51,13 @@ AllUsers Nothing -> "Users On This Server" AllUsers (Just _) -> "Users In My Team" -renderUser :: Bool -> UserInfo -> Widget Name -renderUser foc ui = +renderUser :: Text -> Bool -> UserInfo -> Widget Name +renderUser myUName foc ui = (if foc then forceAttr L.listSelectedFocusedAttr else id) $ vLimit 2 $ padRight Max $ - hBox $ (padRight (Pad 1) $ colorUsername (ui^.uiName) (T.singleton $ userSigilFromInfo ui)) - : (hLimit usernameWidth $ padRight Max $ colorUsername (ui^.uiName) (ui^.uiName)) + hBox $ (padRight (Pad 1) $ colorUsername myUName (ui^.uiName) (T.singleton $ userSigilFromInfo ui)) + : (hLimit usernameWidth $ padRight Max $ colorUsername myUName (ui^.uiName) (ui^.uiName)) : extras where sanitize = T.strip . T.replace "\t" " " diff --git a/src/Events/Main.hs b/src/Events/Main.hs --- a/src/Events/Main.hs +++ b/src/Events/Main.hs @@ -21,9 +21,11 @@ onEventMain :: Vty.Event -> MH () onEventMain = - handleKeyboardEvent mainKeybindings $ \ ev -> case ev of - (Vty.EvPaste bytes) -> handlePaste bytes - _ -> handleEditingInput ev + handleKeyboardEvent mainKeybindings $ \ ev -> do + resetReturnChannel + case ev of + (Vty.EvPaste bytes) -> handlePaste bytes + _ -> handleEditingInput ev mainKeybindings :: KeyConfig -> [Keybinding] mainKeybindings = mkKeybindings @@ -99,7 +101,7 @@ , mkKb PrevChannelEvent "Change to the previous channel in the channel list" prevChannel - , mkKb NextUnreadChannelEvent "Change to the next channel with unread messages" + , mkKb NextUnreadChannelEvent "Change to the next channel with unread messages or return to the channel marked '~'" nextUnreadChannel , mkKb ShowAttachmentListEvent "Show the attachment list" diff --git a/src/Login.hs b/src/Login.hs --- a/src/Login.hs +++ b/src/Login.hs @@ -37,15 +37,16 @@ -- status message that is shown is shown long enough for the user to -- see what is happening (rather than just flashing by in the case -- of a fast server connection). For this usability reason, we have --- a "startup timer" thread: the thread waits a specified number of --- milliseconds (see below) and then notifies the interface that it has --- timed out. If there is an initial connection attempt underway that --- succeeds *before* the timer fires, we wait until the timer fires --- before quitting the application. This ensures that the "connecting --- to..." message stays on the screen long enough to not be jarring, and --- to show the user what is happening. If the connection fails before --- the timer fires, we just resume normal operation and show the login --- form so the user can intervene. +-- a "startup timer" thread: the thread waits a specified number +-- of milliseconds (see 'startupTimerMilliseconds' below) and then +-- notifies the interface that it has timed out. If there is an initial +-- connection attempt underway that succeeds *before* the timer +-- fires, we wait until the timer fires before quitting the Login +-- application and returning control to Matterhorn. This ensures that +-- the "connecting to..." message stays on the screen long enough to not +-- be jarring, and to show the user what is happening. If the connection +-- fails before the timer fires, we just resume normal operation and +-- show the login form so the user can intervene. module Login ( LoginAttempt(..) , interactiveGetLoginSession @@ -63,41 +64,46 @@ import Brick.Widgets.Center import Brick.Widgets.Edit import Control.Concurrent ( forkIO, threadDelay ) -import Control.Exception ( catch ) +import Control.Exception ( SomeException, catch, try ) +import Data.Char (isHexDigit) +import Data.List (tails, inits) import System.IO.Error ( catchIOError ) import qualified Data.Text as T import Graphics.Vty hiding (mkVty) import Lens.Micro.Platform ( (.~), Lens', makeLenses ) import qualified System.IO.Error as Err +import Network.URI ( URI(..), URIAuth(..), parseURI ) import Network.Mattermost ( ConnectionData ) -import Network.Mattermost.Types ( Session, User, Login(..), ConnectionPoolConfig(..) - , initConnectionData, ConnectionType(..) ) +import Network.Mattermost.Types.Internal ( Token(..) ) +import Network.Mattermost.Types ( Session(..), User, Login(..), ConnectionPoolConfig(..) + , initConnectionData, ConnectionType(..), UserParam(..) ) import Network.Mattermost.Exceptions ( LoginFailureException(..) ) -import Network.Mattermost.Endpoints ( mmLogin ) +import Network.Mattermost.Endpoints ( mmGetUser, mmGetLimitedClientConfiguration, mmLogin ) import Markdown import Themes ( clientEmphAttr ) import Types ( ConnectionInfo(..) - , ciPassword, ciUsername, ciHostname - , ciPort, AuthenticationException(..) + , ciPassword, ciUsername, ciHostname, ciUrlPath + , ciPort, ciType, AuthenticationException(..) , LogManager, LogCategory(..), ioLogWithManager + , ciAccessToken ) -- | Resource names for the login interface. data Name = - Hostname - | Port + Server | Username | Password + | AccessToken deriving (Ord, Eq, Show) -- | The result of an authentication attempt. data LoginAttempt = AttemptFailed AuthenticationException -- ^ The attempt failed with the corresponding error. - | AttemptSucceeded ConnectionInfo ConnectionData Session User + | AttemptSucceeded ConnectionInfo ConnectionData Session User (Maybe Text) --team -- ^ The attempt succeeded. -- | The state of the login interface: whether a login attempt is @@ -167,41 +173,92 @@ -- attempt. -> LogManager -- ^ The log manager used to do logging. - -> ConnectionType - -- ^ The kind of connection to make to the server. -> BChan LoginRequest -- ^ The channel on which we'll await requests. -> BChan LoginEvent -- ^ The channel to which we'll send login attempt results. -> IO () -loginWorker setLogger logMgr connTy requestChan respChan = forever $ do +loginWorker setLogger logMgr requestChan respChan = forever $ do req <- readBChan requestChan case req of DoLogin initial connInfo -> do writeBChan respChan $ StartConnect initial $ connInfo^.ciHostname - ioLogWithManager logMgr Nothing LogGeneral $ "Attempting authentication to " <> connInfo^.ciHostname + let doLog = ioLogWithManager logMgr Nothing LogGeneral - let login = Login { username = connInfo^.ciUsername - , password = connInfo^.ciPassword - } + doLog $ "Attempting authentication to " <> connInfo^.ciHostname - cd <- fmap setLogger $ initConnectionData (connInfo^.ciHostname) (fromIntegral (connInfo^.ciPort)) connTy poolCfg + cdResult <- findConnectionData connInfo + case cdResult of + Left e -> + do writeBChan respChan $ LoginResult $ AttemptFailed $ OtherAuthError e + Right (cd_, mbTeam) -> do + let cd = setLogger cd_ + token = connInfo^.ciAccessToken + case T.null token of + False -> do + let sess = Session cd $ Token $ T.unpack token - result <- convertLoginExceptions $ mmLogin cd login - case result of - Left e -> do - ioLogWithManager logMgr Nothing LogGeneral $ - "Error authenticating to " <> connInfo^.ciHostname <> ": " <> (T.pack $ show e) - writeBChan respChan $ LoginResult $ AttemptFailed e - Right (Left e) -> do - ioLogWithManager logMgr Nothing LogGeneral $ - "Error authenticating to " <> connInfo^.ciHostname <> ": " <> (T.pack $ show e) - writeBChan respChan $ LoginResult $ AttemptFailed $ LoginError e - Right (Right (sess, user)) -> do - ioLogWithManager logMgr Nothing LogGeneral $ - "Authenticated successfully to " <> connInfo^.ciHostname <> " as " <> connInfo^.ciUsername - writeBChan respChan $ LoginResult $ AttemptSucceeded connInfo cd sess user + userResult <- try $ mmGetUser UserMe sess + writeBChan respChan $ case userResult of + Left (e::SomeException) -> + LoginResult $ AttemptFailed $ OtherAuthError e + Right user -> + LoginResult $ AttemptSucceeded connInfo cd sess user mbTeam + True -> do + let login = Login { username = connInfo^.ciUsername + , password = connInfo^.ciPassword + } + result <- convertLoginExceptions $ mmLogin cd login + case result of + Left e -> do + doLog $ "Error authenticating to " <> connInfo^.ciHostname <> ": " <> (T.pack $ show e) + writeBChan respChan $ LoginResult $ AttemptFailed e + Right (Left e) -> do + doLog $ "Error authenticating to " <> connInfo^.ciHostname <> ": " <> (T.pack $ show e) + writeBChan respChan $ LoginResult $ AttemptFailed $ LoginError e + Right (Right (sess, user)) -> do + doLog $ "Authenticated successfully to " <> connInfo^.ciHostname <> " as " <> connInfo^.ciUsername + writeBChan respChan $ LoginResult $ AttemptSucceeded connInfo cd sess user mbTeam + + + +-- | Searches prefixes of the given URL to determine Mattermost API URL path and team name +findConnectionData :: ConnectionInfo -> IO (Either SomeException (ConnectionData, Maybe Text)) +findConnectionData connInfo = startSearch + + where + components = filter (not . T.null) (T.split ('/'==) (connInfo^.ciUrlPath)) + + -- the candidates list is never empty because inits never returns an empty list + primary:alternatives = + reverse + [ (T.intercalate "/" l, listToMaybe r) | (l,r) <- zip (inits components) (tails components) ] + + tryCandidate :: (Text, Maybe Text) -> IO (Either SomeException (ConnectionData, Maybe Text)) + tryCandidate (path, team) = + do cd <- initConnectionData (connInfo^.ciHostname) (fromIntegral (connInfo^.ciPort)) path (connInfo^.ciType) poolCfg + res <- try (mmGetLimitedClientConfiguration cd) + pure $! case res of + Left e -> Left e + Right{} -> Right (cd, team) + + -- This code prefers to report the error from the URL corresponding to what the user + -- actually provided. Errors from derived URLs are lost in favor of this first error. + startSearch = + do res1 <- tryCandidate primary + case res1 of + Left e -> search e alternatives + Right cd -> pure (Right cd) + + search e [] = pure (Left e) + search e (x:xs) = + do res <- tryCandidate x + case res of + Left {} -> search e xs + Right cd -> pure (Right cd) + + -- | The amount of time that the startup timer thread will wait before -- firing. startupTimerMilliseconds :: Int @@ -228,9 +285,6 @@ -- never fires since the login app doesn't -- use suspendAndResume, but we need it to -- satisfy the Brick API.) - -> ConnectionType - -- ^ The kind of connection to make to the - -- mattermost server. -> (ConnectionData -> ConnectionData) -- ^ The function to set the logger on -- connection handles. @@ -243,11 +297,11 @@ -- initial connection attempt is made without -- first getting the user to hit Enter. -> IO (Maybe LoginAttempt, Vty) -interactiveGetLoginSession vty mkVty connTy setLogger logMgr initialConfig = do +interactiveGetLoginSession vty mkVty setLogger logMgr initialConfig = do requestChan <- newBChan 10 respChan <- newBChan 10 - void $ forkIO $ loginWorker setLogger logMgr connTy requestChan respChan + void $ forkIO $ loginWorker setLogger logMgr requestChan respChan void $ forkIO $ startupTimer respChan let initialState = mkState initialConfig requestChan @@ -268,8 +322,11 @@ populatedConnectionInfo :: ConnectionInfo -> Bool populatedConnectionInfo ci = and [ not $ T.null $ ci^.ciHostname - , not $ T.null $ ci^.ciUsername - , not $ T.null $ ci^.ciPassword + , or [ and [ not $ T.null $ ci^.ciUsername + , not $ T.null $ ci^.ciPassword + ] + , not $ T.null $ ci^.ciAccessToken + ] , ci^.ciPort > 0 ] @@ -285,10 +342,10 @@ , _timeoutFired = False } form = mkForm cInfo - initialFocus = if | T.null (cInfo^.ciHostname) -> Hostname + initialFocus = if | T.null (cInfo^.ciHostname) -> Server | T.null (cInfo^.ciUsername) -> Username | T.null (cInfo^.ciPassword) -> Password - | otherwise -> Hostname + | otherwise -> Server app :: App State LoginEvent Name app = App @@ -345,33 +402,104 @@ mkForm :: ConnectionInfo -> Form ConnectionInfo e Name mkForm = let label s w = padBottom (Pad 1) $ - (vLimit 1 $ hLimit 18 $ str s <+> fill ' ') <+> w - in newForm [ label "Server hostname:" @@= - editHostname ciHostname Hostname - , label "Server port:" @@= - editShowableField ciPort Port - , label "Username:" @@= - editTextField ciUsername Username (Just 1) - , label "Password:" @@= - editPasswordField ciPassword Password + (vLimit 1 $ hLimit 22 $ str s <+> fill ' ') <+> w + above s w = hCenter (str s) <=> w + in newForm [ label "Server URL:" @@= editServer + , (above "Provide a username and password:" . + label "Username:") @@= editTextField ciUsername Username (Just 1) + , label "Password:" @@= editPasswordField ciPassword Password + , (above "Or provide an OAuth or Personal Access Token:" . + label "Access Token:") @@= editPasswordField ciAccessToken AccessToken ] -editHostname :: (Show n, Ord n) => Lens' s Text -> n -> s -> FormFieldState s e n -editHostname stLens n = - let ini = id - val = validHostname - limit = Just 1 - renderTxt = txt . T.unlines - in editField stLens n limit ini val renderTxt id +serverLens :: Lens' ConnectionInfo (Text, Int, Text, ConnectionType) +serverLens f ci = fmap (\(x,y,z,w) -> ci { _ciHostname = x, _ciPort = y, _ciUrlPath = z, _ciType = w}) + (f (ci^.ciHostname, ci^.ciPort, ci^.ciUrlPath, ci^.ciType)) -validHostname :: [Text] -> Maybe Text -validHostname ls = - let s = T.unpack t - t = T.concat ls - in if all (flip notElem (":/"::String)) s - then Just t - else Nothing +-- | Validate a server URI @hostname[:port][/path]@. Result is either an error message +-- indicating why validation failed or a tuple of (hostname, port, path) +validServer :: [Text] -> Either String (Text, Int, Text, ConnectionType) +validServer ts = + do t <- case ts of + [] -> Left "No input" + [t] -> Right t + _ -> Left "Too many lines" + + let inputWithScheme + | "://" `T.isInfixOf` t = t + | otherwise = "https://" <> t + + uri <- case parseURI (T.unpack inputWithScheme) of + Nothing -> Left "Unable to parse URI" + Just uri -> Right uri + + auth <- case uriAuthority uri of + Nothing -> Left "Missing authority part" + Just auth -> Right auth + + ty <- case uriScheme uri of + "http:" -> Right ConnectHTTP + "https:" -> Right (ConnectHTTPS True) + "https-insecure:" -> Right (ConnectHTTPS False) + _ -> Left "Unknown scheme" + + port <- case (ty, uriPort auth) of + (ConnectHTTP , "") -> Right 80 + (ConnectHTTPS{}, "") -> Right 443 + (_, ':':portStr) + | Just port <- readMaybe portStr -> Right port + _ -> Left "Invalid port" + + let host + | not (null (uriRegName auth)) + , '[' == head (uriRegName auth) + , ']' == last (uriRegName auth) + = init (tail (uriRegName auth)) + | otherwise = uriRegName auth + + if null (uriRegName auth) then Left "Missing server name" else Right () + if null (uriQuery uri) then Right () else Left "Unexpected URI query" + if null (uriFragment uri) then Right () else Left "Unexpected URI fragment" + if null (uriUserInfo auth) then Right () else Left "Unexpected credentials" + + Right (T.pack host, port, T.pack (uriPath uri), ty) + + +renderServer :: (Text, Int, Text, ConnectionType) -> Text +renderServer (h,p,u,t) = scheme <> hStr <> portStr <> uStr + where + hStr + | T.all (\x -> isHexDigit x || ':'==x) h + , T.any (':'==) h = "[" <> h <> "]" + | otherwise = h + + scheme = + case t of + ConnectHTTP -> "http://" + ConnectHTTPS True -> "" + ConnectHTTPS False -> "https-insecure://" + + uStr + | T.null u = u + | otherwise = T.cons '/' (T.dropWhile ('/'==) u) + + portStr = + case t of + ConnectHTTP | p == 80 -> T.empty + ConnectHTTPS{} | p == 443 -> T.empty + _ -> T.pack (':':show p) + +editServer :: ConnectionInfo -> FormFieldState ConnectionInfo e Name +editServer = + let val ts = case validServer ts of + Left{} -> Nothing + Right x-> Just x + limit = Just 1 + renderTxt [""] = str "(Paste your Mattermost URL here)" + renderTxt ts = txt (T.unlines ts) + in editField serverLens Server limit renderServer val renderTxt id + errorAttr :: AttrName errorAttr = "errorMessage" @@ -417,7 +545,7 @@ txt "Connecting to " <+> withDefAttr clientEmphAttr (txt host) <+> txt "..." in case st^.currentState of Idle -> case st^.lastAttempt of - Just (AttemptSucceeded ci _ _ _) -> msg (ci^.ciHostname) + Just (AttemptSucceeded ci _ _ _ _) -> msg (ci^.ciHostname) _ -> emptyWidget (Connecting _ host) -> msg host diff --git a/src/Main.hs b/src/Main.hs --- a/src/Main.hs +++ b/src/Main.hs @@ -21,7 +21,7 @@ configResult <- if optIgnoreConfig opts then return $ Right defaultConfig - else findConfig (optConfLocation opts) + else fmap snd <$> findConfig (optConfLocation opts) config <- case configResult of Left err -> do @@ -30,19 +30,20 @@ Right c -> return c let keyConfig = configUserKeys config + format = optPrintFormat opts printedCommands <- case optPrintCommands opts of - Nothing -> return False - Just ty -> do - case ty of + False -> return False + True -> do + case format of Markdown -> T.putStrLn commandMarkdownTable Plain -> T.putStrLn commandTextTable return True printedKeybindings <- case optPrintKeybindings opts of - Nothing -> return False - Just ty -> do - case ty of + False -> return False + True -> do + case format of Markdown -> T.putStrLn $ keybindingMarkdownTable keyConfig Plain -> T.putStrLn $ keybindingTextTable keyConfig return True diff --git a/src/Markdown.hs b/src/Markdown.hs --- a/src/Markdown.hs +++ b/src/Markdown.hs @@ -142,6 +142,8 @@ -- rendering context. If specified, all non-code blocks -- will be wrapped at this width and code blocks will be -- rendered using the context's width. + , mdMyUsername :: Text + -- ^ The username of the user running Matterhorn. } -- | renderMessage performs markdown rendering of the specified message. @@ -156,13 +158,13 @@ | isEmote msg -> [ B.withDefAttr pinnedMessageIndicatorAttr $ B.txt $ if msg^.mPinned then "[PIN]" else "" , B.txt $ (if msg^.mFlagged then "[!] " else "") <> "*" - , colorUsername un un + , colorUsername mdMyUsername un un , botElem , B.txt " " ] | otherwise -> [ B.withDefAttr pinnedMessageIndicatorAttr $ B.txt $ if msg^.mPinned then "[PIN] " else "" - , colorUsername un un + , colorUsername mdMyUsername un un , botElem , B.txt $ (if msg^.mFlagged then "[!]" else "") <> ": " ] @@ -245,7 +247,7 @@ multiLnLayout hs w nameElems bs = if mdIndentBlocks then vBox [ hBox nameElems - , hBox [B.txt " ", renderMarkdown hs ((subtract 2) <$> w) bs] + , hBox [B.txt " ", renderMarkdown mdMyUsername hs ((subtract 2) <$> w) bs] ] else nameNextToMessage hs w nameElems bs @@ -253,7 +255,7 @@ Widget Fixed Fixed $ do nameResult <- render $ hBox nameElems let newW = subtract (V.imageWidth (nameResult^.imageL)) <$> w - render $ hBox [raw (nameResult^.imageL), renderMarkdown hs newW bs] + render $ hBox [raw (nameResult^.imageL), renderMarkdown mdMyUsername hs newW bs] breakCheck C.LineBreak = True breakCheck C.SoftBreak = True @@ -275,9 +277,9 @@ cursorSentinel = '‸' -- Render markdown with username highlighting -renderMarkdown :: HighlightSet -> Maybe Int -> Blocks -> Widget a -renderMarkdown hSet w = - B.vBox . toList . fmap (blockToWidget hSet w) . addBlankLines +renderMarkdown :: Text -> HighlightSet -> Maybe Int -> Blocks -> Widget a +renderMarkdown curUser hSet w = + B.vBox . toList . fmap (blockToWidget curUser hSet w) . addBlankLines -- Add blank lines only between adjacent elements of the same type, to -- save space @@ -303,10 +305,10 @@ -- Render text to markdown without username highlighting renderText :: Text -> Widget a -renderText txt = renderText' emptyHSet txt +renderText txt = renderText' "" emptyHSet txt -renderText' :: HighlightSet -> Text -> Widget a -renderText' hSet txt = renderMarkdown hSet Nothing bs +renderText' :: Text -> HighlightSet -> Text -> Widget a +renderText' curUser hSet txt = renderMarkdown curUser hSet Nothing bs where C.Doc _ bs = C.markdown C.def txt vBox :: F.Foldable f => f (Widget a) -> Widget a @@ -322,26 +324,26 @@ maybeHLimit Nothing w = w maybeHLimit (Just i) w = hLimit i w -blockToWidget :: HighlightSet -> Maybe Int -> Block -> Widget a -blockToWidget hSet w (C.Para is) = - toInlineChunk w is hSet -blockToWidget hSet w (C.Header n is) = +blockToWidget :: Text -> HighlightSet -> Maybe Int -> Block -> Widget a +blockToWidget curUser hSet w (C.Para is) = + toInlineChunk curUser w is hSet +blockToWidget curUser hSet w (C.Header n is) = B.withDefAttr clientHeaderAttr $ - hBox [B.padRight (B.Pad 1) $ header n, toInlineChunk (subtract 1 <$> w) is hSet] -blockToWidget hSet w (C.Blockquote is) = + hBox [B.padRight (B.Pad 1) $ header n, toInlineChunk curUser (subtract 1 <$> w) is hSet] +blockToWidget curUser hSet w (C.Blockquote is) = maybeHLimit w $ - addQuoting (vBox $ fmap (blockToWidget hSet w) is) -blockToWidget hSet w (C.List _ l bs) = + addQuoting (vBox $ fmap (blockToWidget curUser hSet w) is) +blockToWidget curUser hSet w (C.List _ l bs) = maybeHLimit w $ - blocksToList l w bs hSet -blockToWidget hSet _ (C.CodeBlock ci tx) = + blocksToList curUser l w bs hSet +blockToWidget _ hSet _ (C.CodeBlock ci tx) = let f = maybe rawCodeBlockToWidget (codeBlockToWidget (hSyntaxMap hSet)) mSyntax mSyntax = Sky.lookupSyntax (C.codeLang ci) (hSyntaxMap hSet) in f tx -blockToWidget _ w (C.HtmlBlock txt) = +blockToWidget _ _ w (C.HtmlBlock txt) = maybeHLimit w $ textWithCursor txt -blockToWidget _ w (C.HRule) = +blockToWidget _ _ w (C.HRule) = maybeHLimit w $ B.vLimit 1 (B.fill '*') @@ -381,17 +383,17 @@ expandEmpty s = s in padding <+> (B.vBox $ textWithCursor <$> theLines) -toInlineChunk :: Maybe Int -> Inlines -> HighlightSet -> Widget a -toInlineChunk w is hSet = B.Widget B.Fixed B.Fixed $ do +toInlineChunk :: Text -> Maybe Int -> Inlines -> HighlightSet -> Widget a +toInlineChunk curUser w is hSet = B.Widget B.Fixed B.Fixed $ do ctx <- B.getContext let width = fromMaybe (ctx^.B.availWidthL) w fs = toFragments hSet is - ws = fmap gatherWidgets (split width hSet fs) + ws = fmap (gatherWidgets curUser) (split width hSet fs) B.render (vBox (fmap hBox ws)) -blocksToList :: ListType -> Maybe Int -> [Blocks] -> HighlightSet -> Widget a -blocksToList lt w bs hSet = vBox - [ B.txt i <+> (vBox (fmap (blockToWidget hSet w) b)) +blocksToList :: Text -> ListType -> Maybe Int -> [Blocks] -> HighlightSet -> Widget a +blocksToList curUser lt w bs hSet = vBox + [ B.txt i <+> (vBox (fmap (blockToWidget curUser hSet w) b)) | b <- bs | i <- is ] where is = case lt of C.Bullet _ -> repeat ("• ") @@ -592,8 +594,8 @@ -- This finds adjacent string-ey fragments and concats them, so -- we can use fewer widgets -gatherWidgets :: Seq Fragment -> Seq (Widget a) -gatherWidgets (viewl-> (Fragment frag style :< rs)) = go style (strOf frag) rs +gatherWidgets :: Text -> Seq Fragment -> Seq (Widget a) +gatherWidgets curUser (viewl-> (Fragment frag style :< rs)) = go style (strOf frag) rs where go s t (viewl-> (Fragment f s' :< xs)) | s == s' = go s (t <> strOf f) xs go s t xs = @@ -608,17 +610,17 @@ Link l -> B.hyperlink l $ B.withDefAttr urlAttr $ case frag of TComplex fs -> - hBox $ gatherWidgets fs + hBox $ gatherWidgets curUser fs _ -> rawText Emoji -> B.withDefAttr emojiAttr rawText - User u -> colorUsername u t + User u -> colorUsername curUser u t Channel -> B.withDefAttr channelNameAttr rawText widget | T.any (== cursorSentinel) t = B.visible rawWidget | otherwise = rawWidget - in widget <| gatherWidgets xs -gatherWidgets _ = + in widget <| gatherWidgets curUser xs +gatherWidgets _ _ = S.empty textWithCursor :: Text -> Widget a diff --git a/src/Options.hs b/src/Options.hs --- a/src/Options.hs +++ b/src/Options.hs @@ -5,6 +5,10 @@ import Prelude () import Prelude.MH +import Config +import Data.Char ( toLower ) +import Data.Foldable (traverse_) +import Data.Tuple ( swap ) import Data.Version ( showVersion ) import Development.GitRev import Network.Mattermost.Version ( mmApiVersion ) @@ -12,15 +16,17 @@ import System.Console.GetOpt import System.Environment ( getArgs ) import System.Exit ( exitFailure, exitSuccess ) +import System.IO ( hPutStrLn, stderr ) data Behaviour = Normal | ShowVersion | ShowHelp + | CheckConfig deriving (Eq, Show) -data PrintMode = +data PrintFormat = Markdown | Plain deriving (Eq, Show) data Options = Options @@ -28,8 +34,9 @@ , optLogLocation :: Maybe FilePath , optBehaviour :: Behaviour , optIgnoreConfig :: Bool - , optPrintKeybindings :: Maybe PrintMode - , optPrintCommands :: Maybe PrintMode + , optPrintKeybindings :: Bool + , optPrintCommands :: Bool + , optPrintFormat :: PrintFormat } deriving (Eq, Show) defaultOptions :: Options @@ -38,8 +45,9 @@ , optLogLocation = Nothing , optBehaviour = Normal , optIgnoreConfig = False - , optPrintKeybindings = Nothing - , optPrintCommands = Nothing + , optPrintKeybindings = False + , optPrintCommands = False + , optPrintFormat = Plain } optDescrs :: [OptDescr (Options -> Options)] @@ -59,20 +67,46 @@ , Option ['i'] ["ignore-config"] (NoArg (\ c -> c { optIgnoreConfig = True })) "Start with no configuration" - , Option ['k'] ["keybindings-text"] - (NoArg (\ c -> c { optPrintKeybindings = Just Plain })) - "Print keybindings effective for the current configuration in plain text format" - , Option ['K'] ["keybindings-markdown"] - (NoArg (\ c -> c { optPrintKeybindings = Just Markdown })) - "Print keybindings effective for the current configuration in Markdown format" - , Option ['m'] ["commands-text"] - (NoArg (\ c -> c { optPrintCommands = Just Plain })) - "Print available commands in plain text format" - , Option ['M'] ["commands-markdown"] - (NoArg (\ c -> c { optPrintCommands = Just Markdown })) - "Print available commands in Markdown format" + , Option ['k'] ["keybindings"] + (NoArg (\ c -> c { optPrintKeybindings = True })) + "Print keybindings effective for the current configuration" + , Option ['m'] ["commands"] + (NoArg (\ c -> c { optPrintCommands = True })) + "Print available commands" + , Option ['f'] ["format"] + (ReqArg handleFormat "FORMAT") + ("Print keybinding or command output in the specified format " <> + "(options: " <> formatChoicesStr <> ", default: " <> + formatStringFor (optPrintFormat defaultOptions) <> ")") + , Option [] ["check-config"] + (NoArg (\ c -> c { optBehaviour = CheckConfig })) + "Validate configuration file" ] +formatChoices :: [(String, PrintFormat)] +formatChoices = + [ ("plain", Plain) + , ("markdown", Markdown) + ] + +formatStringFor :: PrintFormat -> String +formatStringFor fmt = + case lookup fmt (swap <$> formatChoices) of + Nothing -> error $ "BUG: no format string for " <> show fmt + Just s -> s + +formatChoicesStr :: String +formatChoicesStr = intercalate ", " $ fst <$> formatChoices + +handleFormat :: String -> Options -> Options +handleFormat fmtStr c = + let fmt = case lookup (toLower <$> fmtStr) formatChoices of + Just f -> f + Nothing -> + error $ "Invalid format: " <> show fmtStr <> ", choices: " <> + formatChoicesStr + in c { optPrintFormat = fmt } + mhVersion :: String mhVersion | $(gitHash) == ("UNKNOWN" :: String) = "matterhorn " ++ showVersion version @@ -95,10 +129,28 @@ Normal -> return rs ShowHelp -> usage >> exitSuccess ShowVersion -> putStrLn fullVersionString >> exitSuccess - (_, _, []) -> do - usage - exitFailure + CheckConfig -> checkConfiguration (optConfLocation rs) (_, _, errs) -> do mapM_ putStr errs usage exitFailure + +checkConfiguration :: Maybe FilePath -> IO a +checkConfiguration mb = + do res <- findConfig mb + let writeLn = hPutStrLn stderr + printLocation Nothing = "No configuration file" + printLocation (Just fp) = "Location: " ++ fp + case res of + Left e -> + do writeLn e + exitFailure + Right ([], config) -> + do writeLn "Configuration file valid" + writeLn (printLocation (configAbsPath config)) + exitSuccess + Right (ws, config) -> + do writeLn "Configuration file generated warnings" + writeLn (printLocation (configAbsPath config)) + traverse_ writeLn ws + exitFailure diff --git a/src/State/Channels.hs b/src/State/Channels.hs --- a/src/State/Channels.hs +++ b/src/State/Channels.hs @@ -21,6 +21,8 @@ , prevChannel , nextChannel , recentChannel + , setReturnChannel + , resetReturnChannel , hideDMChannel , createGroupChannel , showGroupChannelPref @@ -34,6 +36,7 @@ , removeUserFromCurrentChannel , removeChannelFromState , isRecentChannel + , isReturnChannel , isCurrentChannel , deleteCurrentChannel , startLeaveCurrentChannel @@ -411,7 +414,7 @@ setFocus :: ChannelId -> MH () setFocus cId = do showChannelInSidebar cId True - setFocusWith True (Z.findRight ((== cId) . channelListEntryChannelId)) + setFocusWith True (Z.findRight ((== cId) . channelListEntryChannelId)) (return ()) showChannelInSidebar :: ChannelId -> Bool -> MH () showChannelInSidebar cId setPending = do @@ -474,8 +477,10 @@ setFocusWith :: Bool -> (Zipper ChannelListGroup ChannelListEntry - -> Zipper ChannelListGroup ChannelListEntry) -> MH () -setFocusWith updatePrev f = do + -> Zipper ChannelListGroup ChannelListEntry) + -> MH () + -> MH () +setFocusWith updatePrev f onNoChange = do oldZipper <- use csFocus let newZipper = f oldZipper newFocus = Z.focus newZipper @@ -483,18 +488,20 @@ -- If we aren't changing anything, skip all the book-keeping because -- we'll end up clobbering things like csRecentChannel. - when (newFocus /= oldFocus) $ do - mh $ invalidateCacheEntry ChannelSidebar - resetAutocomplete - preChangeChannelCommon - csFocus .= newZipper + if newFocus /= oldFocus + then do + mh $ invalidateCacheEntry ChannelSidebar + resetAutocomplete + preChangeChannelCommon + csFocus .= newZipper - now <- liftIO getCurrentTime - newCid <- use csCurrentChannelId - csChannel(newCid).ccInfo.cdSidebarShowOverride .= Just now + now <- liftIO getCurrentTime + newCid <- use csCurrentChannelId + csChannel(newCid).ccInfo.cdSidebarShowOverride .= Just now - updateViewed updatePrev - postChangeChannelCommon + updateViewed updatePrev + postChangeChannelCommon + else onNoChange postChangeChannelCommon :: MH () postChangeChannelCommon = do @@ -660,32 +667,69 @@ updateSidebar nextChannel :: MH () -nextChannel = setFocusWith True Z.right +nextChannel = do + resetReturnChannel + setFocusWith True Z.right (return ()) -- | This is almost never what you want; we use this when we delete a -- channel and we don't want to update the deleted channel's view time. nextChannelSkipPrevView :: MH () -nextChannelSkipPrevView = setFocusWith False Z.right +nextChannelSkipPrevView = setFocusWith False Z.right (return ()) prevChannel :: MH () -prevChannel = setFocusWith True Z.left +prevChannel = do + resetReturnChannel + setFocusWith True Z.left (return ()) recentChannel :: MH () recentChannel = do recent <- use csRecentChannel case recent of Nothing -> return () - Just cId -> setFocus cId + Just cId -> do + ret <- use csReturnChannel + when (ret == Just cId) resetReturnChannel + setFocus cId +resetReturnChannel :: MH () +resetReturnChannel = do + val <- use csReturnChannel + case val of + Nothing -> return () + Just _ -> do + mh $ invalidateCacheEntry ChannelSidebar + csReturnChannel .= Nothing + +gotoReturnChannel :: MH () +gotoReturnChannel = do + ret <- use csReturnChannel + case ret of + Nothing -> return () + Just cId -> do + resetReturnChannel + setFocus cId + +setReturnChannel :: MH () +setReturnChannel = do + ret <- use csReturnChannel + case ret of + Nothing -> do + cId <- use csCurrentChannelId + csReturnChannel .= Just cId + mh $ invalidateCacheEntry ChannelSidebar + Just _ -> return () + nextUnreadChannel :: MH () nextUnreadChannel = do st <- use id - setFocusWith True (getNextUnreadChannel st) + setReturnChannel + setFocusWith True (getNextUnreadChannel st) gotoReturnChannel nextUnreadUserOrChannel :: MH () nextUnreadUserOrChannel = do st <- use id - setFocusWith True (getNextUnreadUserOrChannel st) + setReturnChannel + setFocusWith True (getNextUnreadUserOrChannel st) gotoReturnChannel leaveChannel :: ChannelId -> MH () leaveChannel cId = leaveChannelIfPossible cId False @@ -912,6 +956,9 @@ isRecentChannel :: ChatState -> ChannelId -> Bool isRecentChannel st cId = st^.csRecentChannel == Just cId + +isReturnChannel :: ChatState -> ChannelId -> Bool +isReturnChannel st cId = st^.csReturnChannel == Just cId joinChannelByName :: Text -> MH () joinChannelByName rawName = do diff --git a/src/State/Common.hs b/src/State/Common.hs --- a/src/State/Common.hs +++ b/src/State/Common.hs @@ -123,6 +123,7 @@ (addMessage $ clientMessageToMessage msg & mMessageId .~ Just (MessageUUID uuid)) csChannels %= modifyChannelById cid addCMsg mh $ invalidateCacheEntry $ ChannelMessages cid + mh $ invalidateCacheEntry ChannelSidebar let msgTy = case msg^.cmType of Error -> LogError diff --git a/src/State/Messages.hs b/src/State/Messages.hs --- a/src/State/Messages.hs +++ b/src/State/Messages.hs @@ -517,7 +517,7 @@ mh $ invalidateCacheEntry (ChannelMessages cId) csChannels %= modifyChannelById cId ((ccContents.cdMessages %~ addMessage msg') . - (adjustUpdated new) . + (if not ignoredJoinLeaveMessage then adjustUpdated new else id) . (\c -> if currCId == cId then c else case newPostData of diff --git a/src/State/Setup.hs b/src/State/Setup.hs --- a/src/State/Setup.hs +++ b/src/State/Setup.hs @@ -40,13 +40,19 @@ incompleteCredentials :: Config -> ConnectionInfo -incompleteCredentials config = ConnectionInfo hStr (configPort config) uStr pStr - where - hStr = maybe "" id $ configHost config - uStr = maybe "" id $ configUser config - pStr = case configPass config of - Just (PasswordString s) -> s - _ -> "" +incompleteCredentials config = ConnectionInfo + { _ciHostname = fromMaybe "" (configHost config) + , _ciPort = configPort config + , _ciUrlPath = fromMaybe "" (configUrlPath config) + , _ciUsername = fromMaybe "" (configUser config) + , _ciPassword = case configPass config of + Just (PasswordString s) -> s + _ -> "" + , _ciAccessToken = case configToken config of + Just (TokenString s) -> s + _ -> "" + , _ciType = configConnectionType config + } apiLogEventToLogMessage :: LogEvent -> IO LogMessage apiLogEventToLogMessage ev = do @@ -73,11 +79,8 @@ let logApiEvent ev = apiLogEventToLogMessage ev >>= sendLogMessage logMgr setLogger cd = cd `withLogger` logApiEvent - connTy = if configUnsafeUseHTTP config - then ConnectHTTP - else ConnectHTTPS $ configValidateServerCertificate config - (mLastAttempt, loginVty) <- interactiveGetLoginSession initialVty mkVty connTy + (mLastAttempt, loginVty) <- interactiveGetLoginSession initialVty mkVty setLogger logMgr (incompleteCredentials config) @@ -86,7 +89,7 @@ Vty.shutdown vty exitSuccess - (session, me, cd) <- case mLastAttempt of + (session, me, cd, mbTeam) <- case mLastAttempt of Nothing -> -- The user never attempted a connection and just chose to -- quit. @@ -95,10 +98,10 @@ -- The user attempted a connection and failed, and then chose -- to quit. shutdown loginVty - Just (AttemptSucceeded _ cd sess user) -> + Just (AttemptSucceeded _ cd sess user mbTeam) -> -- The user attempted a connection and succeeded so continue -- with setup. - return (sess, user, cd) + return (sess, user, cd, mbTeam) teams <- mmGetUsersTeams UserMe session when (Seq.null teams) $ do @@ -107,7 +110,7 @@ (myTeam, teamSelVty) <- do let foundTeam = do - tName <- configTeam config + tName <- mbTeam <|> configTeam config let matchingTeam = listToMaybe $ filter matches $ toList teams matches t = (sanitizeUserText $ teamName t) == tName matchingTeam diff --git a/src/Themes.hs b/src/Themes.hs --- a/src/Themes.hs +++ b/src/Themes.hs @@ -8,6 +8,7 @@ , themeDocs -- * Attribute names + , currentUserAttr , timeAttr , channelHeaderAttr , channelListHeaderAttr @@ -126,6 +127,9 @@ timeAttr :: AttrName timeAttr = "time" +currentUserAttr :: AttrName +currentUserAttr = "currentUser" + channelHeaderAttr :: AttrName channelHeaderAttr = "channelHeader" @@ -236,6 +240,7 @@ lightAttrs = let sty = Sky.kate in [ (timeAttr, fg black) + , (currentUserAttr, defAttr `withStyle` bold) , (channelHeaderAttr, fg black `withStyle` underline) , (channelListHeaderAttr, fg cyan) , (currentChannelNameAttr, black `on` yellow `withStyle` bold) @@ -290,6 +295,7 @@ darkAttrs = let sty = Sky.espresso in [ (timeAttr, fg white) + , (currentUserAttr, defAttr `withStyle` bold) , (channelHeaderAttr, fg white `withStyle` underline) , (channelListHeaderAttr, fg cyan) , (currentChannelNameAttr, black `on` yellow `withStyle` bold) @@ -353,14 +359,46 @@ usernameAttr :: Int -> AttrName usernameAttr i = "username" <> (attrName $ show i) -colorUsername :: Text -> Text -> Widget a -colorUsername username display = +-- | Render a string with a color chosen based on the text of a +-- username. +-- +-- This function takes some display text and renders it using an +-- attribute based on the username associated with the text. If the +-- username associated with the text is equal to the username of +-- the user running Matterhorn, the display text is formatted with +-- 'currentAttr'. Otherwise it is formatted with an attribute chosen +-- by hashing the associated username and choosing from amongst the +-- username color hash buckets with 'usernameAttr'. +-- +-- Usually the first argument to this function will be @myUsername st@, +-- where @st@ is a 'ChatState'. +-- +-- The most common way to call this function is +-- +-- @colorUsername (myUsername st) u u +-- +-- The third argument is allowed to vary from the second since sometimes +-- we call this with the user's status sigil as the third argument. +colorUsername :: Text + -- ^ The username for the user currently running + -- Matterhorn + -> Text + -- ^ The username associated with the text to render + -> Text + -- ^ The text to render + -> Widget a +colorUsername current username display = let normalizedUsername = T.toLower username aName = if normalizedUsername `elem` specialUserMentions then clientEmphAttr else usernameAttr h h = hash normalizedUsername `mod` length usernameColors - in withDefAttr aName $ txt (display) + maybeWithCurrentAttr = if current == username + then withAttr currentUserAttr + else id + in withDefAttr aName $ + maybeWithCurrentAttr $ + txt (display) usernameColors :: [Attr] usernameColors = @@ -633,6 +671,9 @@ ) , ( FB.fileBrowserUnixSocketAttr , "Attribute for Unix sockets in the file browser" + ) + , ( currentUserAttr + , "Attribute for the username of the user running Matterhorn" ) ] <> [ (usernameAttr i, T.pack $ "Username color " <> show i) | i <- [0..(length usernameColors)-1] diff --git a/src/Types.hs b/src/Types.hs --- a/src/Types.hs +++ b/src/Types.hs @@ -40,11 +40,15 @@ , entryIsDMEntry , ciHostname , ciPort + , ciUrlPath , ciUsername , ciPassword + , ciType + , ciAccessToken , Config(..) , HelpScreen(..) , PasswordSource(..) + , TokenSource(..) , MatchType(..) , Mode(..) , ChannelSelectPattern(..) @@ -76,6 +80,7 @@ , csShowChannelList , csPostMap , csRecentChannel + , csReturnChannel , csPostListOverlay , csUserListOverlay , csChannelListOverlay @@ -224,6 +229,7 @@ , isMine , setUserStatus , myUser + , myUsername , myUserId , myTeamId , usernameForUserId @@ -284,7 +290,7 @@ import Data.List ( sortBy, nub, elemIndex ) import qualified Data.Sequence as Seq import qualified Data.Text as T -import Data.Time.Clock ( UTCTime, getCurrentTime, addUTCTime ) +import Data.Time.Clock ( getCurrentTime, addUTCTime ) import Data.UUID ( UUID ) import qualified Data.Vector as Vec import Lens.Micro.Platform ( at, makeLenses, lens, (%~), (^?!), (.=) @@ -326,6 +332,12 @@ | PasswordCommand Text deriving (Eq, Read, Show) +-- | An access token source. +data TokenSource = + TokenString Text + | TokenCommand Text + deriving (Eq, Read, Show) + -- | The type of channel list group headings. data ChannelListGroup = ChannelGroupPublicChannels @@ -355,8 +367,12 @@ -- ^ The team name to use when connecting. , configPort :: Int -- ^ The port to use when connecting. + , configUrlPath :: Maybe Text + -- ^ The server path to use when connecting. , configPass :: Maybe PasswordSource -- ^ The password source to use when connecting. + , configToken :: Maybe TokenSource + -- ^ The token source to use when connecting. , configTimeFormat :: Maybe Text -- ^ The format string for timestamps. , configDateFormat :: Maybe Text @@ -646,11 +662,17 @@ -- necessary to start a connection with a Mattermost server. This is -- built up during interactive authentication and then is used to log -- in. +-- +-- If the access token field is non-empty, that value is used and the +-- username and password values are ignored. data ConnectionInfo = ConnectionInfo { _ciHostname :: Text , _ciPort :: Int + , _ciUrlPath :: Text , _ciUsername :: Text , _ciPassword :: Text + , _ciAccessToken :: Text + , _ciType :: ConnectionType } -- | We want to continue referring to posts by their IDs, but we don't @@ -1231,12 +1253,15 @@ , _csShowMessagePreview :: Bool -- ^ Whether to show the message preview area. , _csShowChannelList :: Bool - -- ^ Whether to show the channe list. + -- ^ Whether to show the channel list. , _csChannelSelectState :: ChannelSelectState -- ^ The state of the user's input and selection for -- channel selection mode. , _csRecentChannel :: Maybe ChannelId -- ^ The most recently-selected channel, if any. + , _csReturnChannel :: Maybe ChannelId + -- ^ The channel to return to after visiting one or more + -- unread channels. , _csUrlList :: List Name LinkChoice -- ^ The URL list used to show URLs drawn from messages in -- a channel. @@ -1317,6 +1342,7 @@ , _csShowChannelList = configShowChannelList $ _crConfiguration startupStateResources , _csChannelSelectState = emptyChannelSelectState , _csRecentChannel = Nothing + , _csReturnChannel = Nothing , _csUrlList = list UrlList mempty 2 , _csConnectionStatus = Connected , _csWorkerIsBusy = Nothing @@ -1875,6 +1901,9 @@ myUser :: ChatState -> User myUser st = st^.csMe + +myUsername :: ChatState -> Text +myUsername st = userUsername $ st^.csMe -- BEWARE: you probably don't want this, but instead -- State.Users.withFetchedUser, since this only looks up users in the diff --git a/src/Types/Channels.hs b/src/Types/Channels.hs --- a/src/Types/Channels.hs +++ b/src/Types/Channels.hs @@ -78,7 +78,7 @@ import Types.Messages ( Messages, noMessages, addMessage , clientMessageToMessage, Message, MessageType ) import Types.Posts ( ClientMessageType(UnknownGapBefore) - , newClientMessage, postIsLeave, postIsJoin ) + , newClientMessage ) import Types.Users ( TypingUsers, noTypingUsers, addTypingUser ) import Types.Common @@ -368,9 +368,7 @@ -- | Adjust updated time based on a message, ensuring that the updated -- time does not move backward. adjustUpdated :: Post -> ClientChannel -> ClientChannel -adjustUpdated m - | postIsLeave m || postIsJoin m = id - | otherwise = +adjustUpdated m = ccInfo.cdUpdated %~ max (maxPostTimestamp m) adjustEditedThreshold :: Post -> ClientChannel -> ClientChannel diff --git a/src/Windows/ViewMessage.hs b/src/Windows/ViewMessage.hs --- a/src/Windows/ViewMessage.hs +++ b/src/Windows/ViewMessage.hs @@ -23,7 +23,6 @@ import Events.Keybindings import Themes import Types -import Types.Messages ( findMessage ) import Markdown import Draw.Messages ( nameForUserRef ) @@ -113,7 +112,7 @@ hs = getHighlightSet st usernameText uids = - renderText' hs $ + renderText' (myUsername st) hs $ T.intercalate ", " $ fmap (userSigil <>) $ catMaybes (lookupUsername <$> F.toList uids) @@ -145,6 +144,7 @@ , mdThreadState = NoThread , mdShowReactions = False , mdMessageWidthLimit = Just vpWidth + , mdMyUsername = myUsername st } in renderMessage md diff --git a/syntax/agda.xml b/syntax/agda.xml --- a/syntax/agda.xml +++ b/syntax/agda.xml @@ -3,7 +3,7 @@ ]> - + abstract @@ -11,6 +11,8 @@ coinductive constructor data + do + eta-equality field forall hiding @@ -20,25 +22,33 @@ infix infixl infixr + instance let + macro + module + mutual + no-eta-equality open + overlap pattern postulate primitive private public - module - mutual quote quoteGoal quoteTerm record renaming rewrite + tactic syntax to unquote + unquoteDecl + unquoteDef using + variable where with @@ -46,7 +56,7 @@ - + diff --git a/syntax/c.xml b/syntax/c.xml --- a/syntax/c.xml +++ b/syntax/c.xml @@ -5,9 +5,12 @@ + + + ]> - - + + @@ -126,6 +129,8 @@ + + @@ -158,19 +163,19 @@ - + - - - + + + - - + + - - + + @@ -203,9 +208,9 @@ - - - + + + @@ -216,8 +221,8 @@ - - + + diff --git a/syntax/cmake.xml b/syntax/cmake.xml --- a/syntax/cmake.xml +++ b/syntax/cmake.xml @@ -9,7 +9,7 @@ Copyright 2004 Alexander Neundorf (neundorf@kde.org) Copyright 2005 Dominik Haumann (dhdev@gmx.de) Copyright 2007,2008,2013,2014 Matthew Woehlke (mw_triad@users.sourceforge.net) - Copyright 2013-2015,2017-2018 Alex Turbov (i.zaufi@gmail.com) + Copyright 2013-2015,2017-2019 Alex Turbov (i.zaufi@gmail.com) ********************************************************************** * This library is free software; you can redistribute it and/or * @@ -31,7 +31,7 @@ target_link_directories target_link_libraries target_link_options + target_precompile_headers target_sources try_compile try_run @@ -248,6 +249,7 @@ COMMAND + COMMAND_ECHO ENCODING ERROR_FILE ERROR_QUIET @@ -268,6 +270,8 @@ AUTO NONE OEM + STDERR + STDOUT UTF8 @@ -287,7 +291,9 @@ FILES_MATCHING FILE_PERMISSIONS FOLLOW_SYMLINKS + FOLLOW_SYMLINK_CHAIN GENERATE + GET_RUNTIME_DEPENDENCIES GLOB GLOB_RECURSE GUARD @@ -317,6 +323,7 @@ PATTERN PERMISSIONS READ + READ_SYMLINK REGEX RELATIVE RELATIVE_PATH @@ -335,6 +342,7 @@ SHA3_512 SHA512 SHOW_PROGRESS + SIZE STATUS STRINGS TIMEOUT @@ -474,6 +482,13 @@ LISTS RANGE + + CACHE_VARIABLES + COMMANDS + COMPONENTS + MACROS + VARIABLES + DEFINITION DIRECTORY @@ -484,8 +499,10 @@ CACHE DIRECTORY EXT + LAST_EXT NAME NAME_WE + NAME_WLE PATH PROGRAM PROGRAM_ARGS @@ -563,6 +580,8 @@ LENGTH ORDER OUTPUT_VARIABLE + POP_BACK + POP_FRONT PREPEND REGEX REMOVE_AT @@ -598,10 +617,14 @@ AUTHOR_WARNING + DEBUG DEPRECATION FATAL_ERROR + NOTICE SEND_ERROR STATUS + TRACE + VERBOSE WARNING @@ -667,6 +690,7 @@ RANDOM RANDOM_SEED REGEX + REPEAT REPLACE REVERSE SHA1 @@ -733,6 +757,7 @@ DEPENDS DEPFILE IMPLICIT_DEPENDS + JOB_POOL MAIN_DEPENDENCY OUTPUT POST_BUILD @@ -753,6 +778,7 @@ DEPENDS DEPFILE IMPLICIT_DEPENDS + JOB_POOL SOURCES USES_TERMINAL VERBATIM @@ -783,6 +809,7 @@ COMMAND + COMMAND_EXPAND_LISTS CONFIGURATIONS NAME WORKING_DIRECTORY @@ -811,10 +838,20 @@ OPTIONAL + ASM + ASM-ATT + ASM_MASM + ASM_NASM C + CSharp + CUDA CXX Fortran + Java + OBJC + OBJCXX RC + Swift ANDROID_MK @@ -911,12 +948,20 @@ ASM + ASM-ATT + ASM_MASM + ASM_NASM C + CSharp CUDA CXX Fortran + Java NONE + OBJC + OBJCXX RC + Swift PROPERTIES @@ -1043,6 +1088,12 @@ PRIVATE PUBLIC + + INTERFACE + PRIVATE + PUBLIC + REUSE_FROM + INTERFACE PRIVATE @@ -1054,6 +1105,7 @@ COPY_FILE COPY_FILE_ERROR LINK_LIBRARIES + LINK_OPTIONS OUTPUT_VARIABLE RESULT_VAR SOURCES @@ -1065,6 +1117,7 @@ COMPILE_OUTPUT_VARIABLE COMPILE_RESULT_VAR LINK_LIBRARIES + LINK_OPTIONS OUTPUT_VARIABLE RUN_OUTPUT_VARIABLE RUN_RESULT_VAR @@ -1129,6 +1182,7 @@ TRACK + BUILD_ID CDASH_UPLOAD CDASH_UPLOAD_TYPE FILES @@ -1138,6 +1192,7 @@ RETRY_COUNT RETRY_DELAY RETURN_VALUE + SUBMIT_URL APPEND @@ -1208,12 +1263,13 @@ CMAKE_AR CMAKE_ARCHIVE_OUTPUT_DIRECTORY CMAKE_ARGC - CMAKE_ARGV0 + CMAKE_AUTOGEN_ORIGIN_DEPENDS CMAKE_AUTOGEN_PARALLEL CMAKE_AUTOGEN_VERBOSE CMAKE_AUTOMOC CMAKE_AUTOMOC_DEPEND_FILTERS CMAKE_AUTOMOC_MOC_OPTIONS + CMAKE_AUTOMOC_PATH_PREFIX CMAKE_AUTOMOC_RELAXED_MODE CMAKE_AUTORCC CMAKE_AUTORCC_OPTIONS @@ -1223,6 +1279,7 @@ CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BINARY_DIR CMAKE_BUILD_RPATH + CMAKE_BUILD_RPATH_USE_ORIGIN CMAKE_BUILD_TOOL CMAKE_BUILD_TYPE CMAKE_BUILD_WITH_INSTALL_NAME_DIR @@ -1248,6 +1305,7 @@ CMAKE_CROSSCOMPILING_EMULATOR CMAKE_CTEST_COMMAND CMAKE_CUDA_EXTENSIONS + CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS CMAKE_CUDA_SEPARABLE_COMPILATION CMAKE_CUDA_STANDARD CMAKE_CUDA_STANDARD_REQUIRED @@ -1274,16 +1332,19 @@ CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT CMAKE_ECLIPSE_MAKE_ARGUMENTS + CMAKE_ECLIPSE_RESOURCE_ENCODING CMAKE_ECLIPSE_VERSION CMAKE_EDIT_COMMAND CMAKE_ENABLE_EXPORTS CMAKE_ERROR_DEPRECATED CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_EXECUTABLE_SUFFIX + CMAKE_EXECUTE_PROCESS_COMMAND_ECHO CMAKE_EXE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS_INIT CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_NO_PACKAGE_REGISTRY + CMAKE_EXPORT_PACKAGE_REGISTRY CMAKE_EXTRA_GENERATOR CMAKE_EXTRA_INCLUDE_FILES CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES @@ -1297,6 +1358,8 @@ CMAKE_FIND_PACKAGE_NAME CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY + CMAKE_FIND_PACKAGE_PREFER_CONFIG + CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS CMAKE_FIND_PACKAGE_SORT_DIRECTION CMAKE_FIND_PACKAGE_SORT_ORDER CMAKE_FIND_PACKAGE_WARN_NO_MODULE @@ -1305,7 +1368,15 @@ CMAKE_FIND_ROOT_PATH_MODE_LIBRARY CMAKE_FIND_ROOT_PATH_MODE_PACKAGE CMAKE_FIND_ROOT_PATH_MODE_PROGRAM + CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH + CMAKE_FIND_USE_CMAKE_PATH + CMAKE_FIND_USE_CMAKE_SYSTEM_PATH + CMAKE_FIND_USE_PACKAGE_REGISTRY + CMAKE_FIND_USE_PACKAGE_ROOT_PATH + CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH + CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY CMAKE_FOLDER + CMAKE_FRAMEWORK CMAKE_FRAMEWORK_PATH CMAKE_Fortran_FORMAT CMAKE_Fortran_MODDIR_DEFAULT @@ -1316,6 +1387,10 @@ CMAKE_GENERATOR_INSTANCE CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET + CMAKE_GLOBAL_AUTOGEN_TARGET + CMAKE_GLOBAL_AUTOGEN_TARGET_NAME + CMAKE_GLOBAL_AUTORCC_TARGET + CMAKE_GLOBAL_AUTORCC_TARGET_NAME CMAKE_GNUtoMS CMAKE_HAS_ANSI_STRING_STREAM CMAKE_HOME_DIRECTORY @@ -1374,6 +1449,7 @@ CMAKE_INSTALL_OPENMP_LIBRARIES CMAKE_INSTALL_PREFIX CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT + CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH CMAKE_INSTALL_RPATH CMAKE_INSTALL_RPATH_USE_LINK_PATH CMAKE_INSTALL_RUNSTATEDIR @@ -1412,12 +1488,16 @@ CMAKE_MAJOR_VERSION CMAKE_MAKE_PROGRAM CMAKE_MATCH_COUNT + CMAKE_MAXIMUM_RECURSION_DEPTH + CMAKE_MESSAGE_INDENT CMAKE_MFC_FLAG CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_MINOR_VERSION CMAKE_MODULE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS_INIT CMAKE_MODULE_PATH + CMAKE_MSVCIDE_RUN_PATH + CMAKE_MSVC_RUNTIME_LIBRARY CMAKE_NETRC CMAKE_NETRC_FILE CMAKE_NINJA_OUTPUT_PATH_PREFIX @@ -1440,6 +1520,8 @@ CMAKE_PROGRAM_PATH CMAKE_PROJECT_DESCRIPTION CMAKE_PROJECT_HOMEPAGE_URL + CMAKE_PROJECT_INCLUDE + CMAKE_PROJECT_INCLUDE_BEFORE CMAKE_PROJECT_NAME CMAKE_PROJECT_VERSION CMAKE_PROJECT_VERSION_MAJOR @@ -1451,6 +1533,7 @@ CMAKE_REQUIRED_FLAGS CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES + CMAKE_REQUIRED_LINK_OPTIONS CMAKE_REQUIRED_QUIET CMAKE_ROOT CMAKE_RUNTIME_OUTPUT_DIRECTORY @@ -1495,6 +1578,7 @@ CMAKE_SYSTEM_PROGRAM_PATH CMAKE_SYSTEM_VERSION CMAKE_Swift_LANGUAGE_VERSION + CMAKE_Swift_MODULE_DIRECTORY CMAKE_THREAD_LIBS_INIT CMAKE_THREAD_PREFER_PTHREAD CMAKE_TOOLCHAIN_FILE @@ -1502,6 +1586,8 @@ CMAKE_TRY_COMPILE_PLATFORM_VARIABLES CMAKE_TRY_COMPILE_TARGET_TYPE CMAKE_TWEAK_VERSION + CMAKE_UNITY_BUILD + CMAKE_UNITY_BUILD_BATCH_SIZE CMAKE_USER_MAKE_RULES_OVERRIDE CMAKE_USE_PTHREADS_INIT CMAKE_USE_RELATIVE_PATHS @@ -1515,6 +1601,7 @@ CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD CMAKE_VS_INTEL_Fortran_PROJECT_VERSION + CMAKE_VS_JUST_MY_CODE_DEBUGGING CMAKE_VS_MSBUILD_COMMAND CMAKE_VS_NsightTegra_VERSION CMAKE_VS_PLATFORM_NAME @@ -1538,6 +1625,7 @@ CMAKE_XCODE_PLATFORM_TOOLSET CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN + CMAKE_XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE @@ -1644,6 +1732,7 @@ CPACK_IFW_PACKAGE_REMOVE_TARGET_DIR CPACK_IFW_PACKAGE_RESOURCES CPACK_IFW_PACKAGE_START_MENU_DIRECTORY + CPACK_IFW_PACKAGE_STYLE_SHEET CPACK_IFW_PACKAGE_TITLE CPACK_IFW_PACKAGE_TITLE_COLOR CPACK_IFW_PACKAGE_WATERMARK @@ -1664,6 +1753,7 @@ CPACK_INSTALL_COMMANDS CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS CPACK_INSTALL_SCRIPT + CPACK_INSTALL_SCRIPTS CPACK_MONOLITHIC_INSTALL CPACK_NSIS_COMPRESSOR CPACK_NSIS_CONTACT @@ -1719,6 +1809,7 @@ CPACK_PACKAGE_INSTALL_DIRECTORY CPACK_PACKAGE_INSTALL_REGISTRY_KEY CPACK_PACKAGE_NAME + CPACK_PACKAGE_RELOCATABLE CPACK_PACKAGE_VENDOR CPACK_PACKAGE_VERSION CPACK_PACKAGE_VERSION_MAJOR @@ -1884,6 +1975,7 @@ CTEST_SCP_COMMAND CTEST_SITE CTEST_SOURCE_DIRECTORY + CTEST_SUBMIT_URL CTEST_SVN_COMMAND CTEST_SVN_OPTIONS CTEST_SVN_UPDATE_OPTIONS @@ -1893,6 +1985,7 @@ CTEST_UPDATE_COMMAND CTEST_UPDATE_OPTIONS CTEST_UPDATE_VERSION_ONLY + CTEST_UPDATE_VERSION_OVERRIDE CTEST_USE_LAUNCHERS CYGWIN EXECUTABLE_OUTPUT_PATH @@ -1964,6 +2057,8 @@ PROJECT_VERSION_PATCH PROJECT_VERSION_TWEAK QTIFWDIR + SWIG_OUTFILE_DIR + SWIG_SOURCE_FILE_EXTENSIONS THREADS_PREFER_PTHREAD_FLAG UNIX WIN32 @@ -1973,6 +2068,45 @@ XCODE XCODE_VERSION + + + CC + CFLAGS + CMAKE_APPBUNDLE_PATH + CMAKE_BUILD_PARALLEL_LEVEL + CMAKE_CONFIG_TYPE + CMAKE_FRAMEWORK_PATH + CMAKE_GENERATOR + CMAKE_GENERATOR_INSTANCE + CMAKE_GENERATOR_PLATFORM + CMAKE_GENERATOR_TOOLSET + CMAKE_MSVCIDE_RUN_PATH + CMAKE_NO_VERBOSE + CMAKE_OSX_ARCHITECTURES + CMAKE_PREFIX_PATH + CSFLAGS + CTEST_INTERACTIVE_DEBUG_MODE + CTEST_OUTPUT_ON_FAILURE + CTEST_PARALLEL_LEVEL + CTEST_PROGRESS_OUTPUT + CTEST_USE_LAUNCHERS_DEFAULT + CUDACXX + CUDAFLAGS + CUDAHOSTCXX + CXX + CXXFLAGS + DASHBOARD_TEST_FROM_CTEST + DESTDIR + FC + FFLAGS + LDFLAGS + MACOSX_DEPLOYMENT_TARGET + PATH + RC + RCFLAGS + SWIFTC + VERBOSE + ALLOW_DUPLICATE_CUSTOM_TARGETS AUTOGEN_SOURCE_GROUP @@ -1982,6 +2116,7 @@ AUTORCC_SOURCE_GROUP CMAKE_CXX_KNOWN_FEATURES CMAKE_C_KNOWN_FEATURES + CMAKE_ROLE DEBUG_CONFIGURATIONS DISABLED_FEATURES ECLIPSE_EXTRA_NATURES @@ -2014,6 +2149,7 @@ XCODE_EMIT_EFFECTIVE_PLATFORM_NAME + ADDITIONAL_CLEAN_FILES ADDITIONAL_MAKE_CLEAN_FILES BINARY_DIR BUILDSYSTEM_TARGETS @@ -2046,6 +2182,7 @@ VS_STARTUP_PROJECT + ADDITIONAL_CLEAN_FILES ALIASED_TARGET ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API @@ -2067,17 +2204,25 @@ ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_NAME AUTOGEN_BUILD_DIR + AUTOGEN_ORIGIN_DEPENDS AUTOGEN_TARGET_DEPENDS AUTOMOC + AUTOMOC_COMPILER_PREDEFINES AUTOMOC_DEPEND_FILTERS + AUTOMOC_EXECUTABLE + AUTOMOC_MACRO_NAMES AUTOMOC_MOC_OPTIONS + AUTOMOC_PATH_PREFIX AUTORCC + AUTORCC_EXECUTABLE AUTORCC_OPTIONS AUTOUIC + AUTOUIC_EXECUTABLE AUTOUIC_OPTIONS AUTOUIC_SEARCH_PATHS BINARY_DIR BUILD_RPATH + BUILD_RPATH_USE_ORIGIN BUILD_WITH_INSTALL_NAME_DIR BUILD_WITH_INSTALL_RPATH BUNDLE @@ -2109,6 +2254,7 @@ DEFINE_SYMBOL DEPLOYMENT_ADDITIONAL_FILES DEPLOYMENT_REMOTE_DIRECTORY + DISABLE_PRECOMPILE_HEADERS DOTNET_TARGET_FRAMEWORK_VERSION ENABLE_EXPORTS EXCLUDE_FROM_ALL @@ -2143,6 +2289,7 @@ IMPORT_SUFFIX INCLUDE_DIRECTORIES INSTALL_NAME_DIR + INSTALL_REMOVE_ENVIRONMENT_RPATH INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH INTERFACE_AUTOUIC_OPTIONS @@ -2155,6 +2302,7 @@ INTERFACE_LINK_LIBRARIES INTERFACE_LINK_OPTIONS INTERFACE_POSITION_INDEPENDENT_CODE + INTERFACE_PRECOMPILE_HEADERS INTERFACE_SOURCES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES INTERPROCEDURAL_OPTIMIZATION @@ -2182,6 +2330,7 @@ MACOSX_FRAMEWORK_INFO_PLIST MACOSX_RPATH MANUALLY_ADDED_DEPENDENCIES + MSVC_RUNTIME_LIBRARY NAME NO_SONAME NO_SYSTEM_FROM_IMPORTED @@ -2190,6 +2339,8 @@ PDB_NAME PDB_OUTPUT_DIRECTORY POSITION_INDEPENDENT_CODE + PRECOMPILE_HEADERS + PRECOMPILE_HEADERS_REUSE_FROM PREFIX PRIVATE_HEADER PROJECT_LABEL @@ -2207,7 +2358,14 @@ STATIC_LIBRARY_FLAGS STATIC_LIBRARY_OPTIONS SUFFIX + Swift_DEPENDENCIES_FILE + Swift_MODULE_DIRECTORY + Swift_MODULE_NAME TYPE + UNITY_BUILD + UNITY_BUILD_BATCH_SIZE + UNITY_BUILD_CODE_AFTER_INCLUDE + UNITY_BUILD_CODE_BEFORE_INCLUDE VERSION VISIBILITY_INLINES_HIDDEN VS_CONFIGURATION_TYPE @@ -2219,13 +2377,18 @@ VS_DOTNET_REFERENCES VS_DOTNET_REFERENCES_COPY_LOCAL VS_DOTNET_TARGET_FRAMEWORK_VERSION + VS_DPI_AWARE VS_GLOBAL_KEYWORD VS_GLOBAL_PROJECT_TYPES VS_GLOBAL_ROOTNAMESPACE VS_IOT_EXTENSIONS_VERSION VS_IOT_STARTUP_TASK + VS_JUST_MY_CODE_DEBUGGING VS_KEYWORD VS_MOBILE_EXTENSIONS_VERSION + VS_NO_SOLUTION_DEPLOY + VS_PACKAGE_REFERENCES + VS_PROJECT_IMPORT VS_SCC_AUXPATH VS_SCC_LOCALPATH VS_SCC_PROJECTNAME @@ -2239,10 +2402,13 @@ WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS XCODE_EXPLICIT_FILE_TYPE + XCODE_GENERATE_SCHEME XCODE_PRODUCT_TYPE XCODE_SCHEME_ADDRESS_SANITIZER XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN XCODE_SCHEME_ARGUMENTS + XCODE_SCHEME_DEBUG_AS_ROOT + XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE @@ -2283,7 +2449,11 @@ SKIP_AUTOMOC SKIP_AUTORCC SKIP_AUTOUIC + SKIP_PRECOMPILE_HEADERS + SKIP_UNITY_BUILD_INCLUSION SYMBOLIC + Swift_DEPENDENCIES_FILE + Swift_DIAGNOSTICS_FILE VS_COPY_TO_OUT_DIR VS_DEPLOYMENT_CONTENT VS_DEPLOYMENT_LOCATION @@ -2324,6 +2494,7 @@ REQUIRED_FILES RESOURCE_LOCK RUN_SERIAL + SKIP_REGULAR_EXPRESSION SKIP_RETURN_CODE TIMEOUT TIMEOUT_AFTER_MATCH @@ -2350,61 +2521,76 @@ 0 1 - AND - ANGLE-R BOOL - BUILD_INTERFACE - COMMA - COMPILE_FEATURES - COMPILE_LANGUAGE + AND + OR + NOT + STREQUAL + EQUAL + IN_LIST + VERSION_LESS + VERSION_GREATER + VERSION_EQUAL + VERSION_LESS_EQUAL + VERSION_GREATER_EQUAL + TARGET_EXISTS CONFIG - CXX_COMPILER_ID - CXX_COMPILER_VERSION + PLATFORM_ID C_COMPILER_ID + CXX_COMPILER_ID + CUDA_COMPILER_ID + Fortran_COMPILER_ID C_COMPILER_VERSION - EQUAL - GENEX_EVAL + CXX_COMPILER_VERSION + CUDA_COMPILER_VERSION + Fortran_COMPILER_VERSION + TARGET_POLICY + COMPILE_FEATURES + COMPILE_LANG_AND_ID + COMPILE_LANGUAGE + ANGLE-R + COMMA + SEMICOLON IF - INSTALL_INTERFACE - INSTALL_PREFIX - IN_LIST JOIN - LINK_ONLY + REMOVE_DUPLICATES + FILTER LOWER_CASE - MAKE_C_IDENTIFIER - NOT - OR - PLATFORM_ID - SEMICOLON - SHELL_PATH - STREQUAL - TARGET_BUNDLE_CONTENT_DIR - TARGET_BUNDLE_DIR - TARGET_EXISTS + UPPER_CASE + GENEX_EVAL + TARGET_GENEX_EVAL + TARGET_NAME_IF_EXISTS TARGET_FILE - TARGET_FILE_DIR + TARGET_FILE_BASE_NAME + TARGET_FILE_PREFIX + TARGET_FILE_SUFFIX TARGET_FILE_NAME - TARGET_GENEX_EVAL + TARGET_FILE_DIR TARGET_LINKER_FILE - TARGET_LINKER_FILE_DIR + TARGET_LINKER_FILE_BASE_NAME + TARGET_LINKER_FILE_PREFIX + TARGET_LINKER_FILE_SUFFIX TARGET_LINKER_FILE_NAME - TARGET_NAME - TARGET_NAME_IF_EXISTS - TARGET_OBJECTS + TARGET_LINKER_FILE_DIR + TARGET_SONAME_FILE + TARGET_SONAME_FILE + TARGET_SONAME_FILE_NAME + TARGET_SONAME_FILE_DIR TARGET_PDB_FILE - TARGET_PDB_FILE_DIR + TARGET_PDB_FILE_BASE_NAME TARGET_PDB_FILE_NAME - TARGET_POLICY + TARGET_PDB_FILE_DIR + TARGET_BUNDLE_DIR + TARGET_BUNDLE_CONTENT_DIR TARGET_PROPERTY - TARGET_SONAME_FILE - TARGET_SONAME_FILE_DIR - TARGET_SONAME_FILE_NAME - UPPER_CASE - VERSION_EQUAL - VERSION_GREATER - VERSION_GREATER_EQUAL - VERSION_LESS - VERSION_LESS_EQUAL + INSTALL_PREFIX + TARGET_NAME + LINK_ONLY + INSTALL_INTERFACE + BUILD_INTERFACE + MAKE_C_IDENTIFIER + TARGET_OBJECTS + SHELL_PATH @@ -2501,6 +2687,7 @@ + @@ -2637,11 +2824,18 @@ + + + + + + + @@ -2711,6 +2905,7 @@ + @@ -2953,18 +3148,30 @@ + + + + + + + + + + + + @@ -3014,10 +3221,16 @@ + + + + + + @@ -3297,6 +3510,14 @@ + + + + + + + + @@ -3538,6 +3759,7 @@ + @@ -3598,6 +3820,7 @@ + @@ -3609,8 +3832,8 @@ - - + + @@ -3629,7 +3852,7 @@ - + @@ -3706,11 +3929,28 @@ - + + + + + + + + + + + + + + + + + + @@ -3809,10 +4049,12 @@ + - + + diff --git a/syntax/coffee.xml b/syntax/coffee.xml --- a/syntax/coffee.xml +++ b/syntax/coffee.xml @@ -2,8 +2,8 @@ - + - + - + - + - + - + @@ -279,16 +279,17 @@ + - + - - + + @@ -320,7 +321,6 @@ - diff --git a/syntax/cpp.xml b/syntax/cpp.xml --- a/syntax/cpp.xml +++ b/syntax/cpp.xml @@ -11,12 +11,12 @@ - + + @@ -1258,8 +1259,9 @@ selection - + not + matches @@ -1383,8 +1385,8 @@ - - + + @@ -1393,7 +1395,8 @@ - + + @@ -1548,7 +1551,7 @@ - + diff --git a/syntax/diff.xml b/syntax/diff.xml --- a/syntax/diff.xml +++ b/syntax/diff.xml @@ -15,7 +15,7 @@ 2008-02-13: 1.11 Eduardo Robles Elvira Fixed folding. --> - + diff --git a/syntax/djangotemplate.xml b/syntax/djangotemplate.xml --- a/syntax/djangotemplate.xml +++ b/syntax/djangotemplate.xml @@ -4,7 +4,7 @@ ]> - + ]> - + diff --git a/syntax/elixir.xml b/syntax/elixir.xml --- a/syntax/elixir.xml +++ b/syntax/elixir.xml @@ -24,13 +24,13 @@ + version="5"> catch diff --git a/syntax/elm.xml b/syntax/elm.xml --- a/syntax/elm.xml +++ b/syntax/elm.xml @@ -1,6 +1,6 @@ - + type @@ -40,7 +40,7 @@ - + @@ -81,16 +81,16 @@ - + - + - + @@ -99,7 +99,7 @@ - + @@ -110,27 +110,27 @@ + - - - + + + - - + + - - - - - + + + + + - - - - - - - + + + + + + diff --git a/syntax/glsl.xml b/syntax/glsl.xml --- a/syntax/glsl.xml +++ b/syntax/glsl.xml @@ -1,6 +1,6 @@ - + break diff --git a/syntax/haskell.xml b/syntax/haskell.xml --- a/syntax/haskell.xml +++ b/syntax/haskell.xml @@ -1,6 +1,6 @@ - + case diff --git a/syntax/html.xml b/syntax/html.xml --- a/syntax/html.xml +++ b/syntax/html.xml @@ -5,7 +5,7 @@ ]> - + @@ -20,8 +20,19 @@ + + + + + + + + + + + @@ -54,8 +65,6 @@ - - @@ -163,16 +172,23 @@ - + + + + + + + + + - @@ -200,6 +216,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/idris.xml b/syntax/idris.xml --- a/syntax/idris.xml +++ b/syntax/idris.xml @@ -9,13 +9,16 @@ case class codata + constructor covering data default do dsl else + export if + implementation implicit import impossible @@ -26,10 +29,11 @@ infixl infixr instance + interface lambda let module - mututal + mutual namespace of parameters diff --git a/syntax/ini.xml b/syntax/ini.xml --- a/syntax/ini.xml +++ b/syntax/ini.xml @@ -1,6 +1,6 @@ - + diff --git a/syntax/isocpp.xml b/syntax/isocpp.xml --- a/syntax/isocpp.xml +++ b/syntax/isocpp.xml @@ -22,7 +22,7 @@ + break case @@ -55,14 +56,14 @@ try while + alignof alignas asm auto class - concept - requires + consteval constexpr const_cast decltype @@ -70,7 +71,6 @@ dynamic_cast enum explicit - export false final friend @@ -110,20 +110,26 @@ or_eq xor xor_eq + + concept + requires - - - - - + + + import + module + export + + co_await + co_return + co_yield + + bool char + char8_t char16_t char32_t double @@ -216,7 +224,7 @@ const extern mutable - register + register static thread_local volatile @@ -239,7 +247,10 @@ __func__ assert _Pragma + __has_include + + __has_cpp_attribute __VA_ARGS__ @@ -283,15 +294,15 @@ + + + - - - @@ -309,6 +320,9 @@ + + + @@ -505,8 +519,10 @@ + + @@ -684,6 +700,7 @@ + diff --git a/syntax/javascript-react.xml b/syntax/javascript-react.xml new file mode 100644 --- /dev/null +++ b/syntax/javascript-react.xml @@ -0,0 +1,421 @@ + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/javascript.xml b/syntax/javascript.xml --- a/syntax/javascript.xml +++ b/syntax/javascript.xml @@ -1,293 +1,2029 @@ -]> - - - - - - - await - break - case - catch - continue - debugger - do - else - finally - for - if - return - switch - throw - try - while - with - - - const - delete - function - in - instanceof - new - of - this - typeof - var - void - - - async - class - enum - extends - super - - - arguments - implements - interface - let - private - protected - public - static - yield - - - import - from - as - default - export - package - - - Infinity - NaN - false - null - true - undefined - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +]> + + + + + + + + await + break + case + catch + continue + debugger + do + else + finally + for + if + return + switch + throw + try + while + with + + + const + delete + function + in + instanceof + new + of + this + typeof + var + void + + + async + class + enum + extends + super + + + arguments + implements + interface + let + private + protected + public + static + yield + + + import + from + as + default + export + package + + + Infinity + NaN + false + null + true + undefined + + + + + + Array + ArrayBuffer + Atomics + Boolean + BigInt + BigInt64Array + BigUint64Array + DataView + Date + Float32Array + Float64Array + Function + Generator + GeneratorFunction + Int8Array + Int16Array + Int32Array + Intl + Map + Object + Proxy + Reflect + RegExp + Set + SharedArrayBuffer + SIMD + String + Symbol + TypedArray + Uint8Array + Uint16Array + Uint32Array + Uint8ClampedArray + WeakMap + WeakSet + + Error + EvalError + InternalError + RangeError + ReferenceError + SyntaxError + TypeError + URIError + + Number + + Math + + Promise + + JSON + console + process + + + + AnalyserNode + ArrayBufferView + Attr + AudioBuffer + AudioBufferSourceNode + AudioContext + AudioDestinationNode + AudioListener + AudioNode + AudioParam + BatteryManager + BeforeUnloadEvent + BiquadFilterNode + Blob + BufferSource + ByteString + CSS + CSSConditionRule + CSSCounterStyleRule + CSSGroupingRule + CSSMatrix + CSSMediaRule + CSSPageRule + CSSPrimitiveValue + CSSRule + CSSRuleList + CSSStyleDeclaration + CSSStyleRule + CSSStyleSheet + CSSSupportsRule + CSSValue + CSSValueList + CanvasGradient + CanvasImageSource + CanvasPattern + CanvasRenderingContext2D + ChannelMergerNode + ChannelSplitterNode + CharacterData + ChromeWorker + CloseEvent + Comment + CompositionEvent + Console + ConvolverNode + Coordinates + Credential + CredentialsContainer + Crypto + CryptoKey + CustomEvent + DOMError + DOMException + DOMHighResTimeStamp + DOMImplementation + DOMString + DOMStringList + DOMStringMap + DOMTimeStamp + DOMTokenList + DataTransfer + DataTransferItem + DataTransferItemList + DedicatedWorkerGlobalScope + DelayNode + DeviceProximityEvent + DirectoryEntry + DirectoryEntrySync + DirectoryReader + DirectoryReaderSync + Document + DocumentFragment + DocumentTouch + DocumentType + DragEvent + DynamicsCompressorNode + Element + Entry + EntrySync + ErrorEvent + Event + EventListener + EventSource + EventTarget + FederatedCredential + FetchEvent + File + FileEntry + FileEntrySync + FileException + FileList + FileReader + FileReaderSync + FileSystem + FileSystemSync + FontFace + FormData + GainNode + Gamepad + GamepadButton + GamepadEvent + Geolocation + GlobalEventHandlers + HTMLAnchorElement + HTMLAreaElement + HTMLAudioElement + HTMLBRElement + HTMLBaseElement + HTMLBodyElement + HTMLButtonElement + HTMLCanvasElement + HTMLCollection + HTMLContentElement + HTMLDListElement + HTMLDataElement + HTMLDataListElement + HTMLDialogElement + HTMLDivElement + HTMLDocument + HTMLElement + HTMLEmbedElement + HTMLFieldSetElement + HTMLFontElement + HTMLFormControlsCollection + HTMLFormElement + HTMLHRElement + HTMLHeadElement + HTMLHeadingElement + HTMLHtmlElement + HTMLIFrameElement + HTMLImageElement + HTMLInputElement + HTMLKeygenElement + HTMLLIElement + HTMLLabelElement + HTMLLegendElement + HTMLLinkElement + HTMLMapElement + HTMLMediaElement + HTMLMetaElement + HTMLMeterElement + HTMLModElement + HTMLOListElement + HTMLObjectElement + HTMLOptGroupElement + HTMLOptionElement + HTMLOptionsCollection + HTMLOutputElement + HTMLParagraphElement + HTMLParamElement + HTMLPreElement + HTMLProgressElement + HTMLQuoteElement + HTMLScriptElement + HTMLSelectElement + HTMLShadowElement + HTMLSourceElement + HTMLSpanElement + HTMLStyleElement + HTMLTableCaptionElement + HTMLTableCellElement + HTMLTableColElement + HTMLTableDataCellElement + HTMLTableElement + HTMLTableHeaderCellElement + HTMLTableRowElement + HTMLTableSectionElement + HTMLTextAreaElement + HTMLTimeElement + HTMLTitleElement + HTMLTrackElement + HTMLUListElement + HTMLUnknownElement + HTMLVideoElement + HashChangeEvent + History + IDBCursor + IDBCursorWithValue + IDBDatabase + IDBEnvironment + IDBFactory + IDBIndex + IDBKeyRange + IDBMutableFile + IDBObjectStore + IDBOpenDBRequest + IDBRequest + IDBTransaction + IDBVersionChangeEvent + IIRFilterNode + IdentityManager + ImageBitmap + ImageBitmapFactories + ImageData + Index + InputDeviceCapabilities + InputEvent + InstallEvent + InstallTrigger + KeyboardEvent + LinkStyle + LocalFileSystem + LocalFileSystemSync + Location + MIDIAccess + MIDIConnectionEvent + MIDIInput + MIDIInputMap + MIDIOutputMap + MediaElementAudioSourceNode + MediaError + MediaKeyMessageEvent + MediaKeySession + MediaKeyStatusMap + MediaKeySystemAccess + MediaKeySystemConfiguration + MediaKeys + MediaRecorder + MediaStream + MediaStreamAudioDestinationNode + MediaStreamAudioSourceNode + MessageChannel + MessageEvent + MessagePort + MouseEvent + MutationObserver + MutationRecord + NamedNodeMap + Navigator + NavigatorConcurrentHardware + NavigatorGeolocation + NavigatorID + NavigatorLanguage + NavigatorOnLine + Node + NodeFilter + NodeIterator + NodeList + NonDocumentTypeChildNode + Notification + OfflineAudioCompletionEvent + OfflineAudioContext + OscillatorNode + PageTransitionEvent + PannerNode + ParentNode + PasswordCredential + Path2D + PaymentAddress + PaymentRequest + PaymentResponse + Performance + PerformanceEntry + PerformanceFrameTiming + PerformanceMark + PerformanceMeasure + PerformanceNavigation + PerformanceNavigationTiming + PerformanceObserver + PerformanceObserverEntryList + PerformanceResourceTiming + PerformanceTiming + PeriodicSyncEvent + PeriodicWave + Plugin + Point + PointerEvent + PopStateEvent + PortCollection + Position + PositionError + PositionOptions + PresentationConnectionClosedEvent + PresentationConnectionList + PresentationReceiver + ProcessingInstruction + ProgressEvent + PromiseRejectionEvent + PushEvent + PushRegistrationManager + RTCCertificate + RTCConfiguration + RTCPeerConnection + RTCSessionDescriptionCallback + RTCStatsReport + RadioNodeList + RandomSource + Range + ReadableByteStream + RenderingContext + SVGAElement + SVGAngle + SVGAnimateColorElement + SVGAnimateElement + SVGAnimateMotionElement + SVGAnimateTransformElement + SVGAnimatedAngle + SVGAnimatedBoolean + SVGAnimatedEnumeration + SVGAnimatedInteger + SVGAnimatedLength + SVGAnimatedLengthList + SVGAnimatedNumber + SVGAnimatedNumberList + SVGAnimatedPoints + SVGAnimatedPreserveAspectRatio + SVGAnimatedRect + SVGAnimatedString + SVGAnimatedTransformList + SVGAnimationElement + SVGCircleElement + SVGClipPathElement + SVGCursorElement + SVGDefsElement + SVGDescElement + SVGElement + SVGEllipseElement + SVGEvent + SVGFilterElement + SVGFontElement + SVGFontFaceElement + SVGFontFaceFormatElement + SVGFontFaceNameElement + SVGFontFaceSrcElement + SVGFontFaceUriElement + SVGForeignObjectElement + SVGGElement + SVGGlyphElement + SVGGradientElement + SVGHKernElement + SVGImageElement + SVGLength + SVGLengthList + SVGLineElement + SVGLinearGradientElement + SVGMPathElement + SVGMaskElement + SVGMatrix + SVGMissingGlyphElement + SVGNumber + SVGNumberList + SVGPathElement + SVGPatternElement + SVGPoint + SVGPolygonElement + SVGPolylineElement + SVGPreserveAspectRatio + SVGRadialGradientElement + SVGRect + SVGRectElement + SVGSVGElement + SVGScriptElement + SVGSetElement + SVGStopElement + SVGStringList + SVGStylable + SVGStyleElement + SVGSwitchElement + SVGSymbolElement + SVGTRefElement + SVGTSpanElement + SVGTests + SVGTextElement + SVGTextPositioningElement + SVGTitleElement + SVGTransform + SVGTransformList + SVGTransformable + SVGUseElement + SVGVKernElement + SVGViewElement + ServiceWorker + ServiceWorkerContainer + ServiceWorkerGlobalScope + ServiceWorkerRegistration + ServiceWorkerState + ShadowRoot + SharedWorker + SharedWorkerGlobalScope + SourceBufferList + StereoPannerNode + Storage + StorageEvent + StyleSheet + StyleSheetList + SubtleCrypto + SyncEvent + Text + TextMetrics + TimeEvent + TimeRanges + Touch + TouchEvent + TouchList + Transferable + TreeWalker + UIEvent + USVString + VRDisplayCapabilities + ValidityState + WaveShaperNode + WebGL + WebGLActiveInfo + WebGLBuffer + WebGLContextEvent + WebGLFramebuffer + WebGLProgram + WebGLRenderbuffer + WebGLRenderingContext + WebGLShader + WebGLShaderPrecisionFormat + WebGLTexture + WebGLTimerQueryEXT + WebGLTransformFeedback + WebGLUniformLocation + WebGLVertexArrayObject + WebGLVertexArrayObjectOES + WebSocket + WebSockets + WebVTT + WheelEvent + Window + WindowBase64 + WindowEventHandlers + WindowTimers + Worker + WorkerGlobalScope + WorkerLocation + WorkerNavigator + XMLHttpRequest + XMLHttpRequestEventTarget + XMLSerializer + XPathExpression + XPathResult + XSLTProcessor + + + + Buffer + EventEmitter + Server + Pipe + Socket + REPLServer + ReadStream + WriteStream + Stream + Inflate + Deflate + InflateRaw + DeflateRaw + GZip + GUnzip + Unzip + Zip + + + + + constructor + length + prototype + __proto__ + + + + clearInterval + clearTimeout + decodeURI + decodeURIComponent + encodeURI + encodeURIComponent + escape + eval + isFinite + isNaN + parseFloat + parseInt + require + setTimeout + setInterval + super + unescape + uneval + + + + + assert + clear + count + debug + dir + error + group + groupCollapsed + groupEnd + info + log + profile + profileEnd + table + time + timeEnd + timeStamp + trace + warn + + + + arch + argv + config + connected + env + execArgv + execPath + exitCode + mainModule + pid + platform + release + stderr + stdin + stdout + title + version + versions + + + + abort + chdir + cwd + disconnect + exit + setegid + seteuid + getegid + geteuid + setgid + setuid + getgid + getuid + send + setgroups + getgroups + initgroups + kill + memoryUsage + nextTick + umask + uptime + hrtime + + + + + EPSILON + MAX_SAFE_INTEGER + MAX_VALUE + MIN_SAFE_INTEGER + MIN_VALUE + NEGATIVE_INFINITY + POSITIVE_INFINITY + + + + E + LN10 + LN2 + LOG10E + LOG2E + PI + SQRT1_2 + SQRT2 + + + + abs + acos + acosh + asin + asinh + atan + atan2 + atanh + cbrt + ceil + clz32 + cos + cosh + exp + expm1 + floor + fround + hypot + imul + log + log10 + log1p + log2 + max + min + pow + random + round + sign + sin + sinh + sqrt + tan + tanh + trunc + + + + parse + stringify + + + + all + catch + finally + race + reject + resolve + then + + + + + global + GLOBAL + root + __dirname + __filename + + + + document + event + navigator + performance + screen + window + + + + ATTRIBUTE_NODE + CDATA_SECTION_NODE + COMMENT_NODE + DOCUMENT_FRAGMENT_NODE + DOCUMENT_NODE + DOCUMENT_TYPE_NODE + DOMSTRING_SIZE_ERR + ELEMENT_NODE + ENTITY_NODE + ENTITY_REFERENCE_NODE + HIERARCHY_REQUEST_ERR + INDEX_SIZE_ERR + INUSE_ATTRIBUTE_ERR + INVALID_CHARACTER_ERR + NO_DATA_ALLOWED_ERR + NO_MODIFICATION_ALLOWED_ERR + NOT_FOUND_ERR + NOT_SUPPORTED_ERR + NOTATION_NODE + PROCESSING_INSTRUCTION_NODE + TEXT_NODE + WRONG_DOCUMENT_ERR + + + + + + _content + x + y + z + abbr + above + accept + acceptCharset + accessKey + action + align + aLink + vLink + aLinkcolor + vLinkcolor + all + alt + anchors + appCodeName + appCore + applets + appMinorVersion + appName + appVersion + archive + areas + arguments + attributes + availHeight + availLeft + availTop + availWidth + axis + background + backgroundColor + backgroundImage + below + bgColor + body + border + borderBottomWidth + borderColor + borderLeftWidth + borderRightWidth + borderStyle + borderTopWidth + borderWidth + bottom + bufferDepth + callee + caller + caption + cellPadding + cells + cellSpacing + ch + characterSet + charset + checked + childNodes + chOff + cite + classes + className + clear + clientInformation + clip + clipBoardData + closed + code + codeBase + codeType + color + colorDepth + cols + colSpan + compact + complete + components + content + controllers + cookie + cookieEnabled + cords + cpuClass + crypto + current + data + dateTime + declare + defaultCharset + defaultChecked + defaultSelected + defaultStatus + defaultValue + defaultView + defer + description + dialogArguments + dialogHeight + dialogLeft + dialogTop + dialogWidth + dir + directories + disabled + display + docmain + doctype + documentElement + elements + embeds + enabledPlugin + encoding + enctype + entities + event + expando + external + face + fgColor + filename + firstChild + fontFamily + fontSize + fontWeight + form + formName + forms + frame + frameBorder + frameElement + frames + hasFocus + hash + headers + height + history + host + hostname + href + hreflang + hspace + htmlFor + httpEquiv + id + ids + ignoreCase + images + implementation + index + innerHeight + innerWidth + input + isMap + label + lang + language + lastChild + lastIndex + lastMatch + lastModified + lastParen + layers + layerX + layerY + left + leftContext + lineHeight + link + linkColor + links + listStyleType + localName + location + locationbar + longDesc + lowsrc + lowSrc + marginBottom + marginHeight + marginLeft + marginRight + marginTop + marginWidth + maxLength + media + menubar + method + mimeTypes + multiline + multiple + name + nameProp + namespaces + namespaceURI + next + nextSibling + nodeName + nodeType + nodeValue + noHref + noResize + noShade + notationName + notations + noWrap + object + offscreenBuffering + onLine + onreadystatechange + opener + opsProfile + options + oscpu + outerHeight + outerWidth + ownerDocument + paddingBottom + paddingLeft + paddingRight + paddingTop + pageX + pageY + pageXOffset + pageYOffset + parent + parentLayer + parentNode + parentWindow + pathname + personalbar + pixelDepth + pkcs11 + platform + plugins + port + prefix + previous + previousDibling + product + productSub + profile + profileend + prompt + prompter + protocol + publicId + readOnly + readyState + referrer + rel + responseText + responseXML + rev + right + rightContext + rowIndex + rows + rowSpan + rules + scheme + scope + screenX + screenY + screenLeft + screenTop + scripts + scrollbars + scrolling + sectionRowIndex + security + securityPolicy + selected + selectedIndex + selection + self + shape + siblingAbove + siblingBelow + size + source + specified + standby + start + status + statusbar + statusText + style + styleSheets + suffixes + summary + systemId + systemLanguage + tagName + tags + target + tBodies + text + textAlign + textDecoration + textIndent + textTransform + tFoot + tHead + title + toolbar + top + type + undefined + uniqueID + updateInterval + URL + URLUnencoded + useMap + userAgent + userLanguage + userProfile + vAlign + value + valueType + vendor + vendorSub + version + visibility + vspace + whiteSpace + width + XMLDocument + XSLDocument + zIndex + + + + acceptNode + add + addEventListener + addTextTrack + adoptNode + after + animate + append + appendChild + appendData + before + blur + canPlayType + captureStream + caretPositionFromPoint + caretRangeFromPoint + checkValidity + clear + click + cloneContents + cloneNode + cloneRange + close + closest + collapse + compareBoundaryPoints + compareDocumentPosition + comparePoint + contains + convertPointFromNode + convertQuadFromNode + convertRectFromNode + createAttribute + createAttributeNS + createCaption + createCDATASection + createComment + createContextualFragment + createDocument + createDocumentFragment + createDocumentType + createElement + createElementNS + createEntityReference + createEvent + createExpression + createHTMLDocument + createNodeIterator + createNSResolver + createProcessingInstruction + createRange + createShadowRoot + createTBody + createTextNode + createTFoot + createTHead + createTreeWalker + delete + deleteCaption + deleteCell + deleteContents + deleteData + deleteRow + deleteTFoot + deleteTHead + detach + disconnect + dispatchEvent + elementFromPoint + elementsFromPoint + enableStyleSheetsForSet + entries + evaluate + execCommand + exitFullscreen + exitPointerLock + expand + extractContents + fastSeek + firstChild + focus + forEach + get + getAll + getAnimations + getAttribute + getAttributeNames + getAttributeNode + getAttributeNodeNS + getAttributeNS + getBoundingClientRect + getBoxQuads + getClientRects + getContext + getDestinationInsertionPoints + getElementById + getElementsByClassName + getElementsByName + getElementsByTagName + getElementsByTagNameNS + getItem + getNamedItem + getSelection + getStartDate + getVideoPlaybackQuality + has + hasAttribute + hasAttributeNS + hasAttributes + hasChildNodes + hasFeature + hasFocus + importNode + initEvent + insertAdjacentElement + insertAdjacentHTML + insertAdjacentText + insertBefore + insertCell + insertData + insertNode + insertRow + intersectsNode + isDefaultNamespace + isEqualNode + isPointInRange + isSameNode + item + key + keys + lastChild + load + lookupNamespaceURI + lookupPrefix + matches + move + moveAttribute + moveAttributeNode + moveChild + moveNamedItem + namedItem + nextNode + nextSibling + normalize + observe + open + parentNode + pause + play + postMessage + prepend + preventDefault + previousNode + previousSibling + probablySupportsContext + queryCommandEnabled + queryCommandIndeterm + queryCommandState + queryCommandSupported + queryCommandValue + querySelector + querySelectorAll + registerContentHandler + registerElement + registerProtocolHandler + releaseCapture + releaseEvents + remove + removeAttribute + removeAttributeNode + removeAttributeNS + removeChild + removeEventListener + removeItem + replace + replaceChild + replaceData + replaceWith + reportValidity + requestFullscreen + requestPointerLock + reset + scroll + scrollBy + scrollIntoView + scrollTo + seekToNextFrame + select + selectNode + selectNodeContents + set + setAttribute + setAttributeNode + setAttributeNodeNS + setAttributeNS + setCapture + setCustomValidity + setEnd + setEndAfter + setEndBefore + setItem + setNamedItem + setRangeText + setSelectionRange + setSinkId + setStart + setStartAfter + setStartBefore + slice + splitText + stepDown + stepUp + stopImmediatePropagation + stopPropagation + submit + substringData + supports + surroundContents + takeRecords + terminate + toBlob + toDataURL + toggle + + values + write + writeln + + + + onRowsinserted + onRowsdelete + onRowenter + onRowexit + onResize + onResizestart + onResizeend + onReset + onReadystatechange + onMouseout + onMouseover + onMousedown + onMouseup + onMousemove + onBeforecut + onBeforedeactivate + onBeforeunload + onBeforeupdate + onBeforepaste + onBeforeprint + onBeforeeditfocus + onBeforeactivate + onBlur + onScrolltop + onSubmit + onSelect + onSelectstart + onSelectionchange + onHover + onHelp + onChange + onContextmenu + onControlselect + onCut + onCellchange + onClock + onClose + onDeactivate + onDatasetchanged + onDatasetcomplete + onDataavailable + onDrop + onDrag + onDragstart + onDragover + onDragdrop + onDragenter + onDragend + onDragleave + onDblclick + onUnload + onPaste + onPropertychange + onError + onErrorupdate + onKeydown + onKeyup + onKeypress + onFocus + onLoad + onActivate + onAfterupdate + onAfterprint + onAbort + + + + shift + showModelessDialog + showModalDialog + showHelp + scroll + scrollX + scrollByPages + scrollByLines + scrollY + scrollTo + stop + strike + sizeToContent + sidebar + signText + sort + sup + sub + substr + substring + splice + split + send + setMilliseconds + setSeconds + setMinutes + setHours + setMonth + setYear + setFullYear + setDate + setUTCMilliseconds + setUTCSeconds + setUTCMinutes + setUTCHours + setUTCMonth + setUTCFullYear + setUTCDate + setTime + setHotkeys + setCursor + setZOptions + setActive + setResizable + setRequestHeader + search + slice + savePreferences + small + home + handleEvent + navigate + char + charCodeAt + charAt + concat + contextual + confirm + compile + clear + captureEvents + call + createStyleSheet + createPopup + createEventObject + toGMTString + toUTCString + toString + toSource + toUpperCase + toLowerCase + toLocaleString + test + taint + taintEnabled + indexOf + italics + disableExternalCapture + dump + detachEvent + unshift + untaint + unwatch + updateCommands + join + javaEnabled + pop + push + plugins.refresh + paddings + parse + print + prompt + preference + enableExternalCapture + exec + execScript + valueOf + UTC + find + file + fileModifiedDate + fileSize + fileCreatedDate + fileUpdatedDate + fixed + fontsize + fontcolor + forward + fromCharCode + watch + link + load + lastIndexOf + anchor + attachEvent + atob + apply + alert + abort + routeEvents + resize + resizeBy + resizeTo + recalc + returnValue + replace + reverse + reload + releaseCapture + releaseEvents + go + getMilliseconds + getSeconds + getMinutes + getHours + getMonth + getDay + getYear + getFullYear + getTime + getDate + getTimezoneOffset + getUTCMilliseconds + getUTCSeconds + getUTCMinutes + getUTCHours + getUTCDay + getUTCMonth + getUTCFullYear + getUTCDate + getAttention + getSelection + getResponseHeader + getAllResponseHeaders + moveBy + moveBelow + moveTo + moveToAbsolute + moveAbove + mergeAttributes + match + margins + btoa + big + bold + borderWidths + blink + back + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/json.xml b/syntax/json.xml --- a/syntax/json.xml +++ b/syntax/json.xml @@ -12,7 +12,7 @@ ** http://tools.ietf.org/html/rfc4627 *************************************************************************** --> - + null diff --git a/syntax/jsp.xml b/syntax/jsp.xml --- a/syntax/jsp.xml +++ b/syntax/jsp.xml @@ -1,3054 +1,238 @@ - - - - - ARG_IN - ARG_INOUT - ARG_OUT - AWTError - AWTEvent - AWTEventListener - AWTEventListenerProxy - AWTEventMulticaster - AWTException - AWTKeyStroke - AWTPermission - AbstractAction - AbstractBorder - AbstractButton - AbstractCellEditor - AbstractCollection - AbstractColorChooserPanel - AbstractDocument - AbstractFormatter - AbstractFormatterFactory - AbstractInterruptibleChannel - AbstractLayoutCache - AbstractList - AbstractListModel - AbstractMap - AbstractMethodError - AbstractPreferences - AbstractSelectableChannel - AbstractSelectionKey - AbstractSelector - AbstractSequentialList - AbstractSet - AbstractSpinnerModel - AbstractTableModel - AbstractUndoableEdit - AbstractWriter - AccessControlContext - AccessControlException - AccessController - AccessException - Accessible - AccessibleAction - AccessibleBundle - AccessibleComponent - AccessibleContext - AccessibleEditableText - AccessibleExtendedComponent - AccessibleExtendedTable - AccessibleHyperlink - AccessibleHypertext - AccessibleIcon - AccessibleKeyBinding - AccessibleObject - AccessibleRelation - AccessibleRelationSet - AccessibleResourceBundle - AccessibleRole - AccessibleSelection - AccessibleState - AccessibleStateSet - AccessibleTable - AccessibleTableModelChange - AccessibleText - AccessibleValue - AccountExpiredException - Acl - AclEntry - AclNotFoundException - Action - ActionEvent - ActionListener - ActionMap - ActionMapUIResource - Activatable - ActivateFailedException - ActivationDesc - ActivationException - ActivationGroup - ActivationGroupDesc - ActivationGroupID - ActivationGroup_Stub - ActivationID - ActivationInstantiator - ActivationMonitor - ActivationSystem - Activator - ActiveEvent - ActiveValue - AdapterActivator - AdapterActivatorOperations - AdapterAlreadyExists - AdapterAlreadyExistsHelper - AdapterInactive - AdapterInactiveHelper - AdapterNonExistent - AdapterNonExistentHelper - AddressHelper - Adjustable - AdjustmentEvent - AdjustmentListener - Adler32 - AffineTransform - AffineTransformOp - AlgorithmParameterGenerator - AlgorithmParameterGeneratorSpi - AlgorithmParameterSpec - AlgorithmParameters - AlgorithmParametersSpi - AlignmentAction - AllPermission - AlphaComposite - AlreadyBound - AlreadyBoundException - AlreadyBoundHelper - AlreadyBoundHolder - AlreadyConnectedException - AncestorEvent - AncestorListener - Annotation - Any - AnyHolder - AnySeqHelper - AnySeqHelper - AnySeqHolder - AppConfigurationEntry - Applet - AppletContext - AppletInitializer - AppletStub - ApplicationException - Arc2D - Area - AreaAveragingScaleFilter - ArithmeticException - Array - Array - ArrayIndexOutOfBoundsException - ArrayList - ArrayStoreException - Arrays - AssertionError - AsyncBoxView - AsynchronousCloseException - Attr - Attribute - Attribute - Attribute - Attribute - Attribute - AttributeContext - AttributeException - AttributeInUseException - AttributeList - AttributeList - AttributeListImpl - AttributeModificationException - AttributeSet - AttributeSet - AttributeSetUtilities - AttributeUndoableEdit - AttributedCharacterIterator - AttributedString - Attributes - Attributes - Attributes - AttributesImpl - AudioClip - AudioFileFormat - AudioFileReader - AudioFileWriter - AudioFormat - AudioInputStream - AudioPermission - AudioSystem - AuthPermission - AuthenticationException - AuthenticationNotSupportedException - Authenticator - Autoscroll - BAD_CONTEXT - BAD_INV_ORDER - BAD_OPERATION - BAD_PARAM - BAD_POLICY - BAD_POLICY_TYPE - BAD_POLICY_VALUE - BAD_TYPECODE - BCSIterator - BCSSServiceProvider - BYTE_ARRAY - BackingStoreException - BadKind - BadLocationException - BadPaddingException - BandCombineOp - BandedSampleModel - BasicArrowButton - BasicAttribute - BasicAttributes - BasicBorders - BasicButtonListener - BasicButtonUI - BasicCaret - BasicCheckBoxMenuItemUI - BasicCheckBoxUI - BasicColorChooserUI - BasicComboBoxEditor - BasicComboBoxRenderer - BasicComboBoxUI - BasicComboPopup - BasicDesktopIconUI - BasicDesktopPaneUI - BasicDirectoryModel - BasicEditorPaneUI - BasicFileChooserUI - BasicFormattedTextFieldUI - BasicGraphicsUtils - BasicHTML - BasicHighlighter - BasicIconFactory - BasicInternalFrameTitlePane - BasicInternalFrameUI - BasicLabelUI - BasicListUI - BasicLookAndFeel - BasicMenuBarUI - BasicMenuItemUI - BasicMenuUI - BasicOptionPaneUI - BasicPanelUI - BasicPasswordFieldUI - BasicPermission - BasicPopupMenuSeparatorUI - BasicPopupMenuUI - BasicProgressBarUI - BasicRadioButtonMenuItemUI - BasicRadioButtonUI - BasicRootPaneUI - BasicScrollBarUI - BasicScrollPaneUI - BasicSeparatorUI - BasicSliderUI - BasicSpinnerUI - BasicSplitPaneDivider - BasicSplitPaneUI - BasicStroke - BasicTabbedPaneUI - BasicTableHeaderUI - BasicTableUI - BasicTextAreaUI - BasicTextFieldUI - BasicTextPaneUI - BasicTextUI - BasicToggleButtonUI - BasicToolBarSeparatorUI - BasicToolBarUI - BasicToolTipUI - BasicTreeUI - BasicViewportUI - BatchUpdateException - BeanContext - BeanContextChild - BeanContextChildComponentProxy - BeanContextChildSupport - BeanContextContainerProxy - BeanContextEvent - BeanContextMembershipEvent - BeanContextMembershipListener - BeanContextProxy - BeanContextServiceAvailableEvent - BeanContextServiceProvider - BeanContextServiceProviderBeanInfo - BeanContextServiceRevokedEvent - BeanContextServiceRevokedListener - BeanContextServices - BeanContextServicesListener - BeanContextServicesSupport - BeanContextSupport - BeanDescriptor - BeanInfo - Beans - BeepAction - BevelBorder - BevelBorderUIResource - Bias - Bidi - BigDecimal - BigInteger - BinaryRefAddr - BindException - Binding - Binding - BindingHelper - BindingHolder - BindingIterator - BindingIteratorHelper - BindingIteratorHolder - BindingIteratorOperations - BindingIteratorPOA - BindingListHelper - BindingListHolder - BindingType - BindingTypeHelper - BindingTypeHolder - BitSet - Blob - BlockView - BoldAction - Book - Boolean - BooleanControl - BooleanHolder - BooleanSeqHelper - BooleanSeqHolder - Border - BorderFactory - BorderLayout - BorderUIResource - BoundedRangeModel - Bounds - Bounds - Box - BoxLayout - BoxPainter - BoxView - BoxedValueHelper - BreakIterator - Buffer - BufferCapabilities - BufferOverflowException - BufferStrategy - BufferUnderflowException - BufferedImage - BufferedImageFilter - BufferedImageOp - BufferedInputStream - BufferedOutputStream - BufferedReader - BufferedWriter - Button - ButtonAreaLayout - ButtonBorder - ButtonBorder - ButtonGroup - ButtonModel - ButtonUI - Byte - ByteArrayInputStream - ByteArrayOutputStream - ByteBuffer - ByteChannel - ByteHolder - ByteLookupTable - ByteOrder - CDATASection - CHAR_ARRAY - CMMException - COMM_FAILURE - CRC32 - CRL - CRLException - CRLSelector - CSS - CTX_RESTRICT_SCOPE - Calendar - CallableStatement - Callback - CallbackHandler - CancelablePrintJob - CancelledKeyException - CannotProceed - CannotProceedException - CannotProceedHelper - CannotProceedHolder - CannotRedoException - CannotUndoException - Canvas - CardLayout - Caret - CaretEvent - CaretListener - CaretPolicy - CellEditor - CellEditorListener - CellRendererPane - CertPath - CertPathBuilder - CertPathBuilderException - CertPathBuilderResult - CertPathBuilderSpi - CertPathParameters - CertPathRep - CertPathValidator - CertPathValidatorException - CertPathValidatorResult - CertPathValidatorSpi - CertSelector - CertStore - CertStoreException - CertStoreParameters - CertStoreSpi - Certificate - Certificate - Certificate - CertificateEncodingException - CertificateEncodingException - CertificateException - CertificateException - CertificateExpiredException - CertificateExpiredException - CertificateFactory - CertificateFactorySpi - CertificateNotYetValidException - CertificateNotYetValidException - CertificateParsingException - CertificateParsingException - CertificateRep - ChangeEvent - ChangeListener - ChangedCharSetException - Channel - ChannelBinding - Channels - CharArrayReader - CharArrayWriter - CharBuffer - CharConversionException - CharHolder - CharSeqHelper - CharSeqHolder - CharSequence - Character - CharacterAttribute - CharacterCodingException - CharacterConstants - CharacterData - CharacterIterator - Charset - CharsetDecoder - CharsetEncoder - CharsetProvider - Checkbox - CheckboxGroup - CheckboxMenuItem - CheckedInputStream - CheckedOutputStream - Checksum - Choice - ChoiceCallback - ChoiceFormat - Chromaticity - Cipher - CipherInputStream - CipherOutputStream - CipherSpi - Class - ClassCastException - ClassCircularityError - ClassDesc - ClassFormatError - ClassLoader - ClassNotFoundException - ClientRequestInfo - ClientRequestInfoOperations - ClientRequestInterceptor - ClientRequestInterceptorOperations - Clip - Clipboard - ClipboardOwner - Clob - CloneNotSupportedException - Cloneable - ClosedByInterruptException - ClosedChannelException - ClosedSelectorException - CodeSets - CodeSource - Codec - CodecFactory - CodecFactoryHelper - CodecFactoryOperations - CodecOperations - CoderMalfunctionError - CoderResult - CodingErrorAction - CollationElementIterator - CollationKey - Collator - Collection - CollectionCertStoreParameters - Collections - Color - ColorAttribute - ColorChooserComponentFactory - ColorChooserUI - ColorConstants - ColorConvertOp - ColorModel - ColorSelectionModel - ColorSpace - ColorSupported - ColorType - ColorUIResource - ComboBoxEditor - ComboBoxModel - ComboBoxUI - ComboPopup - CommandEnvironment - Comment - CommunicationException - Comparable - Comparator - Compiler - CompletionStatus - CompletionStatusHelper - Component - ComponentAdapter - ComponentColorModel - ComponentEvent - ComponentIdHelper - ComponentInputMap - ComponentInputMapUIResource - ComponentListener - ComponentOrientation - ComponentSampleModel - ComponentUI - ComponentView - Composite - CompositeContext - CompositeName - CompositeView - CompoundBorder - CompoundBorderUIResource - CompoundControl - CompoundEdit - CompoundName - Compression - ConcurrentModificationException - Configuration - ConfigurationException - ConfirmationCallback - ConnectException - ConnectException - ConnectIOException - Connection - ConnectionEvent - ConnectionEventListener - ConnectionPendingException - ConnectionPoolDataSource - ConsoleHandler - Constraints - Constructor - Container - ContainerAdapter - ContainerEvent - ContainerListener - ContainerOrderFocusTraversalPolicy - Content - ContentHandler - ContentHandler - ContentHandlerFactory - ContentModel - Context - Context - ContextList - ContextNotEmptyException - ContextualRenderedImageFactory - Control - Control - ControlFactory - ControllerEventListener - ConvolveOp - CookieHolder - Copies - CopiesSupported - CopyAction - CredentialExpiredException - CropImageFilter - CubicCurve2D - Currency - Current - Current - Current - CurrentHelper - CurrentHelper - CurrentHelper - CurrentHolder - CurrentOperations - CurrentOperations - CurrentOperations - Cursor - CustomMarshal - CustomValue - Customizer - CutAction - DATA_CONVERSION - DESKeySpec - DESedeKeySpec - DGC - DHGenParameterSpec - DHKey - DHParameterSpec - DHPrivateKey - DHPrivateKeySpec - DHPublicKey - DHPublicKeySpec - DOMException - DOMImplementation - DOMLocator - DOMResult - DOMSource - DSAKey - DSAKeyPairGenerator - DSAParameterSpec - DSAParams - DSAPrivateKey - DSAPrivateKeySpec - DSAPublicKey - DSAPublicKeySpec - DTD - DTDConstants - DTDHandler - DataBuffer - DataBufferByte - DataBufferDouble - DataBufferFloat - DataBufferInt - DataBufferShort - DataBufferUShort - DataFlavor - DataFormatException - DataInput - DataInputStream - DataInputStream - DataLine - DataOutput - DataOutputStream - DataOutputStream - DataSource - DataTruncation - DatabaseMetaData - DatagramChannel - DatagramPacket - DatagramSocket - DatagramSocketImpl - DatagramSocketImplFactory - Date - Date - DateEditor - DateFormat - DateFormatSymbols - DateFormatter - DateTimeAtCompleted - DateTimeAtCreation - DateTimeAtProcessing - DateTimeSyntax - DebugGraphics - DecimalFormat - DecimalFormatSymbols - DeclHandler - DefaultBoundedRangeModel - DefaultButtonModel - DefaultCaret - DefaultCellEditor - DefaultColorSelectionModel - DefaultComboBoxModel - DefaultDesktopManager - DefaultEditor - DefaultEditorKit - DefaultFocusManager - DefaultFocusTraversalPolicy - DefaultFormatter - DefaultFormatterFactory - DefaultHandler - DefaultHighlightPainter - DefaultHighlighter - DefaultKeyTypedAction - DefaultKeyboardFocusManager - DefaultListCellRenderer - DefaultListModel - DefaultListSelectionModel - DefaultMenuLayout - DefaultMetalTheme - DefaultMutableTreeNode - DefaultPersistenceDelegate - DefaultSelectionType - DefaultSingleSelectionModel - DefaultStyledDocument - DefaultTableCellRenderer - DefaultTableColumnModel - DefaultTableModel - DefaultTextUI - DefaultTreeCellEditor - DefaultTreeCellRenderer - DefaultTreeModel - DefaultTreeSelectionModel - DefinitionKind - DefinitionKindHelper - Deflater - DeflaterOutputStream - Delegate - Delegate - Delegate - DelegationPermission - DesignMode - DesktopIconUI - DesktopManager - DesktopPaneUI - Destination - DestinationType - DestroyFailedException - Destroyable - Dialog - DialogType - Dictionary - DigestException - DigestInputStream - DigestOutputStream - Dimension - Dimension2D - DimensionUIResource - DirContext - DirObjectFactory - DirStateFactory - DirectColorModel - DirectoryManager - DisplayMode - DnDConstants - Doc - DocAttribute - DocAttributeSet - DocFlavor - DocPrintJob - Document - Document - DocumentBuilder - DocumentBuilderFactory - DocumentEvent - DocumentFilter - DocumentFragment - DocumentHandler - DocumentListener - DocumentName - DocumentParser - DocumentType - DomainCombiner - DomainManager - DomainManagerOperations - Double - Double - Double - Double - Double - Double - Double - Double - Double - DoubleBuffer - DoubleHolder - DoubleSeqHelper - DoubleSeqHolder - DragGestureEvent - DragGestureListener - DragGestureRecognizer - DragSource - DragSourceAdapter - DragSourceContext - DragSourceDragEvent - DragSourceDropEvent - DragSourceEvent - DragSourceListener - DragSourceMotionListener - Driver - DriverManager - DriverPropertyInfo - DropTarget - DropTargetAdapter - DropTargetAutoScroller - DropTargetContext - DropTargetDragEvent - DropTargetDropEvent - DropTargetEvent - DropTargetListener - DuplicateName - DuplicateNameHelper - DynAny - DynAny - DynAnyFactory - DynAnyFactoryHelper - DynAnyFactoryOperations - DynAnyHelper - DynAnyOperations - DynAnySeqHelper - DynArray - DynArray - DynArrayHelper - DynArrayOperations - DynEnum - DynEnum - DynEnumHelper - DynEnumOperations - DynFixed - DynFixed - DynFixedHelper - DynFixedOperations - DynSequence - DynSequence - DynSequenceHelper - DynSequenceOperations - DynStruct - DynStruct - DynStructHelper - DynStructOperations - DynUnion - DynUnion - DynUnionHelper - DynUnionOperations - DynValue - DynValue - DynValueBox - DynValueBoxOperations - DynValueCommon - DynValueCommonOperations - DynValueHelper - DynValueOperations - DynamicImplementation - DynamicImplementation - DynamicUtilTreeNode - ENCODING_CDR_ENCAPS - EOFException - EditorKit - Element - Element - Element - ElementChange - ElementEdit - ElementIterator - ElementSpec - Ellipse2D - EmptyBorder - EmptyBorderUIResource - EmptySelectionModel - EmptyStackException - EncodedKeySpec - Encoder - Encoding - Encoding - EncryptedPrivateKeyInfo - Engineering - Entity - Entity - EntityReference - EntityResolver - Entry - EnumControl - EnumSyntax - Enumeration - Environment - Error - ErrorHandler - ErrorListener - ErrorManager - EtchedBorder - EtchedBorderUIResource - Event - EventContext - EventDirContext - EventHandler - EventListener - EventListenerList - EventListenerProxy - EventObject - EventQueue - EventSetDescriptor - EventType - EventType - Exception - ExceptionInInitializerError - ExceptionList - ExceptionListener - ExemptionMechanism - ExemptionMechanismException - ExemptionMechanismSpi - ExpandVetoException - ExportException - Expression - ExtendedRequest - ExtendedResponse - Externalizable - FREE_MEM - FactoryConfigurationError - FailedLoginException - FeatureDescriptor - Fidelity - Field - Field - Field - Field - Field - FieldBorder - FieldNameHelper - FieldNameHelper - FieldPosition - FieldView - File - FileCacheImageInputStream - FileCacheImageOutputStream - FileChannel - FileChooserUI - FileDescriptor - FileDialog - FileFilter - FileFilter - FileHandler - FileIcon16 - FileImageInputStream - FileImageOutputStream - FileInputStream - FileLock - FileLockInterruptionException - FileNameMap - FileNotFoundException - FileOutputStream - FilePermission - FileReader - FileSystemView - FileView - FileWriter - FilenameFilter - Filler - Filter - Filter - FilterBypass - FilterBypass - FilterInputStream - FilterOutputStream - FilterReader - FilterWriter - FilteredImageSource - Finishings - FixedHeightLayoutCache - FixedHolder - FlatteningPathIterator - FlavorException - FlavorMap - FlavorTable - FlipContents - Float - Float - Float - Float - Float - Float - Float - Float - Float - FloatBuffer - FloatControl - FloatHolder - FloatSeqHelper - FloatSeqHolder - FlowLayout - FlowStrategy - FlowView - Flush3DBorder - FocusAdapter - FocusEvent - FocusListener - FocusManager - FocusTraversalPolicy - FolderIcon16 - Font - FontAttribute - FontConstants - FontFamilyAction - FontFormatException - FontMetrics - FontRenderContext - FontSizeAction - FontUIResource - ForegroundAction - FormView - Format - FormatConversionProvider - FormatMismatch - FormatMismatchHelper - Formatter - ForwardRequest - ForwardRequest - ForwardRequestHelper - ForwardRequestHelper - Frame - GSSContext - GSSCredential - GSSException - GSSManager - GSSName - GZIPInputStream - GZIPOutputStream - GapContent - GatheringByteChannel - GeneralPath - GeneralSecurityException - GetField - GlyphJustificationInfo - GlyphMetrics - GlyphPainter - GlyphVector - GlyphView - GradientPaint - GraphicAttribute - Graphics - Graphics2D - GraphicsConfigTemplate - GraphicsConfiguration - GraphicsDevice - GraphicsEnvironment - GrayFilter - GregorianCalendar - GridBagConstraints - GridBagLayout - GridLayout - Group - Guard - GuardedObject - HTML - HTMLDocument - HTMLEditorKit - HTMLEditorKit - HTMLEditorKit - HTMLFrameHyperlinkEvent - HTMLWriter - Handler - HandlerBase - HandshakeCompletedEvent - HandshakeCompletedListener - HasControls - HashAttributeSet - HashDocAttributeSet - HashMap - HashPrintJobAttributeSet - HashPrintRequestAttributeSet - HashPrintServiceAttributeSet - HashSet - Hashtable - HeadlessException - HierarchyBoundsAdapter - HierarchyBoundsListener - HierarchyEvent - HierarchyListener - Highlight - HighlightPainter - Highlighter - HostnameVerifier - HttpURLConnection - HttpsURLConnection - HyperlinkEvent - HyperlinkListener - ICC_ColorSpace - ICC_Profile - ICC_ProfileGray - ICC_ProfileRGB - IDLEntity - IDLType - IDLTypeHelper - IDLTypeOperations - ID_ASSIGNMENT_POLICY_ID - ID_UNIQUENESS_POLICY_ID - IIOByteBuffer - IIOException - IIOImage - IIOInvalidTreeException - IIOMetadata - IIOMetadataController - IIOMetadataFormat - IIOMetadataFormatImpl - IIOMetadataNode - IIOParam - IIOParamController - IIOReadProgressListener - IIOReadUpdateListener - IIOReadWarningListener - IIORegistry - IIOServiceProvider - IIOWriteProgressListener - IIOWriteWarningListener - IMPLICIT_ACTIVATION_POLICY_ID - IMP_LIMIT - INITIALIZE - INPUT_STREAM - INTERNAL - INTF_REPOS - INVALID_TRANSACTION - INV_FLAG - INV_IDENT - INV_OBJREF - INV_POLICY - IOException - IOR - IORHelper - IORHolder - IORInfo - IORInfoOperations - IORInterceptor - IORInterceptorOperations - IRObject - IRObjectOperations - ISO - Icon - IconUIResource - IconView - IdAssignmentPolicy - IdAssignmentPolicyOperations - IdAssignmentPolicyValue - IdUniquenessPolicy - IdUniquenessPolicyOperations - IdUniquenessPolicyValue - IdentifierHelper - Identity - IdentityHashMap - IdentityScope - IllegalAccessError - IllegalAccessException - IllegalArgumentException - IllegalBlockSizeException - IllegalBlockingModeException - IllegalCharsetNameException - IllegalComponentStateException - IllegalMonitorStateException - IllegalPathStateException - IllegalSelectorException - IllegalStateException - IllegalThreadStateException - Image - ImageCapabilities - ImageConsumer - ImageFilter - ImageGraphicAttribute - ImageIO - ImageIcon - ImageInputStream - ImageInputStreamImpl - ImageInputStreamSpi - ImageObserver - ImageOutputStream - ImageOutputStreamImpl - ImageOutputStreamSpi - ImageProducer - ImageReadParam - ImageReader - ImageReaderSpi - ImageReaderWriterSpi - ImageTranscoder - ImageTranscoderSpi - ImageTypeSpecifier - ImageView - ImageWriteParam - ImageWriter - ImageWriterSpi - ImagingOpException - ImplicitActivationPolicy - ImplicitActivationPolicyOperations - ImplicitActivationPolicyValue - IncompatibleClassChangeError - InconsistentTypeCode - InconsistentTypeCode - InconsistentTypeCodeHelper - IndexColorModel - IndexOutOfBoundsException - IndexedPropertyDescriptor - IndirectionException - Inet4Address - Inet6Address - InetAddress - InetSocketAddress - Inflater - InflaterInputStream - Info - Info - Info - Info - Info - InheritableThreadLocal - InitialContext - InitialContextFactory - InitialContextFactoryBuilder - InitialDirContext - InitialLdapContext - InlineView - InputContext - InputEvent - InputMap - InputMapUIResource - InputMethod - InputMethodContext - InputMethodDescriptor - InputMethodEvent - InputMethodHighlight - InputMethodListener - InputMethodRequests - InputSource - InputStream - InputStream - InputStream - InputStreamReader - InputSubset - InputVerifier - InsertBreakAction - InsertContentAction - InsertHTMLTextAction - InsertTabAction - Insets - InsetsUIResource - InstantiationError - InstantiationException - Instrument - InsufficientResourcesException - IntBuffer - IntHolder - Integer - IntegerSyntax - Interceptor - InterceptorOperations - InternalError - InternalFrameAdapter - InternalFrameBorder - InternalFrameEvent - InternalFrameFocusTraversalPolicy - InternalFrameListener - InternalFrameUI - InternationalFormatter - InterruptedException - InterruptedIOException - InterruptedNamingException - InterruptibleChannel - IntrospectionException - Introspector - Invalid - InvalidAddress - InvalidAddressHelper - InvalidAddressHolder - InvalidAlgorithmParameterException - InvalidAttributeIdentifierException - InvalidAttributeValueException - InvalidAttributesException - InvalidClassException - InvalidDnDOperationException - InvalidKeyException - InvalidKeySpecException - InvalidMarkException - InvalidMidiDataException - InvalidName - InvalidName - InvalidName - InvalidNameException - InvalidNameHelper - InvalidNameHelper - InvalidNameHolder - InvalidObjectException - InvalidParameterException - InvalidParameterSpecException - InvalidPolicy - InvalidPolicyHelper - InvalidPreferencesFormatException - InvalidSearchControlsException - InvalidSearchFilterException - InvalidSeq - InvalidSlot - InvalidSlotHelper - InvalidTransactionException - InvalidTypeForEncoding - InvalidTypeForEncodingHelper - InvalidValue - InvalidValue - InvalidValueHelper - InvocationEvent - InvocationHandler - InvocationTargetException - InvokeHandler - IstringHelper - ItalicAction - ItemEvent - ItemListener - ItemSelectable - Iterator - Iterator - IvParameterSpec - JApplet - JButton - JCheckBox - JCheckBoxMenuItem - JColorChooser - JComboBox - JComponent - JDesktopIcon - JDesktopPane - JDialog - JEditorPane - JFileChooser - JFormattedTextField - JFrame - JIS - JInternalFrame - JLabel - JLayeredPane - JList - JMenu - JMenuBar - JMenuItem - JOptionPane - JPEGHuffmanTable - JPEGImageReadParam - JPEGImageWriteParam - JPEGQTable - JPanel - JPasswordField - JPopupMenu - JProgressBar - JRadioButton - JRadioButtonMenuItem - JRootPane - JScrollBar - JScrollPane - JSeparator - JSlider - JSpinner - JSplitPane - JTabbedPane - JTable - JTableHeader - JTextArea - JTextComponent - JTextField - JTextPane - JToggleButton - JToolBar - JToolTip - JTree - JViewport - JWindow - JarEntry - JarException - JarFile - JarInputStream - JarOutputStream - JarURLConnection - JobAttributes - JobHoldUntil - JobImpressions - JobImpressionsCompleted - JobImpressionsSupported - JobKOctets - JobKOctetsProcessed - JobKOctetsSupported - JobMediaSheets - JobMediaSheetsCompleted - JobMediaSheetsSupported - JobMessageFromOperator - JobName - JobOriginatingUserName - JobPriority - JobPrioritySupported - JobSheets - JobState - JobStateReason - JobStateReasons - KerberosKey - KerberosPrincipal - KerberosTicket - Kernel - Key - Key - KeyAdapter - KeyAgreement - KeyAgreementSpi - KeyBinding - KeyEvent - KeyEventDispatcher - KeyEventPostProcessor - KeyException - KeyFactory - KeyFactorySpi - KeyGenerator - KeyGeneratorSpi - KeyListener - KeyManagementException - KeyManager - KeyManagerFactory - KeyManagerFactorySpi - KeyPair - KeyPairGenerator - KeyPairGeneratorSpi - KeySelectionManager - KeySpec - KeyStore - KeyStoreException - KeyStoreSpi - KeyStroke - KeyboardFocusManager - Keymap - LDAPCertStoreParameters - LIFESPAN_POLICY_ID - LOCATION_FORWARD - Label - LabelUI - LabelView - LanguageCallback - LastOwnerException - LayerPainter - LayeredHighlighter - LayoutFocusTraversalPolicy - LayoutManager - LayoutManager2 - LayoutQueue - LazyInputMap - LazyValue - LdapContext - LdapReferralException - Lease - Level - LexicalHandler - LifespanPolicy - LifespanPolicyOperations - LifespanPolicyValue - LimitExceededException - Line - Line2D - LineBorder - LineBorderUIResource - LineBreakMeasurer - LineEvent - LineListener - LineMetrics - LineNumberInputStream - LineNumberReader - LineUnavailableException - LinkController - LinkException - LinkLoopException - LinkRef - LinkageError - LinkedHashMap - LinkedHashSet - LinkedList - List - List - ListCellRenderer - ListDataEvent - ListDataListener - ListEditor - ListIterator - ListModel - ListPainter - ListResourceBundle - ListSelectionEvent - ListSelectionListener - ListSelectionModel - ListUI - ListView - LoaderHandler - LocalObject - Locale - LocateRegistry - Locator - LocatorImpl - LogManager - LogRecord - LogStream - Logger - LoggingPermission - LoginContext - LoginException - LoginModule - LoginModuleControlFlag - Long - LongBuffer - LongHolder - LongLongSeqHelper - LongLongSeqHolder - LongSeqHelper - LongSeqHolder - LookAndFeel - LookAndFeelInfo - LookupOp - LookupTable - MARSHAL - Mac - MacSpi - MalformedInputException - MalformedLinkException - MalformedURLException - ManagerFactoryParameters - Manifest - Map - MapMode - MappedByteBuffer - MarginBorder - MarshalException - MarshalledObject - MaskFormatter - Matcher - Math - MatteBorder - MatteBorderUIResource - Media - MediaName - MediaPrintableArea - MediaSize - MediaSizeName - MediaTracker - MediaTray - MediaType - Member - MemoryCacheImageInputStream - MemoryCacheImageOutputStream - MemoryHandler - MemoryImageSource - Menu - MenuBar - MenuBarBorder - MenuBarBorder - MenuBarUI - MenuComponent - MenuContainer - MenuDragMouseEvent - MenuDragMouseListener - MenuElement - MenuEvent - MenuItem - MenuItemBorder - MenuItemUI - MenuKeyEvent - MenuKeyListener - MenuListener - MenuSelectionManager - MenuShortcut - MessageDigest - MessageDigestSpi - MessageFormat - MessageProp - MetaEventListener - MetaMessage - MetalBorders - MetalButtonUI - MetalCheckBoxIcon - MetalCheckBoxUI - MetalComboBoxButton - MetalComboBoxEditor - MetalComboBoxIcon - MetalComboBoxUI - MetalDesktopIconUI - MetalFileChooserUI - MetalIconFactory - MetalInternalFrameTitlePane - MetalInternalFrameUI - MetalLabelUI - MetalLookAndFeel - MetalPopupMenuSeparatorUI - MetalProgressBarUI - MetalRadioButtonUI - MetalRootPaneUI - MetalScrollBarUI - MetalScrollButton - MetalScrollPaneUI - MetalSeparatorUI - MetalSliderUI - MetalSplitPaneUI - MetalTabbedPaneUI - MetalTextFieldUI - MetalTheme - MetalToggleButtonUI - MetalToolBarUI - MetalToolTipUI - MetalTreeUI - Method - MethodDescriptor - MidiChannel - MidiDevice - MidiDeviceProvider - MidiEvent - MidiFileFormat - MidiFileReader - MidiFileWriter - MidiMessage - MidiSystem - MidiUnavailableException - MimeTypeParseException - MinimalHTMLWriter - MissingResourceException - Mixer - MixerProvider - ModificationItem - Modifier - MouseAdapter - MouseDragGestureRecognizer - MouseEvent - MouseInputAdapter - MouseInputListener - MouseListener - MouseMotionAdapter - MouseMotionListener - MouseWheelEvent - MouseWheelListener - MultiButtonUI - MultiColorChooserUI - MultiComboBoxUI - MultiDesktopIconUI - MultiDesktopPaneUI - MultiDoc - MultiDocPrintJob - MultiDocPrintService - MultiFileChooserUI - MultiInternalFrameUI - MultiLabelUI - MultiListUI - MultiLookAndFeel - MultiMenuBarUI - MultiMenuItemUI - MultiOptionPaneUI - MultiPanelUI - MultiPixelPackedSampleModel - MultiPopupMenuUI - MultiProgressBarUI - MultiRootPaneUI - MultiScrollBarUI - MultiScrollPaneUI - MultiSeparatorUI - MultiSliderUI - MultiSpinnerUI - MultiSplitPaneUI - MultiTabbedPaneUI - MultiTableHeaderUI - MultiTableUI - MultiTextUI - MultiToolBarUI - MultiToolTipUI - MultiTreeUI - MultiViewportUI - MulticastSocket - MultipleComponentProfileHelper - MultipleComponentProfileHolder - MultipleDocumentHandling - MultipleDocumentHandlingType - MultipleMaster - MutableAttributeSet - MutableComboBoxModel - MutableTreeNode - NA - NO_IMPLEMENT - NO_MEMORY - NO_PERMISSION - NO_RESOURCES - NO_RESPONSE - NVList - Name - Name - NameAlreadyBoundException - NameCallback - NameClassPair - NameComponent - NameComponentHelper - NameComponentHolder - NameDynAnyPair - NameDynAnyPairHelper - NameDynAnyPairSeqHelper - NameHelper - NameHolder - NameNotFoundException - NameParser - NameValuePair - NameValuePair - NameValuePairHelper - NameValuePairHelper - NameValuePairSeqHelper - NamedNodeMap - NamedValue - NamespaceChangeListener - NamespaceSupport - Naming - NamingContext - NamingContextExt - NamingContextExtHelper - NamingContextExtHolder - NamingContextExtOperations - NamingContextExtPOA - NamingContextHelper - NamingContextHolder - NamingContextOperations - NamingContextPOA - NamingEnumeration - NamingEvent - NamingException - NamingExceptionEvent - NamingListener - NamingManager - NamingSecurityException - NavigationFilter - NegativeArraySizeException - NetPermission - NetworkInterface - NoClassDefFoundError - NoConnectionPendingException - NoContext - NoContextHelper - NoInitialContextException - NoPermissionException - NoRouteToHostException - NoServant - NoServantHelper - NoSuchAlgorithmException - NoSuchAttributeException - NoSuchElementException - NoSuchFieldError - NoSuchFieldException - NoSuchMethodError - NoSuchMethodException - NoSuchObjectException - NoSuchPaddingException - NoSuchProviderException - Node - NodeChangeEvent - NodeChangeListener - NodeDimensions - NodeList - NonReadableChannelException - NonWritableChannelException - NoninvertibleTransformException - NotActiveException - NotBoundException - NotContextException - NotEmpty - NotEmptyHelper - NotEmptyHolder - NotFound - NotFoundHelper - NotFoundHolder - NotFoundReason - NotFoundReasonHelper - NotFoundReasonHolder - NotOwnerException - NotSerializableException - NotYetBoundException - NotYetConnectedException - Notation - NullCipher - NullPointerException - Number - NumberEditor - NumberFormat - NumberFormatException - NumberFormatter - NumberOfDocuments - NumberOfInterveningJobs - NumberUp - NumberUpSupported - NumericShaper - OBJECT_NOT_EXIST - OBJ_ADAPTER - OMGVMCID - ORB - ORB - ORBInitInfo - ORBInitInfoOperations - ORBInitializer - ORBInitializerOperations - ObjID - Object - Object - ObjectAlreadyActive - ObjectAlreadyActiveHelper - ObjectChangeListener - ObjectFactory - ObjectFactoryBuilder - ObjectHelper - ObjectHolder - ObjectIdHelper - ObjectImpl - ObjectImpl - ObjectInput - ObjectInputStream - ObjectInputValidation - ObjectNotActive - ObjectNotActiveHelper - ObjectOutput - ObjectOutputStream - ObjectStreamClass - ObjectStreamConstants - ObjectStreamException - ObjectStreamField - ObjectView - Observable - Observer - OctetSeqHelper - OctetSeqHolder - Oid - OpenType - Operation - OperationNotSupportedException - Option - OptionDialogBorder - OptionPaneUI - OptionalDataException - OrientationRequested - OrientationRequestedType - OriginType - Other - OutOfMemoryError - OutputDeviceAssigned - OutputKeys - OutputStream - OutputStream - OutputStream - OutputStreamWriter - OverlappingFileLockException - OverlayLayout - Owner - PBEKey - PBEKeySpec - PBEParameterSpec - PDLOverrideSupported - PERSIST_STORE - PKCS8EncodedKeySpec - PKIXBuilderParameters - PKIXCertPathBuilderResult - PKIXCertPathChecker - PKIXCertPathValidatorResult - PKIXParameters - POA - POAHelper - POAManager - POAManagerOperations - POAOperations - PRIVATE_MEMBER - PSSParameterSpec - PUBLIC_MEMBER - Package - PackedColorModel - PageAttributes - PageFormat - PageRanges - Pageable - PagesPerMinute - PagesPerMinuteColor - Paint - PaintContext - PaintEvent - PaletteBorder - PaletteCloseIcon - Panel - PanelUI - Paper - ParagraphAttribute - ParagraphConstants - ParagraphView - ParagraphView - Parameter - ParameterBlock - ParameterDescriptor - ParameterMetaData - ParameterMode - ParameterModeHelper - ParameterModeHolder - ParseException - ParsePosition - Parser - Parser - Parser - ParserAdapter - ParserCallback - ParserConfigurationException - ParserDelegator - ParserFactory - PartialResultException - PasswordAuthentication - PasswordCallback - PasswordView - PasteAction - Patch - PathIterator - Pattern - PatternSyntaxException - Permission - Permission - PermissionCollection - Permissions - PersistenceDelegate - PhantomReference - Pipe - PipedInputStream - PipedOutputStream - PipedReader - PipedWriter - PixelGrabber - PixelInterleavedSampleModel - PlainDocument - PlainView - Point - Point2D - Policy - Policy - Policy - PolicyError - PolicyErrorCodeHelper - PolicyErrorHelper - PolicyErrorHolder - PolicyFactory - PolicyFactoryOperations - PolicyHelper - PolicyHolder - PolicyListHelper - PolicyListHolder - PolicyNode - PolicyOperations - PolicyQualifierInfo - PolicyTypeHelper - Polygon - PooledConnection - Popup - PopupFactory - PopupMenu - PopupMenuBorder - PopupMenuEvent - PopupMenuListener - PopupMenuUI - Port - PortUnreachableException - PortableRemoteObject - PortableRemoteObjectDelegate - Position - PreferenceChangeEvent - PreferenceChangeListener - Preferences - PreferencesFactory - PreparedStatement - PresentationDirection - Principal - Principal - PrincipalHolder - PrintEvent - PrintException - PrintGraphics - PrintJob - PrintJobAdapter - PrintJobAttribute - PrintJobAttributeEvent - PrintJobAttributeListener - PrintJobAttributeSet - PrintJobEvent - PrintJobListener - PrintQuality - PrintQualityType - PrintRequestAttribute - PrintRequestAttributeSet - PrintService - PrintServiceAttribute - PrintServiceAttributeEvent - PrintServiceAttributeListener - PrintServiceAttributeSet - PrintServiceLookup - PrintStream - PrintWriter - Printable - PrinterAbortException - PrinterException - PrinterGraphics - PrinterIOException - PrinterInfo - PrinterIsAcceptingJobs - PrinterJob - PrinterLocation - PrinterMakeAndModel - PrinterMessageFromOperator - PrinterMoreInfo - PrinterMoreInfoManufacturer - PrinterName - PrinterResolution - PrinterState - PrinterStateReason - PrinterStateReasons - PrinterURI - PrivateCredentialPermission - PrivateKey - PrivilegedAction - PrivilegedActionException - PrivilegedExceptionAction - Process - ProcessingInstruction - ProfileDataException - ProfileIdHelper - ProgressBarUI - ProgressMonitor - ProgressMonitorInputStream - Properties - PropertyChangeEvent - PropertyChangeListener - PropertyChangeListenerProxy - PropertyChangeSupport - PropertyDescriptor - PropertyEditor - PropertyEditorManager - PropertyEditorSupport - PropertyPermission - PropertyResourceBundle - PropertyVetoException - ProtectionDomain - ProtocolException - Provider - ProviderException - Proxy - ProxyLazyValue - PublicKey - PushbackInputStream - PushbackReader - PutField - QuadCurve2D - QueuedJobCount - RC2ParameterSpec - RC5ParameterSpec - READER - REQUEST_PROCESSING_POLICY_ID - RGBImageFilter - RMIClassLoader - RMIClassLoaderSpi - RMIClientSocketFactory - RMIFailureHandler - RMISecurityException - RMISecurityManager - RMIServerSocketFactory - RMISocketFactory - RSAKey - RSAKeyGenParameterSpec - RSAMultiPrimePrivateCrtKey - RSAMultiPrimePrivateCrtKeySpec - RSAOtherPrimeInfo - RSAPrivateCrtKey - RSAPrivateCrtKeySpec - RSAPrivateKey - RSAPrivateKeySpec - RSAPublicKey - RSAPublicKeySpec - RTFEditorKit - RadioButtonBorder - Random - RandomAccess - RandomAccessFile - Raster - RasterFormatException - RasterOp - ReadOnlyBufferException - ReadableByteChannel - Reader - Receiver - Rectangle - Rectangle2D - RectangularShape - Ref - RefAddr - Reference - Reference - ReferenceQueue - ReferenceUriSchemesSupported - Referenceable - ReferralException - ReflectPermission - RefreshFailedException - Refreshable - RegisterableService - Registry - RegistryHandler - RemarshalException - Remote - RemoteCall - RemoteException - RemoteObject - RemoteRef - RemoteServer - RemoteStub - RenderContext - RenderableImage - RenderableImageOp - RenderableImageProducer - RenderedImage - RenderedImageFactory - Renderer - RenderingHints - RepaintManager - ReplicateScaleFilter - RepositoryIdHelper - Request - RequestInfo - RequestInfoOperations - RequestProcessingPolicy - RequestProcessingPolicyOperations - RequestProcessingPolicyValue - RequestingUserName - RescaleOp - ResolutionSyntax - ResolveResult - Resolver - ResourceBundle - ResponseHandler - Result - Result - ResultSet - ResultSetMetaData - ReverbType - Robot - RolloverButtonBorder - RolloverButtonBorder - RootPaneContainer - RootPaneUI - RoundRectangle2D - RowMapper - RowSet - RowSetEvent - RowSetInternal - RowSetListener - RowSetMetaData - RowSetReader - RowSetWriter - RuleBasedCollator - RunTime - RunTimeOperations - Runnable - Runtime - RuntimeException - RuntimePermission - SAXException - SAXNotRecognizedException - SAXNotSupportedException - SAXParseException - SAXParser - SAXParserFactory - SAXResult - SAXSource - SAXTransformerFactory - SERVANT_RETENTION_POLICY_ID - SERVICE_FORMATTED - SQLData - SQLException - SQLInput - SQLOutput - SQLPermission - SQLWarning - SSLContext - SSLContextSpi - SSLException - SSLHandshakeException - SSLKeyException - SSLPeerUnverifiedException - SSLPermission - SSLProtocolException - SSLServerSocket - SSLServerSocketFactory - SSLSession - SSLSessionBindingEvent - SSLSessionBindingListener - SSLSessionContext - SSLSocket - SSLSocketFactory - STRING - SUCCESSFUL - SYNC_WITH_TRANSPORT - SYSTEM_EXCEPTION - SampleModel - Savepoint - ScatteringByteChannel - SchemaViolationException - ScrollBarUI - ScrollPane - ScrollPaneAdjustable - ScrollPaneBorder - ScrollPaneConstants - ScrollPaneLayout - ScrollPaneUI - Scrollable - Scrollbar - SealedObject - SearchControls - SearchResult - SecretKey - SecretKeyFactory - SecretKeyFactorySpi - SecretKeySpec - SecureClassLoader - SecureRandom - SecureRandomSpi - Security - SecurityException - SecurityManager - SecurityPermission - Segment - SelectableChannel - SelectionKey - Selector - SelectorProvider - Separator - Separator - SeparatorUI - Sequence - SequenceInputStream - Sequencer - Serializable - SerializablePermission - Servant - ServantActivator - ServantActivatorHelper - ServantActivatorOperations - ServantActivatorPOA - ServantAlreadyActive - ServantAlreadyActiveHelper - ServantLocator - ServantLocatorHelper - ServantLocatorOperations - ServantLocatorPOA - ServantManager - ServantManagerOperations - ServantNotActive - ServantNotActiveHelper - ServantObject - ServantRetentionPolicy - ServantRetentionPolicyOperations - ServantRetentionPolicyValue - ServerCloneException - ServerError - ServerException - ServerNotActiveException - ServerRef - ServerRequest - ServerRequestInfo - ServerRequestInfoOperations - ServerRequestInterceptor - ServerRequestInterceptorOperations - ServerRuntimeException - ServerSocket - ServerSocketChannel - ServerSocketFactory - ServiceContext - ServiceContextHelper - ServiceContextHolder - ServiceContextListHelper - ServiceContextListHolder - ServiceDetail - ServiceDetailHelper - ServiceIdHelper - ServiceInformation - ServiceInformationHelper - ServiceInformationHolder - ServicePermission - ServiceRegistry - ServiceUI - ServiceUIFactory - ServiceUnavailableException - Set - SetOfIntegerSyntax - SetOverrideType - SetOverrideTypeHelper - Severity - Shape - ShapeGraphicAttribute - SheetCollate - Short - ShortBuffer - ShortBufferException - ShortHolder - ShortLookupTable - ShortMessage - ShortSeqHelper - ShortSeqHolder - Sides - SidesType - Signature - SignatureException - SignatureSpi - SignedObject - Signer - SimpleAttributeSet - SimpleBeanInfo - SimpleDateFormat - SimpleDoc - SimpleFormatter - SimpleTimeZone - SinglePixelPackedSampleModel - SingleSelectionModel - SinkChannel - Size2DSyntax - SizeLimitExceededException - SizeRequirements - SizeSequence - Skeleton - SkeletonMismatchException - SkeletonNotFoundException - SliderUI - Socket - SocketAddress - SocketChannel - SocketException - SocketFactory - SocketHandler - SocketImpl - SocketImplFactory - SocketOptions - SocketPermission - SocketSecurityException - SocketTimeoutException - SoftBevelBorder - SoftReference - SortedMap - SortedSet - SortingFocusTraversalPolicy - Soundbank - SoundbankReader - SoundbankResource - Source - SourceChannel - SourceDataLine - SourceLocator - SpinnerDateModel - SpinnerListModel - SpinnerModel - SpinnerNumberModel - SpinnerUI - SplitPaneBorder - SplitPaneUI - Spring - SpringLayout - Stack - StackOverflowError - StackTraceElement - StartTlsRequest - StartTlsResponse - State - StateEdit - StateEditable - StateFactory - Statement - Statement - StreamCorruptedException - StreamHandler - StreamPrintService - StreamPrintServiceFactory - StreamResult - StreamSource - StreamTokenizer - Streamable - StreamableValue - StrictMath - String - StringBuffer - StringBufferInputStream - StringCharacterIterator - StringContent - StringHolder - StringIndexOutOfBoundsException - StringNameHelper - StringReader - StringRefAddr - StringSelection - StringSeqHelper - StringSeqHolder - StringTokenizer - StringValueHelper - StringWriter - Stroke - Struct - StructMember - StructMemberHelper - Stub - StubDelegate - StubNotFoundException - Style - StyleConstants - StyleContext - StyleSheet - StyledDocument - StyledEditorKit - StyledTextAction - Subject - SubjectDomainCombiner - Subset - SupportedValuesAttribute - SwingConstants - SwingPropertyChangeSupport - SwingUtilities - SyncFailedException - SyncMode - SyncScopeHelper - Synthesizer - SysexMessage - System - SystemColor - SystemException - SystemFlavorMap - TAG_ALTERNATE_IIOP_ADDRESS - TAG_CODE_SETS - TAG_INTERNET_IOP - TAG_JAVA_CODEBASE - TAG_MULTIPLE_COMPONENTS - TAG_ORB_TYPE - TAG_POLICIES - TCKind - THREAD_POLICY_ID - TRANSACTION_REQUIRED - TRANSACTION_ROLLEDBACK - TRANSIENT - TRANSPORT_RETRY - TabExpander - TabSet - TabStop - TabableView - TabbedPaneUI - TableCellEditor - TableCellRenderer - TableColumn - TableColumnModel - TableColumnModelEvent - TableColumnModelListener - TableHeaderBorder - TableHeaderUI - TableModel - TableModelEvent - TableModelListener - TableUI - TableView - Tag - TagElement - TaggedComponent - TaggedComponentHelper - TaggedComponentHolder - TaggedProfile - TaggedProfileHelper - TaggedProfileHolder - TargetDataLine - Templates - TemplatesHandler - Text - TextAction - TextArea - TextAttribute - TextComponent - TextEvent - TextField - TextFieldBorder - TextHitInfo - TextInputCallback - TextLayout - TextListener - TextMeasurer - TextOutputCallback - TextSyntax - TextUI - TexturePaint - Thread - ThreadDeath - ThreadGroup - ThreadLocal - ThreadPolicy - ThreadPolicyOperations - ThreadPolicyValue - Throwable - Tie - TileObserver - Time - TimeLimitExceededException - TimeZone - Timer - Timer - TimerTask - Timestamp - TitledBorder - TitledBorderUIResource - ToggleButtonBorder - ToggleButtonBorder - ToggleButtonModel - TooManyListenersException - ToolBarBorder - ToolBarUI - ToolTipManager - ToolTipUI - Toolkit - Track - TransactionRequiredException - TransactionRolledbackException - TransactionService - TransferHandler - Transferable - TransformAttribute - Transformer - TransformerConfigurationException - TransformerException - TransformerFactory - TransformerFactoryConfigurationError - TransformerHandler - Transmitter - Transparency - TreeCellEditor - TreeCellRenderer - TreeControlIcon - TreeExpansionEvent - TreeExpansionListener - TreeFolderIcon - TreeLeafIcon - TreeMap - TreeModel - TreeModelEvent - TreeModelListener - TreeNode - TreePath - TreeSelectionEvent - TreeSelectionListener - TreeSelectionModel - TreeSet - TreeUI - TreeWillExpandListener - TrustAnchor - TrustManager - TrustManagerFactory - TrustManagerFactorySpi - Type - Type - Type - Type - Type - Type - Type - TypeCode - TypeCodeHolder - TypeMismatch - TypeMismatch - TypeMismatch - TypeMismatchHelper - TypeMismatchHelper - Types - UID - UIDefaults - UIManager - UIResource - UIResource - UIResource - UIResource - UIResource - UIResource - UIResource - ULongLongSeqHelper - ULongLongSeqHolder - ULongSeqHelper - ULongSeqHolder - UNKNOWN - UNSUPPORTED_POLICY - UNSUPPORTED_POLICY_VALUE - URI - URIException - URIResolver - URISyntax - URISyntaxException - URL - URL - URLClassLoader - URLConnection - URLDecoder - URLEncoder - URLStreamHandler - URLStreamHandlerFactory - URLStringHelper - USER_EXCEPTION - UShortSeqHelper - UShortSeqHolder - UTFDataFormatException - UndeclaredThrowableException - UnderlineAction - UndoManager - UndoableEdit - UndoableEditEvent - UndoableEditListener - UndoableEditSupport - UnexpectedException - UnicastRemoteObject - UnicodeBlock - UnionMember - UnionMemberHelper - UnknownEncoding - UnknownEncodingHelper - UnknownError - UnknownException - UnknownGroupException - UnknownHostException - UnknownHostException - UnknownObjectException - UnknownServiceException - UnknownTag - UnknownUserException - UnknownUserExceptionHelper - UnknownUserExceptionHolder - UnmappableCharacterException - UnmarshalException - UnmodifiableSetException - UnrecoverableKeyException - Unreferenced - UnresolvedAddressException - UnresolvedPermission - UnsatisfiedLinkError - UnsolicitedNotification - UnsolicitedNotificationEvent - UnsolicitedNotificationListener - UnsupportedAddressTypeException - UnsupportedAudioFileException - UnsupportedCallbackException - UnsupportedCharsetException - UnsupportedClassVersionError - UnsupportedEncodingException - UnsupportedFlavorException - UnsupportedLookAndFeelException - UnsupportedOperationException - UserException - Util - UtilDelegate - Utilities - VMID - VM_ABSTRACT - VM_CUSTOM - VM_NONE - VM_TRUNCATABLE - ValueBase - ValueBaseHelper - ValueBaseHolder - ValueFactory - ValueHandler - ValueMember - ValueMemberHelper - VariableHeightLayoutCache - Vector - VerifyError - VersionSpecHelper - VetoableChangeListener - VetoableChangeListenerProxy - VetoableChangeSupport - View - ViewFactory - ViewportLayout - ViewportUI - VirtualMachineError - Visibility - VisibilityHelper - VoiceStatus - Void - VolatileImage - WCharSeqHelper - WCharSeqHolder - WStringSeqHelper - WStringSeqHolder - WStringValueHelper - WeakHashMap - WeakReference - Window - WindowAdapter - WindowConstants - WindowEvent - WindowFocusListener - WindowListener - WindowStateListener - WrappedPlainView - WritableByteChannel - WritableRaster - WritableRenderedImage - WriteAbortedException - Writer - WrongAdapter - WrongAdapterHelper - WrongPolicy - WrongPolicyHelper - WrongTransaction - WrongTransactionHelper - WrongTransactionHolder - X500Principal - X500PrivateCredential - X509CRL - X509CRLEntry - X509CRLSelector - X509CertSelector - X509Certificate - X509Certificate - X509EncodedKeySpec - X509Extension - X509KeyManager - X509TrustManager - XAConnection - XADataSource - XAException - XAResource - XMLDecoder - XMLEncoder - XMLFilter - XMLFilterImpl - XMLFormatter - XMLReader - XMLReaderAdapter - XMLReaderFactory - Xid - ZipEntry - ZipException - ZipFile - ZipInputStream - ZipOutputStream - ZoneView - _BindingIteratorImplBase - _BindingIteratorStub - _DynAnyFactoryStub - _DynAnyStub - _DynArrayStub - _DynEnumStub - _DynFixedStub - _DynSequenceStub - _DynStructStub - _DynUnionStub - _DynValueStub - _IDLTypeStub - _NamingContextExtStub - _NamingContextImplBase - _NamingContextStub - _PolicyStub - _Remote_Stub - _ServantActivatorStub - _ServantLocatorStub - - - - abstract - assert - break - case - catch - class - continue - default - do - else - extends - false - finally - for - goto - if - implements - import - instanceof - interface - native - new - null - package - private - protected - public - return - super - strictfp - switch - synchronized - this - throws - throw - transient - true - try - volatile - while - - - - boolean - byte - char - const - double - final - float - int - long - short - static - void - - - - and - eq - gt - true - instanceof - or - ne - le - false - empty - not - lt - ge - null - div - mod - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + and + eq + gt + true + instanceof + or + ne + le + false + empty + not + lt + ge + null + div + mod + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/julia.xml b/syntax/julia.xml --- a/syntax/julia.xml +++ b/syntax/julia.xml @@ -27,9 +27,13 @@ Author: Timothy E. Holy, Washington University in St. Louis --> - + + +]> - + @@ -46,6 +50,7 @@ catch + finally else elseif @@ -68,6 +73,16 @@ module return typealias + importall + baremodule + using + where + new + in + struct + ans + + ccall AbstractArray @@ -128,11 +143,11 @@ Task Tuple Type - Uint - Uint8 - Uint16 - Uint32 - Uint64 + UInt + UInt8 + UInt16 + UInt32 + UInt64 Union Unsigned UTF8String @@ -140,66 +155,385 @@ Vector Void WeakRef + + Missing + Cmd + EnvDict + VersionNumber + ArgumentError + AssertionError + BoundsError + CompositeException + DimensionMismatch + DivideError + DomainError + EOFError + ErrorException + InexactError + InterruptException + KeyError + LoadError + MethodError + MissingException + OutOfMemoryError + ReadOnlyMemoryError + OverflowError + StackOverflowError + SystemError + TypeError + UndefKeywordError + UndefRefError + UndefVarError + StringIndexError + InitError + ExponentialBackOff + Timer + AsyncCondition + ParseError + + IteratorEltype + AbstractRange + OrdinalRange + AbstractUnitRange + StepRange + UnitRange + LinRange + IdDict + WeakKeyDict + ImmutableDict + BitSet + Pair + + OneTo + StepRangeLen + RoundingMode + + AbstractFloat + AbstractIrrational + Float16 + Float32 + Float64 + BigFloat + Int128 + UInt128 + BigInt + ComplexF16 + ComplexF32 + ComplexF64 + Irrational + UnionAll + NamedTuple + Val + Vararg + Some + + AbstractChar + SubstitutionString + AbstractString + + UndefInitializer + DenseArray + DenseVector + DenseMatrix + BitArray + IndexStyle + IndexLinear + IndexCartesian + BroadcastStyle + AbstractArrayStyle + ArrayStyle + DefaultArrayStyle + Colon + CartesianIndex + CartesianIndices + Dims + LinearIndices + PermutedDimsArray + + Condition + Channel + + Atomic + AbstractLock + ReentrantLock + Mutex + SpinLock + RecursiveSpinLock + Semaphore + + RawFD + + IOBuffer + IOContext + TextDisplay + AbstractDisplay + + PartialQuickSort + + Stateful + + Pairs + + CFunction + Ptr + Ref + Cchar + Cuchar + Cshort + Cstring + Cushort + Cint + Cuint + Clong + Culong + Clonglong + Culonglong + Cintmax_t + Cuintmax_t + Csize_t + Cssize_t + Cptrdiff_t + Cwchar_t + Cwstring + Cfloat + Cdouble + + TmStruct + + StackFrame + StackTrace + + Base64EncodePipe + Base64DecodePipe + + Period + CompoundPeriod + Instant + UTInstant + TimeType + DateTime + Date + Time + DateFormat + + LogLevel + AbstractLogger + NullLogger + ConsoleLogger + SimpleLogger + + Anonymous + + RandomDevice + MersenneTwister + + SharedArray + + IPv4 + IPv6 + TCPSocket + UDPSocket + + SparseVector + SparseMatrixCSC + + AbstractChannel + AbstractSet + AbstractDict + BitMatrix + BitVector + Enum + CapturedException + InvalidStateException + ProcessFailedException + + + + nothing + PROGRAM_FILE + ARGS + C_NULL + VERSION + LOAD_PATH + DEPOT_PATH + + BINDIR + CPU_THREADS + WORD_SIZE + KERNEL + ARCH + MACHINE + + missing + devnull + ENV + + stdout + stderr + stdin + open + read + write + create + truncate + append + ENDIAN_BOM + + im + pi + e + catalan + eulergamma + golden + Inf + Inf64 + Inf32 + Inf16 + NaN + NaN64 + NaN32 + NaN16 + + RoundNearest + RoundNearestTiesAway + RoundNearestTiesUp + RoundToZero + RoundFromZero + RoundUp + RoundDown + + AbstractVecOrMat + undef + VecOrMat + DenseVecOrMat + StridedArray + StridedVector + StridedMatrix + StridedVecOrMat + + InsertionSort + MergeSort + QuickSort + InsertionSort + + MS_ASYNC + MS_INVALIDATE + MS_SYNC + + + true + false + + + Base + Core + Main + Meta + StackTraces + Sys + Libc + Docs + Threads + Iterators + Broadcast + MathConstants + Math + Unicode + Sort + Base64 + Dates + Mmap + Random + SharedArrays + Sockets + SparseArrays + CoreLogging + - + - - - + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + @@ -207,11 +541,17 @@ + + + - - + + + + + @@ -243,26 +583,98 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + - + + + @@ -270,8 +682,14 @@ + + + + + + - + @@ -279,6 +697,7 @@ + @@ -286,4 +705,4 @@ - + diff --git a/syntax/latex.xml b/syntax/latex.xml --- a/syntax/latex.xml +++ b/syntax/latex.xml @@ -1,45 +1,321 @@ - - + + + +]> + + + + \begin + + + + \end + + + + \Autocite + \autocite + \autoref + \Cite + \cite + \Citeauthor + \citeauthor + \citep + \citet + \citetitle + \citeurl + \citeyear + \cref + \Cref + \cref* + \Cref* + \eqref + \Footcite + \footcite + \footfullcite + \fullcite + \label + \nocite + \pagecite + \pageref + \Parencite + \parencite + \ref + \subref + \subref* + \supercite + \Textcite + \textcite + \vpageref + \vref + + + + \documentclass + \includegraphics + \include + \usepackage + \bibliography + \bibliographystyle + + + + \cites + \Cites + \parencites + \Parencites + \autocites + \Autocites + \supercites + \footcites + \Footcites + + + + \part* + \part + \chapter* + \chapter + \section* + \section + \subsection* + \subsection + \subsubsection* + \subsubsection + \paragraph* + \paragraph + \subparagraph* + \subparagraph + + + + \column + \definecolor + \geometry + \hspace* + \hspace + \input + \newboolean + \rule + \setboolean + \setcounter + \setlength + \special + \textcolor + \vspace* + \vspace + + + + \footnote* + \footnote + + + + \renewcommand* + \renewcommand + \providecommand* + \providecommand + \newcommand* + \newcommand + + + + \edef + \gdef + \xdef + + + + \ensuremath + + + + \iffalse + + + + \fi + \else + + + + verb* + verb + Verb + + + + lstinline + + + + mint + + + + lstlisting* + lstlisting + + + + minted* + minted + + + + Verbatim* + Verbatim + BVerbatim* + BVerbatim + LVerbatim* + LVerbatim + verbatim* + verbatim + boxedverbatim* + boxedverbatim + + + + comment* + comment + + + + alignat* + alignat + xalignat* + xalignat + xxalignat* + xxalignat + + + + Bmatrix* + Bmatrix + IEEEeqnarray* + IEEEeqnarray + IEEEeqnarraybox* + IEEEeqnarraybox + Vmatrix* + Vmatrix + align* + align + bmatrix* + bmatrix + cases* + cases + displaymath* + displaymath + eqnarray* + eqnarray + equation* + equation + flalign* + flalign + gather* + gather + math* + math + multline* + multline + pmatrix* + pmatrix + smallmatrix* + smallmatrix + subeqnarray* + subeqnarray + vmatrix* + vmatrix + + + + tabularx* + tabularx + tabular* + tabular + supertabular* + supertabular + mpsupertabular* + mpsupertabular + xtabular* + xtabular + mpxtabular* + mpxtabular + longtable* + longtable + + + + \text + \textit + \textbf + \textmd + \textsl + \textsc + \textrm + \textsf + \texttt + \textup + \textlf + \textnormal + \shortintertext + \intertext + \mbox + \emph + + + + \KileResetHL + \KateResetHL + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + - + - - - + + + + + + + + + + + + + + + + + + + + + - - + + @@ -47,36 +323,34 @@ - + - + - - - + + - + - + - - - + + - - + + @@ -84,54 +358,39 @@ - - - - - - - - - - + - - + + + - + + - - - - - - - + - - - - - - - + + + + + @@ -147,92 +406,99 @@ - + - - + + + + - + - + + - - - + + + - + + - + - - + + - - - + + + + - - - + + + + - + + - + - - + + + - - - - - - + - - - - - - + + + + + + + - + + - + + - + - - + + + @@ -242,306 +508,474 @@ - - - + + - + - - - + + - + - - - - - - - - - - - - + + + + + + + + + + - + - - - + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + - + - - - + + + + + - - + + - - + + + + - - + + - - - - - - - - - + + + + - - + + - - + - + + - - + + + - - + - - - - - + + + - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + - + - - - + + - - + + - - - - + + - - + + + - + + + + - - - - - + + - - - - - + + + + + + + + + - - - - - - + + + - + - - - + + + + + + + + - - - - - + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - + + + + + + - - - - + + + + - - - - - - + + + - - - - - - + + + + + - - - + + + + + + + + @@ -556,12 +990,12 @@ + - @@ -571,7 +1005,7 @@ - + diff --git a/syntax/literate-haskell.xml b/syntax/literate-haskell.xml --- a/syntax/literate-haskell.xml +++ b/syntax/literate-haskell.xml @@ -1,6 +1,6 @@ - + diff --git a/syntax/lua.xml b/syntax/lua.xml --- a/syntax/lua.xml +++ b/syntax/lua.xml @@ -8,6 +8,11 @@ CHANGES + [ Version 1.05 (2019-06-03) by Jonathan Poelen ] + + - warn and coroutine.kill (Lua 5.4) + - end of a function as Keyword rather than Control + [ Version 1.04 (2018-04-30) by Jonathan Poelen ] - based on Lua 5.3 @@ -43,7 +48,7 @@ - NOTE, FIXME, TODO alerts added on comments - improved highlighting --> - + and @@ -74,6 +79,22 @@ while + + do + if + repeat + + + + else + elseif + + + + end + until + + _PROMPT _PROMPT2 @@ -121,12 +142,14 @@ tonumber tostring type + warn xpcall coroutine.create coroutine.isyieldable coroutine.resume + coroutine.kill coroutine.running coroutine.status coroutine.wrap @@ -453,13 +476,9 @@ - + - - - - - + @@ -479,6 +498,17 @@ + + + + + + + + + + + @@ -536,3 +566,4 @@ + diff --git a/syntax/markdown.xml b/syntax/markdown.xml --- a/syntax/markdown.xml +++ b/syntax/markdown.xml @@ -6,6 +6,7 @@ Dual-Licensed under both GPL and BSD licenses. Extended 2009 Claes Holmerson. http://github.com/claes/kate-markdown/ + Extended 2019 Nibaldo González S. (changes under MIT license). --> - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + ]> - + + - - - - - - - - - - - - - - - - - + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + - - - + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + diff --git a/syntax/matlab.xml b/syntax/matlab.xml --- a/syntax/matlab.xml +++ b/syntax/matlab.xml @@ -57,7 +57,7 @@ - + @@ -98,8 +98,10 @@ - - + + + + @@ -136,25 +138,18 @@ - - + + - - - - - + + + + + + + - @@ -166,65 +161,3 @@ - diff --git a/syntax/mediawiki.xml b/syntax/mediawiki.xml --- a/syntax/mediawiki.xml +++ b/syntax/mediawiki.xml @@ -6,7 +6,7 @@ ]> - + diff --git a/syntax/modelines.xml b/syntax/modelines.xml --- a/syntax/modelines.xml +++ b/syntax/modelines.xml @@ -8,7 +8,7 @@ Copyright (c) 2012-2014 by Alex Turbov (i.zaufi@gmail.com) --> - + - + @@ -142,7 +142,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -164,13 +164,13 @@ - + - + diff --git a/syntax/mustache.xml b/syntax/mustache.xml new file mode 100644 --- /dev/null +++ b/syntax/mustache.xml @@ -0,0 +1,471 @@ + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/octave.xml b/syntax/octave.xml --- a/syntax/octave.xml +++ b/syntax/octave.xml @@ -1,2217 +1,2832 @@ - - - - - - - - - all_va_args - break - case - continue - else - elseif - end_unwind_protect - global - gplot - gsplot - otherwise - persistent - replot - return - static - until - unwind_protect - unwind_protect_cleanup - varargin - varargout - - - - argv - e - eps - false - F_DUPFD - F_GETFD - F_GETFL - filesep - F_SETFD - F_SETFL - i - I - inf - Inf - j - J - NA - nan - NaN - O_APPEND - O_ASYNC - O_CREAT - OCTAVE_HOME - OCTAVE_VERSION - O_EXCL - O_NONBLOCK - O_RDONLY - O_RDWR - O_SYNC - O_TRUNC - O_WRONLY - pi - program_invocation_name - program_name - P_tmpdir - realmax - realmin - SEEK_CUR - SEEK_END - SEEK_SET - SIG - stderr - stdin - stdout - true - ans - automatic_replot - beep_on_error - completion_append_char - crash_dumps_octave_core - current_script_file_name - debug_on_error - debug_on_interrupt - debug_on_warning - debug_symtab_lookups - DEFAULT_EXEC_PATH - DEFAULT_LOADPATH - default_save_format - echo_executing_commands - EDITOR - EXEC_PATH - FFTW_WISDOM_PROGRAM - fixed_point_format - gnuplot_binary - gnuplot_command_axes - gnuplot_command_end - gnuplot_command_plot - gnuplot_command_replot - gnuplot_command_splot - gnuplot_command_title - gnuplot_command_using - gnuplot_command_with - gnuplot_has_frames - history_file - history_size - ignore_function_time_stamp - IMAGEPATH - INFO_FILE - INFO_PROGRAM - __kluge_procbuf_delay__ - LOADPATH - MAKEINFO_PROGRAM - max_recursion_depth - octave_core_file_format - octave_core_file_limit - octave_core_file_name - output_max_field_width - output_precision - page_output_immediately - PAGER - page_screen_output - print_answer_id_name - print_empty_dimensions - print_rhs_assign_val - PS1 - PS2 - PS4 - save_header_format_string - save_precision - saving_history - sighup_dumps_octave_core - sigterm_dumps_octave_core - silent_functions - split_long_rows - string_fill_char - struct_levels_to_print - suppress_verbose_help_message - variables_can_hide_functions - warn_assign_as_truth_value - warn_divide_by_zero - warn_empty_list_elements - warn_fortran_indexing - warn_function_name_clash - warn_future_time_stamp - warn_imag_to_real - warn_matlab_incompatible - warn_missing_semicolon - warn_neg_dim_as_zero - warn_num_to_str - warn_precedence_change - warn_reload_forces_clear - warn_resize_on_range_error - warn_separator_insert - warn_single_quote_string - warn_str_to_num - warn_undefined_return_values - warn_variable_switch_label - whos_line_format - - - - casesen - cd - chdir - clear - dbclear - dbstatus - dbstop - dbtype - dbwhere - diary - echo - edit_history - __end__ - format - gset - gshow - help - history - hold - iskeyword - isvarname - load - ls - mark_as_command - mislocked - mlock - more - munlock - run_history - save - set - show - type - unmark_command - which - who - whos - - - - abs - acos - acosh - all - angle - any - append - arg - argnames - asin - asinh - assignin - atan - atan2 - atanh - atexit - bitand - bitmax - bitor - bitshift - bitxor - casesen - cat - cd - ceil - cell - cell2struct - cellstr - char - chdir - class - clc - clear - clearplot - clg - closeplot - completion_matches - conj - conv - convmtx - cos - cosh - cumprod - cumsum - dbclear - dbstatus - dbstop - dbtype - dbwhere - deconv - det - dftmtx - diag - diary - disp - document - do_string_escapes - double - dup2 - echo - edit_history - __end__ - erf - erfc - ERRNO - error - __error_text__ - error_text - eval - evalin - exec - exist - exit - exp - eye - fclose - fcntl - fdisp - feof - ferror - feval - fflush - fft - fgetl - fgets - fieldnames - file_in_loadpath - file_in_path - filter - find - find_first_of_in_loadpath - finite - fix - floor - fmod - fnmatch - fopen - fork - format - formula - fprintf - fputs - fread - freport - frewind - fscanf - fseek - ftell - func2str - functions - fwrite - gamma - gammaln - getegid - getenv - geteuid - getgid - getpgrp - getpid - getppid - getuid - glob - graw - gset - gshow - help - history - hold - home - horzcat - ifft - imag - inline - input - input_event_hook - int16 - int32 - int64 - int8 - intmax - intmin - inv - inverse - ipermute - isalnum - isalpha - isascii - isbool - iscell - iscellstr - ischar - iscntrl - iscomplex - isdigit - isempty - isfield - isfinite - isglobal - isgraph - ishold - isieee - isinf - iskeyword - islist - islogical - islower - ismatrix - isna - isnan - is_nan_or_na - isnumeric - isprint - ispunct - isreal - isspace - isstream - isstreamoff - isstruct - isupper - isvarname - isxdigit - kbhit - keyboard - kill - lasterr - lastwarn - length - lgamma - link - linspace - list - load - log - log10 - ls - lstat - lu - mark_as_command - mislocked - mkdir - mkfifo - mkstemp - mlock - more - munlock - nargin - nargout - native_float_format - ndims - nth - numel - octave_config_info - octave_tmp_file_name - ones - pause - pclose - permute - pipe - popen - printf - __print_symbol_info__ - __print_symtab_info__ - prod - purge_tmp_files - putenv - puts - pwd - quit - rank - readdir - readlink - read_readline_init_file - real - rehash - rename - reshape - reverse - rmdir - rmfield - roots - round - run_history - save - scanf - set - shell_cmd - show - sign - sin - sinh - size - sizeof - sleep - sort - source - splice - sprintf - sqrt - squeeze - sscanf - stat - str2func - streamoff - struct - struct2cell - sum - sumsq - symlink - system - tan - tanh - tilde_expand - tmpfile - tmpnam - toascii - __token_count__ - tolower - toupper - type - typeinfo - uint16 - uint32 - uint64 - uint8 - umask - undo_string_escapes - unlink - unmark_command - usage - usleep - va_arg - va_start - vectorize - vertcat - vr_val - waitpid - warning - warranty - which - who - whos - zeros - airy - balance - besselh - besseli - besselj - besselk - bessely - betainc - chol - colloc - daspk - daspk_options - dasrt - dasrt_options - dassl - dassl_options - det - eig - endgrent - endpwent - expm - fft - fft2 - fftn - fftw_wisdom - filter - find - fsolve - fsolve_options - gammainc - gcd - getgrent - getgrgid - getgrnam - getpwent - getpwnam - getpwuid - getrusage - givens - gmtime - hess - ifft - ifft2 - ifftn - inv - inverse - kron - localtime - lpsolve - lpsolve_options - lsode - lsode_options - lu - max - min - minmax - mktime - odessa - odessa_options - pinv - qr - quad - quad_options - qz - rand - randn - schur - setgrent - setpwent - sort - sqrtm - strftime - strptime - svd - syl - time - abcddim - __abcddims__ - acot - acoth - acsc - acsch - analdemo - anova - arch_fit - arch_rnd - arch_test - are - arma_rnd - asctime - asec - asech - autocor - autocov - autoreg_matrix - axis - axis2dlim - __axis_label__ - bar - bartlett - bartlett_test - base2dec - bddemo - beep - bessel - beta - beta_cdf - betai - beta_inv - beta_pdf - beta_rnd - bin2dec - bincoeff - binomial_cdf - binomial_inv - binomial_pdf - binomial_rnd - bitcmp - bitget - bitset - blackman - blanks - bode - bode_bounds - __bodquist__ - bottom_title - bug_report - buildssic - c2d - cart2pol - cart2sph - cauchy_cdf - cauchy_inv - cauchy_pdf - cauchy_rnd - cellidx - center - chisquare_cdf - chisquare_inv - chisquare_pdf - chisquare_rnd - chisquare_test_homogeneity - chisquare_test_independence - circshift - clock - cloglog - close - colormap - columns - com2str - comma - common_size - commutation_matrix - compan - complement - computer - cond - contour - controldemo - conv - cor - corrcoef - cor_test - cot - coth - cov - cputime - create_set - cross - csc - csch - ctime - ctrb - cut - d2c - damp - dare - date - dcgain - deal - deblank - dec2base - dec2bin - dec2hex - deconv - delete - DEMOcontrol - demoquat - detrend - dezero - dgkfdemo - dgram - dhinfdemo - diff - diffpara - dir - discrete_cdf - discrete_inv - discrete_pdf - discrete_rnd - dkalman - dlqe - dlqg - dlqr - dlyap - dmr2d - dmult - dot - dre - dump_prefs - duplication_matrix - durbinlevinson - empirical_cdf - empirical_inv - empirical_pdf - empirical_rnd - erfinv - __errcomm__ - errorbar - __errplot__ - etime - exponential_cdf - exponential_inv - exponential_pdf - exponential_rnd - f_cdf - fftconv - fftfilt - fftshift - figure - fileparts - findstr - f_inv - fir2sys - flipdim - fliplr - flipud - flops - f_pdf - fractdiff - frdemo - freqchkw - __freqresp__ - freqz - freqz_plot - f_rnd - f_test_regression - fullfile - fv - fvl - gamma_cdf - gammai - gamma_inv - gamma_pdf - gamma_rnd - geometric_cdf - geometric_inv - geometric_pdf - geometric_rnd - gls - gram - gray - gray2ind - grid - h2norm - h2syn - hamming - hankel - hanning - hex2dec - hilb - hinf_ctr - hinfdemo - hinfnorm - hinfsyn - hinfsyn_chk - hinfsyn_ric - hist - hotelling_test - hotelling_test_2 - housh - hsv2rgb - hurst - hypergeometric_cdf - hypergeometric_inv - hypergeometric_pdf - hypergeometric_rnd - image - imagesc - impulse - imshow - ind2gray - ind2rgb - ind2sub - index - int2str - intersection - invhilb - iqr - irr - isa - is_abcd - is_bool - is_complex - is_controllable - isdefinite - is_detectable - is_dgkf - is_digital - is_duplicate_entry - is_global - is_leap_year - isletter - is_list - is_matrix - is_observable - ispc - is_sample - is_scalar - isscalar - is_signal_list - is_siso - is_square - issquare - is_stabilizable - is_stable - isstr - is_stream - is_struct - is_symmetric - issymmetric - isunix - is_vector - isvector - jet707 - kendall - kolmogorov_smirnov_cdf - kolmogorov_smirnov_test - kolmogorov_smirnov_test_2 - kruskal_wallis_test - krylov - krylovb - kurtosis - laplace_cdf - laplace_inv - laplace_pdf - laplace_rnd - lcm - lin2mu - listidx - list_primes - loadaudio - loadimage - log2 - logical - logistic_cdf - logistic_inv - logistic_pdf - logistic_regression - logistic_regression_derivatives - logistic_regression_likelihood - logistic_rnd - logit - loglog - loglogerr - logm - lognormal_cdf - lognormal_inv - lognormal_pdf - lognormal_rnd - logspace - lower - lqe - lqg - lqr - lsim - ltifr - lyap - mahalanobis - manova - mcnemar_test - mean - meansq - median - menu - mesh - meshdom - meshgrid - minfo - mod - moddemo - moment - mplot - mu2lin - multiplot - nargchk - nextpow2 - nichols - norm - normal_cdf - normal_inv - normal_pdf - normal_rnd - not - nper - npv - ntsc2rgb - null - num2str - nyquist - obsv - ocean - ols - oneplot - ord2 - orth - __outlist__ - pack - packedform - packsys - parallel - paren - pascal_cdf - pascal_inv - pascal_pdf - pascal_rnd - path - periodogram - perror - place - playaudio - plot - plot_border - __plr__ - __plr1__ - __plr2__ - __plt__ - __plt1__ - __plt2__ - __plt2mm__ - __plt2mv__ - __plt2ss__ - __plt2vm__ - __plt2vv__ - __pltopt__ - __pltopt1__ - pmt - poisson_cdf - poisson_inv - poisson_pdf - poisson_rnd - pol2cart - polar - poly - polyder - polyderiv - polyfit - polyinteg - polyout - polyreduce - polyval - polyvalm - popen2 - postpad - pow2 - ppplot - prepad - probit - prompt - prop_test_2 - pv - pvl - pzmap - qconj - qcoordinate_plot - qderiv - qderivmat - qinv - qmult - qqplot - qtrans - qtransv - qtransvmat - quaternion - qzhess - qzval - randperm - range - rank - ranks - rate - record - rectangle_lw - rectangle_sw - rem - repmat - residue - rgb2hsv - rgb2ind - rgb2ntsc - rindex - rldemo - rlocus - roots - rot90 - rotdim - rotg - rows - run_cmd - run_count - run_test - saveaudio - saveimage - sec - sech - semicolon - semilogx - semilogxerr - semilogy - semilogyerr - series - setaudio - setstr - shg - shift - shiftdim - sign_test - sinc - sinetone - sinewave - skewness - sombrero - sortcom - spearman - spectral_adf - spectral_xdf - spencer - sph2cart - split - ss - ss2sys - ss2tf - ss2zp - stairs - starp - statistics - std - stdnormal_cdf - stdnormal_inv - stdnormal_pdf - stdnormal_rnd - step - __stepimp__ - stft - str2mat - str2num - strappend - strcat - strcmp - strerror - strjust - strrep - struct_contains - struct_elements - studentize - sub2ind - subplot - substr - subwindow - swap - swapcols - swaprows - sylvester_matrix - synthesis - sys2fir - sys2ss - sys2tf - sys2zp - sysadd - sysappend - syschnames - __syschnamesl__ - syschtsam - __sysconcat__ - sysconnect - syscont - __syscont_disc__ - __sysdefioname__ - __sysdefstname__ - sysdimensions - sysdisc - sysdup - sysgetsignals - sysgettsam - sysgettype - sysgroup - __sysgroupn__ - sysidx - sysmin - sysmult - sysout - sysprune - sysreorder - sysrepdemo - sysscale - syssetsignals - syssub - sysupdate - table - t_cdf - tempdir - tempname - texas_lotto - tf - tf2ss - tf2sys - __tf2sysl__ - tf2zp - __tfl__ - tfout - tic - t_inv - title - toc - toeplitz - top_title - t_pdf - trace - triangle_lw - triangle_sw - tril - triu - t_rnd - t_test - t_test_2 - t_test_regression - tzero - tzero2 - ugain - uniform_cdf - uniform_inv - uniform_pdf - uniform_rnd - union - unix - unpacksys - unwrap - upper - u_test - values - vander - var - var_test - vec - vech - version - vol - weibull_cdf - weibull_inv - weibull_pdf - weibull_rnd - welch_test - wgt1o - wiener_rnd - wilcoxon_test - xlabel - xor - ylabel - yulewalker - zgfmul - zgfslv - zginit - __zgpbal__ - zgreduce - zgrownorm - zgscal - zgsgiv - zgshsr - zlabel - zp - zp2ss - __zp2ssg2__ - zp2sys - zp2tf - zpout - z_test - z_test_2 - - - - airy_Ai - airy_Ai_deriv - airy_Ai_deriv_scaled - airy_Ai_scaled - airy_Bi - airy_Bi_deriv - airy_Bi_deriv_scaled - airy_Bi_scaled - airy_zero_Ai - airy_zero_Ai_deriv - airy_zero_Bi - airy_zero_Bi_deriv - atanint - bchdeco - bchenco - bessel_il_scaled - bessel_In - bessel_In_scaled - bessel_Inu - bessel_Inu_scaled - bessel_jl - bessel_Jn - bessel_Jnu - bessel_kl_scaled - bessel_Kn - bessel_Kn_scaled - bessel_Knu - bessel_Knu_scaled - bessel_lnKnu - bessel_yl - bessel_Yn - bessel_Ynu - bessel_zero_J0 - bessel_zero_J1 - beta_gsl - bfgsmin - bisectionstep - builtin - bwfill - bwlabel - cell2csv - celleval - Chi - chol - Ci - clausen - conicalP_0 - conicalP_1 - conicalP_half - conicalP_mhalf - conv2 - cordflt2 - coupling_3j - coupling_6j - coupling_9j - csv2cell - csvconcat - csvexplode - cyclgen - cyclpoly - dawson - debye_1 - debye_2 - debye_3 - debye_4 - deref - dispatch - dispatch_help - display_fixed_operations - dlmread - ellint_Ecomp - ellint_Kcomp - ellipj - erfc_gsl - erf_gsl - erf_Q - erf_Z - _errcore - eta - eta_int - expint_3 - expint_E1 - expint_E2 - expint_Ei - expm1 - exp_mult - exprel - exprel_2 - exprel_n - fabs - fangle - farg - fatan2 - fceil - fconj - fcos - fcosh - fcumprod - fcumsum - fdiag - fermi_dirac_3half - fermi_dirac_half - fermi_dirac_inc_0 - fermi_dirac_int - fermi_dirac_mhalf - fexp - ffloor - fimag - finitedifference - fixed - flog - flog10 - fprod - freal - freshape - fround - fsin - fsinh - fsqrt - fsum - fsumsq - ftan - ftanh - full - gamma_gsl - gamma_inc - gamma_inc_P - gamma_inc_Q - gammainv_gsl - gammastar - gdet - gdiag - gexp - gf - gfilter - _gfweight - ginv - ginverse - glog - glu - gpick - gprod - grab - grank - graycomatrix - __grcla__ - __grclf__ - __grcmd__ - greshape - __grexit__ - __grfigure__ - __grgetstat__ - __grhold__ - __grinit__ - __grishold__ - __grnewset__ - __grsetgraph__ - gsl_sf - gsqrt - gsum - gsumsq - gtext - gzoom - hazard - houghtf - hyperg_0F1 - hzeta - is_complex_sparse - isfixed - isgalois - isprimitive - is_real_sparse - is_sparse - jpgread - jpgwrite - lambert_W0 - lambert_Wm1 - legendre_Pl - legendre_Plm - legendre_Ql - legendre_sphPlm - legendre_sphPlm_array - leval - listen - lnbeta - lncosh - lngamma_gsl - lnpoch - lnsinh - log_1plusx - log_1plusx_mx - log_erfc - lp - make_sparse - mark_for_deletion - medfilt1 - newtonstep - nnz - numgradient - numhessian - pchip_deriv - pngread - pngwrite - poch - pochrel - pretty - primpoly - psi - psi_1_int - psi_1piy - psi_n - rand - rande - randn - randp - regexp - remez - reset_fixed_operations - rotate_scale - rsdec - rsenc - samin - SBBacksub - SBEig - SBFactor - SBProd - SBSolve - Shi - Si - sinc_gsl - spabs - sparse - spfind - spimag - spinv - splu - spreal - SymBand - synchrotron_1 - synchrotron_2 - syndtable - taylorcoeff - transport_2 - transport_3 - transport_4 - transport_5 - trisolve - waitbar - xmlread - zeta - zeta_int - aar - aarmam - ac2poly - ac2rc - acorf - acovf - addpath - ademodce - adim - adsmax - amodce - anderson_darling_cdf - anderson_darling_test - anovan - apkconst - append_save - applylut - ar2poly - ar2rc - arburg - arcext - arfit2 - ar_spa - aryule - assert - au - aucapture - auload - auplot - aurecord - ausave - autumn - average_moments - awgn - azimuth - BandToFull - BandToSparse - base64encode - battery - bchpoly - bestblk - best_dir - best_dir_cov - betaln - bfgs - bfgsmin_example - bi2de - biacovf - bilinear - bisdemo - bispec - biterr - blkdiag - blkproc - bmpwrite - bone - bound_convex - boxcar - boxplot - brighten - bs_gradient - butter - buttord - bwborder - bweuler - bwlabel - bwmorph - bwselect - calendar - cceps - cdiff - cellstr - char - cheb - cheb1ord - cheb2ord - chebwin - cheby1 - cheby2 - chirp - clf - clip - cmpermute - cmunique - cohere - col2im - colfilt - colorgradient - comms - compand - complex - concat - conndef - content - contents - Contents - contourf - convhull - convmtx - cool - copper - corr2 - cosets - count - covm - cplxpair - cquadnd - create_lookup_table - crule - crule2d - crule2dgen - csape - csapi - csd - csvread - csvwrite - ctranspose - cumtrapz - czt - d2_min - datenum - datestr - datevec - dct - dct2 - dctmtx - de2bi - deal - decimate - decode - deg2rad - del2 - delaunay - delaunay3 - delta_method - demo - demodmap - deriv - detrend - dfdp - dftmtx - dhbar - dilate - dispatch - distance - dlmread - dlmwrite - dos - double - drawnow - durlev - dxfwrite - edge - edit - ellip - ellipdemo - ellipj - ellipke - ellipord - __ellip_ws - __ellip_ws_min - encode - eomday - erode - example - ExampleEigenValues - ExampleGenEigenValues - expdemo - expfit - eyediagram - factor - factorial - fail - fcnchk - feedback - fem_test - ff2n - fftconv2 - fieldnames - fill - fill3 - filter2 - filtfilt - filtic - findsym - fir1 - fir2 - fixedpoint - flag - flag_implicit_samplerate - flattopwin - flix - float - fmin - fminbnd - fmins - fminunc - fnder - fnplt - fnval - fplot - freqs - freqs_plot - fsort - fullfact - FullToBand - funm - fzero - gammaln - gapTest - gaussian - gausswin - gconv - gconvmtx - gdeconv - gdftmtx - gen2par - geomean - getfield - getfields - gfft - gftable - gfweight - gget - gifft - ginput - gmm_estimate - gmm_example - gmm_obj - gmm_results - gmm_variance - gmm_variance_inefficient - gquad - gquad2d - gquad2d6 - gquad2dgen - gquad6 - gquadnd - grace_octave_path - gradient - grayslice - grep - grid - griddata - groots - grpdelay - grule - grule2d - grule2dgen - hadamard - hammgen - hankel - hann - harmmean - hilbert - histeq - histfit - histo - histo2 - histo3 - histo4 - hot - hsv - hup - idct - idct2 - idplot - idsim - ifftshift - im2bw - im2col - imadjust - imginfo - imhist - imnoise - impad - impz - imread - imrotate - imshear - imtranslate - imwrite - innerfun - inputname - interp - interp1 - interp2 - interpft - intersect - invest0 - invest1 - invfdemo - invfreq - invfreqs - invfreqz - inz - irsa_act - irsa_actcore - irsa_check - irsa_dft - irsa_dftfp - irsa_genreal - irsa_idft - irsa_isregular - irsa_jitsp - irsa_mdsp - irsa_normalize - irsa_plotdft - irsa_resample - irsa_rgenreal - isa - isbw - isdir - isequal - isfield - isgray - isind - ismember - isprime - isrgb - issparse - isunix - jet - kaiser - kaiserord - lambertw - lattice - lauchli - leasqr - leasqrdemo - legend - legendre - levinson - lin2mu - line_min - lloyds - lookup - lookup_table - lpc - lp_test - mad - magic - makelut - MakeShears - map - mat2gray - mat2str - mdsmax - mean2 - medfilt2 - meshc - minimize - minpol - mkpp - mktheta - mle_estimate - mle_example - mle_obj - mle_results - mle_variance - modmap - mu2lin - mvaar - mvar - mvfilter - mvfreqz - myfeval - nanmax - nanmean - nanmedian - nanmin - nanstd - nansum - ncauer - nchoosek - ncrule - ndims - nelder_mead_min - newmark - nlfilter - nlnewmark - __nlnewmark_fcn__ - nmsmax - nonzeros - normplot - now - nrm - nthroot - nze - OCTAVE_FORGE_VERSION - ode23 - ode45 - ode78 - optimset - ordfilt2 - orient - pacf - padarray - parameterize - parcor - pareto - pascal - patch - pburg - pcg - pchip - pcolor - pcr - peaks - penddot - pendulum - perms - pie - pink - plot3 - __plt3__ - poly2ac - poly2ar - poly_2_ex - poly2mask - poly2rc - poly2sym - poly2th - polyarea - polyconf - polyder - polyderiv - polygcd - polystab - __power - ppval - prctile - prettyprint - prettyprint_c - primes - princomp - print - prism - proplan - pulstran - pwelch - pyulear - qaskdeco - qaskenco - qtdecomp - qtgetblk - qtsetblk - quad2dc - quad2dcgen - quad2dg - quad2dggen - quadc - quadg - quadl - quadndg - quantiz - quiver - rad2deg - rainbow - randerr - randint - randsrc - rat - rats - rc2ac - rc2ar - rc2poly - rceps - read_options - read_pdb - rectpuls - resample - rgb2gray - rk2fixed - rk4fixed - rk8fixed - rmfield - rmle - rmpath - roicolor - rosser - rotparams - rotv - rref - rsdecof - rsencof - rsgenpoly - samin_example - save_vrml - sbispec - scale_data - scatter - scatterplot - select_3D_points - selmo - setdiff - setfield - setfields - setxor - sftrans - sgolay - sgolayfilt - sinvest1 - slurp_file - sortrows - sound - soundsc - spdiags - specgram - speed - speye - spfun - sphcat - spline - splot - spones - sprand - sprandn - spring - spstats - spsum - sp_test - sptest - spvcat - spy - std2 - stem - str2double - strcmpi - stretchlim - strfind - strmatch - strncmp - strncmpi - strsort - strtok - strtoz - struct - strvcat - summer - sumskipnan - surf - surfc - sym2poly - symerr - symfsolve - tabulate - tar - temp_name - test - test_d2_min_1 - test_d2_min_2 - test_d2_min_3 - test_ellipj - test_fminunc_1 - testimio - test_inline_1 - test_min_1 - test_min_2 - test_min_3 - test_min_4 - test_minimize_1 - test_nelder_mead_min_1 - test_nelder_mead_min_2 - test_sncndn - test_struct - test_vmesh - test_vrml_faces - test_wpolyfit - text - textread - tf2zp - tfe - thfm - tics - toeplitz - toggle_grace_use - transpose - trapz - triang - tril - trimmean - tripuls - trisolve - triu - tsademo - tsearchdemo - ucp - uintlut - unique - unix - unmkpp - unscale_parameters - vec2mat - view - vmesh - voronoi - voronoin - vrml_arrow - vrml_Background - vrml_browse - vrml_cyl - vrml_demo_tutorial_1 - vrml_demo_tutorial_2 - vrml_demo_tutorial_3 - vrml_demo_tutorial_4 - vrml_ellipsoid - vrml_faces - vrml_flatten - vrml_frame - vrml_group - vrml_kill - vrml_lines - vrml_material - vrml_parallelogram - vrml_PointLight - vrml_points - vrml_select_points - vrml_surf - vrml_text - vrml_thick_surf - vrml_transfo - wavread - wavwrite - weekday - wgn - white - wilkinson - winter - wpolyfit - wpolyfitdemo - write_pdb - wsolve - xcorr - xcorr2 - xcov - xlsread - xmlwrite - y2res - zero_count - zoom - zp2tf - zplane - zscore - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + ===================================================================================================== + Octave syntax highlighting file for the KDE editors Kate and Kwrite + ===================================================================================================== + based on Octave 4.2.0 + keywords, functions list bases on __builtins__ and __keywords__ commands. For details see + https://stackoverflow.com/questions/49840280/list-of-all-built-in-symbols-in-matlab-octave + Commands list bases on parsing source code (search inside embedded into code documentation + (by "@deftypefn") for commands, used without brackets). + (grep '@deftypefn' -r * | grep -v '@deftypefnx' | grep -v '(') + + + Change log: + 16-Dec-04 Created from Matlab and Scilab files. + 19-Feb-04 Update from Octave 4.2.0 (updated by sirgienko.n ) + + Author: Federico Zenith, Norwegian University of Science and Technology + Thanks to Luis Silvestre for previous version and suggestions +--> + + + + + + + + + case + catch + continue + else + elseif + global + otherwise + return + static + persistent + unwind_protect_cleanup + varargin + varargout + break + for + endfor + if + endif + do + until + while + endwhile + function + endfunction + unwind_protect + end_unwind_protect + parfor + endparfor + classdef + endclassdef + enumeration + endenumeration + events + endevents + methods + endmethods + properties + endproperties + switch + endswitch + try + end_try_catch + end + + + + EDITOR + EXEC_PATH + F_DUPFD + F_GETFD + F_GETFL + F_SETFD + F_SETFL + IMAGE_PATH + J + OCTAVE_HOME + OCTAVE_VERSION + O_APPEND + O_ASYNC + O_CREAT + O_EXCL + O_NONBLOCK + O_RDONLY + O_RDWR + O_SYNC + O_TRUNC + O_WRONLY + PAGER + PAGER_FLAGS + PS1 + PS2 + PS4 + P_tmpdir + SEEK_CUR + SEEK_END + SEEK_SET + SIG + S_ISBLK + S_ISCHR + S_ISDIR + S_ISFIFO + S_ISLNK + S_ISREG + S_ISSOCK + WCONTINUE + WCOREDUMP + WEXITSTATUS + WIFCONTINUED + WIFEXITED + WIFSIGNALED + WIFSTOPPED + WNOHANG + WSTOPSIG + WTERMSIG + WUNTRACED + __accumarray_max__ + __accumarray_min__ + __accumarray_sum__ + __accumdim_sum__ + __builtins__ + __calc_dimensions__ + __compactformat__ + __contourc__ + __current_scope__ + __db_next_breakpoint_quiet__ + __diaryfile__ + __diarystate__ + __dispatch__ + __display_tokens__ + __dsearchn__ + __dump_load_path__ + __dump_symtab_info__ + __dump_typeinfo__ + __echostate__ + __fieldnames__ + __fnmatch__ + __formatstring__ + __ftp__ + __ftp_ascii__ + __ftp_binary__ + __ftp_close__ + __ftp_cwd__ + __ftp_delete__ + __ftp_dir__ + __ftp_mget__ + __ftp_mkdir__ + __ftp_mode__ + __ftp_mput__ + __ftp_pwd__ + __ftp_rename__ + __ftp_rmdir__ + __get__ + __get_cmdline_fcn_txt__ + __go_axes__ + __go_axes_init__ + __go_delete__ + __go_execute_callback__ + __go_figure__ + __go_figure_handles__ + __go_handles__ + __go_hggroup__ + __go_image__ + __go_light__ + __go_line__ + __go_patch__ + __go_surface__ + __go_text__ + __go_uibuttongroup__ + __go_uicontextmenu__ + __go_uicontrol__ + __go_uimenu__ + __go_uipanel__ + __go_uipushtool__ + __go_uitoggletool__ + __go_uitoolbar__ + __gud_mode__ + __ichol0__ + __icholt__ + __ilu0__ + __iluc__ + __ilutp__ + __image_pixel_size__ + __is_handle_visible__ + __java_exit__ + __java_get__ + __java_init__ + __java_set__ + __keywords__ + __lexer_debug_flag__ + __lin_interpn__ + __list_functions__ + __luinc__ + __magick_finfo__ + __magick_formats__ + __magick_ping__ + __magick_read__ + __magick_write__ + __meta_class_query__ + __meta_get_package__ + __methods__ + __mkdir__ + __octave_config_info__ + __octave_link_edit_file__ + __octave_link_enabled__ + __octave_link_file_dialog__ + __octave_link_input_dialog__ + __octave_link_list_dialog__ + __octave_link_message_dialog__ + __octave_link_question_dialog__ + __octave_link_show_doc__ + __octave_link_show_preferences__ + __open_with_system_app__ + __operators__ + __parent_classes__ + __parse_file__ + __parser_debug_flag__ + __pathorig__ + __pchip_deriv__ + __profiler_data__ + __profiler_enable__ + __profiler_reset__ + __qp__ + __request_drawnow__ + __sort_rows_idx__ + __superclass_reference__ + __textscan__ + __token_count__ + __usage__ + __varval__ + __version_info__ + __wglob__ + __which__ + __zoom__ + + + + Inf + NaN + e + eps + pi + realmax + realmin + I + NA + dbstop + dbclear + dbstatus + dbwhere + dbtype + dblist + dbstack + dbup + dbdown + dbstep + dbcont + dbquit + cd + rmdir + link + symlink + readlink + rename + diary + more + exit + load + save + edit_history + history + run_history + who + whos + clear + format + echo + + + + __actual_axis_position__ + __all_opts__ + __clabel__ + __default_plot_options__ + __delaunayn__ + __eigs__ + __finish__ + __fltk_check__ + __fltk_uigetfile__ + __getlegenddata__ + __glpk__ + __gnuplot_drawnow__ + __gripe_missing_component__ + __have_feature__ + __have_gnuplot__ + __init_fltk__ + __init_gnuplot__ + __makeinfo__ + __next_line_color__ + __next_line_style__ + __opengl_info__ + __osmesa_print__ + __player_audioplayer__ + __player_get_channels__ + __player_get_fs__ + __player_get_id__ + __player_get_nbits__ + __player_get_sample_number__ + __player_get_tag__ + __player_get_total_samples__ + __player_get_userdata__ + __player_isplaying__ + __player_pause__ + __player_play__ + __player_playblocking__ + __player_resume__ + __player_set_fs__ + __player_set_tag__ + __player_set_userdata__ + __player_stop__ + __plt_get_axis_arg__ + __pltopt__ + __printf_assert__ + __prog_output_assert__ + __recorder_audiorecorder__ + __recorder_get_channels__ + __recorder_get_fs__ + __recorder_get_id__ + __recorder_get_nbits__ + __recorder_get_sample_number__ + __recorder_get_tag__ + __recorder_get_total_samples__ + __recorder_get_userdata__ + __recorder_getaudiodata__ + __recorder_isrecording__ + __recorder_pause__ + __recorder_record__ + __recorder_recordblocking__ + __recorder_resume__ + __recorder_set_fs__ + __recorder_set_tag__ + __recorder_set_userdata__ + __recorder_stop__ + __run_test_suite__ + __unimplemented__ + __voronoi__ + abs + accumarray + accumdim + acos + acosd + acosh + acot + acotd + acoth + acsc + acscd + acsch + add_input_event_hook + addlistener + addpath + addpref + addproperty + addtodate + airy + all + allchild + allow_noninteger_range_as_index + amd + ancestor + and + angle + annotation + anova + ans + any + arch_fit + arch_rnd + arch_test + area + arg + argnames + argv + arma_rnd + arrayfun + asctime + asec + asecd + asech + asin + asind + asinh + assert + assignin + atan + atan2 + atan2d + atand + atanh + atexit + audiodevinfo + audioformats + audioinfo + audioread + audiowrite + autoload + autoreg_matrix + autumn + available_graphics_toolkits + axes + axis + balance + bandwidth + bar + barh + bartlett + bartlett_test + base2dec + base64_decode + base64_encode + beep + beep_on_error + bessel + besselh + besseli + besselj + besselk + bessely + beta + betacdf + betainc + betaincinv + betainv + betaln + betapdf + betarnd + bicg + bicgstab + bicubic + bin2dec + bincoeff + binocdf + binoinv + binopdf + binornd + bitand + bitcmp + bitget + bitmax + bitor + bitpack + bitset + bitshift + bitunpack + bitxor + blackman + blanks + blkdiag + blkmm + bone + box + brighten + bsxfun + bug_report + built_in_docstrings_file + builtin + bunzip2 + bzip2 + calendar + camlight + canonicalize_file_name + cart2pol + cart2sph + cast + cat + cauchy_cdf + cauchy_inv + cauchy_pdf + cauchy_rnd + caxis + cbrt + ccolamd + ceil + cell + cell2mat + cell2struct + celldisp + cellfun + cellindexmat + cellslices + cellstr + center + cgs + char + chdir + chi2cdf + chi2inv + chi2pdf + chi2rnd + chisquare_test_homogeneity + chisquare_test_independence + chol + chol2inv + choldelete + cholinsert + cholinv + cholshift + cholupdate + chop + circshift + citation + cla + clabel + class + clc + clf + clock + cloglog + close + closereq + cmpermute + cmunique + colamd + colloc + colon + colorbar + colorcube + colormap + colperm + colstyle + columns + comet + comet3 + comma + command_line_path + common_size + commutation_matrix + compan + compare_versions + compass + completion_append_char + completion_matches + complex + computer + cond + condeig + condest + confirm_recursive_rmdir + conj + contour + contour3 + contourc + contourf + contrast + conv + conv2 + convhull + convhulln + convn + cool + copper + copyfile + copyobj + cor_test + corr + corrcoef + cos + cosd + cosh + cot + cotd + coth + cov + cplxpair + cputime + crash_dumps_octave_core + cross + csc + cscd + csch + cstrcat + csvread + csvwrite + csymamd + ctime + ctranspose + cubehelix + cummax + cummin + cumprod + cumsum + cumtrapz + curl + cylinder + daspect + daspk + daspk_options + dasrt + dasrt_options + dassl + dassl_options + date + datenum + datestr + datetick + datevec + dawson + dblquad + dbnext + deal + debian_missing_handler + deblank + debug + debug_java + debug_jit + debug_on_error + debug_on_interrupt + debug_on_warning + dec2base + dec2bin + dec2hex + deconv + deg2rad + del2 + delaunay + delaunay3 + delaunayn + delete + dellistener + demo + desktop + det + detrend + diag + dialog + diff + diffpara + diffuse + dir + dir_in_loadpath + disable_diagonal_matrix + disable_permutation_matrix + disable_range + discrete_cdf + discrete_inv + discrete_pdf + discrete_rnd + disp + display + divergence + dlmread + dlmwrite + dmperm + do_braindead_shortcircuit_evaluation + do_string_escapes + doc + doc_cache_create + doc_cache_file + dos + dot + double + drawnow + dsearch + dsearchn + dump_prefs + dup2 + duplication_matrix + durbinlevinson + echo_executing_commands + edit + eig + eigs + ellipj + ellipke + ellipsoid + empirical_cdf + empirical_inv + empirical_pdf + empirical_rnd + end + endgrent + endpwent + eomday + eq + erf + erfc + erfcinv + erfcx + erfi + erfinv + errno + errno_list + error + error_ids + errorbar + errordlg + etime + etree + etreeplot + eval + evalc + evalin + example + exec + exist + exp + expcdf + expint + expinv + expm + expm1 + exppdf + exprnd + eye + ezcontour + ezcontourf + ezmesh + ezmeshc + ezplot + ezplot3 + ezpolar + ezsurf + ezsurfc + f_test_regression + fact + factor + factorial + fail + false + fcdf + fclear + fclose + fcntl + fdisp + feather + feof + ferror + feval + fflush + fft + fft2 + fftconv + fftfilt + fftn + fftshift + fftw + fgetl + fgets + fieldnames + figure + file_in_loadpath + file_in_path + fileattrib + filemarker + fileparts + fileread + filesep + fill + filter + filter2 + find + find_dir_in_path + findall + findfigs + findobj + findstr + finite + finv + fix + fixed_point_format + flag + flintmax + flip + flipdim + fliplr + flipud + floor + fminbnd + fminsearch + fminunc + fmod + fnmatch + fopen + fork + formula + fpdf + fplot + fprintf + fputs + fractdiff + frame2im + fread + freport + freqz + freqz_plot + frewind + frnd + fscanf + fseek + fskipl + fsolve + ftell + full + fullfile + func2str + functions + fwrite + fzero + gallery + gamcdf + gaminv + gamma + gammainc + gammaln + gampdf + gamrnd + gca + gcbf + gcbo + gcd + gcf + gco + ge + genpath + genvarname + geocdf + geoinv + geopdf + geornd + get + get_first_help_sentence + get_help_text + get_help_text_from_file + get_home_directory + getappdata + getegid + getenv + geteuid + getfield + getgid + getgrent + getgrgid + getgrnam + gethostname + getpgrp + getpid + getppid + getpref + getpwent + getpwnam + getpwuid + getrusage + getuid + ginput + givens + glob + glpk + gls + gmap40 + gmres + gmtime + gnuplot_binary + gplot + grabcode + gradient + graphics_toolkit + gray + gray2ind + grid + griddata + griddata3 + griddatan + gt + gtext + guidata + guihandles + gunzip + gzip + hadamard + hamming + hankel + hanning + hash + have_window_system + hdl2struct + help + helpdlg + hess + hex2dec + hex2num + hggroup + hgload + hgsave + hidden + hilb + hist + histc + history_control + history_file + history_save + history_size + history_timestamp_format_string + hold + home + horzcat + hot + hotelling_test + hotelling_test_2 + housh + hsv + hsv2rgb + hurst + hygecdf + hygeinv + hygepdf + hygernd + hypot + i + ichol + idivide + ifelse + ifft + ifft2 + ifftn + ifftshift + ignore_function_time_stamp + ilu + im2double + im2frame + imag + image + imagesc + imfinfo + imformats + importdata + imread + imshow + imwrite + ind2gray + ind2rgb + ind2sub + index + inf + inferiorto + info + info_file + info_program + inline + inpolygon + input + inputParser + inputdlg + inputname + int16 + int2str + int32 + int64 + int8 + interp1 + interp2 + interp3 + interpft + interpn + intersect + intmax + intmin + inv + inverse + invhilb + ipermute + iqr + is_absolute_filename + is_dq_string + is_function_handle + is_leap_year + is_rooted_relative_filename + is_sq_string + is_valid_file_id + isa + isalnum + isalpha + isappdata + isargout + isascii + isaxes + isbanded + isbool + iscell + iscellstr + ischar + iscntrl + iscolormap + iscolumn + iscomplex + isdebugmode + isdefinite + isdeployed + isdiag + isdigit + isdir + isempty + isequal + isequaln + isfield + isfigure + isfinite + isfloat + isglobal + isgraph + isguirunning + ishandle + ishermitian + ishghandle + ishold + isieee + isindex + isinf + isinteger + isjava + iskeyword + isletter + islogical + islower + ismac + ismatrix + ismember + ismethod + isna + isnan + isnull + isnumeric + isobject + isocaps + isocolors + isonormals + isosurface + ispc + ispref + isprime + isprint + isprop + ispunct + isreal + isrow + isscalar + issorted + isspace + issparse + issquare + isstr + isstrprop + isstruct + isstudent + issymmetric + istril + istriu + isunix + isupper + isvarname + isvector + isxdigit + j + java2mat + javaArray + javaMethod + javaObject + java_get + java_matrix_autoconversion + java_set + java_unsigned_autoconversion + javaaddpath + javachk + javaclasspath + javamem + javarmpath + jet + jit_enable + jit_failcnt + jit_startcnt + kbhit + kendall + keyboard + keywords + kill + kolmogorov_smirnov_cdf + kolmogorov_smirnov_test + kolmogorov_smirnov_test_2 + kron + kruskal_wallis_test + krylov + kurtosis + laplace_cdf + laplace_inv + laplace_pdf + laplace_rnd + lasterr + lasterror + lastwarn + lcm + ldivide + le + legend + legendre + length + lgamma + license + light + lighting + lin2mu + line + lines + linkaxes + linkprop + linsolve + linspace + list_in_columns + list_primes + listdlg + loadaudio + loaded_graphics_toolkits + loadobj + localfunctions + localtime + log + log10 + log1p + log2 + logical + logistic_cdf + logistic_inv + logistic_pdf + logistic_regression + logistic_rnd + logit + loglog + loglogerr + logm + logncdf + logninv + lognpdf + lognrnd + logspace + lookfor + lookup + lower + ls + ls_command + lscov + lsode + lsode_options + lsqnonneg + lstat + lt + lu + luinc + luupdate + magic + mahalanobis + make_absolute_filename + makeinfo_program + manova + mat2cell + mat2str + material + matlabroot + matrix_type + max + max_recursion_depth + mcnemar_test + md5sum + mean + meansq + median + menu + merge + mesh + meshc + meshgrid + meshz + meta.class + meta.dynproperty + meta.event + meta.method + meta.package + meta.property + metaclass + methods + mex + mexext + mfilename + mgorth + min + minus + mislocked + missing_component_hook + missing_function_hook + mkdir + mkfifo + mkoctfile + mkpp + mkstemp + mktime + mldivide + mlock + mod + mode + moment + mouse_wheel_zoom + movefile + mpoles + mpower + mrdivide + msgbox + mtimes + mu2lin + munlock + namelengthmax + nan + nargchk + nargin + narginchk + nargout + nargoutchk + native_float_format + nbincdf + nbininv + nbinpdf + nbinrnd + nchoosek + ndgrid + ndims + ne + newplot + news + nextpow2 + nfields + nnz + nonzeros + norm + normcdf + normest + normest1 + norminv + normpdf + normrnd + not + now + nproc + nth_element + nthargout + nthroot + ntsc2rgb + null + num2cell + num2hex + num2str + numel + numfields + nzmax + ocean + octave_config_info + octave_core_file_limit + octave_core_file_name + octave_core_file_options + octave_tmp_file_name + ode23 + ode45 + odeget + odeplot + odeset + ols + onCleanup + onenormest + ones + open + optimget + optimize_subsasgn_calls + optimset + or + orderfields + ordschur + orient + orth + ostrsplit + output_precision + pack + padecoef + page_output_immediately + page_screen_output + pan + paren + pareto + parseparams + pascal + patch + path + pathdef + pathsep + pause + pbaspect + pcg + pchip + pclose + pcolor + pcr + peaks + periodogram + perl + perms + permute + pie + pie3 + pink + pinv + pipe + pkg + planerot + playaudio + plot + plot3 + plotmatrix + plotyy + plus + poisscdf + poissinv + poisspdf + poissrnd + pol2cart + polar + poly + polyaffine + polyarea + polyder + polyeig + polyfit + polygcd + polyint + polyout + polyreduce + polyval + polyvalm + popen + popen2 + postpad + pow2 + power + powerset + ppder + ppint + ppjumps + ppplot + ppval + pqpnonneg + prctile + prefdir + preferences + prepad + primes + print + print_empty_dimensions + print_struct_array_contents + print_usage + printd + printf + prism + probit + prod + profexplore + profexport + profile + profshow + program_invocation_name + program_name + prop_test_2 + psi + publish + putenv + puts + pwd + python + qmr + qp + qqplot + qr + qrdelete + qrinsert + qrshift + qrupdate + quad + quad_options + quadcc + quadgk + quadl + quadv + quantile + questdlg + quit + quiver + quiver3 + qz + qzhess + rad2deg + rainbow + rand + rande + randg + randi + randn + randp + randperm + range + rank + ranks + rat + rats + rcond + rdivide + readdir + readline_re_read_init_file + readline_read_init_file + real + reallog + realpow + realsqrt + record + rectangle + rectint + recycle + reducepatch + reducevolume + refresh + refreshdata + regexp + regexpi + regexprep + regexptranslate + register_graphics_toolkit + rehash + rem + remove_input_event_hook + repelems + repmat + reset + reshape + residue + resize + restoredefaultpath + rethrow + rgb2hsv + rgb2ind + rgb2ntsc + rgbplot + ribbon + rindex + rmappdata + rmfield + rmpath + rmpref + roots + rose + rosser + rot90 + rotate + rotate3d + rotdim + round + roundb + rows + rref + rsf2csf + run + run_count + run_test + rundemos + runlength + runtests + save_default_options + save_header_format_string + save_precision + saveas + saveaudio + saveobj + savepath + scanf + scatter + scatter3 + schur + sec + secd + sech + semicolon + semilogx + semilogxerr + semilogy + semilogyerr + set + setappdata + setaudio + setdiff + setenv + setfield + setgrent + setpref + setpwent + setxor + shading + shg + shift + shiftdim + shrinkfaces + sighup_dumps_octave_core + sign + sign_test + signbit + sigterm_dumps_octave_core + silent_functions + sin + sinc + sind + sinetone + sinewave + single + sinh + size + size_equal + sizemax + sizeof + skewness + sleep + slice + smooth3 + sombrero + sort + sortrows + sound + soundsc + source + spalloc + sparse + sparse_auto_mutate + spaugment + spconvert + spdiags + spearman + spectral_adf + spectral_xdf + specular + speed + spencer + speye + spfun + sph2cart + sphere + spinmap + spline + splinefit + split_long_rows + spones + spparms + sprand + sprandn + sprandsym + sprank + spring + sprintf + spstats + spy + sqp + sqrt + sqrtm + squeeze + sscanf + stairs + stat + statistics + std + stderr + stdin + stdnormal_cdf + stdnormal_inv + stdnormal_pdf + stdnormal_rnd + stdout + stem + stem3 + stemleaf + stft + str2double + str2func + str2num + strcat + strchr + strcmp + strcmpi + strfind + strftime + string_fill_char + strjoin + strjust + strmatch + strncmp + strncmpi + strptime + strread + strrep + strsplit + strtok + strtrim + strtrunc + struct + struct2cell + struct2hdl + struct_levels_to_print + structfun + strvcat + sub2ind + subplot + subsasgn + subsindex + subspace + subsref + substr + substruct + sum + summer + sumsq + superiorto + suppress_verbose_help_message + surf + surface + surfc + surfl + surfnorm + svd + svd_driver + svds + swapbytes + syl + sylvester + symamd + symbfact + symrcm + symvar + synthesis + system + t_test + t_test_2 + t_test_regression + table + tan + tand + tanh + tar + tcdf + tempdir + tempname + terminal_size + test + tetramesh + texi_macros_file + text + textread + textscan + tic + tilde_expand + time + times + tinv + title + tmpfile + tmpnam + toascii + toc + toeplitz + tolower + toupper + tpdf + trace + transpose + trapz + treelayout + treeplot + tril + trimesh + triplequad + triplot + trisurf + triu + trnd + true + tsearch + tsearchn + type + typecast + typeinfo + u_test + uibuttongroup + uicontextmenu + uicontrol + uigetdir + uigetfile + uimenu + uint16 + uint32 + uint64 + uint8 + uipanel + uipushtool + uiputfile + uiresume + uitoggletool + uitoolbar + uiwait + umask + uminus + uname + undo_string_escapes + unidcdf + unidinv + unidpdf + unidrnd + unifcdf + unifinv + unifpdf + unifrnd + union + unique + unix + unlink + unmkpp + unpack + unsetenv + untabify + untar + unwrap + unzip + uplus + upper + urlread + urlwrite + usage + usejava + usleep + validateattributes + validatestring + vander + var + var_test + vec + vech + vectorize + ver + version + vertcat + view + viridis + voronoi + voronoin + waitbar + waitfor + waitforbuttonpress + waitpid + warndlg + warning + warning_ids + warranty + waterfall + wavread + wavwrite + wblcdf + wblinv + wblpdf + wblrnd + weekday + welch_test + what + which + white + whitebg + whos_line_format + wienrnd + wilcoxon_test + wilkinson + winter + xlabel + xlim + xor + yes_or_no + ylabel + ylim + yulewalker + z_test + z_test_2 + zeros + zip + zlabel + zlim + zoom + zscore + + + + airy_Ai + airy_Ai_deriv + airy_Ai_deriv_scaled + airy_Ai_scaled + airy_Bi + airy_Bi_deriv + airy_Bi_deriv_scaled + airy_Bi_scaled + airy_zero_Ai + airy_zero_Ai_deriv + airy_zero_Bi + airy_zero_Bi_deriv + atanint + bchdeco + bchenco + bessel_il_scaled + bessel_In + bessel_In_scaled + bessel_Inu + bessel_Inu_scaled + bessel_jl + bessel_Jn + bessel_Jnu + bessel_kl_scaled + bessel_Kn + bessel_Kn_scaled + bessel_Knu + bessel_Knu_scaled + bessel_lnKnu + bessel_yl + bessel_Yn + bessel_Ynu + bessel_zero_J0 + bessel_zero_J1 + beta_gsl + bfgsmin + bisectionstep + builtin + bwfill + bwlabel + cell2csv + celleval + Chi + chol + Ci + clausen + conicalP_0 + conicalP_1 + conicalP_half + conicalP_mhalf + conv2 + cordflt2 + coupling_3j + coupling_6j + coupling_9j + csv2cell + csvconcat + csvexplode + cyclgen + cyclpoly + dawson + debye_1 + debye_2 + debye_3 + debye_4 + deref + dispatch + dispatch_help + display_fixed_operations + dlmread + ellint_Ecomp + ellint_Kcomp + ellipj + erfc_gsl + erf_gsl + erf_Q + erf_Z + _errcore + eta + eta_int + expint_3 + expint_E1 + expint_E2 + expint_Ei + expm1 + exp_mult + exprel + exprel_2 + exprel_n + fabs + fangle + farg + fatan2 + fceil + fconj + fcos + fcosh + fcumprod + fcumsum + fdiag + fermi_dirac_3half + fermi_dirac_half + fermi_dirac_inc_0 + fermi_dirac_int + fermi_dirac_mhalf + fexp + ffloor + fimag + finitedifference + fixed + flog + flog10 + fprod + freal + freshape + fround + fsin + fsinh + fsqrt + fsum + fsumsq + ftan + ftanh + full + gamma_gsl + gamma_inc + gamma_inc_P + gamma_inc_Q + gammainv_gsl + gammastar + gdet + gdiag + gexp + gf + gfilter + _gfweight + ginv + ginverse + glog + glu + gpick + gprod + grab + grank + graycomatrix + __grcla__ + __grclf__ + __grcmd__ + greshape + __grexit__ + __grfigure__ + __grgetstat__ + __grhold__ + __grinit__ + __grishold__ + __grnewset__ + __grsetgraph__ + gsl_sf + gsqrt + gsum + gsumsq + gtext + gzoom + hazard + houghtf + hyperg_0F1 + hzeta + is_complex_sparse + isfixed + isgalois + isprimitive + is_real_sparse + is_sparse + jpgread + jpgwrite + lambert_W0 + lambert_Wm1 + legendre_Pl + legendre_Plm + legendre_Ql + legendre_sphPlm + legendre_sphPlm_array + leval + listen + lnbeta + lncosh + lngamma_gsl + lnpoch + lnsinh + log_1plusx + log_1plusx_mx + log_erfc + lp + make_sparse + mark_for_deletion + medfilt1 + newtonstep + nnz + numgradient + numhessian + pchip_deriv + pngread + pngwrite + poch + pochrel + pretty + primpoly + psi + psi_1_int + psi_1piy + psi_n + rand + rande + randn + randp + regexp + remez + reset_fixed_operations + rotate_scale + rsdec + rsenc + samin + SBBacksub + SBEig + SBFactor + SBProd + SBSolve + Shi + Si + sinc_gsl + spabs + sparse + spfind + spimag + spinv + splu + spreal + SymBand + synchrotron_1 + synchrotron_2 + syndtable + taylorcoeff + transport_2 + transport_3 + transport_4 + transport_5 + trisolve + waitbar + xmlread + zeta + zeta_int + aar + aarmam + ac2poly + ac2rc + acorf + acovf + addpath + ademodce + adim + adsmax + amodce + anderson_darling_cdf + anderson_darling_test + anovan + apkconst + append_save + applylut + ar2poly + ar2rc + arburg + arcext + arfit2 + ar_spa + aryule + assert + au + aucapture + auload + auplot + aurecord + ausave + autumn + average_moments + awgn + azimuth + BandToFull + BandToSparse + base64encode + battery + bchpoly + bestblk + best_dir + best_dir_cov + betaln + bfgs + bfgsmin_example + bi2de + biacovf + bilinear + bisdemo + bispec + biterr + blkdiag + blkproc + bmpwrite + bone + bound_convex + boxcar + boxplot + brighten + bs_gradient + butter + buttord + bwborder + bweuler + bwlabel + bwmorph + bwselect + calendar + cceps + cdiff + cellstr + char + cheb + cheb1ord + cheb2ord + chebwin + cheby1 + cheby2 + chirp + clf + clip + cmpermute + cmunique + cohere + col2im + colfilt + colorgradient + comms + compand + complex + concat + conndef + content + contents + Contents + contourf + convhull + convmtx + cool + copper + corr2 + cosets + count + covm + cplxpair + cquadnd + create_lookup_table + crule + crule2d + crule2dgen + csape + csapi + csd + csvread + csvwrite + ctranspose + cumtrapz + czt + d2_min + datenum + datestr + datevec + dct + dct2 + dctmtx + de2bi + deal + decimate + decode + deg2rad + del2 + delaunay + delaunay3 + delta_method + demo + demodmap + deriv + detrend + dfdp + dftmtx + dhbar + dilate + dispatch + distance + dlmread + dlmwrite + dos + double + drawnow + durlev + dxfwrite + edge + edit + ellip + ellipdemo + ellipj + ellipke + ellipord + __ellip_ws + __ellip_ws_min + encode + eomday + erode + example + ExampleEigenValues + ExampleGenEigenValues + expdemo + expfit + eyediagram + factor + factorial + fail + fcnchk + feedback + fem_test + ff2n + fftconv2 + fieldnames + fill + fill3 + filter2 + filtfilt + filtic + findsym + fir1 + fir2 + fixedpoint + flag + flag_implicit_samplerate + flattopwin + flix + float + fmin + fminbnd + fmins + fminunc + fnder + fnplt + fnval + fplot + freqs + freqs_plot + fsort + fullfact + FullToBand + funm + fzero + gammaln + gapTest + gaussian + gausswin + gconv + gconvmtx + gdeconv + gdftmtx + gen2par + geomean + getfield + getfields + gfft + gftable + gfweight + gget + gifft + ginput + gmm_estimate + gmm_example + gmm_obj + gmm_results + gmm_variance + gmm_variance_inefficient + gquad + gquad2d + gquad2d6 + gquad2dgen + gquad6 + gquadnd + grace_octave_path + gradient + grayslice + grep + grid + griddata + groots + grpdelay + grule + grule2d + grule2dgen + hadamard + hammgen + hankel + hann + harmmean + hilbert + histeq + histfit + histo + histo2 + histo3 + histo4 + hot + hsv + hup + idct + idct2 + idplot + idsim + ifftshift + im2bw + im2col + imadjust + imginfo + imhist + imnoise + impad + impz + imread + imrotate + imshear + imtranslate + imwrite + innerfun + inputname + interp + interp1 + interp2 + interpft + intersect + invest0 + invest1 + invfdemo + invfreq + invfreqs + invfreqz + inz + irsa_act + irsa_actcore + irsa_check + irsa_dft + irsa_dftfp + irsa_genreal + irsa_idft + irsa_isregular + irsa_jitsp + irsa_mdsp + irsa_normalize + irsa_plotdft + irsa_resample + irsa_rgenreal + isa + isbw + isdir + isequal + isfield + isgray + isind + ismember + isprime + isrgb + issparse + isunix + jet + kaiser + kaiserord + lambertw + lattice + lauchli + leasqr + leasqrdemo + legend + legendre + levinson + lin2mu + line_min + lloyds + lookup + lookup_table + lpc + lp_test + mad + magic + makelut + MakeShears + map + mat2gray + mat2str + mdsmax + mean2 + medfilt2 + meshc + minimize + minpol + mkpp + mktheta + mle_estimate + mle_example + mle_obj + mle_results + mle_variance + modmap + mu2lin + mvaar + mvar + mvfilter + mvfreqz + myfeval + nanmax + nanmean + nanmedian + nanmin + nanstd + nansum + ncauer + nchoosek + ncrule + ndims + nelder_mead_min + newmark + nlfilter + nlnewmark + __nlnewmark_fcn__ + nmsmax + nonzeros + normplot + now + nrm + nthroot + nze + OCTAVE_FORGE_VERSION + ode23 + ode45 + ode78 + optimset + ordfilt2 + orient + pacf + padarray + parameterize + parcor + pareto + pascal + patch + pburg + pcg + pchip + pcolor + pcr + peaks + penddot + pendulum + perms + pie + pink + plot3 + __plt3__ + poly2ac + poly2ar + poly_2_ex + poly2mask + poly2rc + poly2sym + poly2th + polyarea + polyconf + polyder + polyderiv + polygcd + polystab + __power + ppval + prctile + prettyprint + prettyprint_c + primes + princomp + print + prism + proplan + pulstran + pwelch + pyulear + qaskdeco + qaskenco + qtdecomp + qtgetblk + qtsetblk + quad2dc + quad2dcgen + quad2dg + quad2dggen + quadc + quadg + quadl + quadndg + quantiz + quiver + rad2deg + rainbow + randerr + randint + randsrc + rat + rats + rc2ac + rc2ar + rc2poly + rceps + read_options + read_pdb + rectpuls + resample + rgb2gray + rk2fixed + rk4fixed + rk8fixed + rmfield + rmle + rmpath + roicolor + rosser + rotparams + rotv + rref + rsdecof + rsencof + rsgenpoly + samin_example + save_vrml + sbispec + scale_data + scatter + scatterplot + select_3D_points + selmo + setdiff + setfield + setfields + setxor + sftrans + sgolay + sgolayfilt + sinvest1 + slurp_file + sortrows + sound + soundsc + spdiags + specgram + speed + speye + spfun + sphcat + spline + splot + spones + sprand + sprandn + spring + spstats + spsum + sp_test + sptest + spvcat + spy + std2 + stem + str2double + strcmpi + stretchlim + strfind + strmatch + strncmp + strncmpi + strsort + strtok + strtoz + struct + strvcat + summer + sumskipnan + surf + surfc + sym2poly + symerr + symfsolve + tabulate + tar + temp_name + test + test_d2_min_1 + test_d2_min_2 + test_d2_min_3 + test_ellipj + test_fminunc_1 + testimio + test_inline_1 + test_min_1 + test_min_2 + test_min_3 + test_min_4 + test_minimize_1 + test_nelder_mead_min_1 + test_nelder_mead_min_2 + test_sncndn + test_struct + test_vmesh + test_vrml_faces + test_wpolyfit + text + textread + tf2zp + tfe + thfm + tics + toeplitz + toggle_grace_use + transpose + trapz + triang + tril + trimmean + tripuls + trisolve + triu + tsademo + tsearchdemo + ucp + uintlut + unique + unix + unmkpp + unscale_parameters + vec2mat + view + vmesh + voronoi + voronoin + vrml_arrow + vrml_Background + vrml_browse + vrml_cyl + vrml_demo_tutorial_1 + vrml_demo_tutorial_2 + vrml_demo_tutorial_3 + vrml_demo_tutorial_4 + vrml_ellipsoid + vrml_faces + vrml_flatten + vrml_frame + vrml_group + vrml_kill + vrml_lines + vrml_material + vrml_parallelogram + vrml_PointLight + vrml_points + vrml_select_points + vrml_surf + vrml_text + vrml_thick_surf + vrml_transfo + wavread + wavwrite + weekday + wgn + white + wilkinson + winter + wpolyfit + wpolyfitdemo + write_pdb + wsolve + xcorr + xcorr2 + xcov + xlsread + xmlwrite + y2res + zero_count + zoom + zp2tf + zplane + zscore + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/perl.xml b/syntax/perl.xml --- a/syntax/perl.xml +++ b/syntax/perl.xml @@ -39,7 +39,7 @@ Enhance tr/// and y/// support. --> - + if @@ -252,6 +252,7 @@ rewinddir rindex rmdir + say scalar seek seekdir @@ -383,8 +384,11 @@ - - + + + + + diff --git a/syntax/php.xml b/syntax/php.xml --- a/syntax/php.xml +++ b/syntax/php.xml @@ -73,7 +73,7 @@ ]> - + + + + + @@ -916,6 +921,7 @@ + diff --git a/syntax/python.xml b/syntax/python.xml --- a/syntax/python.xml +++ b/syntax/python.xml @@ -1,5 +1,10 @@ - + + + +]> @@ -14,7 +19,7 @@ - + import @@ -65,6 +70,7 @@ ascii basestring bin + breakpoint bool buffer bytearray @@ -342,15 +348,17 @@ - - - - - - - - - + + + + + + + + + + + @@ -362,14 +370,10 @@ - + - - - - @@ -661,6 +665,7 @@ + diff --git a/syntax/qml.xml b/syntax/qml.xml new file mode 100644 --- /dev/null +++ b/syntax/qml.xml @@ -0,0 +1,190 @@ + + +]> + + + + + + State + PropertyChanges + StateGroup + ParentChange + StateChangeScript + AnchorChanges + PropertyAnimation + NumberAnimation + ColorAnimation + SequentialAnimation + ParallelAnimation + PauseAnimation + PropertyAction + ParentAction + ScriptAction + Transition + SpringFollow + EaseFollow + Behavior + Binding + ListModel + ListElement + VisualItemModel + XmlListModel + XmlRole + DateTimeFormatter + NumberFormatter + Script + Connections + Component + Timer + QtObject + Item + Rectangle + Image + BorderImage + Text + TextInput + TextEdit + MouseArea + FocusScope + Flickable + Flipable + WebView + Loader + Repeater + SystemPalette + GraphicsObjectContainer + LayoutItem + ListView + GridView + PathView + Path + PathLine + PathQuad + PathCubic + PathAttribute + PathPercent + Column + Row + Grid + Scale + Rotation + Blur + Colorize + DropShadow + Opacity + Particles + ParticleMotionLinear + ParticleMotionGravity + ParticleMotionWander + + Gradient + GradientStop + MouseRegion + + + + readonly + + + + string + int + bool + date + color + url + real + double + var + variant + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/rest.xml b/syntax/rest.xml --- a/syntax/rest.xml +++ b/syntax/rest.xml @@ -1,9 +1,12 @@ + + + + ]> - + @@ -24,11 +27,16 @@ - + + - + + + + + @@ -37,8 +45,9 @@ - - + + + @@ -92,8 +101,10 @@ + + diff --git a/syntax/rust.xml b/syntax/rust.xml --- a/syntax/rust.xml +++ b/syntax/rust.xml @@ -33,7 +33,7 @@ ]> - + fn @@ -45,6 +45,8 @@ abstract alignof as + async + await become box break @@ -53,6 +55,7 @@ crate default do + dyn else enum extern @@ -76,14 +79,12 @@ pure ref return - Self - self sizeof static struct super trait - type + try typeof union unsafe @@ -93,52 +94,125 @@ where while yield + - + + Add + AddAssign + Alloc + Any AsMut AsRef - AsSlice - CharExt + Binary + BitAnd + BitAndAssign + BitOr + BitOrAssign + BitXor + BitXorAssign + Borrow + BorrowMut + BuildHasher Clone + CoerceUnsized Copy Debug - Decodable Default + Deref + DerefMut + DispatchFromDyn Display + Div + DivAssign DoubleEndedIterator Drop - Encodable Eq ExactSizeIterator Extend + FixedSizeArray Fn + FnBox FnMut FnOnce From - FromPrimitive + FromIterator + FromStr + FusedIterator + Future + Generator + GlobalAlloc Hash + Hasher + Index + IndexMut Into IntoIterator Iterator - IteratorExt - MutPtrExt + LowerExp + LowerHex + Mul + MulAssign + Neg + Not + Octal Ord PartialEq PartialOrd - PtrExt - Rand - RustcDecodable - RustcEncodable + Pointer + Product + RangeBounds + Rem + RemAssign Send + Shl + ShlAssign + Shr + ShrAssign Sized + SliceIndex + Step + Sub + SubAssign + Sum + Sync + TrustedLen + Try + TryFrom + TryInto + Unpin + Unsize + UpperExp + UpperHex + Write + + AsSlice + BufRead + CharExt + Decodable + Encodable + Error + FromPrimitive + IteratorExt + MultiSpan + MutPtrExt + Pattern + PtrExt + Rand + Read + RefUnwindSafe + Seek SliceConcatExt SliceExt Str StrExt - Sync + TDynBenchFn + Termination ToOwned + ToSocketAddrs ToString + UnwindSafe bool @@ -213,6 +287,32 @@ Failure Cons Nil + + + MAX + + REPLACEMENT_CHARACTER + UNICODE_VERSION + + DIGITS + EPSILON + INFINITY + MANTISSA_DIGITS + MAX_10_EXP + MAX_EXP + MIN + MIN_10_EXP + MIN_EXP + MIN_POSITIVE + NAN + NEG_INFINITY + RADIX + + MAIN_SEPARATOR + + ONCE_INIT + + UNIX_EPOCH EXIT_FAILURE @@ -263,32 +363,43 @@ + - - - - - - - + + + + + + + + + + + + - + + + - - + + + + + @@ -297,28 +408,30 @@ - - + + + - - - + + + + - - - - - + + + + + - + @@ -333,6 +446,10 @@ + + + + @@ -365,6 +482,7 @@ + @@ -376,4 +494,4 @@ - + diff --git a/syntax/stata.xml b/syntax/stata.xml new file mode 100644 --- /dev/null +++ b/syntax/stata.xml @@ -0,0 +1,3223 @@ + + + + + + + + + addlabels + addlabopts + addplot + bar + barwidth + bin + blabel + caption + center + circle + circle_hollow + color + cols + combine + dot + draw + dropline + frequency + grid + hbar + imargin + labsize + legend + margin + medthick + mlabangle + mlabcolor + mlabel + mlabgap + mlabposition + mlabsize + mlabstyle + mlabtextstyle + mlabvposition + msymbol + name + nodraw + nogrid + over + plotregion + position + ring + rows + scale + size + start + subtitle + t1title + t2title + text + textsize + title + xcommon + xlabel + xline + xscale + xsize + xtitle + ycommon + ylabel + yline + yscale + ysize + ytitle + zero + + + + background + bg + black + blue + bluishgray + brown + cranberry + cyan + dimgray + dkgreen + dknavy + dkorange + ebblue + ebg + edkblue + eggshell + eltblue + eltgreen + emerald + emidblue + erose + fg + foreground + forest_green + gold + gray + green + gs + khaki + lavender + lime + ltblue + ltbluishgray + ltkhaki + magenta + maroon + midblue + midgreen + mint + navy + none + olive + olive_teal + orange + orange_red + pink + purple + red + sand + sandb + sienna + stone + teal + white + yellow + + + + accum + as + ascending + BASE + be + begin + bfgs + bhhh + brrweight + clean + close + clpatt + clpattern + clwidth + cole + color + confirm + continue + cov(unstr) + cov(unstructured) + covariance + dash + define + deft + delmacs + detail + dev + deviations + dfp + difficult + dirname + do + effects + eform + else + emdots + emiterate + emlog + emonly + emtolerance + end + error + estmetric + exchangeable + exit + family + fe + fitted + force + foreach + forvalues + fpc + frequency + function + global + gtolerance + hessian + ic + identity + if + in + independent + intpoints + irr + iterate + jkrweight + lincom + linearized + local + long + ltolerance + macro + manage + meff + meft + minimize + mle + mse + multiplier + noclear + nocons + noconstant + nodots + nofetable + nogroup + noheader + nolog + nolrtest + none + nonrtolerance + noobs + noomit + noretable + nostderr + not + nr + of + offset + or + p + parse + patterns + poststrata + postweight + prefix + program + r2_p + reffects + reml + reset + resid + run + scale + shift + showstep + SITE + size + star + stats + STBPLUS + stfmt + store + strata + syntax + tempfile + tempname + tempvar + tokenize + tolerance + unstructured + until + UPDATES + weight + while + wide + window + x2 + xb + + _b[ + _coeff[ + + ereturn + rreturn + sreturn + + e( + r( + s( + + + + all + BASE + coleq + colfullnames + coln + colnames + constraint + data + dir + display + environment + format + l + label + length + list + nobreak + nofail + permname + PERSONAL + piece + PLUS + quoted + row + roweq + rowfullnames + rown + rownames + SITE + sortedby + STATA + strict + sysdir + tempfile + tempvar + tsnorm + UPDATES + value + variable + + + + allstring + append + args + aweight + born + by + bys + bysort + byte + capture + cfreq + clear + Cns + Co + collinear + columns + comma + compress + connect + console + cpercent + cr + d0 + data + datestring + decode + delimit + depnames + desc + describe + di + diparm_options + display + double + drop + eclass + encode + esample + Ev + exec + fam + fdadescribe + fdasave + fdause + filefilter + float + format + fweight + gen + generate + gr + green + gradient + hold + include + insert + insheet + int + iweight + k + keep + label + Ld + link + load + long + longstub + macrolen + markout + marksample + maximize + meanonly + mlmatsbysum + mlout + mode + model + more + N + namelen + noextend + nofootnote + noi + noisily + nolabel + nonotes + nopreserve + norescale + noscvars + nosummary + nototal + nrtolerance + obs + odbc + off + oim + on + oneway + opg + order + outfile + outsheet + percent + permanently + post + postclose + postfile + preserve + Psi + pweight + query + qui + quietly + rawsum + red + ren + rename + replace + Replay + report + repost + restore + robust + save + saving + SD + SE + search + set + shownrtolerance + sort + sqlfile + sqlshow + STATA + statistics + sum + summarize + t1title + t2title + tab + tabulate + technique + timer + total + unhold + unique + uniquemaster + uniqusing + use + using + V + values + variable + varlist + VCE + waldtest + width + xlabel + xmlsave + xmluse + yellow + ylabel + yline + + + + + + abs + acos + asin + atan + atan2 + atanh + ceil + cloglog + comb + cos + digamma + exp + floor + invcloglog + invlogit + ln + lnfact + lnfactorial + lngamma + log + log10 + max + min + mod + reldif + round + sign + sin + sqrt + sum + tan + tanh + trigamma + trunc + + + + betaden + Binomial + binorm + binormal + chi2 + chi2tail + dgammapda + dgammapdada + dgammapdadx + dgammapdx + dgammapdxdx + F + Fden + Ftail + gammaden + gammap + ibeta + invbinomial + invchi2 + invchi2tail + invF + invFtail + invgammap + invibeta + invnchi2 + invnFtail + invnibeta + invnorm + invnormal + invttail + nbetaden + nchi2 + nFden + nFtail + nibeta + norm + normal + normalden + normd + npnchi2 + tden + ttail + uniform() + + + + abbrev + char + index + indexnot + length + lower + ltrim + match + plural + proper + real + regexm + regexr + regexs + reverse + rtrim + string + strlen + strlower + strltrim + strmatch + strofreal + strpos + strproper + strreverse + strrtrim + strtrim + strupper + subinstr + subinword + substr + trim + upper + word + wordcount + + + + _caller + autocode + byteorder + chop + clip + cond + e + epsdouble + epsfloat + group + inlist + inrange + irecode + matrix + maxbyte + maxdouble + maxfloat + maxint + maxlong + mi + minbyte + mindouble + minfloat + minint + minlong + missing + r + recode + replay + return + s + scalar + + + + d + date + day + dow + doy + halfyear + mdy + month + quarter + week + year + + + + d + daily + dofd + dofh + dofm + dofq + dofw + dofy + h + halfyearly + hofd + m + mofd + monthly + q + qofd + quarterly + tin + twithin + w + weekly + wofd + y + yearly + yh + ym + yofd + yq + yw + + + + cholesky + colnumb + colsof + corr + det + diag + diag0cnt + el + get + hadamard + I + inv + invsym + issym + issymmetric + J + matmissing + matuniform + mreldif + nullmat + rownumb + rowsof + sweep + syminv + trace + vec + vecdiag + + + + anycount + anymatch + anyvalue + at + concat + count + cut + diff + ends + field + fill + group + groupicodes + head + iqr + kurt + label + last + lname + mad + max + maxlength + maxmode + mdev + mean + median + min + minmode + missing + mode + mtr + nummodemissing + pc + prop + pctile + punct + rank + rowfirst + rowlast + rowmax + rowmean + rowmin + rowmiss + rownonmiss + rowsd + rowtotal + sd + seq + skew + std + strok + tag + tail + total + track + trim + truncate + + + + _all + _column + _cons + _dta + _dup + _merge + _n + _newline + _pi + _rc + creturn + c(adopath) + c(adosize) + c(ALPHA) + c(born_date) + c(byteorder) + c(changed) + c(checksum) + c(cmdlen) + c(console) + c(copycolor) + c(current_date) + c(current_time) + c(dirsep) + c(dockable) + c(dockingguides) + c(dp) + c(epsdouble) + c(epsfloat) + c(filedate) + c(filename) + c(flavor) + c(graphics) + c(httpproxy) + c(httpproxyauth) + c(httpproxyhost) + c(httpproxyport) + c(httpproxypw) + c(httpproxyuser) + c(k) + c(level) + c(linegap) + c(linesize) + c(locksplitters) + c(logtype) + c(machine_type) + c(macrolen) + c(matacache) + c(matafavor) + c(matalibs) + c(matalnum) + c(matamofirst) + c(mataoptimize) + c(matastrict) + c(matsize) + c(max_cmdlen) + c(max_k_current) + c(max_k_theory) + c(max_macrolen) + c(max_matsize) + c(max_N_current) + c(max_N_theory) + c(max_width_current) + c(max_width_theory) + c(maxbyte) + c(maxdb) + c(maxdouble) + c(maxfloat) + c(maxint) + c(maxiter) + c(maxlong) + c(maxstrvarlen) + c(maxvar) + c(memory) + c(min_matsize) + c(minbyte) + c(mindouble) + c(minfloat) + c(minint) + c(minlong) + c(mode) + c(Mons) + c(Months) + c(more) + c(N) + c(namelen) + c(os) + c(osdtl) + c(pagesize) + c(persistfv) + c(persistvtopic) + c(pi) + c(printcolor) + c(pwd) + c(rc) + c(reventries) + c(rmsg_time) + c(rmsg) + c(scheme) + c(scrollbufsize) + c(SE) + c(searchdefault) + c(seed) + c(stata_version) + c(sysdir_base) + c(sysdir_oldplace) + c(sysdir_personal) + c(sysdir_plus) + c(sysdir_site) + c(sysdir_stata) + c(sysdir_updates) + c(timeout1) + c(timeout2) + c(trace) + c(tracedepth) + c(traceexpand) + c(tracehilite) + c(traceindent) + c(tracenumber) + c(tracesep) + c(type) + c(update_interval) + c(update_prompt) + c(update_query) + c(varabbrev) + c(varlabelpos) + c(version) + c(virtual) + c(Wdays) + c(Weekdays) + c(width) + c(xptheme) + + + + adosize + checksum + copycolor + dockable + dockingguides + dp + graphics + httpproxy + httpproxyauth + httpproxyhost + httpproxyport + httpproxypw + httpproxyuser + level + linegap + linesize + locksplitters + logtype + matacache + matafavor + matalibs + matalnum + matamofirst + mataoptimize + matastrict + matsize + maxdb + maxiter + maxvar + memory + more + pagesize + persistfv + persistvtopic + printcolor + reventries + rmsg + scheme + scrollbufsize + searchdefault + seed + timeout1 + timeout2 + trace + tracedepth + traceexpand + tracehilite + traceindent + tracenumber + tracesep + type + update_interval + update_prompt + update_query + varabbrev + varlabelpos + version + virtual + xptheme + + + + + _a_cls_msg + _addgph + _assert + _assert_mreldif + _assert_mreldifp + _assert_mreldifs + _assert_obs + _assert_streq + _at + _bigtab + _binperfect + _binperfout + _biplotmat + _brr_sum + _bs_display + _bs_sum + _btcmd + _byoptnotallowed + _ca_parse_normalize + _callerr + _cci + _check_eformopt + _check4gropts + _choice_table + _ckirfset + _cknotsvaroi + _ckvec + _clsarr2list + _cmdxel + _coef_table + _coef_table_header + _confirm_date + _confirm_number_or_date + _copy_mat_stripes + _cpmatnm + _crc2use + _crc4fld + _crcacnt + _crcar1 + _crcause + _crcbin + _crcbygr + _crcchi2 + _crcchkw + _crccip + _crceprs + _crcgldv + _crcglil + _crcird + _crcirr + _crcmeq + _crcnuse + _crcor + _crcphdr + _crcra + _crcrd + _crcrr + _crcseq + _crcshdr + _crcslbl + _crcsrvc + _crcswxx + _crcunab + _crcunit + _crcvarl + _crcwsrv + _crczsku + _cvar + _date2elapsed + _diag2mat + _diparm + _diparm_8 + _dots + _e2r + _egennoby + _evlist + _exp_list_expand + _exp_list_parse + _find_tsops + _fr_area_parse_and_log + _fr_aspect_parse_and_log + _fr_draw_rect + _fr_droplines_draw + _fr_erasearr + _fr_legend_parse_and_log + _fr_merged_implicit + _fr_runlog + _fr_sztextbox_parse_and_log + _fr_tbstyle_parse_and_log + _fr_tedits_parse_and_log + _fr_textbox_parse_and_log + _fr_title_parse_and_log + _fr_x_log_cleanup + _fr_x_log_create + _fracpp + _fracxo + _frr_sztextbox_pnl + _gany + _ganycount + _ganymatch + _ganyvalue + _gconcat + _gcount + _gcut + _gdiff + _gends + _geqany + _get_diparmopts + _get_diparmopts_8 + _get_eformopts + _get_eqspec + _get_gropts + _get_irf + _get_offopt + _getbv + _getcovcorr + _getfilename + _getnewlabelname + _getrhs + _getvarcns + _getxel + _getxel2 + _gfill + _ggroup + _giqr + _gkurt + _gm_edit + _gm_log + _gma + _gmad + _gmax + _gmdev + _gmean + _gmedian + _gmin + _gmode + _gmtr + _gneqany + _gpc + _gpctile + _gr_arrowhead + _gr_atomize_styles + _gr_common_axes + _gr_drawrect + _gr_linkstyles + _gr_symbol_of + _grank + _grfirst + _grlast + _grmax + _grmean + _grmin + _grmiss + _grobs + _growfirst + _growlast + _growmax + _growmean + _growmin + _growmiss + _grownonmiss + _growsd + _growtotal + _grsd + _grsum + _gs_addgrname + _gs_bygraph + _gs_clean_graphlist + _gs_default_bands + _gs_islivefile + _gs_parse_and_log_axoptions + _gs_parse_and_log_axtitle + _gs_parse_and_log_lines + _gs_parse_and_log_tickset + _gs_rdfilehdr + _gs_wrfilehdr + _gs_x_create + _gsd + _gseq + _gskew + _gstd + _gsum + _gtag + _gtotal + _hadamard_verify + _hw_comp + _hw_opt_d0 + _hwsa_comp + _hwsa_opt_d0 + _hwsm_comp + _hwsm_opt_d0 + _isfit + _ivreg_project + _jk_nlegend + _jk_pseudo + _jk_sum + _labels2names + _linemax + _loop_brr + _loop_jknife + _loop_jknife_fw + _loop_jknife_iw + _loop_jknife2 + _loop_rw + _lrtest7 + _m2matrix + _m2scalar + _matplot + _matsort + _mdisplay + _mds_classical + _mds_dataheader + _mds_display + _mds_display_classical + _mds_euclidean + _mds_parse_dopts + _mds_parse_method + _mds_parse_s2d + _mds_s2d + _me_der + _me_der2 + _me_derb + _me_derd + _me_l_der + _me_l_der2 + _mfrmvec + _mka2 + _mkg + _mkkmn + _mksigma + _mkvec + _mprobitestimator + _mtest + _mvec + _no_estat + _no_predict + _nobs + _on_colon_parse + _parmlist + _parse_optexp + _parsewt + _pk_p + _plotpos + _pred_me + _pred_se + _prefix_check4esample + _prefix_checkopt + _prefix_clear + _prefix_command + _prefix_display + _prefix_expand + _prefix_explist + _prefix_footnote + _prefix_getchars + _prefix_getmat + _prefix_legend + _prefix_mlogit + _prefix_model_test + _prefix_note + _prefix_reject + _prefix_relabel_eqns + _prefix_run_error + _prefix_saving + _prefix_title + _prefix_vcenotallowed + _qsort_index + _qsur + _r2e + _repost + _resample_warn + _restore_labels + _returnclear + _rmdcoll + _robust2 + _roccom1 + _roccom1_8 + _rocsen + _rotate_clear + _rotate_text + _score_spec + _set_irf_vars + _shortenpath + _sigfm + _small2dotz + _stata_internalerror + _stcurv + _strip_labels + _sttrend + _stubstar2names + _sum_table + _sumaccum + _sunflower_binar + _svar_cnsmac + _svar_eqmac + _svar_newcns + _svar_post + _svard2 + _svariden + _svaridenlr + _svarlrd2 + _svd + _svy_check_cmdopts + _svy_check_fpc + _svy_check_postw + _svy_check_predict + _svy_check_vce + _svy_fpc_note + _svy_ftest + _svy_ivreg_first + _svy_mkdeff + _svy_mkmeff + _svy_mkvmsp + _svy_mkvsrs + _svy_newrule + _svy_setup + _svy_singleton_note + _svy_subpop + _svy_subpop_note + _svy_summarize + _svy_summarize_legend + _svy_tabulate + _svy2 + _svydes_dlg + _svylc + _svyset + _sw_ood + _ts + _ts_dexp + _ts_exp + _ts_hw + _ts_hwsa + _ts_hwsm + _tsheadr + _tsinchk + _tsma + _ttest + _ttest1 + _ttest2 + _tutends + _var_mka + _varbsf + _vardisprmse + _varfcast + _varfcast_clear + _varfcast_fcast + _varfcast_graph + _varirf + _varsim + _vce_parserun + _vec_ckgraph + _vec_dreduced + _vec_grcroots + _vec_opck + _vec_pgparse + _vec_pgridplots + _vec_postvar + _vecauxdisp + _vecfcast_compute + _vecfcast_compute_w + _vecgetacns + _vecgetcv + _vecgtn + _vecmka + _vecmkapvp + _vecmkce + _vecmkgam + _vecmksi + _vecmktrend + _vecortho + _vecpclean + _vectparse + _vecu + _virf_add + _virf_char + _virf_fck + _virf_mknewfile + _virf_nlen + _virf_use + _writenum + _xtreg_chk_cl + + ac + ac_7 + acprplot + acprplot_7 + adjust + adopath + alpha + ameans + anova_estat + anova_terms + aorder + arch + arch_dr + arch_estat + arch_p + archlm + areg + areg_p + arima + arima_dr + arima_estat + arima_p + asmprobit + asmprobit_estat + asmprobit_lf + asmprobit_p + avplot + avplot_7 + avplots + avplots_7 + bcskew0 + bgodfrey + binreg + bip0_lf + biplot + bipp_lf + bipr_lf + bipr_p + biprobit + bitest + bitesti + bitowt + blogit + bmemsize + boot + bootsamp + bootstrap + bootstrap_8 + boxco_l + boxco_p + boxcox + boxcox_6 + boxcox_p + bprobit + brier + brr + brrstat + bs + bs_7 + bsampl_w + bsample + bsample_7 + bsqreg + bstat + bstat_7 + bstat_8 + bstrap + bstrap_7 + ca + ca_estat + ca_p + cabiplot + camat + canon + canon_8 + canon_8_p + canon_estat + canon_p + caprojection + cc + cchart + cchart_7 + cci + censobs_table + centile + cf + checkdlgfiles + checkhlpfiles + ci + cii + classutil + clear + clo + clog + clog_lf + clog_p + clogi + clogi_sw + clogit + clogit_lf + clogit_p + clogitp + clogl_sw + cloglog + clonevar + clslistarray + cluster + cluster_measures + cluster_stop + cluster_tree + cluster_tree_8 + clustermat + cnr + cnre + cnreg + cnreg_p + cnreg_sw + cnsreg + codebook + collaps4 + collapse + colormult_nb + colormult_nw + compare + conren + contract + copyright + copysource + corc + corr_anti + corr_kmo + corr_smc + corr2data + corrgram + cox_p + cox_sw + coxbase + coxhaz + coxvar + cprplot + cprplot_7 + crc + cross + cs + cscript + cscript_log + csi + ct + ct_is + ctset + ctst_5 + ctst_st + cttost + cumsp + cumsp_7 + cumul + cusum + cusum_7 + cutil + + d + datetof + db + dbeta + de + deff + des + desc + descr + descri + describ + describe + destring + dfbeta + dfgls + dfuller + dirstats + disp_res + disp_s + dotplot + dotplot_7 + dprobit + drawnorm + ds + ds_util + dstdize + duplicates + durbina + dwstat + dydx + egen + eivreg + emdef + eq + ereg + ereg_lf + ereg_p + ereg_sw + ereghet + ereghet_glf + ereghet_glf_sh + ereghet_gp + ereghet_ilf + ereghet_ilf_sh + ereghet_ip + est + est_cfexist + est_cfname + est_clickable + est_expand + est_hold + est_table + est_unhold + est_unholdok + estat + estat_default + estat_summ + estat_vce_only + esti + estimates + etodow + etof + etomdy + expandcl + fac + fact + facto + factor + factor_estat + factor_p + factor_pca_rotated + factor_rotate + factormat + fcast + fcast_compute + fcast_graph + fh_st + fillin + find_hlp_file + findfile + findit + findit_7 + fit + for + for5_0 + fpredict + frac_154 + frac_adj + frac_chk + frac_cox + frac_ddp + frac_dis + frac_dv + frac_in + frac_mun + frac_pp + frac_pq + frac_pv + frac_wgt + frac_xo + fracgen + fracplot + fracplot_7 + fracpoly + fracpred + fron_ex + fron_hn + fron_p + fron_tn + fron_tn2 + frontier + ftodate + ftoe + ftomdy + ftowdate + + gamhet_glf + gamhet_gp + gamhet_ilf + gamhet_ip + gamma + gamma_d2 + gamma_p + gamma_sw + gammahet + gdi_hexagon + gdi_spokes + genrank + genstd + genvmean + gladder + gladder_7 + glim_l01 + glim_l02 + glim_l03 + glim_l04 + glim_l05 + glim_l06 + glim_l07 + glim_l08 + glim_l09 + glim_l10 + glim_l11 + glim_l12 + glim_lf + glim_mu + glim_nw1 + glim_nw2 + glim_nw3 + glim_p + glim_v1 + glim_v2 + glim_v3 + glim_v4 + glim_v5 + glim_v6 + glim_v7 + glm + glm_6 + glm_p + glm_sw + glmpred + glogit + glogit_8 + glogit_p + gmeans + gnbre_lf + gnbreg + gnbreg_5 + gnbreg_p + gomp_lf + gompe_sw + gomper_p + gompertz + gompertzhet + gomphet_glf + gomphet_glf_sh + gomphet_gp + gomphet_ilf + gomphet_ilf_sh + gomphet_ip + gphdot + gphpen + gphprint + gprobi_p + gprobit + gprobit_8 + gr + gr_copy + gr_current + gr_db + gr_describe + gr_dir + gr_draw + gr_draw_replay + gr_drop + gr_edit + gr_editviewopts + gr_example + gr_example2 + gr_export + gr_print + gr_qscheme + gr_query + gr_read + gr_rename + gr_replay + gr_save + gr_set + gr_setscheme + gr_table + gr_undo + gr_use + graph + grebar + greigen + greigen_7 + greigen_8 + grmeanby + grmeanby_7 + gs_fileinfo + gs_filetype + gs_graphinfo + gs_stat + gsort + gwood + h + hadimvo + hareg + hausman + he + heck_d2 + heckma_p + heckman + heckp_lf + heckpr_p + heckprob + hel + help + hereg + hetpr_lf + hetpr_p + hetprob + hettest + hilite + hist + hist_7 + histogram + hlogit + hlu + hmeans + hotel + hotelling + hprobit + hreg + icd9 + icd9_ff + icd9p + iis + impute + imtest + inbase + integ + inten + intreg + intreg_7 + intreg_p + intrg_ll + intrg_ll2 + intrg2_ll + ipolate + iqreg + ir + irf + irf_create + irfm + iri + is_svy + is_svysum + isid + istdize + ivprob_1_lf + ivprob_lf + ivprobit + ivprobit_p + ivreg + ivreg_footnote + ivtob_1_lf + ivtob_lf + ivtobit + ivtobit_p + + jackknife + jacknife + jknife + jknife_6 + jknife_8 + jkstat + joinby + kalarma1 + kap + kap_3 + kapmeier + kappa + kapwgt + kdensity + kdensity_7 + ksm + ksmirnov + ktau + kwallis + labelbook + ladder + levels + levelsof + leverage + lfit + lfit_p + lincom + line + linktest + lloghet_glf + lloghet_glf_sh + lloghet_gp + lloghet_ilf + lloghet_ilf_sh + lloghet_ip + llogi_sw + llogis_p + llogist + llogistic + llogistichet + lnorm_lf + lnorm_sw + lnorma_p + lnormal + lnormalhet + lnormhet_glf + lnormhet_glf_sh + lnormhet_gp + lnormhet_ilf + lnormhet_ilf_sh + lnormhet_ip + lnskew0 + loadingplot + logi + logis_lf + logistic + logistic_p + logit + logit_estat + logit_p + loglogs + logrank + loneway + lookfor + lowess + lowess_7 + lpredict + lrecomp + lroc + lroc_7 + lrtest + lsens + lsens_7 + lsens_x + lstat + ltable + ltable_7 + ltriang + lv + lvr2plot + lvr2plot_7 + + makecns + manova_estat + manova_p + mantel + mat_capp + mat_order + mat_rapp + mata_matdescribe + mata_matsave + mata_matuse + matalabel + matcproc + matlist + matname + matstrik + mcc + mcci + md0_ + md1_ + md1debug_ + md2_ + md2debug_ + mds + mds_estat + mds_p + mdsconfig + mdslong + mdsmat + mdsshepard + mdytoe + mdytof + me_derd + mean + means + median + memsize + meqparse + mer + merg + merge + mfp + mfx + mhelp + mhodds + mixed_ll + mixed_ll_reparm + mkassert + mkmat + mkspline + ml + ml_5 + ml_adjs + ml_bhhhs + ml_c_d + ml_check + ml_clear + ml_cnt + ml_debug + ml_defd + ml_e0 + ml_e0_bfgs + ml_e0_cycle + ml_e0_dfp + ml_e0i + ml_e1 + ml_e1_bfgs + ml_e1_bhhh + ml_e1_cycle + ml_e1_dfp + ml_e2 + ml_e2_cycle + ml_ebfg0 + ml_ebfr0 + ml_ebfr1 + ml_ebh0q + ml_ebhh0 + ml_ebhr0 + ml_ebr0i + ml_ecr0i + ml_edfp0 + ml_edfr0 + ml_edfr1 + ml_edr0i + ml_eds + ml_eer0i + ml_egr0i + ml_elf + ml_elf_bfgs + ml_elf_bhhh + ml_elf_cycle + ml_elf_dfp + ml_elfi + ml_elfs + ml_enr0i + ml_enrr0 + ml_erdu0 + ml_erdu0_bfgs + ml_erdu0_bhhh + ml_erdu0_bhhhq + ml_erdu0_cycle + ml_erdu0_dfp + ml_erdu0_nrbfgs + ml_exde + ml_footnote + ml_geqnr + ml_grad0 + ml_graph + ml_hbhhh + ml_hd0 + ml_hold + ml_init + ml_inv + ml_log + ml_max + ml_mlout + ml_model + ml_nb0 + ml_opt + ml_p + ml_plot + ml_query + ml_rdgrd + ml_repor + ml_s_e + ml_score + ml_searc + ml_technique + ml_unhold + mlf_ + mlog + mlogi + mlogit + mlogit_footnote + mlogit_p + mlopts + mnl0_ + mprobit + mprobit_lf + mprobit_p + mrdu0_ + mrdu1_ + mvdecode + mvencode + mvreg + mvreg_estat + nbreg + nbreg_al + nbreg_lf + nbreg_p + nbreg_sw + newey + newey_7 + newey_p + nl + nl_7 + nl_p + nl_p_7 + nlcom + nlcom_p + nlexp2 + nlexp2_7 + nlexp2a + nlexp2a_7 + nlexp3 + nlexp3_7 + nlgom3 + nlgom3_7 + nlgom4 + nlgom4_7 + nlinit + nllog3 + nllog3_7 + nllog4 + nllog4_7 + nlog_rd + nlogit + nlogit_p + nlogitgen + nlogittree + nlpred + note + notes + nptrend + numlabel + old_ver + olo + olog + ologi + ologi_sw + ologit + ologit_p + ologitp + op_colnm + op_comp + op_diff + op_inv + op_str + opr + opro + oprob + oprob_sw + oprobi + oprobi_p + oprobit + oprobitp + opts_exclusive + orthog + orthpoly + ovtest + + pac + pac_7 + palette + parse_dissim + pause + pca + pca_8 + pca_display + pca_estat + pca_p + pca_rotate + pcamat + pchart + pchart_7 + pchi + pchi_7 + pcorr + pctile + pentium + pergram + pergram_7 + permute + permute_8 + personal + peto_st + pkcollapse + pkcross + pkequiv + pkexamine + pkexamine_7 + pkshape + pksumm + pksumm_7 + pnorm + pnorm_7 + poisgof + poiss_lf + poiss_sw + poisso_p + poisson + poisson_estat + pperron + prais + prais_e + prais_e2 + prais_p + predict + predictnl + print + prob + probi + probit + probit_estat + probit_p + proc_time + procoverlay + procrustes + procrustes_estat + procrustes_p + profiler + prop + proportion + prtest + prtesti + pwcorr + qby + qbys + qchi + qchi_7 + qladder + qladder_7 + qnorm + qnorm_7 + qqplot + qqplot_7 + qreg + qreg_c + qreg_p + qreg_sw + quadchk + quantile + quantile_7 + range + ranksum + ratio + rchart + rchart_7 + rcof + recast + recode + reg + reg3 + reg3_p + regdw + regr + regre + regre_p2 + regres + regres_p + regress + regress_estat + regriv_p + remap + renpfix + repeat + reshape + robvar + roccomp + roccomp_7 + roccomp_8 + rocf_lf + rocfit + rocfit_8 + rocgold + rocplot + rocplot_7 + roctab + roctab_7 + rolling + rologit + rologit_p + rot + rota + rotat + rotate + rotatemat + rreg + rreg_p + runtest + rvfplot + rvfplot_7 + rvpplot + rvpplot_7 + + safesum + sample + sampsi + savedresults + saveold + sc + scatter + scm_mine + sco + scob_lf + scob_p + scobi_sw + scobit + scor + score + scoreplot + scoreplot_help + scree + screeplot + screeplot_help + sdtest + sdtesti + separate + seperate + serrbar + serrbar_7 + set_defaults + sfrancia + shewhart + shewhart_7 + signrank + signtest + simul + simul_7 + simulate + simulate_8 + sktest + slogit + slogit_d2 + slogit_p + smooth + snapspan + spearman + spikeplot + spikeplot_7 + spikeplt + spline_x + split + sqreg + sqreg_p + ssc + st + st_ct + st_hc + st_hcd + st_hcd_sh + st_is + st_issys + st_note + st_promo + st_set + st_show + st_smpl + st_subid + stack + statsby + statsby_8 + stbase + stci + stci_7 + stcox + stcox_estat + stcox_fr + stcox_fr_ll + stcox_p + stcox_sw + stcoxkm + stcoxkm_7 + stcstat + stcurv + stcurve + stcurve_7 + stdes + stem + stepwise + stereg + stfill + stgen + stir + stjoin + stmc + stmh + stphplot + stphplot_7 + stphtest + stphtest_7 + stptime + strate + strate_7 + streg + streg_sw + streset + sts + sts_7 + stset + stsplit + stsum + sttocc + sttoct + stvary + stweib + suest + suest_8 + sunflower + sureg + survcurv + survsum + svar + svar_p + svmat + svy + svy_disp + svy_dreg + svy_est + svy_est_7 + svy_estat + svy_get + svy_gnbreg_p + svy_head + svy_header + svy_heckman_p + svy_heckprob_p + svy_intreg_p + svy_ivreg_p + svy_logistic_p + svy_logit_p + svy_mlogit_p + svy_nbreg_p + svy_ologit_p + svy_oprobit_p + svy_poisson_p + svy_probit_p + svy_regress_p + svy_sub + svy_sub_7 + svy_x + svy_x_7 + svy_x_p + svydes + svydes_8 + svygen + svygnbreg + svyheckman + svyheckprob + svyintreg + svyintreg_7 + svyintrg + svyivreg + svylc + svylog_p + svylogit + svymarkout + svymarkout_8 + svymean + svymlog + svymlogit + svynbreg + svyolog + svyologit + svyoprob + svyoprobit + svyopts + svypois + svypois_7 + svypoisson + svyprobit + svyprobt + svyprop + svyprop_7 + svyratio + svyreg + svyreg_p + svyregress + svyset + svyset_7 + svyset_8 + svytab + svytab_7 + svytest + svytotal + sw + sw_8 + swcnreg + swcox + swereg + swilk + swlogis + swlogit + swologit + swoprbt + swpois + swprobit + swqreg + swtobit + swweib + symmetry + symmi + symplot + symplot_7 + sysdescribe + sysuse + szroeter + tab_or + tab1 + tab2 + tabi + table + tabodds + tabodds_7 + tabstat + te + tes + test + testnl + testparm + teststd + tetrachoric + time_it + tis + tob + tobi + tobit + tobit_p + tobit_sw + tostring + total + treat_ll + treatr_p + treatreg + trim + trnb_cons + trnb_mean + trpoiss_d2 + trunc_ll + truncr_p + truncreg + tsappend + tset + tsfill + tsline + tsline_ex + tsreport + tsrline + tsset + tssmooth + tsunab + ttest + ttesti + tut_chk + tut_wait + tutorial + tw + tware_st + two + twoway + twoway__fpfit_serset + twoway__function_gen + twoway__histogram_gen + twoway__ipoint_serset + twoway__ipoints_serset + twoway__kdensity_gen + twoway__lfit_serset + twoway__normgen_gen + twoway__pci_serset + twoway__qfit_serset + twoway__scatteri_serset + twoway__sunflower_gen + twoway_ksm_serset + typeof + unab + unabbrev + uselabel + + var + var_mkcompanion + var_p + varbasic + varfcast + vargranger + varirf + varirf_add + varirf_cgraph + varirf_create + varirf_ctable + varirf_describe + varirf_dir + varirf_drop + varirf_erase + varirf_graph + varirf_ograph + varirf_rename + varirf_set + varirf_table + varlmar + varnorm + varsoc + varstable + varstable_w + varstable_w2 + varwle + vce + vec + vec_fevd + vec_mkphi + vec_p + vec_p_w + vecirf_create + veclmar + veclmar_w + vecnorm + vecnorm_w + vecrank + vecstable + verinst + viewsource + vif + vwls + wdatetof + webdescribe + webseek + webuse + weib_lf + weib_lf0 + weib1_lf + weib2_lf + weibhet_glf + weibhet_glf_sh + weibhet_glfa + weibhet_glfa_sh + weibhet_gp + weibhet_ilf + weibhet_ilf_sh + weibhet_ilfa + weibhet_ilfa_sh + weibhet_ip + weibu_sw + weibul_p + weibull + weibull_c + weibull_s + weibullhet + whelp + wilc_st + wilcoxon + wntestb + wntestb_7 + wntestq + xchart + xchart_7 + xcorr + xcorr_7 + xi + xi_6 + xpose + xt_iis + xt_tis + xtab_p + xtabond + xtbin_p + xtclog + xtcloglog + xtcloglog_8 + xtcloglog_d2 + xtcloglog_re_p + xtcnt_p + xtcorr + xtdata + xtdes + xtfront_p + xtfrontier + xtgee + xtgee_elink + xtgee_estat + xtgee_makeivar + xtgee_p + xtgee_plink + xtgls + xtgls_p + xthaus + xthausman + xtht_p + xthtaylor + xtile + xtint_p + xtintreg + xtintreg_8 + xtintreg_d2 + xtintreg_p + xtivp_1 + xtivp_2 + xtivreg + xtline + xtline_ex + xtlogit + xtlogit_8 + xtlogit_d2 + xtlogit_fe_p + xtlogit_pa_p + xtlogit_re_p + xtmixed + xtmixed_estat + xtmixed_p + xtnb_fe + xtnb_lf + xtnbreg + xtnbreg_pa_p + xtnbreg_refe_p + xtpcse + xtpcse_p + xtpois + xtpoisson + xtpoisson_d2 + xtpoisson_pa_p + xtpoisson_refe_p + xtpred + xtprobit + xtprobit_8 + xtprobit_d2 + xtprobit_re_p + xtps_fe + xtps_lf + xtps_ren + xtps_ren_8 + xtrar_p + xtrc + xtrc_p + xtrchh + xtrefe_p + xtreg + xtreg_be + xtreg_fe + xtreg_ml + xtreg_pa_p + xtreg_re + xtregar + xtrere_p + xtsf_ll + xtsf_llti + xtsum + xttab + xttest0 + xttobit + xttobit_8 + xttobit_p + xttrans + yx + yxview__barlike_draw + yxview_area_draw + yxview_bar_draw + yxview_dot_draw + yxview_dropline_draw + yxview_function_draw + yxview_iarrow_draw + yxview_ilabels_draw + yxview_normal_draw + yxview_pcarrow_draw + yxview_pcbarrow_draw + yxview_pccapsym_draw + yxview_pcscatter_draw + yxview_pcspike_draw + yxview_rarea_draw + yxview_rbar_draw + yxview_rbarm_draw + yxview_rcap_draw + yxview_rcapsym_draw + yxview_rconnected_draw + yxview_rline_draw + yxview_rscatter_draw + yxview_rspike_draw + yxview_spike_draw + yxview_sunflower_draw + zap_s + zinb + zinb_llf + zinb_plf + zip + zip_llf + zip_p + zip_plf + zt_ct_5 + zt_hc_5 + zt_hcd_5 + zt_is_5 + zt_iss_5 + zt_sho_5 + zt_smp_5 + ztbase_5 + ztcox_5 + ztdes_5 + ztereg_5 + ztfill_5 + ztgen_5 + ztir_5 + ztjoin_5 + ztnb + ztnb_p + ztp + ztp_p + zts_5 + ztset_5 + ztspli_5 + ztsum_5 + zttoct_5 + ztvary_5 + ztweib_5 + + + + _cholinv + _cholsolve + _corr + _edittoint + _edittointtol + _edittozero + _edittozerotol + _eigen_work + _eigensystem + _eigenvalues + _equilc + _equilr + _equilrc + _ftell + _fullsvd + _hqrd + _hqrdp + _invlower + _jumble + _lefteigensystem + _lowertriangle + _lud + _lud_la + _luinv + _lusolve + _matexpsym + _matlogsym + _matpowersym + _mprobit_outer_prod + _mprobit_quadrature + _mprobit_quadrature_eval + _mprobit_quadrature_m + _mprobit_select + _mprobit_simulator + _mprobit_simulator_case_g + _mprobit_simulator_lk + _mprobit_simulator_m + _mprobit_simulator_mi + _mprobit_validate_choice + _mprobit_weights_roots_laguerre + _perhapsequilc + _perhapsequilr + _perhapsequilrc + _pinv + _qrinv + _qrsolve + _rowswap + _solvelower + _solveupper + _sort + _svd + _svdsv + _svsolve + _svy_design + _svy_group_sum + _svy_identify + _svy_mean + _svy_mean_post + _svy_mean_std + _svy_mean_stdpost + _svy_over_expand + _svy_over_sizes + _svy_post_sizes + _svy_ratio + _svy_ratio_post + _svy_ratio_std + _svy_ratio_stdpost + _svy_srs_variance + _svy_srssub_variance + _svy_std_sizes + _svy_total + _svy_total_post + _svy_variance + _symeigen_work + _symeigensystem + _symeigenvalues + _symmatfunc_work + _uppertriangle + _xtm_beta + _xtm_blup + _xtm_blup_save + _xtm_blup_save_u + _xtm_blup_u + _xtm_cleanup + _xtm_covtype + _xtm_de_th_u + _xtm_delta_to_theta + _xtm_det_upper + _xtm_em_get_rij + _xtm_em_get_uij + _xtm_em_iter + _xtm_em_iter_u + _xtm_em_solve + _xtm_fact_expand + _xtm_ga_th_u + _xtm_gamma_to_theta + _xtm_get_delta + _xtm_get_delta_u + _xtm_invert_R + _xtm_logdetr00 + _xtm_logdetr00_u + _xtm_matexp + _xtm_matlog + _xtm_mixed_ll + _xtm_mixed_ll_u + _xtm_mixed_ll_uu + _xtm_mk_eqs + _xtm_ml_eqlist + _xtm_ml_eqlist_wrk + _xtm_setup + _xtm_start + _xtm_start_collapse + _xtm_start_u + _xtm_th_de_u + _xtm_th_ga_u + _xtm_theta_to_delta + _xtm_theta_to_gamma + acos + acosh + aggregate + array + asin + asinh + assert + asserteq + atan + atanh + blockdiag + boolean + break + byte + case + cat + catch + chdir + cholesky + cholinv + cholsolve + class + cloglog + collate + colmax + colmin + colscalefactors + colshape + colvector + complex + cond + const + continue + convolve + convolveslowly + Corr + correlation + Corrslowly + corruppercase + cosh + deconvolve + default + delegate + delete + designmatrix + det + dettriangular + diag + diag0cnt + do + double + dsign + e + editmissing + edittoint + edittointtol + edittozero + edittozerotol + editvalue + eigensystem + eigenvalues + else + eltypedef + end + enum + explicit + export + external + fft + fileexists + findfile + float + for + friend + ftell + ftfreqs + ftpad + ftperiodogram + ftretime + ftunwrap + ftwrap + fullsdiag + fullsvd + function + gamma + global + goto + helloworld + Hilbert + hqrd + hqrdmultq + hqrdmultq1t + hqrdp + hqrdq + hqrdq1 + hqrdr + hqrdr1 + if + inline + int + invcloglog + invfft + invHilbert + invlogit + invlower + invorder + invslowfft + invslowft + invvech + isdiagonal + jumble + lefteigensystem + local + log10 + logit + long + lowertriangle + lud + luinv + lusolve + makesymmetric + mat_norm + mata + matexpsym + matlogsym + matpowersym + matrix + max + mean + meanvariance + min + mkdir + mmat_ + mmat_describe + mmat_expandlist + mmat_readerror + mmat_save + mmat_use + mmat_writeerror + namespace + new + norm + NULL + numeric + operator + orgtypedef + panelsetup + panelsetup_u + panelstats + panelsubmatrix + panelsubview + pathlist + pathsubsysdir + pi + pinv + pointer + polyadd + polyadd_expand + polyderiv + polydiv + polyeval + polyinteg + polymorphic + polymult + polyroots + polysolve + polytrim + pragma + private + protected + public + qrd + qrdp + qrinv + qrsolve + quad + quadcorrelation + quadmeanvariance + quadrant + quadvariance + range + rangen + rank + rank_from_singular_values + real + return + revorder + rmdir + rowmax + rowmin + rowscalefactors + rowvector + scalar + scalar_norm + short + sign + signed + sinh + sizeof + slowfft + slowft + solve_tol + solve_tolscale + solvelower + solveupper + sort + spline3 + spline3eval + splineeval + st_islmname + static + string + struct + super + svd + svdsv + svsolve + switch + symeigensystem + symeigenvalues + tanh + template + this + throw + Toeplitz + trace + trace_prod + transmorphic + transposeonly + try + typedef + typename + union + uniqrows + unitcircle + unorder + unsigned + uppertriangle + using + Vandermonde + variance + vec + vec_norm + vech + vector + version + virtual + void + volatile + while + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/tcsh.xml b/syntax/tcsh.xml --- a/syntax/tcsh.xml +++ b/syntax/tcsh.xml @@ -8,7 +8,7 @@ ]> - + - - - @@ -510,13 +501,14 @@ - - - - - + + + + - + + + @@ -581,9 +573,7 @@ - - - + @@ -619,15 +609,6 @@ - - - - - - - - - @@ -760,6 +741,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -783,22 +789,23 @@ - - - - - - + + + + + + + - - - - - - - - + + + + + + + + diff --git a/syntax/typescript.xml b/syntax/typescript.xml --- a/syntax/typescript.xml +++ b/syntax/typescript.xml @@ -1,2023 +1,707 @@ -]> - - - - - - - - - - controlflow##JavaScript - goto - - - keywords##JavaScript - declare - - - reserved##JavaScript - type - arguments - - - readonly - abstract - constructor - get - set - - - - module##JavaScript - - - primitives##JavaScript - - - object - - - - - - namespace - module - - - keyof - infer - - - string - number - boolean - symbol - any - void - never - unknown - undefined - null - - - - - - Array - ArrayBuffer - Atomics - Boolean - DataView - Date - Float32Array - Float64Array - Function - Generator - GeneratorFunction - Int8Array - Int16Array - Int32Array - Intl - Map - Number - Object - Proxy - Reflect - RegExp - Set - SharedArrayBuffer - SIMD - String - Symbol - TypedArray - Uint8Array - Uint16Array - Uint32Array - Uint8ClampedArray - WeakMap - WeakSet - - Error - EvalError - InternalError - RangeError - ReferenceError - SyntaxError - TypeError - URIError - - Math - - Promise - - JSON - console - process - - - - AnalyserNode - ArrayBufferView - Attr - AudioBuffer - AudioBufferSourceNode - AudioContext - AudioDestinationNode - AudioListener - AudioNode - AudioParam - BatteryManager - BeforeUnloadEvent - BiquadFilterNode - Blob - BufferSource - ByteString - CSS - CSSConditionRule - CSSCounterStyleRule - CSSGroupingRule - CSSMatrix - CSSMediaRule - CSSPageRule - CSSPrimitiveValue - CSSRule - CSSRuleList - CSSStyleDeclaration - CSSStyleRule - CSSStyleSheet - CSSSupportsRule - CSSValue - CSSValueList - CanvasGradient - CanvasImageSource - CanvasPattern - CanvasRenderingContext2D - ChannelMergerNode - ChannelSplitterNode - CharacterData - ChromeWorker - CloseEvent - Comment - CompositionEvent - Console - ConvolverNode - Coordinates - Credential - CredentialsContainer - Crypto - CryptoKey - CustomEvent - DOMError - DOMException - DOMHighResTimeStamp - DOMImplementation - DOMString - DOMStringList - DOMStringMap - DOMTimeStamp - DOMTokenList - DataTransfer - DataTransferItem - DataTransferItemList - DedicatedWorkerGlobalScope - DelayNode - DeviceProximityEvent - DirectoryEntry - DirectoryEntrySync - DirectoryReader - DirectoryReaderSync - Document - DocumentFragment - DocumentTouch - DocumentType - DragEvent - DynamicsCompressorNode - Element - Entry - EntrySync - ErrorEvent - Event - EventListener - EventSource - EventTarget - FederatedCredential - FetchEvent - File - FileEntry - FileEntrySync - FileException - FileList - FileReader - FileReaderSync - FileSystem - FileSystemSync - FontFace - FormData - GainNode - Gamepad - GamepadButton - GamepadEvent - Geolocation - GlobalEventHandlers - HTMLAnchorElement - HTMLAreaElement - HTMLAudioElement - HTMLBRElement - HTMLBaseElement - HTMLBodyElement - HTMLButtonElement - HTMLCanvasElement - HTMLCollection - HTMLContentElement - HTMLDListElement - HTMLDataElement - HTMLDataListElement - HTMLDialogElement - HTMLDivElement - HTMLDocument - HTMLElement - HTMLEmbedElement - HTMLFieldSetElement - HTMLFontElement - HTMLFormControlsCollection - HTMLFormElement - HTMLHRElement - HTMLHeadElement - HTMLHeadingElement - HTMLHtmlElement - HTMLIFrameElement - HTMLImageElement - HTMLInputElement - HTMLKeygenElement - HTMLLIElement - HTMLLabelElement - HTMLLegendElement - HTMLLinkElement - HTMLMapElement - HTMLMediaElement - HTMLMetaElement - HTMLMeterElement - HTMLModElement - HTMLOListElement - HTMLObjectElement - HTMLOptGroupElement - HTMLOptionElement - HTMLOptionsCollection - HTMLOutputElement - HTMLParagraphElement - HTMLParamElement - HTMLPreElement - HTMLProgressElement - HTMLQuoteElement - HTMLScriptElement - HTMLSelectElement - HTMLShadowElement - HTMLSourceElement - HTMLSpanElement - HTMLStyleElement - HTMLTableCaptionElement - HTMLTableCellElement - HTMLTableColElement - HTMLTableDataCellElement - HTMLTableElement - HTMLTableHeaderCellElement - HTMLTableRowElement - HTMLTableSectionElement - HTMLTextAreaElement - HTMLTimeElement - HTMLTitleElement - HTMLTrackElement - HTMLUListElement - HTMLUnknownElement - HTMLVideoElement - HashChangeEvent - History - IDBCursor - IDBCursorWithValue - IDBDatabase - IDBEnvironment - IDBFactory - IDBIndex - IDBKeyRange - IDBMutableFile - IDBObjectStore - IDBOpenDBRequest - IDBRequest - IDBTransaction - IDBVersionChangeEvent - IIRFilterNode - IdentityManager - ImageBitmap - ImageBitmapFactories - ImageData - Index - InputDeviceCapabilities - InputEvent - InstallEvent - InstallTrigger - KeyboardEvent - LinkStyle - LocalFileSystem - LocalFileSystemSync - Location - MIDIAccess - MIDIConnectionEvent - MIDIInput - MIDIInputMap - MIDIOutputMap - MediaElementAudioSourceNode - MediaError - MediaKeyMessageEvent - MediaKeySession - MediaKeyStatusMap - MediaKeySystemAccess - MediaKeySystemConfiguration - MediaKeys - MediaRecorder - MediaStream - MediaStreamAudioDestinationNode - MediaStreamAudioSourceNode - MessageChannel - MessageEvent - MessagePort - MouseEvent - MutationObserver - MutationRecord - NamedNodeMap - Navigator - NavigatorConcurrentHardware - NavigatorGeolocation - NavigatorID - NavigatorLanguage - NavigatorOnLine - Node - NodeFilter - NodeIterator - NodeList - NonDocumentTypeChildNode - Notification - OfflineAudioCompletionEvent - OfflineAudioContext - OscillatorNode - PageTransitionEvent - PannerNode - ParentNode - PasswordCredential - Path2D - PaymentAddress - PaymentRequest - PaymentResponse - Performance - PerformanceEntry - PerformanceFrameTiming - PerformanceMark - PerformanceMeasure - PerformanceNavigation - PerformanceNavigationTiming - PerformanceObserver - PerformanceObserverEntryList - PerformanceResourceTiming - PerformanceTiming - PeriodicSyncEvent - PeriodicWave - Plugin - Point - PointerEvent - PopStateEvent - PortCollection - Position - PositionError - PositionOptions - PresentationConnectionClosedEvent - PresentationConnectionList - PresentationReceiver - ProcessingInstruction - ProgressEvent - PromiseRejectionEvent - PushEvent - PushRegistrationManager - RTCCertificate - RTCConfiguration - RTCPeerConnection - RTCSessionDescriptionCallback - RTCStatsReport - RadioNodeList - RandomSource - Range - ReadableByteStream - RenderingContext - SVGAElement - SVGAngle - SVGAnimateColorElement - SVGAnimateElement - SVGAnimateMotionElement - SVGAnimateTransformElement - SVGAnimatedAngle - SVGAnimatedBoolean - SVGAnimatedEnumeration - SVGAnimatedInteger - SVGAnimatedLength - SVGAnimatedLengthList - SVGAnimatedNumber - SVGAnimatedNumberList - SVGAnimatedPoints - SVGAnimatedPreserveAspectRatio - SVGAnimatedRect - SVGAnimatedString - SVGAnimatedTransformList - SVGAnimationElement - SVGCircleElement - SVGClipPathElement - SVGCursorElement - SVGDefsElement - SVGDescElement - SVGElement - SVGEllipseElement - SVGEvent - SVGFilterElement - SVGFontElement - SVGFontFaceElement - SVGFontFaceFormatElement - SVGFontFaceNameElement - SVGFontFaceSrcElement - SVGFontFaceUriElement - SVGForeignObjectElement - SVGGElement - SVGGlyphElement - SVGGradientElement - SVGHKernElement - SVGImageElement - SVGLength - SVGLengthList - SVGLineElement - SVGLinearGradientElement - SVGMPathElement - SVGMaskElement - SVGMatrix - SVGMissingGlyphElement - SVGNumber - SVGNumberList - SVGPathElement - SVGPatternElement - SVGPoint - SVGPolygonElement - SVGPolylineElement - SVGPreserveAspectRatio - SVGRadialGradientElement - SVGRect - SVGRectElement - SVGSVGElement - SVGScriptElement - SVGSetElement - SVGStopElement - SVGStringList - SVGStylable - SVGStyleElement - SVGSwitchElement - SVGSymbolElement - SVGTRefElement - SVGTSpanElement - SVGTests - SVGTextElement - SVGTextPositioningElement - SVGTitleElement - SVGTransform - SVGTransformList - SVGTransformable - SVGUseElement - SVGVKernElement - SVGViewElement - ServiceWorker - ServiceWorkerContainer - ServiceWorkerGlobalScope - ServiceWorkerRegistration - ServiceWorkerState - ShadowRoot - SharedWorker - SharedWorkerGlobalScope - SourceBufferList - StereoPannerNode - Storage - StorageEvent - StyleSheet - StyleSheetList - SubtleCrypto - SyncEvent - Text - TextMetrics - TimeEvent - TimeRanges - Touch - TouchEvent - TouchList - Transferable - TreeWalker - UIEvent - USVString - VRDisplayCapabilities - ValidityState - WaveShaperNode - WebGL - WebGLActiveInfo - WebGLBuffer - WebGLContextEvent - WebGLFramebuffer - WebGLProgram - WebGLRenderbuffer - WebGLRenderingContext - WebGLShader - WebGLShaderPrecisionFormat - WebGLTexture - WebGLTimerQueryEXT - WebGLTransformFeedback - WebGLUniformLocation - WebGLVertexArrayObject - WebGLVertexArrayObjectOES - WebSocket - WebSockets - WebVTT - WheelEvent - Window - WindowBase64 - WindowEventHandlers - WindowTimers - Worker - WorkerGlobalScope - WorkerLocation - WorkerNavigator - XMLHttpRequest - XMLHttpRequestEventTarget - XMLSerializer - XPathExpression - XPathResult - XSLTProcessor - - - - Buffer - EventEmitter - Server - Pipe - Socket - REPLServer - ReadStream - WriteStream - Stream - Inflate - Deflate - InflateRaw - DeflateRaw - GZip - GUnzip - Unzip - Zip - - - - constructor - length - prototype - __proto__ - EPSILON - MAX_SAFE_INTEGER - MAX_VALUE - MIN_SAFE_INTEGER - MIN_VALUE - NEGATIVE_INFINITY - POSITIVE_INFINITY - - - - clearInterval - clearTimeout - decodeURI - decodeURIComponent - encodeURI - encodeURIComponent - escape - eval - isFinite - isNaN - parseFloat - parseInt - require - setTimeout - setInterval - super - unescape - uneval - - - - abs - acos - acosh - asin - asinh - atan - atan2 - atanh - cbrt - ceil - clz32 - cos - cosh - exp - expm1 - floor - fround - hypot - imul - log - log10 - log1p - log2 - max - min - pow - random - round - sign - sin - sinh - sqrt - tan - tanh - trunc - - - - E - LN10 - LN2 - LOG10E - LOG2E - PI - SQRT1_2 - SQRT2 - - - - assert - clear - count - debug - dir - error - group - groupCollapsed - groupEnd - info - log - profile - profileEnd - table - time - timeEnd - timeStamp - trace - warn - - - - parse - stringify - - - - global - GLOBAL - root - __dirname - __filename - - - - arch - argv - config - connected - env - execArgv - execPath - exitCode - mainModule - pid - platform - release - stderr - stdin - stdout - title - version - versions - - - - abort - chdir - cwd - disconnect - exit - setegid - seteuid - getegid - geteuid - setgid - setuid - getgid - getuid - send - setgroups - getgroups - initgroups - kill - memoryUsage - nextTick - umask - uptime - hrtime - - - - all - catch - finally - race - reject - resolve - then - - - - document - event - navigator - performance - screen - window - - - - ATTRIBUTE_NODE - CDATA_SECTION_NODE - COMMENT_NODE - DOCUMENT_FRAGMENT_NODE - DOCUMENT_NODE - DOCUMENT_TYPE_NODE - DOMSTRING_SIZE_ERR - ELEMENT_NODE - ENTITY_NODE - ENTITY_REFERENCE_NODE - HIERARCHY_REQUEST_ERR - INDEX_SIZE_ERR - INUSE_ATTRIBUTE_ERR - INVALID_CHARACTER_ERR - NO_DATA_ALLOWED_ERR - NO_MODIFICATION_ALLOWED_ERR - NOT_FOUND_ERR - NOT_SUPPORTED_ERR - NOTATION_NODE - PROCESSING_INSTRUCTION_NODE - TEXT_NODE - WRONG_DOCUMENT_ERR - - - - _content - x - y - z - abbr - above - accept - acceptCharset - accessKey - action - align - aLink - vLink - aLinkcolor - vLinkcolor - all - alt - anchors - appCodeName - appCore - applets - appMinorVersion - appName - appVersion - archive - areas - arguments - attributes - availHeight - availLeft - availTop - availWidth - axis - background - backgroundColor - backgroundImage - below - bgColor - body - border - borderBottomWidth - borderColor - borderLeftWidth - borderRightWidth - borderStyle - borderTopWidth - borderWidth - bottom - bufferDepth - callee - caller - caption - cellPadding - cells - cellSpacing - ch - characterSet - charset - checked - childNodes - chOff - cite - classes - className - clear - clientInformation - clip - clipBoardData - closed - code - codeBase - codeType - color - colorDepth - cols - colSpan - compact - complete - components - content - controllers - cookie - cookieEnabled - cords - cpuClass - crypto - current - data - dateTime - declare - defaultCharset - defaultChecked - defaultSelected - defaultStatus - defaultValue - defaultView - defer - description - dialogArguments - dialogHeight - dialogLeft - dialogTop - dialogWidth - dir - directories - disabled - display - docmain - doctype - documentElement - elements - embeds - enabledPlugin - encoding - enctype - entities - event - expando - external - face - fgColor - filename - firstChild - fontFamily - fontSize - fontWeight - form - formName - forms - frame - frameBorder - frameElement - frames - hasFocus - hash - headers - height - history - host - hostname - href - hreflang - hspace - htmlFor - httpEquiv - id - ids - ignoreCase - images - implementation - index - innerHeight - innerWidth - input - isMap - label - lang - language - lastChild - lastIndex - lastMatch - lastModified - lastParen - layers - layerX - layerY - left - leftContext - lineHeight - link - linkColor - links - listStyleType - localName - location - locationbar - longDesc - lowsrc - lowSrc - marginBottom - marginHeight - marginLeft - marginRight - marginTop - marginWidth - maxLength - media - menubar - method - mimeTypes - multiline - multiple - name - nameProp - namespaces - namespaceURI - next - nextSibling - nodeName - nodeType - nodeValue - noHref - noResize - noShade - notationName - notations - noWrap - object - offscreenBuffering - onLine - onreadystatechange - opener - opsProfile - options - oscpu - outerHeight - outerWidth - ownerDocument - paddingBottom - paddingLeft - paddingRight - paddingTop - pageX - pageY - pageXOffset - pageYOffset - parent - parentLayer - parentNode - parentWindow - pathname - personalbar - pixelDepth - pkcs11 - platform - plugins - port - prefix - previous - previousDibling - product - productSub - profile - profileend - prompt - prompter - protocol - publicId - readOnly - readyState - referrer - rel - responseText - responseXML - rev - right - rightContext - rowIndex - rows - rowSpan - rules - scheme - scope - screenX - screenY - screenLeft - screenTop - scripts - scrollbars - scrolling - sectionRowIndex - security - securityPolicy - selected - selectedIndex - selection - self - shape - siblingAbove - siblingBelow - size - source - specified - standby - start - status - statusbar - statusText - style - styleSheets - suffixes - summary - systemId - systemLanguage - tagName - tags - target - tBodies - text - textAlign - textDecoration - textIndent - textTransform - tFoot - tHead - title - toolbar - top - type - undefined - uniqueID - updateInterval - URL - URLUnencoded - useMap - userAgent - userLanguage - userProfile - vAlign - value - valueType - vendor - vendorSub - version - visibility - vspace - whiteSpace - width - XMLDocument - XSLDocument - zIndex - - - - acceptNode - add - addEventListener - addTextTrack - adoptNode - after - animate - append - appendChild - appendData - before - blur - canPlayType - captureStream - caretPositionFromPoint - caretRangeFromPoint - checkValidity - clear - click - cloneContents - cloneNode - cloneRange - close - closest - collapse - compareBoundaryPoints - compareDocumentPosition - comparePoint - contains - convertPointFromNode - convertQuadFromNode - convertRectFromNode - createAttribute - createAttributeNS - createCaption - createCDATASection - createComment - createContextualFragment - createDocument - createDocumentFragment - createDocumentType - createElement - createElementNS - createEntityReference - createEvent - createExpression - createHTMLDocument - createNodeIterator - createNSResolver - createProcessingInstruction - createRange - createShadowRoot - createTBody - createTextNode - createTFoot - createTHead - createTreeWalker - delete - deleteCaption - deleteCell - deleteContents - deleteData - deleteRow - deleteTFoot - deleteTHead - detach - disconnect - dispatchEvent - elementFromPoint - elementsFromPoint - enableStyleSheetsForSet - entries - evaluate - execCommand - exitFullscreen - exitPointerLock - expand - extractContents - fastSeek - firstChild - focus - forEach - get - getAll - getAnimations - getAttribute - getAttributeNames - getAttributeNode - getAttributeNodeNS - getAttributeNS - getBoundingClientRect - getBoxQuads - getClientRects - getContext - getDestinationInsertionPoints - getElementById - getElementsByClassName - getElementsByName - getElementsByTagName - getElementsByTagNameNS - getItem - getNamedItem - getSelection - getStartDate - getVideoPlaybackQuality - has - hasAttribute - hasAttributeNS - hasAttributes - hasChildNodes - hasFeature - hasFocus - importNode - initEvent - insertAdjacentElement - insertAdjacentHTML - insertAdjacentText - insertBefore - insertCell - insertData - insertNode - insertRow - intersectsNode - isDefaultNamespace - isEqualNode - isPointInRange - isSameNode - item - key - keys - lastChild - load - lookupNamespaceURI - lookupPrefix - matches - move - moveAttribute - moveAttributeNode - moveChild - moveNamedItem - namedItem - nextNode - nextSibling - normalize - observe - open - parentNode - pause - play - postMessage - prepend - preventDefault - previousNode - previousSibling - probablySupportsContext - queryCommandEnabled - queryCommandIndeterm - queryCommandState - queryCommandSupported - queryCommandValue - querySelector - querySelectorAll - registerContentHandler - registerElement - registerProtocolHandler - releaseCapture - releaseEvents - remove - removeAttribute - removeAttributeNode - removeAttributeNS - removeChild - removeEventListener - removeItem - replace - replaceChild - replaceData - replaceWith - reportValidity - requestFullscreen - requestPointerLock - reset - scroll - scrollBy - scrollIntoView - scrollTo - seekToNextFrame - select - selectNode - selectNodeContents - set - setAttribute - setAttributeNode - setAttributeNodeNS - setAttributeNS - setCapture - setCustomValidity - setEnd - setEndAfter - setEndBefore - setItem - setNamedItem - setRangeText - setSelectionRange - setSinkId - setStart - setStartAfter - setStartBefore - slice - splitText - stepDown - stepUp - stopImmediatePropagation - stopPropagation - submit - substringData - supports - surroundContents - takeRecords - terminate - toBlob - toDataURL - toggle - toString - values - write - writeln - - - - - onRowsinserted - onRowsdelete - onRowenter - onRowexit - onResize - onResizestart - onResizeend - onReset - onReadystatechange - onMouseout - onMouseover - onMousedown - onMouseup - onMousemove - onBeforecut - onBeforedeactivate - onBeforeunload - onBeforeupdate - onBeforepaste - onBeforeprint - onBeforeeditfocus - onBeforeactivate - onBlur - onScrolltop - onSubmit - onSelect - onSelectstart - onSelectionchange - onHover - onHelp - onChange - onContextmenu - onControlselect - onCut - onCellchange - onClock - onClose - onDeactivate - onDatasetchanged - onDatasetcomplete - onDataavailable - onDrop - onDrag - onDragstart - onDragover - onDragdrop - onDragenter - onDragend - onDragleave - onDblclick - onUnload - onPaste - onPropertychange - onError - onErrorupdate - onKeydown - onKeyup - onKeypress - onFocus - onLoad - onActivate - onAfterupdate - onAfterprint - onAbort - - - - shift - showModelessDialog - showModalDialog - showHelp - scroll - scrollX - scrollByPages - scrollByLines - scrollY - scrollTo - stop - strike - sizeToContent - sidebar - signText - sort - sup - sub - substr - substring - splice - split - send - setMilliseconds - setSeconds - setMinutes - setHours - setMonth - setYear - setFullYear - setDate - setUTCMilliseconds - setUTCSeconds - setUTCMinutes - setUTCHours - setUTCMonth - setUTCFullYear - setUTCDate - setTime - setHotkeys - setCursor - setZOptions - setActive - setResizable - setRequestHeader - search - slice - savePreferences - small - home - handleEvent - navigate - char - charCodeAt - charAt - concat - contextual - confirm - compile - clear - captureEvents - call - createStyleSheet - createPopup - createEventObject - toGMTString - toUTCString - toString - toSource - toUpperCase - toLowerCase - toLocaleString - test - taint - taintEnabled - indexOf - italics - disableExternalCapture - dump - detachEvent - unshift - untaint - unwatch - updateCommands - join - javaEnabled - pop - push - plugins.refresh - paddings - parse - print - prompt - preference - enableExternalCapture - exec - execScript - valueOf - UTC - find - file - fileModifiedDate - fileSize - fileCreatedDate - fileUpdatedDate - fixed - fontsize - fontcolor - forward - fromCharCode - watch - link - load - lastIndexOf - anchor - attachEvent - atob - apply - alert - abort - routeEvents - resize - resizeBy - resizeTo - recalc - returnValue - replace - reverse - reload - releaseCapture - releaseEvents - go - getMilliseconds - getSeconds - getMinutes - getHours - getMonth - getDay - getYear - getFullYear - getTime - getDate - getTimezoneOffset - getUTCMilliseconds - getUTCSeconds - getUTCMinutes - getUTCHours - getUTCDay - getUTCMonth - getUTCFullYear - getUTCDate - getAttention - getSelection - getResponseHeader - getAllResponseHeaders - moveBy - moveBelow - moveTo - moveToAbsolute - moveAbove - mergeAttributes - match - margins - btoa - big - bold - borderWidths - blink - back - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + +]> + + + + + + + + + + controlflow##JavaScript + goto + + + keywords##JavaScript + declare + + + reserved##JavaScript + type + arguments + + readonly + abstract + constructor + get + set + + + + module##JavaScript + + + primitives##JavaScript + + object + + + + + + namespace + module + + + keyof + infer + + + + + string + number + bigint + boolean + symbol + any + void + never + unknown + + undefined + null + object + + + + + + class_builtin##JavaScript + + + + class_dom##JavaScript + + + + class_node##JavaScript + + + + + variable_property##JavaScript + + + + functions##JavaScript + + + + + console_functions##JavaScript + + + + process_property##JavaScript + + + + process_functions##JavaScript + + + + + number_constant##JavaScript + + + + math_constant##JavaScript + + + + math_functions##JavaScript + + + + json_functions##JavaScript + + + + promise_functions##JavaScript + + + + + node_variable##JavaScript + + + + dom_variable##JavaScript + + + + dom_constant##JavaScript + + + + + + dom_property##JavaScript + + + + dom_functions##JavaScript + + + + eventhandler_property##JavaScript + + + + function_common##JavaScript + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/vhdl.xml b/syntax/vhdl.xml --- a/syntax/vhdl.xml +++ b/syntax/vhdl.xml @@ -8,7 +8,7 @@ ]> - + file @@ -220,7 +220,7 @@ - @@ -414,7 +414,7 @@ - @@ -598,7 +598,9 @@ - + + + diff --git a/syntax/yaml.xml b/syntax/yaml.xml --- a/syntax/yaml.xml +++ b/syntax/yaml.xml @@ -27,22 +27,27 @@ + + + + ]> - - + + - + - + - + @@ -50,48 +55,77 @@ - - + + - - - + + + - - - - - + + + + + - - + + + - - - + + + + + + + + - + + - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + @@ -100,87 +134,102 @@ - + - + - + + + + + + - - + - - - - + + + + + + - - + - - + + + + + + - - + + + + + + + - - + + + - + + - - - + + - - - - - + + + + + - - - + + + @@ -188,75 +237,77 @@ - + + + - - + + - - - - - - + + + + + - - - + + + - + + - + - + - + + - + - - + - + @@ -351,8 +402,10 @@ > key: !!type >- > ^Start the folded text --> + + String="^(&space;*)(?:[^"'#\-\?\s][^:#]*|\-(?:[^\s:#][^:#]*)?|&keyDQ;|&keySQ;)(?=\:\s+(?:(?:&keyDQ;|&keySQ;|[^#])*[^#\w\|<>"'])?&literalOp;&endValue;)" /> - + @@ -402,157 +455,163 @@ - + - - - + + + - - - + + + - + - - - + + + - + + + + + - - + + - + - + - + - + - + - + - + - + - + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + + - - - - - - - + + + + + + + - + @@ -564,6 +623,10 @@ + + + +