- additional methods for multibyte UFT8 character detection

- bumped version for latest WotLK Classic patch
- updated Ace3.0 libraries for latest WotLK Classic patch

.gitignore

@@ -38,6 +38,7 @@ obj/
 
 # Misc
 .bin/
+.release/
 *.log
 *.graphml
 coverage.db*

.pkgmeta

@@ -2,23 +2,29 @@ package-as: Grichelde
 
 enable-nolib-creation: no
 
-externals:
+embedded-libraries:
-  libs/LibStub: https://repos.wowace.com/wow/libstub/tags/1.0
+  Libs/LibStub: https://repos.wowace.com/wow/libstub/tags/1.0
-  libs/LibDataBroker: https://github.com/tekkub/libdatabroker-1-1
+    curse-slug: libstub
-  libs/LibDBIcon: https://repos.curseforge.com/wow/libdbicon-1-0/trunk/LibDBIcon-1.0
+  Libs/LibDataBroker: https://github.com/tekkub/libdatabroker-1-1
-  libs/CallbackHandler-1.0: https://repos.wowace.com/wow/callbackhandler/trunk/CallbackHandler-1.0
+    curse-slug: libdatabroker-1-1
-  libs/AceAddon-3.0: https://repos.wowace.com/wow/ace3/trunk/AceAddon-3.0
+  Libs/LibDBIcon: https://repos.curseforge.com/wow/libdbicon-1-0/trunk/LibDBIcon-1.0
-  libs/AceConfig-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConfig-3.0
+    curse-slug: libdbicon-1-0
-  libs/AceConsole-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConsole-3.0
+  Libs/CallbackHandler-1.0: https://repos.wowace.com/wow/callbackhandler/trunk/CallbackHandler-1.0
-  libs/AceDB-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDB-3.0
+    curse-slug: callbackhandler
-  libs/AceDBOptions-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDBOptions-3.0
+  Libs/AceAddon-3.0: https://repos.wowace.com/wow/ace3/trunk/AceAddon-3.0
-  libs/AceEvent-3.0: https://repos.wowace.com/wow/ace3/trunk/AceEvent-3.0
+    curse-slug: ace3
-  libs/AceGUI-3.0: https://repos.wowace.com/wow/ace3/trunk/AceGUI-3.0
+  Libs/AceConfig-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConfig-3.0
-  libs/AceHook-3.0: https://repos.wowace.com/wow/ace3/trunk/AceHook-3.0
+  Libs/AceConsole-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConsole-3.0
-  libs/AceLocale-3.0: https://repos.wowace.com/wow/ace3/trunk/AceLocale-3.0
+  Libs/AceDB-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDB-3.0
+  Libs/AceDBOptions-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDBOptions-3.0
+  Libs/AceEvent-3.0: https://repos.wowace.com/wow/ace3/trunk/AceEvent-3.0
+  Libs/AceGUI-3.0: https://repos.wowace.com/wow/ace3/trunk/AceGUI-3.0
+  Libs/AceHook-3.0: https://repos.wowace.com/wow/ace3/trunk/AceHook-3.0
+  Libs/AceLocale-3.0: https://repos.wowace.com/wow/ace3/trunk/AceLocale-3.0
 
 ignore:
   - twitch
+  - GricheldeTest.lua
 
 manual-changelog:
   filename: CHANGELOG.md

.release/README.md

@@ -0,0 +1,311 @@
+# release.sh
+
+__release.sh__ generates an addon zip file from a Git, SVN, or Mercurial
+checkout.
+
+__release.sh__ works by creating a new project directory (*.release* by
+default), copying files from the checkout into the project directory, checking
+out external repositories then copying their files into the project directory,
+then moves subdirectories into the project root.  The project directory is then
+zipped to create a distributable addon zip file which can also be uploaded to
+CurseForge, WoWInterface, Wago, and GitHub (as a release).
+
+__release.sh__ assumes that tags (Git annotated tags and SVN tags) are named for
+the version numbers for the project.  It will identify if the HEAD is tagged and
+use that as the current version number.  It will search back through parent
+commits for the previous tag and generate a changelog containing the commits
+since that tag.
+
+## Building with GitHub Actions
+
+For a full example workflow, please check out the [wiki page](https://github.com/BigWigsMods/packager/wiki/GitHub-Actions-workflow).
+
+### Example using [options](#Usage)
+
+```yaml
+- uses: BigWigsMods/packager@v1
+  with:
+    args: -g classic -m .pkgmeta-classic
+```
+
+## Customizing the build
+
+__release.sh__ uses the TOC file to determine the package name for the project.
+You can also set the CurseForge project id (`-p`), the WoWInterface addon
+id (`-w`) or the Wago project id (`-a`) by adding the following to the TOC file:
+
+```toc
+## X-Curse-Project-ID: 1234
+## X-WoWI-ID: 5678
+## X-Wago-ID: he54k6bL
+```
+
+Your CurseForge project id can be found on the addon page in the "About Project"
+side box.
+
+Your WoWInterface addon id is in the url for the addon, eg, the "5678"
+in <https://wowinterface.com/downloads/info5678-MyAddon>.
+
+Your Wago project id can be found on the developer dashboard.
+
+### The PackageMeta file
+
+__release.sh__ can read a __.pkgmeta__ file and supports the following
+directives. See the [wiki page](https://github.com/BigWigsMods/packager/wiki/Preparing-the-PackageMeta-File)
+for more info.
+
+- *externals* (Git, SVN, and Mercurial) Caveats: An external's .pkgmeta is only
+  parsed for ignore and externals will not have localization keywords replaced.
+- *ignore*
+- *changelog-title*
+- *manual-changelog*
+- *move-folders*
+- *package-as*
+- *enable-nolib-creation* (defaults to no) Caveats: nolib packages will only be
+  uploaded to GitHub and attached to a release. Unlike with the CurseForge
+  packager, manually uploaded nolib packages will not be used by the client when
+  users have enabled downloading libraries separately.
+- *tools-used*
+- *required-dependencies*
+- *optional-dependencies*
+- *embedded-libraries* Note: All fetched externals will be marked as embedded,
+  overriding any manually set relations in the pkgmeta.
+
+You can also use a few directives for WoWInterface uploading.
+
+- *wowi-archive-previous* : `yes|no` (defaults to yes) Archive the previous
+  release.
+- *wowi-create-changelog* : `yes|no` (defaults to yes) Generate a changelog
+  using BBCode that will be set when uploading. A manual changelog will always
+  be used instead if set in the .pkgmeta.
+- *wowi-convert-changelog* : `yes|no` (defaults to yes) Convert a manual
+  changelog in Markdown format to BBCode if you have [pandoc](http://pandoc.org/)
+  installed; otherwise, the manual changelog will be used as-is.  If set to `no`
+  when using a generated changelog, Markdown will be used instead of BBCode.
+  **Note**: Markdown support is experimental and needs to be requested on a
+  per-project basis.
+
+### String replacements
+
+__release.sh__ supports the following repository substitution keywords when
+copying the files from the checkout into the project directory. See the
+[wiki page](https://github.com/BigWigsMods/packager/wiki/Repository-Keyword-Substitutions)
+for more info.
+
+- *@[localization](https://github.com/BigWigsMods/packager/wiki/Localization-Substitution)(locale="locale", format="format", ...)@*
+  - *escape-non-ascii*
+  - *handle-unlocalized*
+  - *handle-subnamespaces="concat"*
+  - *key*
+  - *namespace*
+  - *same-key-is-true*
+  - *table-name*
+- *@file-revision@*
+- *@project-revision@*
+- *@file-hash@*
+- *@project-hash@*
+- *@file-abbreviated-hash@*
+- *@project-abbreviated-hash@*
+- *@file-author@*
+- *@project-author@*
+- *@file-date-iso@*
+- *@project-date-iso@*
+- *@file-date-integer@*
+- *@project-date-integer@*
+- *@file-timestamp@*
+- *@project-timestamp@*
+- *@project-version@*
+
+### Build type keywords
+
+Specific keywords used in a comment at the start (`@keyword@`) and end
+(`@end-keyword@`) of a block of code can be used to conditionally run that code
+based on the build type.  If the build type does not match, the block of code
+is comment out so line numbers do not change.
+
+Supported keywords and when the code block will run:
+
+- `alpha`: in untagged builds.
+- `debug`: never.  Code will only run when using an unpackaged source.
+- `do-not-package`: never.  Same as `debug` except removed from the packaged
+  file.
+- `no-lib-strip`: _(not supported in Lua files)_ in any build other than a
+  *nolib* build.
+- `retail`,`version-retail`,`version-classic`,`version-bcc`: based on game
+  version.
+
+`do-not-package` is a bit special. Everything between the tags, including the
+tags themselves, will always be removed from the packaged file. This will cause
+the line numbers of subsequent lines to change, which can result in bug report
+line numbers not matching the source code.  The typical usage is at the end of
+Lua files surrounding debugging functions and other code that end users should
+never see or execute.
+
+All keywords except `do-not-package` can be prefixed with `non-` to inverse the
+logic.  When doing this, the keywords should start and end a **block comment**
+as shown below.
+
+More examples are available on the [wiki page](https://github.com/BigWigsMods/packager/wiki/Repository-Keyword-Substitutions#debug-replacements).
+
+#### In Lua files
+
+`--@keyword@` and `--@end-keyword@`  
+turn into `--[===[@keyword` and `--@end-keyword]===]`.
+
+`--[===[@non-keyword@` and `--@end-non-keyword@]===]`  
+turn into `--@non-keyword@` and `--@end-non-keyword@`.
+
+#### In XML files
+
+**Note:** XML doesn't allow nested comments so make sure not to nest keywords.
+If you need to nest keywords, you can do so in the TOC instead.
+
+`<!--@keyword@-->` and `<!--@end-keyword@-->`  
+turn into `<!--@keyword` and `@end-keyword@-->`.
+
+`<!--@non-keyword@` and `@end-non-keyword@-->`  
+turn into `<!--@non-keyword@-->` and `<!--@end-non-keyword@-->`.
+
+#### In TOC files
+
+The lines with `#@keyword@` and `#@end-keyword@` get removed, as well as every
+line in-between.
+
+The lines with `#@non-keyword@` and `#@end-non-keyword@` get removed, as well as
+removing a '# ' at the beginning of each line in-between.
+
+### Changing the file name
+
+__release.sh__ uses the file name template `"{package-name}-{project-version}{nolib}{classic}"`
+for the addon zip file.  This can be changed with the `-n` switch (`release.sh
+-n "{package-name}-{project-version}"`).
+
+These tokens are always replaced with their value:
+
+- `{package-name}`
+- `{project-revision}`
+- `{project-hash}`
+- `{project-abbreviated-hash}`
+- `{project-author}`
+- `{project-date-iso}`
+- `{project-date-integer}`
+- `{project-timestamp}`
+- `{project-version}`
+- `{game-type}`
+- `{release-type}`
+
+These tokens are "flags" and are conditionally shown prefixed with a dash based
+on the build type:
+
+- `{alpha}`
+- `{beta}`
+- `{nolib}`
+- `{classic}`
+
+`{classic}` has some additional magic:
+
+1. It will show as the non-retail build type, so either `-classic` or `-bcc`.
+2. It will not be shown if "-classic" or "-bcc" is in the project version.
+3. If it is included in the file name (it is by default) and #2 does not apply,
+   it will also be appended to the file label (i.e., the name shown on
+   CurseForge).
+
+## Building for multiple game versions
+
+__release.sh__ needs to know what version of World of Warcraft the package is
+targeting.  This is normally automatically detected using the `## Interface:`
+line of the addon's TOC file.
+
+If your addon supports both retail and classic in the same branch, you can use
+multiple `## Interface-Type:` lines in your TOC file.  Only one `## Interface:`
+line will be included in the packaged TOC file based on the targeted game
+version.
+
+```toc
+## Interface: 90005
+## Interface-Retail: 90005
+## Interface-Classic: 11306
+## Interface-BCC: 20501
+```
+
+You specify what version of the game you're targeting with the `-g` switch. You
+can use a specific version (`release.sh -g 1.13.6`) or you can use the game type
+(`release.sh -g classic`).  Using a game type will set the game version based on
+the appropriate TOC `## Interface` value.
+
+You can also set multiple specific versions as a comma delimited list using the
+`-g` switch (`release.sh -g 1.13.6,2.5.1,9.0.5`).  This will still only build
+one package, with the the last version listed used as the target version for
+the build.
+
+**Setting multiple versions is not recommended!** The addon will always be
+marked "Out of date" in-game for versions that do not match the TOC interface
+value for the last version set. So even if you don't need any special file
+processing, it will always be best to run the packager multiple times so the TOC
+interface value is correct for each game version.
+
+## Building locally
+
+The recommended way to include __release.sh__ in a project is to:
+
+1. Create a *.release* subdirectory in your top-level checkout.
+2. Copy __release.sh__ into the *.release* directory.
+3. Ignore the *.release* subdirectory in __.gitignore__.
+4. Run __release.sh__.
+
+## Usage
+
+```text
+Usage: release.sh [options]
+  -c               Skip copying files into the package directory.
+  -d               Skip uploading.
+  -e               Skip checkout of external repositories.
+  -l               Skip @localization@ keyword replacement.
+  -L               Only do @localization@ keyword replacement (skip upload to CurseForge).
+  -o               Keep existing package directory, overwriting its contents.
+  -s               Create a stripped-down "nolib" package.
+  -u               Use Unix line-endings.
+  -z               Skip zip file creation.
+  -t topdir        Set top-level directory of checkout.
+  -r releasedir    Set directory containing the package directory. Defaults to "$topdir/.release".
+  -p curse-id      Set the project id used on CurseForge for localization and uploading. (Use 0 to unset the TOC value)
+  -w wowi-id       Set the addon id used on WoWInterface for uploading. (Use 0 to unset the TOC value)
+  -a wago-id       Set the project id used on Wago Addons for uploading. (Use 0 to unset the TOC value)
+  -g game-version  Set the game version to use for uploading.
+  -m pkgmeta.yaml  Set the pkgmeta file to use.
+  -n package-name  Set the package zip file name. Use "-n help" for more info.
+```
+
+### Uploading
+
+__release.sh__ uses following environment variables for uploading:
+
+- `CF_API_KEY` - a [CurseForge API token](https://wow.curseforge.com/account/api-tokens),
+  required for the CurseForge API to fetch localization and upload files.
+- `WOWI_API_TOKEN` - a [WoWInterface API token](https://www.wowinterface.com/downloads/filecpl.php?action=apitokens),
+  required for uploading to WoWInterface.
+- `WAGO_API_TOKEN` - a [Wago Addons API token](https://addons.wago.io/account/apikeys),
+  required for uploading to Wago Addons.
+- `GITHUB_OAUTH` - a [GitHub personal access token](https://github.com/settings/tokens),
+  required for uploading to GitHub.
+
+__release.sh__ will attempt to load environment variables from a `.env` file in
+the topdir or current working directory.  You can also edit __release.sh__ and
+enter the tokens near the top of the file.
+
+### Dependencies
+
+__release.sh__ is mostly POSIX-compatible, so it should run in any Unix-like
+environment provided the following are available:
+
+- bash >= 4.3
+- awk
+- sed
+- curl
+- zip
+- version control software as needed:
+  - git >= 2.13.0
+  - subversion >= 1.7.0
+  - mercurial >= 3.9.0 (pre-3.9 will have issues with [secure connections](https://www.mercurial-scm.org/wiki/SecureConnections))
+- [jq](https://stedolan.github.io/jq/download/) >= 1.5 (when uploading)
+- [pandoc](https://pandoc.org/installing.html) >= 1.19.2 (optional)

CHANGELOG.md

@@ -3,6 +3,57 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Version 1.1.7 - 2022-xx-yy
+### Fixed
+- handling of german umlauts (and other unicode characters)
+
+## Version 1.1.6 - 2023-01-18
+### Changed
+- bumped version for latest WotLK Classic patch
+### Fixed 
+- updated Ace3.0 libraries for latest WotLK Classic patch
+
+## Version 1.1.5 - 2022-12-04
+### Fixed
+- updated Ace3 libraries for Dragonflight
+- bumped version for all incarnations of WoW (Classic Era, WotLK, Retail)
+
+## Version 1.1.4 - 2022-09-28
+### Changed
+- typos in descriptions
+- ambiguous variable definitions
+- bumped version for all incarnations of WoW (Classic Era, WotLK, Retail)
+
+## Version 1.1.3 - 2021-10-06
+### Changed
+- bumped version for all incarnations of WoW (Classic Era, Season of Mastery, BCC, Retail)
+### Fixed
+- error on missing options at first start
+- updated Ace3.0 libraries for latest Shadowlands patch
+
+## Version 1.1.2 - 2021-05-23
+### Changed
+- adopted to BigWigs release script to better support different game packages
+
+## Version 1.1.1 - 2021-04-22
+### Changed
+- bumped versions for WoW Classic and Shadowlands
+
+## Version 1.1.0 - 2020-12-08
+### Added
+- split of messages preserves item links, textures, substitutions and raid target markers
+- added safety measures to prevent endless replacement loops
+### Changed
+- bumped version for Shadowlands
+- bumped version for Naxxramas
+### Fixed
+- split of messages with excessive length no longer causes errors or broken texts
+- proper handling of umlauts
+
+## Version 1.0.1 - 2020-10-17
+### Changed
+- bumped version for Shadowlands Pre-Patch
+
 ## Version 1.0.0 - 2020-09-01 [First Release]
 ### Added
 - info section with contact and thanks
@@ -33,7 +84,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - stop replacements per mapping
 - more ooc recognition patterns
 ### Fixed
-- keep cases of over-long replacements
+- keep cases of replacements with excessive length
 
 ## Version 0.8.0-beta - 2020-06-14 [Feature Complete]
 ### Added
@@ -101,7 +152,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Version 0.3.0 - 2020-05-27
 ### Fixed
-- fixed DB storange and debug printing
+- fixed DB storage and debug printing
 
 ## Version 0.2.2 (unreleased) - 2020-05-26
 ### Added

Grichelde.lua

@@ -21,8 +21,9 @@ local _G = _G
 -- initialize addon
 local Grichelde = LibStub("AceAddon-3.0"):NewAddon(AddonTable, AddonName, "AceConsole-3.0", "AceEvent-3.0", "AceHook-3.0")
 Grichelde.version = GetAddOnMetadata(AddonName, "Version")
-Grichelde.build = GetAddOnMetadata(AddonName, "X-Build") or "Experimental"
+Grichelde.build = GetAddOnMetadata(AddonName, "X-Build") or "Development"
-Grichelde.classic = _G.WOW_PROJECT_ID == _G.WOW_PROJECT_CLASSIC
+--Grichelde.era = _G.WOW_PROJECT_ID == _G.WOW_PROJECT_CLASSIC
+--Grichelde.bcc = _G.WOW_PROJECT_ID == _G.WOW_PROJECT_BURNING_CRUSADE_CLASSIC
 Grichelde.logLevel = 0      -- cannot reference Grichelde.LOG_LEVELs here as they are loaded afterwards
 
 -- publish to global env

Grichelde.toc

@@ -1,13 +1,16 @@
-## Interface: 11305
+## Interface: 100002
 
 ## Title: Grichelde
 ## Notes: Replaces characters of your chat input line before sending.
-## Notes-de: Ersetzt eingegebene Zeichen in der Chat-Zeile vor dem Versand.
+## Notes-de: Ersetzt eingegebene Zeichen in der Chat-Zeile vor dem Versenden.
-## Version: 1.0.0
+## Version: 1.1.6
 ## Author: Teilzeit-Jedi
 ## eMail: tj@teilzeit-jedi.de
 
-## X-Build: Classic
+## X-Build: Retail
+## X-Compatible: 11403
+## X-Compatible: 30401
+
 ## X-Curse-Project-ID: 385480
 ## X-License: GPLv3
 ## X-Category: Chat/Communication
@@ -17,7 +20,19 @@
 ## OptionalDeps: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
 ## SavedVariables: GricheldeDB
 
-libs.xml
+Libs\LibStub\LibStub.lua
+Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml
+Libs\AceAddon-3.0\AceAddon-3.0.xml
+Libs\AceLocale-3.0\AceLocale-3.0.xml
+Libs\AceEvent-3.0\AceEvent-3.0.xml
+Libs\AceHook-3.0\AceHook-3.0.xml
+Libs\AceConsole-3.0\AceConsole-3.0.xml
+Libs\AceDB-3.0\AceDB-3.0.xml
+Libs\AceDBOptions-3.0\AceDBOptions-3.0.xml
+Libs\AceGUI-3.0\AceGUI-3.0.xml
+Libs\AceConfig-3.0\AceConfig-3.0.xml
+Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua
+Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua
 
 Grichelde.lua
 GricheldeConstants.lua
@@ -30,5 +45,3 @@ GricheldeUpgrade.lua
 GricheldeOptions.lua
 GricheldeMinimap.lua
 GricheldeChat.lua
-
-GricheldeTest.lua

GricheldeChat.lua

@@ -2,45 +2,139 @@
 local _G = _G
 local Grichelde = _G.Grichelde or {}
 
-local IsAddOnLoaded, assert, nilOrEmpty, pairs, ipairs, spairs, tContains, tFilter, tInsert, tConcat, tSize, tIsEmpty, find, sub, gsub, gmatch, getNextCharUtf8, isLetter, isUpper, isLower, toUpper, toLower, capitalize, trim, length, lengthUtf8
+local IsAddOnLoaded, assert, nilOrEmpty, pairs, ipairs, spairs, tContains, tFilter, tInsert, tIsEmpty, find, sub, gsub, getNextCharUtf8, isUtf8MultiByte, getUtf8Sequence, isUpper, isLower, toUpper, toLower, bytes2Char, trim, length, lengthUtf8
-    = Grichelde.F.IsAddOnLoaded, Grichelde.F.assert, Grichelde.F.nilOrEmpty, Grichelde.F.pairs, Grichelde.F.ipairs, Grichelde.F.spairs, Grichelde.F.tContains, Grichelde.F.tFilter, Grichelde.F.tInsert, Grichelde.F.tConcat, Grichelde.F.tSize, Grichelde.F.tIsEmpty,
+    = Grichelde.F.IsAddOnLoaded, Grichelde.F.assert, Grichelde.F.nilOrEmpty, Grichelde.F.pairs, Grichelde.F.ipairs, Grichelde.F.spairs, Grichelde.F.tContains, Grichelde.F.tFilter, Grichelde.F.tInsert, Grichelde.F.tIsEmpty,
-      Grichelde.F.find, Grichelde.F.sub, Grichelde.F.gsub, Grichelde.F.gmatch, Grichelde.F.getNextCharUtf8, Grichelde.F.isLetter, Grichelde.F.isUpper, Grichelde.F.isLower, Grichelde.F.toUpper, Grichelde.F.toLower, Grichelde.F.capitalize, Grichelde.F.trim, Grichelde.F.length, Grichelde.F.lengthUtf8
+      Grichelde.F.find, Grichelde.F.sub, Grichelde.F.gsub, Grichelde.F.getNextCharUtf8, Grichelde.F.isUtf8MultiByte, Grichelde.F.getUtf8Sequence, Grichelde.F.isUpper, Grichelde.F.isLower, Grichelde.F.toUpper, Grichelde.F.toLower, Grichelde.F.bytes2Char, Grichelde.F.trim, Grichelde.F.length, Grichelde.F.lengthUtf8
 
 --- Splits a long text in longest possible chunks of <= 255 length, split at last available space
 -- @param text string
--- @return table
+-- @return array of chunks
 function Grichelde:SplitText(text)
     local chunks = {}
-    local splitText = text
+    local leftGuillemet = bytes2Char(194, 171) .. " "
-    local textSize = length(splitText or "")
+    local rightGuillemet = " " .. bytes2Char(194, 187)
+    local chunkSize = Grichelde.INPUT_LIMIT - length(leftGuillemet) - length(rightGuillemet)
 
-    while (textSize > 255) do
+    local function preserveText(newText, chunk, blockText, posEnd)
-        local chunk = sub(splitText, 1, 255)
+        -- link found, block completed
-        local remaining = ""
+        self:TracePrint("SplitText : Found preservable text up to %s", posEnd)
+        local preserved = sub(newText, 1, posEnd)
 
-        -- special case: if space is the start of the next chunk, don't split this chunk
+        if ((length(chunk) > 0) and (length(chunk .. blockText) > chunkSize)) then
-        if (sub(splitText, 256, 256) ~= ' ') then
+            -- block exceeds chunk, chunkify previous blocks
-            -- split at last space, don't assign directly as nil might be returned
+            self:DebugPrint("SplitText : add chunk:", chunk)
-            local left, right = self:SplitOnLastMatch(chunk)
+            tInsert(chunks, chunk .. rightGuillemet)
-            if (left ~= nil) then
+            chunk = leftGuillemet .. trim(blockText)
-                chunk = left
+        else
-            end
+            chunk = chunk .. blockText
-            if (right ~= nil) then
+        end
-                remaining = right
+
+        if ((length(chunk) > 0) and (length(chunk .. preserved) > chunkSize)) then
+            -- block exceeds chunk, chunkify previous blocks
+            self:DebugPrint("SplitText : add chunk:", chunk)
+            tInsert(chunks, chunk .. rightGuillemet)
+            chunk = leftGuillemet .. trim(preserved)
+        else
+            chunk = chunk .. preserved
+        end
+
+        blockText = ""
+        newText = sub(newText, posEnd + 1)
+
+        return newText, chunk, blockText, posEnd
+    end
+
+    if (length(text or "") <= Grichelde.INPUT_LIMIT) then
+        self:DebugPrint("SplitText : no chunk:", text)
+        tInsert(chunks, text)
+    else
+        local lookAheads = { '|', '*', '<', '%', '{', '(', 'o' }
+
+        local newText = text or ""
+        local chunk, blockText = "", ""
+        local currentChar
+        local escape = 0
+
+        -- must not enforce UTF-8 support here, as the positions are used
+        while ((length(newText) > 0) and (escape < Grichelde.ENDLESS_LOOP_LIMIT)) do
+            escape = escape + 1
+            local first, textAhead = getNextCharUtf8(newText)
+            currentChar = first
+            self:DebugPrint("SplitText : currentChar, escape: %s, %s", currentChar, escape)
+            self:TracePrint("SplitText : chunk:", chunk)
+            self:TracePrint("SplitText : newText:", newText)
+
+            -- as there is not OR in Luas pattern matching, search for all of the exclude patterns after another is
+            -- cumbersome and inefficient -> look for each char consecutively if it matches the starting pattern only
+            -- and if if matches do full pattern matching
+            if (currentChar == ' ') then
+                self:TracePrint("SplitText : block completed")
+
+                if ((length(chunk) > 0) and (length(chunk .. blockText) > chunkSize)) then
+                    -- block exceeds chunk, chunkify previous blocks
+                    self:DebugPrint("SplitText : add chunk:", chunk)
+                    tInsert(chunks, chunk .. rightGuillemet)
+                    chunk = leftGuillemet .. trim(blockText)
+                else
+                    chunk = chunk .. blockText
+                end
+
+                blockText = currentChar
+                newText = textAhead
+            elseif (tContains(lookAheads, currentChar)) then
+                -- lookahead-check for all preservable patterns (itemLinks, textures, emotes, ooc, etc.)
+
+                -- link detection
+                local linkPosEnd = self:CheckForLink(newText, currentChar)
+                if (linkPosEnd ~= nil) then
+                    -- link found, block completed
+                    newText, chunk, blockText = preserveText(newText, chunk, blockText, linkPosEnd)
+                else
+                    -- substitution detection
+                    local substPosEnd = self:CheckForSubstitutions(newText, currentChar)
+                    if (substPosEnd ~= nil) then
+                        -- substitution found, block completed
+                        newText, chunk, blockText = preserveText(newText, chunk, blockText, substPosEnd)
+                    else
+                        -- raid target marker detection
+                        local rtmPosEnd = self:CheckForRaidTargetMarkers(newText, currentChar)
+                        if (rtmPosEnd ~= nil) then
+                            -- raid target marker found, block completed
+                            newText, chunk, blockText = preserveText(newText, chunk, blockText, rtmPosEnd)
+                        else
+                            blockText = blockText .. currentChar
+                            newText = textAhead
+                        end
+                    end
+                end
+            else
+                blockText = blockText .. currentChar
+                newText = textAhead
             end
         end
 
-        self:DebugPrint("SplitText : chunk:", chunk)
+        self:TracePrint("SplitText : main loop completed")
+        if (length(chunk .. blockText) > 0) then
+            -- catchup remaining text at the end
+            if (length(chunk .. blockText) > chunkSize) then
+                -- block exceeds chunk, chunkify previous blocks
+                if (length(chunk) > 0) then
+                    self:DebugPrint("SplitText : add chunk:", chunk)
+                    tInsert(chunks, chunk .. rightGuillemet)
+                    chunk = leftGuillemet .. trim(blockText)
+                else
+                    chunk = chunk .. blockText
+                end
+            else
+                chunk = chunk .. blockText
+            end
 
-        tInsert(chunks, chunk)
+            self:DebugPrint("SplitText : last chunk:", chunk)
-        splitText = remaining .. sub(splitText, 256)
+            -- sub(chunk, 1, 255) can result in broken UTF8 chars and error message
-        textSize = length(splitText)
+            tInsert(chunks, chunk)
+        end
     end
 
-    -- pickup remaining text < 255
-    self:DebugPrint("SplitText : last chunk:", splitText)
-    tInsert(chunks, splitText)
-
     return chunks
 end
 
@@ -59,14 +153,33 @@ function Grichelde:SendChunkifiedChatMessage(message, ...)
 end
 
 function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, replacedTexts)
+    local function convertToCaseInsensitivePatternGroup(p)
+        local upperP, lowerP = toUpper(p), toLower(p)
+--[[
+        if (isUtf8MultiByte(p)) then
+            local sequence = nil
+            for _, byteSequence in spairs(getUtf8Table(upperP)) do
+                sequence = sequence .. byteSequence
+            end
+        else
+]]
+            if (upperP ~= lowerP) then
+                return upperP .. lowerP
+            else
+                return p
+            end
+        --end
+    end
+
     local function convertToCaseInsensitivePattern(pattern)
         local ciPattern = ""
         local ignored = {'^', '$', '(', ')', '.'}
         local quantifiers = {'*', '+', '-', '?'}
-        local pos = 1
         local p, patRest = getNextCharUtf8(pattern)
+        local escape = 0
 
-        while (p ~= nil) do
+        while ((p ~= nil) and (escape < Grichelde.ENDLESS_LOOP_LIMIT)) do
+            escape = escape + 1
             if (tContains(ignored, p) or tContains(quantifiers, p)) then
                 -- ignore
                 ciPattern = ciPattern .. p
@@ -88,18 +201,13 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
                             ciPattern = ciPattern .. "%" .. p
                         end
                     else
-                        local upperP, lowerP = toUpper(p), toLower(p)
+                        ciPattern = ciPattern .. convertToCaseInsensitivePatternGroup(p)
-                        if (upperP ~= lowerP) then
-                            ciPattern = ciPattern .. upperP .. lowerP
-                        else
-                            ciPattern = ciPattern .. p
-                        end
                     end
                     p, patRest = getNextCharUtf8(patRest)
                 end
                 ciPattern = ciPattern .. "]"
             else
-                ciPattern = ciPattern .. "[" ..  Grichelde.F.toUpper(p) .. Grichelde.F.toLower(p) .. "]"
+                ciPattern = ciPattern .. "[" .. convertToCaseInsensitivePatternGroup(p) .. "]"
             end
 
             p, patRest = getNextCharUtf8(patRest)
@@ -108,9 +216,9 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
         return ciPattern
     end
 
-    local function replaceCaptures(text, replaceText, captures)
+    local function replaceCaptures(txt, replaceText, captures)
         local replText = replaceText
-        self:TracePrint("replaceCaptures : text: %s, #captures: %d", text, #captures)
+        self:TracePrint("replaceCaptures : txt: %s, #captures: %d", txt, #captures)
 
         if (#captures > 0) then
             for i, cap in ipairs(captures) do
@@ -189,9 +297,6 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
     self:TracePrint("ReplaceCharacters : pos1: %d, pos2: %d", pos1, pos2)
     self:TracePrint("ReplaceCharacters : cap1: %s, cap2: %s, cap3: %s, cap4: %s, cap5: %s, cap6: %s, cap7: %s, cap8: %s, cap9: %s", cap1, cap2, cap3, cap4, cap5, cap6, cap7, cap8, cap9)
     while (pos1 ~= nil) and (pos2 ~= nil) and (pos1 <= pos2) do
-        -- continue from that position later
-        pos = pos2 + 1
-
         if doStopOnMatch then
             stopOnMatch = true
         end
@@ -201,6 +306,24 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
         local post = sub(result, pos2 + 1)
         local wordStart = sub(pre, -1, -1)
         local wordEnd = sub(post, 1, 1)
+        self:TracePrint("ReplaceCharacters : result: %s", result)
+        self:TracePrint("ReplaceCharacters : pre: %s, match: %s, post: %s, wordStart: %s, wordEnd: %s", pre, match, post, wordStart, wordEnd)
+
+--[[
+        self:TracePrint("ReplaceCharacters : pos2: %d, isChar: %s", pos2, isChar(match))
+        while (not isChar(match) and pos2 < length(result)) do
+            pos2 = pos2 + 1
+            pre = sub(result, 1, pos1 - 1)
+            match = sub(result, pos1, pos2)
+            post = sub(result, pos2 + 1)
+            wordStart = sub(pre, -1, -1)
+            wordEnd = sub(post, 1, 1)
+            self:TracePrint("ReplaceCharacters : pos2: %d, isChar: %s", pos2, isChar(match))
+        end
+]]
+
+        -- continue from that position later
+        pos = pos2 + 1
 
         -- additional checks for word boundaries
         local doesMatchWhen = false
@@ -345,8 +468,8 @@ end
 -- @param text string
 -- @param replacements table of mappings
 -- @return string
-function Grichelde:ReplaceAndConsolidate(text, replacements)
+function Grichelde:ReplaceAndConsolidate(text, _replacements)
-    local replacements = replacements or self.db.profile.replacements or {}
+    local replacements = _replacements or self.db.profile.replacements or {}
     self:TracePrint("ReplaceAndConsolidate : replacements")
     self:TracePrint(replacements)
 
@@ -429,47 +552,42 @@ function Grichelde:ReplaceAndConsolidate(text, replacements)
     return result
 end
 
---- Checks if the text starts with a preversable ignore pattern, such as itemLinks, textures, raid target icons,
+--- looks for colored items, item links or textures
---- emotes, ooc or %-substitutons and returns the end location of the match, or 0 if no pattern was found
+function Grichelde:CheckForLink(text, currentChar)
--- @param text string
+    if (currentChar == "|") then
--- @param currentChar string(1) current character (first one) of the text, given for performance reasons
--- @param previousChar string(1) previous character of the text, otherwise unreachable
--- @param preserveEmotes boolean ignore replacements for emotes, for testing purposes
--- @return number
-function Grichelde:CheckForPreversableText(text, currentChar, previousChar, replaceEmotes)
-    self:DebugPrint("CheckForPreversableText : text:", text)
-    local replaceEmotes = replaceEmotes or self.db.profile.channels.emote or false
-
-    -- Calling find on ever pattern might be inefficient but its way less code than marching over every character
-    if (currentChar == "|" ) then
         for _, pattern in ipairs(Grichelde.IGNORE_PATTERNS.LINKS) do
             local pos1, pos2 = find(text, "^" .. pattern)
             if (pos1 == 1) and (pos2 ~= nil) then
-                self:DebugPrint("CheckForPreversableText : Found link or texture pattern \"%s\" at (%d, %d)", pattern, pos1, pos2)
+                self:DebugPrint("CheckForLink : Found link or texture pattern \"%s\" at (%d, %d)", pattern, pos1, pos2)
                 return pos2
             end
         end
     end
+    return nil
+end
 
-    -- emote detection
+--- looks for emotes
+function Grichelde:CheckForEmote(text, currentChar, replaceEmotes)
     if (currentChar == "*" or currentChar == "<") then
         for _, pattern in ipairs(Grichelde.IGNORE_PATTERNS.EMOTES) do
             local pos1, pos2 = find(text, "^" .. pattern)
             if (pos1 == 1) and (pos2 ~= nil) then
                 local emote = sub(text, pos1, pos2)
                 if (not replaceEmotes) then
-                    self:DebugPrint("CheckForPreversableText : Found emote \"%s\" at (%d, %d), but preserved it", emote, pos1, pos2)
+                    self:DebugPrint("CheckForEmote : Found emote \"%s\" at (%d, %d), but preserved it", emote, pos1, pos2)
                     return pos2
                 else
-                    self:DebugPrint("CheckForPreversableText : ignoring emote \"%s\" at (%d, %d)", emote, pos1, pos2)
+                    self:DebugPrint("CheckForEmote : Processing emote \"%s\" at (%d, %d)", emote, pos1, pos2)
                 end
             end
         end
     end
+    return nil
+end
 
+--- looks for %-substitutions
+function Grichelde:CheckForSubstitutions(text, currentChar)
     local lowerText = toLower(text)
-
-    -- %-substitutions
     if (currentChar == "%") then
         for _, pattern in ipairs(Grichelde.IGNORE_PATTERNS.SUBSTITUTES) do
             local pos1, pos2 = find(lowerText, "^" .. pattern)
@@ -479,8 +597,12 @@ function Grichelde:CheckForPreversableText(text, currentChar, previousChar, repl
             end
         end
     end
+    return nil
+end
 
-    -- raid target markers
+--- looks for general and localized raid target markers
+function Grichelde:CheckForRaidTargetMarkers(text, currentChar)
+    local lowerText = toLower(text)
     if (currentChar == "{") then
         -- rt1-9
         local pattern = Grichelde.IGNORE_PATTERNS.RAID_TARGETS[1]
@@ -494,15 +616,19 @@ function Grichelde:CheckForPreversableText(text, currentChar, previousChar, repl
             local translation = toLower(self.L["IgnorePattern_" .. localizedRT])
             local localizedPattern = "^{" .. translation .. "}"
             self:TracePrint("CheckForPreversableText : localizedPattern:", localizedPattern)
-            local pos1, pos2 = find(lowerText, localizedPattern)
+            local p1, p2 = find(lowerText, localizedPattern)
-            if (pos1 == 1) and (pos2 ~= nil) then
+            if (p1 == 1) and (p2 ~= nil) then
-                self:DebugPrint("CheckForPreversableText : Found localized raid target marker \"%s\" at (%d, %d)", localizedPattern, pos1, pos2)
+                self:DebugPrint("CheckForPreversableText : Found localized raid target marker \"%s\" at (%d, %d)", localizedPattern, p1, p2)
-                return pos2
+                return p2
             end
         end
     end
+    return nil
+end
 
-    -- ooc bracket detection
+--- looks for ooc with brackets
+function Grichelde:CheckForOocBrackets(text, currentChar)
+    local lowerText = toLower(text)
     if (currentChar == "(") then
         for _, pattern in ipairs(Grichelde.IGNORE_PATTERNS.OOC_BRACKETS) do
             local pos1, pos2 = find(lowerText, "^" .. pattern)
@@ -512,15 +638,63 @@ function Grichelde:CheckForPreversableText(text, currentChar, previousChar, repl
             end
         end
     end
+    return nil
+end
 
-    -- ooc without brackets: remaing text is treated as ooc completely!
+--- looks for ooc without brackets
+function Grichelde:CheckForOocNoBrackets(text, currentChar, previousChar)
+    local lowerText = toLower(text)
     if (currentChar == "o") then
         local pattern = Grichelde.IGNORE_PATTERNS.OOC_NO_BRACKETS[1]
         if ((previousChar == nil) or (find(previousChar, "%s") ~= nil)) and (find(lowerText, pattern) ~= nil) then
             self:DebugPrint("CheckForPreversableText : ooc for remaing text")
+            -- remaing text is treated as ooc completely!
             return length(text)
         end
     end
+    return nil
+end
+
+--- Checks if the text starts with a preversable ignore pattern, such as itemLinks, textures, raid target icons,
+--- emotes, ooc or %-substitutons and returns the end location of the match, or 0 if no pattern was found
+-- @param text string
+-- @param currentChar string(1) current character (first one) of the text, given for performance reasons
+-- @param previousChar string(1) previous character of the text, otherwise unreachable
+-- @param preserveEmotes boolean ignore replacements for emotes, for testing purposes
+-- @return number
+function Grichelde:CheckForPreversableText(text, currentChar, previousChar, _replaceEmotes)
+    self:DebugPrint("CheckForPreversableText : text:", text)
+    local replaceEmotes = _replaceEmotes or self.db.profile.channels.emote or false
+
+    local linkPos = self:CheckForLink(text, currentChar)
+    if (linkPos ~= nil) then
+        return linkPos
+    end
+
+    local emotePos = self:CheckForEmote(text, currentChar, replaceEmotes)
+    if (emotePos ~= nil) then
+        return emotePos
+    end
+
+    local substPos = self:CheckForSubstitutions(text, currentChar)
+    if (substPos ~= nil) then
+        return substPos
+    end
+
+    local rtmPos = self:CheckForRaidTargetMarkers(text, currentChar)
+    if (rtmPos ~= nil) then
+        return rtmPos
+    end
+
+    local oocBracketPos = self:CheckForOocBrackets(text, currentChar)
+    if (oocBracketPos ~= nil) then
+        return oocBracketPos
+    end
+
+    local oocNoBracketPos = self:CheckForOocNoBrackets(text, currentChar, previousChar)
+    if (oocNoBracketPos ~= nil) then
+        return oocNoBracketPos
+    end
 
     self:DebugPrint("CheckForPreversableText : no ignore pattern found")
     return 0
@@ -531,54 +705,54 @@ end
 -- @param text string the text to apply the mappings on
 -- @param preserveEmotes boolean ignore replacements for emotes, for testing purposes
 -- @return string
-function Grichelde:ReplaceText(text, replacements, replaceEmotes)
+function Grichelde:ReplaceText(text, _replacements, _replaceEmotes)
     local lookAheads = { '|', '*', '<', '%', '{', '(', 'o' }
     local newText = text
-    local preserveEmotes = replaceEmotes or self.db.profile.channels.emote or false
+    local preserveEmotes = _replaceEmotes or self.db.profile.channels.emote or false
-    local replacements = replacements or self.db.profile.replacements or {}
+    local replacements = _replacements or self.db.profile.replacements or {}
-    local finalText = ""
+    local finalText, replaceText = "", ""
+    local currentChar
+    local escape = 0
 
-    local currentChar, previousChar
+    -- must not enforce UTF-8 support here, as the positions are used
-    local current = 1
+    while ((length(newText) > 0) and (escape < Grichelde.ENDLESS_LOOP_LIMIT)) do
-    local lastStart = 1
+        escape = escape + 1
-
+        local previousChar = currentChar
-    -- no UTF-8 support required here, as the positions are used
+        local first, textAhead = getNextCharUtf8(newText)
-    while current <= length(newText) do
+        currentChar = first
-        previousChar = currentChar
+        self:TracePrint("ReplaceText : currentChar : %s", currentChar)
-        currentChar = sub(newText, current, current)
-        self:TracePrint("ReplaceText : current/char : %s,%s", current, currentChar)
 
         -- as there is not OR in Luas pattern matching, search for all of the exclude patterns after another is
         -- cumbersome and inefficient -> look for each char consecutively if it matches the starting pattern only
         -- and if if matches do full pattern matching
-        if (not tContains(lookAheads, currentChar)) then
+        if (tContains(lookAheads, currentChar)) then
-            current = current + 1
-        else
             -- lookahead-check for all preservable patterns (itemLinks, textures, emotes, ooc, etc.)
-            local textAhead = sub(newText, current)
+            --local textAhead = sub(newText, current)
-            local posEnd = self:CheckForPreversableText(textAhead, currentChar, previousChar, preserveEmotes)
+            local posEnd = self:CheckForPreversableText(newText, currentChar, previousChar, preserveEmotes)
             if (posEnd > 0) then
                 self:DebugPrint("ReplaceText : Found an ignore pattern")
 
-                -- split text and continue after preserved text
+                -- replace all text up until now
-                local textBefore = sub(newText, lastStart, current - 1)
+                local replacement = self:ReplaceAndConsolidate(replaceText, replacements)
-                local replacement = self:ReplaceAndConsolidate(textBefore, replacements)
+                local preserved = sub(newText, 1, posEnd)
-                local preservedText = sub(textAhead, 1, posEnd)
 
-                finalText = finalText .. replacement .. preservedText
+                finalText = finalText .. replacement .. preserved
-                current = current + posEnd
+                replaceText = ""
-                lastStart = current
+                newText = sub(newText, posEnd + 1)
-                self:DebugPrint("ReplaceText : restarting at", lastStart)
+                self:DebugPrint("ReplaceText : remaining text", newText)
             else
                 -- no corresponding end was found to start pattern, continue loop with next char
-                current = current + 1
+                replaceText = replaceText .. currentChar
+                newText = textAhead
             end
+        else
+            replaceText = replaceText .. currentChar
+            newText = textAhead
         end
     end
 
     -- catchup remaining text to the end
-    local remainingText = sub(newText, lastStart)
+    local replacement = self:ReplaceAndConsolidate(replaceText, replacements)
-    local replacement = self:ReplaceAndConsolidate(remainingText, replacements)
     finalText = finalText .. replacement
 
     self:DebugPrint("ReplaceText : replaced \"%s\"", text)
@@ -592,22 +766,24 @@ function Grichelde:IsOneBigEmote(text)
 
     -- emote detection
     local isEmote = false
-    -- scheme *emote*
+    local firstChar, rest = getNextCharUtf8(firstWord)
-    if (sub(firstWord, 1, 1) == "<") then
+
+    -- scheme <emote>
+    if (firstChar == "<") then
         -- search for emote end
         local _, emoteEnd = find(text, "%>", 2)
-        isEmote = (emoteEnd == length(text))
+        isEmote = (emoteEnd == lengthUtf8(text))
     end
-    if (not isEmote and (sub(firstWord, 1, 1) == "*")) then
+    if (not isEmote and (firstChar == "*")) then
-        -- search for emote end
+        if (getNextCharUtf8(rest) == "*") then
-        local _, emoteEnd = find(text, "%*", 2)
+            -- scheme **emote**
-        isEmote = (emoteEnd == length(text))
+            local _, emoteEnd = find(text, "%*%*", 3)
-    end
+            isEmote = (emoteEnd == lengthUtf8(text))
-    -- scheme **emote**
+        else
-    if (not isEmote and (sub(firstWord, 1, 2) == "**")) then
+            -- scheme *emote*
-        -- search for emote end
+            local _, emoteEnd = find(text, "%*", 2)
-        local _, emoteEnd = find(text, "%*%*", 3)
+            isEmote = (emoteEnd == lengthUtf8(text))
-        isEmote = (emoteEnd == length(text))
+        end
     end
 
     -- the whole text is one big emote
@@ -659,7 +835,7 @@ function Grichelde:CheckReplacementAllowed(text, channel)
     assert(firstWord ~= nil, "firstWord is never nil")
 
     -- don't replace slash commands
-    if (sub(firstWord, 1, 1) == "/") then
+    if (getNextCharUtf8(firstWord) == "/") then
         self:DebugPrint("CheckReplacementAllowed : skip other slash commands:", firstWord)
         return false
     end
@@ -691,7 +867,7 @@ function Grichelde:CheckAndExtractMessageTypeTarget(message)
     end
 
     -- first word should be a chat command
-    if (sub(message, 1, 1) == "/") then
+    if (getNextCharUtf8(message) == "/") then
         -- extract chat command
         local chatCmd, targetAndText = self:SplitOnFirstMatch(message)
         assert(chatCmd ~= nil, "chatCmd is never nil")

GricheldeConstants.lua

@@ -5,6 +5,10 @@ local Grichelde = _G.Grichelde or {}
 -- constants and upvalues
 Grichelde.LOG_LEVEL = { DEBUG = 1, TRACE = 2 }
 
+-- chat input in client is limited to 255 bytes (unicode length is less)
+Grichelde.INPUT_LIMIT = 255
+-- safety measure in case malformed user input causes infinite loops on string parsing
+Grichelde.ENDLESS_LOOP_LIMIT = 10000
 Grichelde.MAPPING_OFFSET = 10
 Grichelde.MINIMAP_ENABLED = 1.0
 Grichelde.MINIMAP_DARKENDED = 0.5
@@ -116,6 +120,7 @@ Grichelde.BLIZZ_TYPE_TO_OPTIONS = {
 }
 
 -- do not replace these patterns
+-- combined item links in the chat will look like this: |cff9d9d9d|Hitem:3299::::::::20:257::::::|h[Fractured Canine]|h|r
 Grichelde.IGNORE_PATTERNS = {
     LINKS = {
         "|[Cc]%x%x%x%x%x%x%x%x.-|r", -- colored items (or links)
@@ -166,11 +171,11 @@ local function nilOrEmpty(s)
     return s == nil or s:trim() == ""
 end
 
-local function spairs(t, orderFunc)
+local function spairs(tbl, orderFunc)
     -- collect the keys
     local sortedKeys = {}
     -- for every non-nil value
-    for key, _ in Grichelde.F.pairs(t) do
+    for key, _ in Grichelde.F.pairs(tbl) do
         Grichelde.F.tInsert(sortedKeys, key)
     end
 
@@ -186,22 +191,22 @@ local function spairs(t, orderFunc)
     return function()
         it = it + 1
         if (sortedKeys[it] ~= nil) then
-            return sortedKeys[it], t[sortedKeys[it]]
+            return sortedKeys[it], tbl[sortedKeys[it]]
         else
             return nil
         end
     end
 end
 
-local function tFilter(t, condition, extract)
+local function tFilter(type, condition, extract)
     local filtered = {}
-    for key, value in Grichelde.F.pairs(t) do
+    for key, value in Grichelde.F.pairs(type) do
         local cond = false
         if (condition) then
-            local t = Grichelde.F.type(condition)
+            local typ = Grichelde.F.type(condition)
-            if (t == "function") then
+            if (typ == "function") then
-                cond = condition(t, key, value)
+                cond = condition(typ, key, value)
-            elseif (t == "string") or (t == "number") then
+            elseif (typ == "string") or (typ == "number") then
                 cond = (value == condition)
             end
         end
@@ -209,7 +214,7 @@ local function tFilter(t, condition, extract)
         if (cond) then
             local val = value
             if (extract and (Grichelde.F.type(extract) == "function")) then
-                val = extract(t, key, value)
+                val = extract(type, key, value)
             end
             Grichelde.F.tInsert(filtered, val)
         end
@@ -217,20 +222,20 @@ local function tFilter(t, condition, extract)
     return filtered
 end
 
-local function tSize(t)
+local function tSize(tbl)
     local size = 0
-    if (t ~= nil) then
+    if (tbl ~= nil) then
         -- for every non-nil value
-        for _, _ in Grichelde.F.pairs(t) do
+        for _, _ in Grichelde.F.pairs(tbl) do
             size = size + 1
         end
     end
     return size
 end
 
-local function tIsEmpty(t)
+local function tIsEmpty(tbl)
-    if (not t) then return true end
+    if (not tbl) then return true end
-    return Grichelde.F.tNext(t) == nil
+    return Grichelde.F.tNext(tbl) == nil
 end
 
 local function tClone(orig)
@@ -282,6 +287,97 @@ local function getNextCharUtf8(word)
     end
 end
 
+local function isUtf8MultiByte(word)
+    return Grichelde.F.length(word) ~= Grichelde.F.lengthUtf8(word)
+end
+
+local function getUtf8Sequence(word)
+    if ((word == nil) or (Grichelde.F.type(word) ~= "string") or (Grichelde.F.lengthUtf8(word) ~= 1)) then
+        return nil
+    end
+
+    --[[
+     You could use the following code snippet to iterate over UTF-8 sequences
+     (this will simply skip over most invalid codes):
+
+        for uchar in string.gmatch(ustring, "([%z\1-\127\194-\244][\128-\191]*)") do
+          ...
+        end
+    ]]--
+
+    local sequence = "%z"
+    local c1 = Grichelde.F.toByte(word, 1)
+    sequence = sequence .. "\\" .. c1
+
+    if (c1 > 0) and (c1 <= 127) then
+        -- UTF8-1
+        return sequence
+    end
+
+    local c2 = Grichelde.F.toByte(word, 2)
+    sequence = sequence .. "\\" .. c2
+    if (c1 >= 194) and (c1 <= 223) then
+        -- UTF8-2
+        return sequence
+    end
+
+    local c3 = Grichelde.F.toByte(word, 3)
+    sequence = sequence .. "\\" .. c3
+    if (c1 >= 224) and (c1 <= 239) then
+        -- UTF8-3
+        return sequence
+    end
+
+    local c4 = Grichelde.F.toByte(word, 4)
+    sequence = sequence .. "\\" .. c4
+    if (c1 >= 240) and (c1 <= 244) then
+        -- UTF8-4
+        return sequence
+    end
+
+    return nil
+end
+
+local function getUtf8Table(word)
+    if ((word == nil) or (Grichelde.F.type(word) ~= "string") or (Grichelde.F.lengthUtf8(word) ~= 1)) then
+        return nil
+    end
+
+    --[[
+     You could use the following code snippet to iterate over UTF-8 sequences
+     (this will simply skip over most invalid codes):
+
+        for uchar in string.gmatch(ustring, "([%z\1-\127\194-\244][\128-\191]*)") do
+          ...
+        end
+    ]]--
+
+    local tbl = {}
+
+    local c1 = Grichelde.F.toByte(word, 1)
+    Grichelde.F.tInsert(tbl, "%z\\" .. c1)
+
+    local c2 = Grichelde.F.toByte(word, 2)
+    if (c1 >= 194) and (c1 <= 223) then
+        -- UTF8-2
+        Grichelde.F.tInsert(tbl, "\\" .. c2)
+    end
+
+    local c3 = Grichelde.F.toByte(word, 3)
+    if (c1 >= 224) and (c1 <= 239) then
+        -- UTF8-3
+        Grichelde.F.tInsert(tbl, "\\" .. c3)
+    end
+
+    local c4 = Grichelde.F.toByte(word, 4)
+    if (c1 >= 240) and (c1 <= 244) then
+        -- UTF8-4
+        Grichelde.F.tInsert(tbl, "\\" .. c4)
+    end
+
+    return tbl
+end
+
 local function isLetter(word)
     local char = Grichelde.F.getNextCharUtf8(word)
     return (char ~= nil) and (Grichelde.F.toUpper(char) ~= Grichelde.F.toLower(char))
@@ -320,11 +416,11 @@ local function isCapital(word)
         return false
     else
         local first, rest = Grichelde.F.getNextCharUtf8(word)
-        local isCapital = Grichelde.F.isUpper(first)
+        local isCap = Grichelde.F.isUpper(first)
         if (rest ~= nil) then
-            return isCapital and Grichelde.F.isLower(rest)
+            return isCap and Grichelde.F.isLower(rest)
         else
-           return isCapital
+           return isCap
         end
     end
 end
@@ -343,8 +439,8 @@ local function capitalize(word)
     end
 end
 
-local function color(color, text)
+local function color(colour, text)
-    return color .. text .. Grichelde.COLOR_CODES.CLOSE
+    return colour .. text .. Grichelde.COLOR_CODES.CLOSE
 end
 
 local function cPrefix(text)
@@ -413,6 +509,9 @@ Grichelde.F = {
     toUpper         = _G.strupper,
     toLower         = _G.strlower,
     getNextCharUtf8 = getNextCharUtf8,
+    isUtf8MultiByte = isUtf8MultiByte,
+    getUtf8Sequence = getUtf8Sequence,
+    getUtf8Table    = getUtf8Table,
     isLetter        = isLetter,
     isNumber        = isNumber,
     isUpper         = isUpper,

GricheldeDatabase.lua

@@ -2,8 +2,8 @@
 local _G = _G
 local Grichelde = _G.Grichelde or {}
 
-local pairs, tInsert, tClone, tWipe, unpack, join, toString
+local pairs, tInsert, tClone, unpack, join, toString
-    = Grichelde.F.pairs, Grichelde.F.tInsert, Grichelde.F.tClone, Grichelde.F.tWipe, Grichelde.F.unpack, Grichelde.F.join, Grichelde.F.toString
+    = Grichelde.F.pairs, Grichelde.F.tInsert, Grichelde.F.tClone, Grichelde.F.unpack, Grichelde.F.join, Grichelde.F.toString
 
 function Grichelde.getDefaultConfig()
     return {

GricheldeMinimap.lua

@@ -2,8 +2,8 @@
 local _G = _G
 local Grichelde = _G.Grichelde or {}
 
-local cPrefix, cGreen, cRed
+local cGreen, cRed
-    = Grichelde.F.cPrefix, Grichelde.F.cGreen, Grichelde.F.cRed
+    = Grichelde.F.cGreen, Grichelde.F.cRed
 
 
 --- add Minimap button

GricheldeOptions.lua

@@ -254,7 +254,7 @@ function Grichelde:CreateOptionsUI()
                                 name = self.L.Options_Help_Examples_Import_Name,
                                 -- desc = self.L.Options_Help_Examples_Import_Desc,
                                 desc = function() return format(self.L.Options_Help_Examples_Import_Desc, cPrefix(self.L.Options_Help_Examples[selectedExample].name)) end,
-                                func = function(info) self:ImportExample(selectedExample) end,
+                                func = function(_) self:ImportExample(selectedExample) end,
                             },
 
                             spacer4 = {
@@ -617,17 +617,19 @@ function Grichelde:RefreshOptions(replacementsTable)
     self:TracePrint("RefreshOptions : DB table:")
     self:TracePrint(replacementsTable)
 
-    -- remove all previous replacements from options (not DB), except header and buttons
+    if (self.options ~= nil) then
-    local replacements = self.options.args.replacements.args or {}
+        -- remove all previous replacements from options (not DB), except header and buttons
-    for k, _ in pairs(replacements) do
+        local replacements = self.options.args.replacements.args or {}
-        if (k and (find(k, "^replacement_") ~= nil)) then
+        for k, _ in pairs(replacements) do
-            replacements[k] = nil
+            if (k and (find(k, "^replacement_") ~= nil)) then
+                replacements[k] = nil
+            end
         end
-    end
 
-    for replName, _ in pairs(replacementsTable or {}) do
+        for replName, _ in pairs(replacementsTable or {}) do
-        local _, replNumber = self:SplitOnFirstMatch(replName, "_")
+            local _, replNumber = self:SplitOnFirstMatch(replName, "_")
-        replacements[replName] = self:CreateMapping(toNumber(replNumber))
+            replacements[replName] = self:CreateMapping(toNumber(replNumber))
+        end
     end
 
 --  self:TracePrint("RefreshOptions : UI options:")
@@ -635,7 +637,9 @@ function Grichelde:RefreshOptions(replacementsTable)
 end
 
 function Grichelde:RefreshDialog()
-    self.dialog:ConfigTableChanged(nil, self.name)
+    if (self.dialog ~= nil) then
+        self.dialog:ConfigTableChanged(nil, self.name)
+    end
 end
 
 function Grichelde:AddEmptyMapping()

GricheldeTest.lua

@@ -2,7 +2,7 @@
 local _G = _G
 local Grichelde = _G.Grichelde or {}
 
-local find, pairs, tSize, cRed, cGreen, format = Grichelde.F.find, Grichelde.F.pairs, Grichelde.F.tSize, Grichelde.F.cRed, Grichelde.F.cGreen, Grichelde.F.format
+local find, pairs, tSize, cRed, cGreen = Grichelde.F.find, Grichelde.F.pairs, Grichelde.F.tSize, Grichelde.F.cRed, Grichelde.F.cGreen
 
 function Grichelde:TestMatch(text, pattern)
     -- disable debug print out for testing
@@ -17,6 +17,7 @@ function Grichelde:TestMatch(text, pattern)
     Grichelde.logLevel = oldLogLevel
 end
 
+--- Invoke ingame with /run Grichelde:RunTests()
 function Grichelde:RunTests()
     local function test(name, replacements, testData, replaceEmotes)
         local i, ok, size = 0, 0, tSize(testData)
@@ -71,7 +72,7 @@ function Grichelde:RunTests()
             ["OSSO"] = "OCHO",
             ["ooSS"] = "ooCH",
             ["schmeissen"] = "chmeichen",
-            ["Schön"] = "Chön",
+            ["Schön"] = "Chön",
         }
     )
     ok = ok + o
@@ -775,10 +776,60 @@ function Grichelde:RunTests()
     ok = ok + o
     all = all + a
 
+    o, a = test(
+        "umlauts",
+        {
+            replacement_10 = {
+                order = 10,
+                searchText = "ä",
+                replaceText = "ae",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "ö",
+                replaceText = "oe",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "ü",
+                replaceText = "ue",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_13 = {
+                order = 13,
+                searchText = "ß",
+                replaceText = "ss",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+        },
+        {
+            ["Hallä"] = "Hallae",
+            ["Ätsch"] = "Aetsch",
+            ["Hällöleü"] = "Haelloeleue",
+            ["ÜöÄ"] = "UeoeAe",
+        }
+    )
+    ok = ok + o
+    all = all + a
+
     if (ok == all) then
         self:PrefixedPrint("All %d tests %s", all, cGreen("passed"))
     else
-        self:PrefixedPrint("%d test %s, %d tests %s", all - ok, cRed("failed"), ok, cGreen("passed"))
+        self:PrefixedPrint("%d test%s %s, %d tests %s", all - ok, all - ok > 1 and "s" or "", cRed("failed"), ok, cGreen("passed"))
     end
 
     -- restore old loglevel

GricheldeUpgrade.lua

@@ -2,8 +2,8 @@
 local _G = _G
 local Grichelde = _G.Grichelde or {}
 
-local pairs, tSize, tClone, find, sub, cGreen, cOrange, cRed, toNumber
+local pairs, tClone, find, sub, cGreen, cOrange, cRed, toNumber
-    = Grichelde.F.pairs, Grichelde.F.tSize,Grichelde.F.tClone, Grichelde.F.find, Grichelde.F.sub, Grichelde.F.cGreen, Grichelde.F.cOrange, Grichelde.F.cRed, Grichelde.F.toNumber
+    = Grichelde.F.pairs, Grichelde.F.tClone, Grichelde.F.find, Grichelde.F.sub, Grichelde.F.cGreen, Grichelde.F.cOrange, Grichelde.F.cRed, Grichelde.F.toNumber
 
 function Grichelde:Upgrade_To_v060()
     self:PrefixedPrint(self.L.Upgrade_ToVersion, cOrange("0.6.0"))

GricheldeUtils.lua

@@ -84,12 +84,6 @@ function Grichelde:SplitOnLastMatch(text, delimPattern, start)
     return left, right or text
 end
 
---- Splits at last word of a text line
-function Grichelde:TestMatch(text, pattern)
-    local pos1, pos2, left, right = find(text, pattern, 1)
-    self:DebugPrint("TestMatch : pos1: %d, pos2: %d, left: %s, right: %s", pos1, pos2, left, right)
-end
-
 function Grichelde:Format(message, ...)
     if (message == nil) then
         return "<nil>"

Grichelde_Vanilla.toc

@@ -0,0 +1,49 @@
+## Interface: 11403
+
+## Title: Grichelde
+## Notes: Replaces characters of your chat input line before sending.
+## Notes-de: Ersetzt eingegebene Zeichen in der Chat-Zeile vor dem Versenden.
+## Version: 1.1.6
+## Author: Teilzeit-Jedi
+## eMail: tj@teilzeit-jedi.de
+
+## X-Build: Classic
+## X-Compatible: 30401
+## X-Compatible: 100002
+
+## X-Curse-Project-ID: 385480
+## X-License: GPLv3
+## X-Category: Chat/Communication
+## X-Credits: Teilzeit-Jedi
+## X-Embeds: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
+
+## OptionalDeps: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
+## SavedVariables: GricheldeDB
+
+Libs\LibStub\LibStub.lua
+Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml
+Libs\AceAddon-3.0\AceAddon-3.0.xml
+Libs\AceLocale-3.0\AceLocale-3.0.xml
+Libs\AceEvent-3.0\AceEvent-3.0.xml
+Libs\AceHook-3.0\AceHook-3.0.xml
+Libs\AceConsole-3.0\AceConsole-3.0.xml
+Libs\AceDB-3.0\AceDB-3.0.xml
+Libs\AceDBOptions-3.0\AceDBOptions-3.0.xml
+Libs\AceGUI-3.0\AceGUI-3.0.xml
+Libs\AceConfig-3.0\AceConfig-3.0.xml
+Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua
+Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua
+
+Grichelde.lua
+GricheldeConstants.lua
+
+localisation.xml
+
+GricheldeUtils.lua
+GricheldeDatabase.lua
+GricheldeUpgrade.lua
+GricheldeOptions.lua
+GricheldeMinimap.lua
+GricheldeChat.lua
+
+GricheldeTest.lua

Grichelde_Wrath.toc

@@ -0,0 +1,47 @@
+## Interface: 30401
+
+## Title: Grichelde
+## Notes: Replaces characters of your chat input line before sending.
+## Notes-de: Ersetzt eingegebene Zeichen in der Chat-Zeile vor dem Versenden.
+## Version: 1.1.6
+## Author: Teilzeit-Jedi
+## eMail: tj@teilzeit-jedi.de
+
+## X-Build: WotLK
+## X-Compatible: 11403
+## X-Compatible: 100002
+
+## X-Curse-Project-ID: 385480
+## X-License: GPLv3
+## X-Category: Chat/Communication
+## X-Credits: Teilzeit-Jedi
+## X-Embeds: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
+
+## OptionalDeps: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
+## SavedVariables: GricheldeDB
+
+Libs\LibStub\LibStub.lua
+Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml
+Libs\AceAddon-3.0\AceAddon-3.0.xml
+Libs\AceLocale-3.0\AceLocale-3.0.xml
+Libs\AceEvent-3.0\AceEvent-3.0.xml
+Libs\AceHook-3.0\AceHook-3.0.xml
+Libs\AceConsole-3.0\AceConsole-3.0.xml
+Libs\AceDB-3.0\AceDB-3.0.xml
+Libs\AceDBOptions-3.0\AceDBOptions-3.0.xml
+Libs\AceGUI-3.0\AceGUI-3.0.xml
+Libs\AceConfig-3.0\AceConfig-3.0.xml
+Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua
+Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua
+
+Grichelde.lua
+GricheldeConstants.lua
+
+localisation.xml
+
+GricheldeUtils.lua
+GricheldeDatabase.lua
+GricheldeUpgrade.lua
+GricheldeOptions.lua
+GricheldeMinimap.lua
+GricheldeChat.lua

Libs/AceAddon-3.0/AceAddon-3.0.lua

@@ -28,9 +28,9 @@
 -- end
 -- @class file
 -- @name AceAddon-3.0.lua
--- @release $Id: AceAddon-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
+-- @release $Id$
 
-local MAJOR, MINOR = "AceAddon-3.0", 12
+local MAJOR, MINOR = "AceAddon-3.0", 13
 local AceAddon, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceAddon then return end -- No Upgrade needed.
@@ -49,10 +49,6 @@ local select, pairs, next, type, unpack = select, pairs, next, type, unpack
 local loadstring, assert, error = loadstring, assert, error
 local setmetatable, getmetatable, rawset, rawget = setmetatable, getmetatable, rawset, rawget
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: LibStub, IsLoggedIn, geterrorhandler
-
 --[[
 	 xpcall safecall implementation
 ]]
@@ -601,10 +597,20 @@ function AceAddon:IterateAddonStatus() return pairs(self.statuses) end
 function AceAddon:IterateEmbedsOnAddon(addon) return pairs(self.embeds[addon]) end
 function AceAddon:IterateModulesOfAddon(addon) return pairs(addon.modules) end
 
+-- Blizzard AddOns which can load very early in the loading process and mess with Ace3 addon loading
+local BlizzardEarlyLoadAddons = {
+	Blizzard_DebugTools = true,
+	Blizzard_TimeManager = true,
+	Blizzard_BattlefieldMap = true,
+	Blizzard_MapCanvas = true,
+	Blizzard_SharedMapDataProviders = true,
+	Blizzard_CombatLog = true,
+}
+
 -- Event Handling
 local function onEvent(this, event, arg1)
-	-- 2011-08-17 nevcairiel - ignore the load event of Blizzard_DebugTools, so a potential startup error isn't swallowed up
+	-- 2020-08-28 nevcairiel - ignore the load event of Blizzard addons which occur early in the loading process
-	if (event == "ADDON_LOADED"  and arg1 ~= "Blizzard_DebugTools") or event == "PLAYER_LOGIN" then
+	if (event == "ADDON_LOADED"  and (arg1 == nil or not BlizzardEarlyLoadAddons[arg1])) or event == "PLAYER_LOGIN" then
 		-- if a addon loads another addon, recursion could happen here, so we need to validate the table on every iteration
 		while(#AceAddon.initializequeue > 0) do
 			local addon = tremove(AceAddon.initializequeue, 1)

Libs/AceConfig-3.0/AceConfig-3.0.lua

@@ -3,7 +3,7 @@
 -- as well as associate it with a slash command.
 -- @class file
 -- @name AceConfig-3.0
--- @release $Id: AceConfig-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $
+-- @release $Id$
 
 --[[
 AceConfig-3.0

Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua

@@ -1,7 +1,7 @@
 --- AceConfigCmd-3.0 handles access to an options table through the "command line" interface via the ChatFrames.
 -- @class file
 -- @name AceConfigCmd-3.0
--- @release $Id: AceConfigCmd-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $
+-- @release $Id$
 
 --[[
 AceConfigCmd-3.0
@@ -37,17 +37,10 @@ local error, assert = error, assert
 -- WoW APIs
 local _G = _G
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: LibStub, SELECTED_CHAT_FRAME, DEFAULT_CHAT_FRAME
-
-
 local L = setmetatable({}, {	-- TODO: replace with proper locale
 	__index = function(self,k) return k end
 })
 
-
-
 local function print(msg)
 	(SELECTED_CHAT_FRAME or DEFAULT_CHAT_FRAME):AddMessage(msg)
 end
@@ -401,7 +394,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 		return
 	end
 
-	local str = strsub(info.input,inputpos);
+	local strInput = strsub(info.input,inputpos);
 
 	if tab.type=="execute" then
 		------------ execute --------------------------------------------
@@ -414,21 +407,21 @@ local function handle(info, inputpos, tab, depth, retfalse)
 
 		local res = true
 		if tab.pattern then
-			if not(type(tab.pattern)=="string") then err(info, inputpos, "'pattern' - expected a string") end
+			if type(tab.pattern)~="string" then err(info, inputpos, "'pattern' - expected a string") end
-			if not strmatch(str, tab.pattern) then
+			if not strmatch(strInput, tab.pattern) then
-				usererr(info, inputpos, "'"..str.."' - " .. L["invalid input"])
+				usererr(info, inputpos, "'"..strInput.."' - " .. L["invalid input"])
 				return
 			end
 		end
 
-		do_final(info, inputpos, tab, "set", str)
+		do_final(info, inputpos, tab, "set", strInput)
 
 
 
 	elseif tab.type=="toggle" then
 		------------ toggle --------------------------------------------
 		local b
-		local str = strtrim(strlower(str))
+		local str = strtrim(strlower(strInput))
 		if str=="" then
 			b = callmethod(info, inputpos, tab, "get")
 
@@ -465,9 +458,9 @@ local function handle(info, inputpos, tab, depth, retfalse)
 
 	elseif tab.type=="range" then
 		------------ range --------------------------------------------
-		local val = tonumber(str)
+		local val = tonumber(strInput)
 		if not val then
-			usererr(info, inputpos, "'"..str.."' - "..L["expected number"])
+			usererr(info, inputpos, "'"..strInput.."' - "..L["expected number"])
 			return
 		end
 		if type(info.step)=="number" then
@@ -487,7 +480,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 
 	elseif tab.type=="select" then
 		------------ select ------------------------------------
-		local str = strtrim(strlower(str))
+		local str = strtrim(strlower(strInput))
 
 		local values = tab.values
 		if type(values) == "function" or type(values) == "string" then
@@ -528,7 +521,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 
 	elseif tab.type=="multiselect" then
 		------------ multiselect -------------------------------------------
-		local str = strtrim(strlower(str))
+		local str = strtrim(strlower(strInput))
 
 		local values = tab.values
 		if type(values) == "function" or type(values) == "string" then
@@ -565,7 +558,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 
 			--check that the opt is valid
 			local ok
-			for k,v in pairs(values) do 
+			for k in pairs(values) do
 				if strlower(k)==opt then
 					opt = k	-- overwrite with key (in case of case mismatches)
 					ok = true
@@ -634,7 +627,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 
 	elseif tab.type=="color" then
 		------------ color --------------------------------------------
-		local str = strtrim(strlower(str))
+		local str = strtrim(strlower(strInput))
 		if str == "" then
 			--TODO: Show current value
 			return
@@ -706,7 +699,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 
 	elseif tab.type=="keybinding" then
 		------------ keybinding --------------------------------------------
-		local str = strtrim(strlower(str))
+		local str = strtrim(strlower(strInput))
 		if str == "" then
 			--TODO: Show current value
 			return

Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua

@@ -1,13 +1,13 @@
 --- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
 -- @class file
 -- @name AceConfigDialog-3.0
--- @release $Id: AceConfigDialog-3.0.lua 1169 2018-02-27 16:18:28Z nevcairiel $
+-- @release $Id$
 
 local LibStub = LibStub
 local gui = LibStub("AceGUI-3.0")
 local reg = LibStub("AceConfigRegistry-3.0")
 
-local MAJOR, MINOR = "AceConfigDialog-3.0", 66
+local MAJOR, MINOR = "AceConfigDialog-3.0", 86
 local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfigDialog then return end
@@ -15,25 +15,20 @@ if not AceConfigDialog then return end
 AceConfigDialog.OpenFrames = AceConfigDialog.OpenFrames or {}
 AceConfigDialog.Status = AceConfigDialog.Status or {}
 AceConfigDialog.frame = AceConfigDialog.frame or CreateFrame("Frame")
+AceConfigDialog.tooltip = AceConfigDialog.tooltip or CreateFrame("GameTooltip", "AceConfigDialogTooltip", UIParent, "GameTooltipTemplate")
 
 AceConfigDialog.frame.apps = AceConfigDialog.frame.apps or {}
 AceConfigDialog.frame.closing = AceConfigDialog.frame.closing or {}
 AceConfigDialog.frame.closeAllOverride = AceConfigDialog.frame.closeAllOverride or {}
 
 -- Lua APIs
-local tconcat, tinsert, tsort, tremove, tsort = table.concat, table.insert, table.sort, table.remove, table.sort
+local tinsert, tsort, tremove, wipe = table.insert, table.sort, table.remove, table.wipe
 local strmatch, format = string.match, string.format
-local assert, loadstring, error = assert, loadstring, error
+local error = error
-local pairs, next, select, type, unpack, wipe, ipairs = pairs, next, select, type, unpack, wipe, ipairs
+local pairs, next, select, type, unpack, ipairs = pairs, next, select, type, unpack, ipairs
-local rawset, tostring, tonumber = rawset, tostring, tonumber
+local tostring, tonumber = tostring, tonumber
 local math_min, math_max, math_floor = math.min, math.max, math.floor
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: NORMAL_FONT_COLOR, GameTooltip, StaticPopupDialogs, ACCEPT, CANCEL, StaticPopup_Show
--- GLOBALS: PlaySound, GameFontHighlight, GameFontHighlightSmall, GameFontHighlightLarge
--- GLOBALS: CloseSpecialWindows, InterfaceOptions_AddCategory, geterrorhandler
-
 local emptyTbl = {}
 
 --[[
@@ -45,39 +40,10 @@ local function errorhandler(err)
 	return geterrorhandler()(err)
 end
 
-local function CreateDispatcher(argCount)
-	local code = [[
-		local xpcall, eh = ...
-		local method, ARGS
-		local function call() return method(ARGS) end
-	
-		local function dispatch(func, ...)
-			 method = func
-			 if not method then return end
-			 ARGS = ...
-			 return xpcall(call, eh)
-		end
-	
-		return dispatch
-	]]
-	
-	local ARGS = {}
-	for i = 1, argCount do ARGS[i] = "arg"..i end
-	code = code:gsub("ARGS", tconcat(ARGS, ", "))
-	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler)
-end
-
-local Dispatchers = setmetatable({}, {__index=function(self, argCount)
-	local dispatcher = CreateDispatcher(argCount)
-	rawset(self, argCount, dispatcher)
-	return dispatcher
-end})
-Dispatchers[0] = function(func)
-	return xpcall(func, errorhandler)
-end
- 
 local function safecall(func, ...)
-	return Dispatchers[select("#", ...)](func, ...)
+	if func then
+		return xpcall(func, errorhandler, ...)
+	end
 end
 
 local width_multiplier = 170
@@ -85,18 +51,18 @@ local width_multiplier = 170
 --[[
 Group Types
   Tree 	- All Descendant Groups will all become nodes on the tree, direct child options will appear above the tree
-  		- Descendant Groups with inline=true and thier children will not become nodes
+        - Descendant Groups with inline=true and thier children will not become nodes
 
   Tab	- Direct Child Groups will become tabs, direct child options will appear above the tab control
-  		- Grandchild groups will default to inline unless specified otherwise
+        - Grandchild groups will default to inline unless specified otherwise
 
   Select- Same as Tab but with entries in a dropdown rather than tabs
 
 
   Inline Groups
-  	- Will not become nodes of a select group, they will be effectivly part of thier parent group seperated by a border
+    - Will not become nodes of a select group, they will be effectivly part of thier parent group seperated by a border
-  	- If declared on a direct child of a root node of a select group, they will appear above the group container control
+    - If declared on a direct child of a root node of a select group, they will appear above the group container control
-  	- When a group is displayed inline, all descendants will also be inline members of the group
+    - When a group is displayed inline, all descendants will also be inline members of the group
 
 ]]
 
@@ -181,6 +147,7 @@ local stringIsLiteral = {
 	width = true,
 	image = true,
 	fontSize = true,
+	tooltipHyperlink = true
 }
 
 --Is Never a function or method
@@ -222,9 +189,8 @@ local function GetOptionsMemberValue(membername, option, options, path, appName,
 		--We have a function to call
 		local info = new()
 		--traverse the options table, picking up the handler and filling the info with the path
-		local handler
 		local group = options
-		handler = group.handler or handler
+		local handler = group.handler
 
 		for i = 1, #path do
 			group = GetSubOption(group, path[i])
@@ -325,7 +291,7 @@ local function compareOptions(a,b)
 		return NameA:upper() < NameB:upper()
 	end
 	if OrderA < 0 then
-		if OrderB > 0 then
+		if OrderB >= 0 then
 			return false
 		end
 	else
@@ -533,8 +499,17 @@ local function OptionOnMouseOver(widget, event)
 	local options = user.options
 	local path = user.path
 	local appName = user.appName
+	local tooltip = AceConfigDialog.tooltip
+
+	tooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT")
+
+	local tooltipHyperlink = GetOptionsMemberValue("tooltipHyperlink", opt, options, path, appName)
+	if tooltipHyperlink then
+		tooltip:SetHyperlink(tooltipHyperlink)
+		tooltip:Show()
+		return
+	end
 
-	GameTooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT")
 	local name = GetOptionsMemberValue("name", opt, options, path, appName)
 	local desc = GetOptionsMemberValue("desc", opt, options, path, appName)
 	local usage = GetOptionsMemberValue("usage", opt, options, path, appName)
@@ -542,98 +517,142 @@ local function OptionOnMouseOver(widget, event)
 
 	if descStyle and descStyle ~= "tooltip" then return end
 
-	GameTooltip:SetText(name, 1, .82, 0, true)
+	tooltip:SetText(name, 1, .82, 0, true)
 
 	if opt.type == "multiselect" then
-		GameTooltip:AddLine(user.text, 0.5, 0.5, 0.8, true)
+		tooltip:AddLine(user.text, 0.5, 0.5, 0.8, true)
 	end
 	if type(desc) == "string" then
-		GameTooltip:AddLine(desc, 1, 1, 1, true)
+		tooltip:AddLine(desc, 1, 1, 1, true)
 	end
 	if type(usage) == "string" then
-		GameTooltip:AddLine("Usage: "..usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true)
+		tooltip:AddLine("Usage: "..usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true)
 	end
 
-	GameTooltip:Show()
+	tooltip:Show()
 end
 
 local function OptionOnMouseLeave(widget, event)
-	GameTooltip:Hide()
+	AceConfigDialog.tooltip:Hide()
 end
 
 local function GetFuncName(option)
-	local type = option.type
+	if option.type == "execute" then
-	if type == "execute" then
 		return "func"
 	else
 		return "set"
 	end
 end
-local function confirmPopup(appName, rootframe, basepath, info, message, func, ...)
+do
-	if not StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] then
+	local frame = AceConfigDialog.popup
-		StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] = {}
+	if not frame or oldminor < 81 then
-	end
+		frame = CreateFrame("Frame", nil, UIParent)
-	local t = StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"]
+		AceConfigDialog.popup = frame
-	for k in pairs(t) do
+		frame:Hide()
-		t[k] = nil
+		frame:SetPoint("CENTER", UIParent, "CENTER")
-	end
+		frame:SetSize(320, 72)
-	t.text = message
+		frame:EnableMouse(true) -- Do not allow click-through on the frame
-	t.button1 = ACCEPT
+		frame:SetFrameStrata("TOOLTIP")
-	t.button2 = CANCEL
+		frame:SetFrameLevel(100) -- Lots of room to draw under it
-	t.preferredIndex = STATICPOPUP_NUMDIALOGS
+		frame:SetScript("OnKeyDown", function(self, key)
-	local dialog, oldstrata
+			if key == "ESCAPE" then
-	t.OnAccept = function()
+				self:SetPropagateKeyboardInput(false)
-		safecall(func, unpack(t))
+				if self.cancel:IsShown() then
-		if dialog and oldstrata then
+					self.cancel:Click()
-			dialog:SetFrameStrata(oldstrata)
+				else -- Showing a validation error
-		end
+					self:Hide()
-		AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
+				end
-		del(info)
+			else
-	end
+				self:SetPropagateKeyboardInput(true)
-	t.OnCancel = function()
+			end
-		if dialog and oldstrata then
+		end)
-			dialog:SetFrameStrata(oldstrata)
-		end
-		AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
-		del(info)
-	end
-	for i = 1, select("#", ...) do
-		t[i] = select(i, ...) or false
-	end
-	t.timeout = 0
-	t.whileDead = 1
-	t.hideOnEscape = 1
 
-	dialog = StaticPopup_Show("ACECONFIGDIALOG30_CONFIRM_DIALOG")
+		local border = CreateFrame("Frame", nil, frame, "DialogBorderOpaqueTemplate")
-	if dialog then
+		border:SetAllPoints(frame)
-		oldstrata = dialog:GetFrameStrata()
+		frame:SetFixedFrameStrata(true)
-		dialog:SetFrameStrata("TOOLTIP")
+		frame:SetFixedFrameLevel(true)
+
+		local text = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlight")
+		text:SetSize(290, 0)
+		text:SetPoint("TOP", 0, -16)
+		frame.text = text
+
+		local function newButton(newText)
+			local button = CreateFrame("Button", nil, frame)
+			button:SetSize(128, 21)
+			button:SetNormalFontObject(GameFontNormal)
+			button:SetHighlightFontObject(GameFontHighlight)
+			button:SetNormalTexture(130763) -- "Interface\\Buttons\\UI-DialogBox-Button-Up"
+			button:GetNormalTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
+			button:SetPushedTexture(130761) -- "Interface\\Buttons\\UI-DialogBox-Button-Down"
+			button:GetPushedTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
+			button:SetHighlightTexture(130762) -- "Interface\\Buttons\\UI-DialogBox-Button-Highlight"
+			button:GetHighlightTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
+			button:SetText(newText)
+			return button
+		end
+
+		local accept = newButton(ACCEPT)
+		accept:SetPoint("BOTTOMRIGHT", frame, "BOTTOM", -6, 16)
+		frame.accept = accept
+
+		local cancel = newButton(CANCEL)
+		cancel:SetPoint("LEFT", accept, "RIGHT", 13, 0)
+		frame.cancel = cancel
 	end
 end
+local function confirmPopup(appName, rootframe, basepath, info, message, func, ...)
+	local frame = AceConfigDialog.popup
+	frame:Show()
+	frame.text:SetText(message)
+	-- From StaticPopup.lua
+	-- local height = 32 + text:GetHeight() + 2;
+	-- height = height + 6 + accept:GetHeight()
+	-- We add 32 + 2 + 6 + 21 (button height) == 61
+	local height = 61 + frame.text:GetHeight()
+	frame:SetHeight(height)
+
+	frame.accept:ClearAllPoints()
+	frame.accept:SetPoint("BOTTOMRIGHT", frame, "BOTTOM", -6, 16)
+	frame.cancel:Show()
+
+	local t = {...}
+	local tCount = select("#", ...)
+	frame.accept:SetScript("OnClick", function(self)
+		safecall(func, unpack(t, 1, tCount)) -- Manually set count as unpack() stops on nil (bug with #table)
+		AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
+		frame:Hide()
+		self:SetScript("OnClick", nil)
+		frame.cancel:SetScript("OnClick", nil)
+		del(info)
+	end)
+	frame.cancel:SetScript("OnClick", function(self)
+		AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
+		frame:Hide()
+		self:SetScript("OnClick", nil)
+		frame.accept:SetScript("OnClick", nil)
+		del(info)
+	end)
+end
 
 local function validationErrorPopup(message)
-	if not StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"] then
+	local frame = AceConfigDialog.popup
-		StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"] = {}
+	frame:Show()
-	end
+	frame.text:SetText(message)
-	local t = StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"]
+	-- From StaticPopup.lua
-	t.text = message
+	-- local height = 32 + text:GetHeight() + 2;
-	t.button1 = OKAY
+	-- height = height + 6 + accept:GetHeight()
-	t.preferredIndex = STATICPOPUP_NUMDIALOGS
+	-- We add 32 + 2 + 6 + 21 (button height) == 61
-	local dialog, oldstrata
+	local height = 61 + frame.text:GetHeight()
-	t.OnAccept = function()
+	frame:SetHeight(height)
-		if dialog and oldstrata then
-			dialog:SetFrameStrata(oldstrata)
-		end
-	end
-	t.timeout = 0
-	t.whileDead = 1
-	t.hideOnEscape = 1
 
-	dialog = StaticPopup_Show("ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG")
+	frame.accept:ClearAllPoints()
-	if dialog then
+	frame.accept:SetPoint("BOTTOM", frame, "BOTTOM", 0, 16)
-		oldstrata = dialog:GetFrameStrata()
+	frame.cancel:Hide()
-		dialog:SetFrameStrata("TOOLTIP")
+
-	end
+	frame.accept:SetScript("OnClick", function()
+		frame:Hide()
+	end)
 end
 
 local function ActivateControl(widget, event, ...)
@@ -656,7 +675,7 @@ local function ActivateControl(widget, event, ...)
 	if group[funcname] ~= nil then
 		func =  group[funcname]
 	end
-	handler = group.handler or handler
+	handler = group.handler
 	confirm = group.confirm
 	validate = group.validate
 	for i = 1, #path do
@@ -720,7 +739,6 @@ local function ActivateControl(widget, event, ...)
 		end
 	end
 
-	local rootframe = user.rootframe
 	if not validated or type(validated) == "string" then
 		if not validated then
 			if usage then
@@ -735,8 +753,8 @@ local function ActivateControl(widget, event, ...)
 		end
 
 		-- show validate message
-		if rootframe.SetStatusText then
+		if user.rootframe.SetStatusText then
-			rootframe:SetStatusText(validated)
+			user.rootframe:SetStatusText(validated)
 		else
 			validationErrorPopup(validated)
 		end
@@ -773,14 +791,14 @@ local function ActivateControl(widget, event, ...)
 		if type(confirm) == "boolean" then
 			if confirm then
 				if not confirmText then
-					local name, desc = option.name, option.desc
+					local option_name, desc = option.name, option.desc
-					if type(name) == "function" then
+					if type(option_name) == "function" then
-						name = name(info)
+						option_name = option_name(info)
 					end
 					if type(desc) == "function" then
 						desc = desc(info)
 					end
-					confirmText = name
+					confirmText = option_name
 					if desc then
 						confirmText = confirmText.." - "..desc
 					end
@@ -886,7 +904,7 @@ end
 
 local function MultiControlOnClosed(widget, event, ...)
 	local user = widget:GetUserDataTable()
-	if user.valuechanged then
+	if user.valuechanged and not widget:IsReleasing() then
 		local iscustom = user.rootframe:GetUserData("iscustom")
 		local basepath = user.rootframe:GetUserData("basepath") or emptyTbl
 		if iscustom then
@@ -1064,6 +1082,23 @@ local function InjectInfo(control, options, option, path, rootframe, appName)
 	control:SetCallback("OnEnter", OptionOnMouseOver)
 end
 
+local function CreateControl(userControlType, fallbackControlType)
+	local control
+	if userControlType then
+		control = gui:Create(userControlType)
+		if not control then
+			geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(userControlType)))
+		end
+	end
+	if not control then
+		control = gui:Create(fallbackControlType)
+	end
+	return control
+end
+
+local function sortTblAsStrings(x,y)
+	return tostring(x) < tostring(y) -- Support numbers as keys
+end
 
 --[[
 	options - root of the options table being fed
@@ -1105,15 +1140,14 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 				--Control to feed
 				local control
 
-				local name = GetOptionsMemberValue("name", v, options, path, appName)
-				
 				if v.type == "execute" then
 
 					local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName)
 					local image, width, height = GetOptionsMemberValue("image",v, options, path, appName)
 
-					if type(image) == "string" or type(image) == "number" then
+					local iconControl = type(image) == "string" or type(image) == "number"
-						control = gui:Create("Icon")
+					control = CreateControl(v.dialogControl or v.control, iconControl and "Icon" or "Button")
+					if iconControl then
 						if not width then
 							width = GetOptionsMemberValue("imageWidth",v, options, path, appName)
 						end
@@ -1134,18 +1168,12 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 						control:SetImageSize(width, height)
 						control:SetLabel(name)
 					else
-						control = gui:Create("Button")
 						control:SetText(name)
 					end
 					control:SetCallback("OnClick",ActivateControl)
 
 				elseif v.type == "input" then
-					local controlType = v.dialogControl or v.control or (v.multiline and "MultiLineEditBox") or "EditBox"
+					control = CreateControl(v.dialogControl or v.control, v.multiline and "MultiLineEditBox" or "EditBox")
-					control = gui:Create(controlType)
-					if not control then
-						geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
-						control = gui:Create(v.multiline and "MultiLineEditBox" or "EditBox")
-					end
 
 					if v.multiline and control.SetNumLines then
 						control:SetNumLines(tonumber(v.multiline) or 4)
@@ -1159,7 +1187,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					control:SetText(text)
 
 				elseif v.type == "toggle" then
-					control = gui:Create("CheckBox")
+					control = CreateControl(v.dialogControl or v.control, "CheckBox")
 					control:SetLabel(name)
 					control:SetTriState(v.tristate)
 					local value = GetOptionsMemberValue("get",v, options, path, appName)
@@ -1182,7 +1210,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 						end
 					end
 				elseif v.type == "range" then
-					control = gui:Create("Slider")
+					control = CreateControl(v.dialogControl or v.control, "Slider")
 					control:SetLabel(name)
 					control:SetSliderValues(v.softMin or v.min or 0, v.softMax or v.max or 100, v.bigStep or v.step or 0)
 					control:SetIsPercent(v.isPercent)
@@ -1196,6 +1224,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 
 				elseif v.type == "select" then
 					local values = GetOptionsMemberValue("values", v, options, path, appName)
+					local sorting = GetOptionsMemberValue("sorting", v, options, path, appName)
 					if v.style == "radio" then
 						local disabled = CheckOptionDisabled(v, options, path, appName)
 						local width = GetOptionsMemberValue("width",v,options,path,appName)
@@ -1206,12 +1235,14 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 
 						control:PauseLayout()
 						local optionValue = GetOptionsMemberValue("get",v, options, path, appName)
-						local t = {}
+						if not sorting then
-						for value, text in pairs(values) do
+							sorting = {}
-							t[#t+1]=value
+							for value, text in pairs(values) do
+								sorting[#sorting+1]=value
+							end
+							tsort(sorting, sortTblAsStrings)
 						end
-						tsort(t)
+						for _, value in ipairs(sorting) do
-						for k, value in ipairs(t) do
 							local text = values[value]
 							local radio = gui:Create("CheckBox")
 							radio:SetLabel(text)
@@ -1238,19 +1269,14 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 						control:ResumeLayout()
 						control:DoLayout()
 					else
-						local controlType = v.dialogControl or v.control or "Dropdown"
+						control = CreateControl(v.dialogControl or v.control, "Dropdown")
-						control = gui:Create(controlType)
-						if not control then
-							geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
-							control = gui:Create("Dropdown")
-						end
 						local itemType = v.itemControl
 						if itemType and not gui:GetWidgetVersion(itemType) then
 							geterrorhandler()(("Invalid Custom Item Type - %s"):format(tostring(itemType)))
 							itemType = nil
 						end
 						control:SetLabel(name)
-						control:SetList(values, nil, itemType)
+						control:SetList(values, sorting, itemType)
 						local value = GetOptionsMemberValue("get",v, options, path, appName)
 						if not values[value] then
 							value = nil
@@ -1263,8 +1289,6 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					local values = GetOptionsMemberValue("values", v, options, path, appName)
 					local disabled = CheckOptionDisabled(v, options, path, appName)
 
-					local controlType = v.dialogControl or v.control
-					
 					local valuesort = new()
 					if values then
 						for value, text in pairs(values) do
@@ -1273,6 +1297,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					end
 					tsort(valuesort)
 
+					local controlType = v.dialogControl or v.control
 					if controlType then
 						control = gui:Create(controlType)
 						if not control then
@@ -1299,8 +1324,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 							control:SetWidth(width_multiplier)
 						end
 						--check:SetTriState(v.tristate)
-						for i = 1, #valuesort do
+						for s = 1, #valuesort do
-							local key = valuesort[i]
+							local key = valuesort[s]
 							local value = GetOptionsMemberValue("get",v, options, path, appName, key)
 							control:SetItemValue(key,value)
 						end
@@ -1312,8 +1337,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 
 						control:PauseLayout()
 						local width = GetOptionsMemberValue("width",v,options,path,appName)
-						for i = 1, #valuesort do
+						for s = 1, #valuesort do
-							local value = valuesort[i]
+							local value = valuesort[s]
 							local text = values[value]
 							local check = gui:Create("CheckBox")
 							check:SetLabel(text)
@@ -1330,7 +1355,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 							elseif width == "half" then
 								check:SetWidth(width_multiplier / 2)
 							elseif (type(width) == "number") then
-								control:SetWidth(width_multiplier * width)
+								check:SetWidth(width_multiplier * width)
 							elseif width == "full" then
 								check.width = "fill"
 							else
@@ -1346,7 +1371,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					del(valuesort)
 
 				elseif v.type == "color" then
-					control = gui:Create("ColorPicker")
+					control = CreateControl(v.dialogControl or v.control, "ColorPicker")
 					control:SetLabel(name)
 					control:SetHasAlpha(GetOptionsMemberValue("hasAlpha",v, options, path, appName))
 					control:SetColor(GetOptionsMemberValue("get",v, options, path, appName))
@@ -1354,18 +1379,18 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					control:SetCallback("OnValueConfirmed",ActivateControl)
 
 				elseif v.type == "keybinding" then
-					control = gui:Create("Keybinding")
+					control = CreateControl(v.dialogControl or v.control, "Keybinding")
 					control:SetLabel(name)
 					control:SetKey(GetOptionsMemberValue("get",v, options, path, appName))
 					control:SetCallback("OnKeyChanged",ActivateControl)
 
 				elseif v.type == "header" then
-					control = gui:Create("Heading")
+					control = CreateControl(v.dialogControl or v.control, "Heading")
 					control:SetText(name)
 					control.width = "fill"
 
 				elseif v.type == "description" then
-					control = gui:Create("Label")
+					control = CreateControl(v.dialogControl or v.control, "Label")
 					control:SetText(name)
 
 					local fontSize = GetOptionsMemberValue("fontSize",v, options, path, appName)
@@ -1400,8 +1425,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 						end
 						control:SetImageSize(width, height)
 					end
-					local width = GetOptionsMemberValue("width",v,options,path,appName)
+					local controlWidth = GetOptionsMemberValue("width",v,options,path,appName)
-					control.width = not width and "fill"
+					control.width = not controlWidth and "fill"
 				end
 
 				--Common Init
@@ -1453,6 +1478,7 @@ local function TreeOnButtonEnter(widget, event, uniquevalue, button)
 	local option = user.option
 	local path = user.path
 	local appName = user.appName
+	local tooltip = AceConfigDialog.tooltip
 
 	local feedpath = new()
 	for i = 1, #path do
@@ -1469,24 +1495,25 @@ local function TreeOnButtonEnter(widget, event, uniquevalue, button)
 	local name = GetOptionsMemberValue("name", group, options, feedpath, appName)
 	local desc = GetOptionsMemberValue("desc", group, options, feedpath, appName)
 
-	GameTooltip:SetOwner(button, "ANCHOR_NONE")
+	tooltip:SetOwner(button, "ANCHOR_NONE")
+	tooltip:ClearAllPoints()
 	if widget.type == "TabGroup" then
-		GameTooltip:SetPoint("BOTTOM",button,"TOP")
+		tooltip:SetPoint("BOTTOM",button,"TOP")
 	else
-		GameTooltip:SetPoint("LEFT",button,"RIGHT")
+		tooltip:SetPoint("LEFT",button,"RIGHT")
 	end
 
-	GameTooltip:SetText(name, 1, .82, 0, true)
+	tooltip:SetText(name, 1, .82, 0, true)
 
 	if type(desc) == "string" then
-		GameTooltip:AddLine(desc, 1, 1, 1, true)
+		tooltip:AddLine(desc, 1, 1, 1, true)
 	end
 
-	GameTooltip:Show()
+	tooltip:Show()
 end
 
 local function TreeOnButtonLeave(widget, event, value, button)
-	GameTooltip:Hide()
+	AceConfigDialog.tooltip:Hide()
 end
 
 
@@ -1533,10 +1560,6 @@ local function GroupSelected(widget, event, uniquevalue)
 	end
 
 	BuildPath(feedpath, ("\001"):split(uniquevalue))
-	local group = options
-	for i = 1, #feedpath do
-		group = GetSubOption(group, feedpath[i])
-	end
 	widget:ReleaseChildren()
 	AceConfigDialog:FeedGroup(user.appName,options,widget,rootframe,feedpath)
 
@@ -1658,29 +1681,29 @@ function AceConfigDialog:FeedGroup(appName,options,container,rootframe,path, isR
 
 		elseif grouptype == "select" then
 
-			local select = gui:Create("DropdownGroup")
+			local selectGroup = gui:Create("DropdownGroup")
-			select:SetTitle(name)
+			selectGroup:SetTitle(name)
-			InjectInfo(select, options, group, path, rootframe, appName)
+			InjectInfo(selectGroup, options, group, path, rootframe, appName)
-			select:SetCallback("OnGroupSelected", GroupSelected)
+			selectGroup:SetCallback("OnGroupSelected", GroupSelected)
 			local status = AceConfigDialog:GetStatusTable(appName, path)
 			if not status.groups then
 				status.groups = {}
 			end
-			select:SetStatusTable(status.groups)
+			selectGroup:SetStatusTable(status.groups)
 			local grouplist, orderlist = BuildSelect(group, options, path, appName)
-			select:SetGroupList(grouplist, orderlist)
+			selectGroup:SetGroupList(grouplist, orderlist)
-			select:SetUserData("grouplist", grouplist)
+			selectGroup:SetUserData("grouplist", grouplist)
-			select:SetUserData("orderlist", orderlist)
+			selectGroup:SetUserData("orderlist", orderlist)
 
 			local firstgroup = orderlist[1]
 			if firstgroup then
-				select:SetGroup((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or firstgroup)
+				selectGroup:SetGroup((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or firstgroup)
 			end
 
-			select.width = "fill"
+			selectGroup.width = "fill"
-			select.height = "fill"
+			selectGroup.height = "fill"
 
-			container:AddChild(select)
+			container:AddChild(selectGroup)
 
 		--assume tree group by default
 		--if parenttype is tree then this group is already a node on that tree
@@ -1908,13 +1931,13 @@ end
 -- convert pre-39 BlizOptions structure to the new format
 if oldminor and oldminor < 39 and AceConfigDialog.BlizOptions then
 	local old = AceConfigDialog.BlizOptions
-	local new = {}
+	local newOpt = {}
 	for key, widget in pairs(old) do
 		local appName = widget:GetUserData("appName")
-		if not new[appName] then new[appName] = {} end
+		if not newOpt[appName] then newOpt[appName] = {} end
-		new[appName][key] = widget
+		newOpt[appName][key] = widget
 	end
-	AceConfigDialog.BlizOptions = new
+	AceConfigDialog.BlizOptions = newOpt
 else
 	AceConfigDialog.BlizOptions = AceConfigDialog.BlizOptions or {}
 end
@@ -1947,6 +1970,7 @@ end
 -- @param parent The parent to use in the interface options tree.
 -- @param ... The path in the options table to feed into the interface options panel.
 -- @return The reference to the frame registered into the Interface Options.
+-- @return The category ID to pass to Settings.OpenToCategory (or InterfaceOptionsFrame_OpenToCategory)
 function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
 	local BlizOptions = AceConfigDialog.BlizOptions
 
@@ -1962,7 +1986,6 @@ function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
 	if not BlizOptions[appName][key] then
 		local group = gui:Create("BlizOptionsGroup")
 		BlizOptions[appName][key] = group
-		group:SetName(name or appName, parent)
 
 		group:SetTitle(name or appName)
 		group:SetUserData("appName", appName)
@@ -1975,8 +1998,30 @@ function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
 		end
 		group:SetCallback("OnShow", FeedToBlizPanel)
 		group:SetCallback("OnHide", ClearBlizPanel)
-		InterfaceOptions_AddCategory(group.frame)
+		if Settings and Settings.RegisterCanvasLayoutCategory then
-		return group.frame
+			local categoryName = name or appName
+			if parent then
+				local category = Settings.GetCategory(parent)
+				if not category then
+					error(("The parent category '%s' was not found"):format(parent), 2)
+				end
+				local subcategory = Settings.RegisterCanvasLayoutSubcategory(category, group.frame, categoryName)
+
+				-- force the generated ID to be used for subcategories, as these can have very simple names like "Profiles"
+				group:SetName(subcategory.ID, parent)
+			else
+				local category = Settings.RegisterCanvasLayoutCategory(group.frame, categoryName)
+				-- using appName here would be cleaner, but would not be 100% compatible
+				-- but for top-level categories it should be fine, as these are typically addon names
+				category.ID = categoryName
+				group:SetName(categoryName, parent)
+				Settings.RegisterAddOnCategory(category)
+			end
+		else
+			group:SetName(name or appName, parent)
+			InterfaceOptions_AddCategory(group.frame)
+		end
+		return group.frame, group.frame.name
 	else
 		error(("%s has already been added to the Blizzard Options Window with the given path"):format(appName), 2)
 	end

Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua

@@ -8,10 +8,10 @@
 -- :IterateOptionsTables() (and :GetOptionsTable() if only given one argument) return a function reference that the requesting config handling addon must call with valid "uiType", "uiName".
 -- @class file
 -- @name AceConfigRegistry-3.0
--- @release $Id: AceConfigRegistry-3.0.lua 1169 2018-02-27 16:18:28Z nevcairiel $
+-- @release $Id$
 local CallbackHandler = LibStub("CallbackHandler-1.0")
 
-local MAJOR, MINOR = "AceConfigRegistry-3.0", 18
+local MAJOR, MINOR = "AceConfigRegistry-3.0", 21
 local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfigRegistry then return end
@@ -59,7 +59,6 @@ local optstring={["nil"]=true,["string"]=true, _="string"}
 local optstringfunc={["nil"]=true,["string"]=true,["function"]=true, _="string or funcref"}
 local optstringnumberfunc={["nil"]=true,["string"]=true,["number"]=true,["function"]=true, _="string, number or funcref"}
 local optnumber={["nil"]=true,["number"]=true, _="number"}
-local optmethod={["nil"]=true,["string"]=true,["function"]=true, _="methodname or funcref"}
 local optmethodfalse={["nil"]=true,["string"]=true,["function"]=true,["boolean"]={[false]=true},  _="methodname, funcref or false"}
 local optmethodnumber={["nil"]=true,["string"]=true,["function"]=true,["number"]=true,  _="methodname, funcref or number"}
 local optmethodtable={["nil"]=true,["string"]=true,["function"]=true,["table"]=true,  _="methodname, funcref or table"}
@@ -84,6 +83,7 @@ local basekeys={
 		dialogHidden=optmethodbool,
 		dropdownHidden=optmethodbool,
 	cmdHidden=optmethodbool,
+	tooltipHyperlink=optstringfunc,
 	icon=optstringnumberfunc,
 	iconCoords=optmethodtable,
 	handler=opttable,
@@ -95,13 +95,20 @@ local basekeys={
 }
 
 local typedkeys={
-	header={},
+	header={
+		control=optstring,
+		dialogControl=optstring,
+		dropdownControl=optstring,
+	},
 	description={
 		image=optstringnumberfunc,
 		imageCoords=optmethodtable,
 		imageHeight=optnumber,
 		imageWidth=optnumber,
 		fontSize=optstringfunc,
+		control=optstring,
+		dialogControl=optstring,
+		dropdownControl=optstring,
 	},
 	group={
 		args=istable,
@@ -118,6 +125,9 @@ local typedkeys={
 		imageCoords=optmethodtable,
 		imageHeight=optnumber,
 		imageWidth=optnumber,
+		control=optstring,
+		dialogControl=optstring,
+		dropdownControl=optstring,
 	},
 	input={
 		pattern=optstring,
@@ -131,6 +141,9 @@ local typedkeys={
 		tristate=optbool,
 		image=optstringnumberfunc,
 		imageCoords=optmethodtable,
+		control=optstring,
+		dialogControl=optstring,
+		dropdownControl=optstring,
 	},
 	tristate={
 	},
@@ -142,9 +155,13 @@ local typedkeys={
 		step=optnumber,
 		bigStep=optnumber,
 		isPercent=optbool,
+		control=optstring,
+		dialogControl=optstring,
+		dropdownControl=optstring,
 	},
 	select={
 		values=ismethodtable,
+		sorting=optmethodtable,
 		style={
 			["nil"]=true,
 			["string"]={dropdown=true,radio=true},
@@ -165,9 +182,14 @@ local typedkeys={
 	},
 	color={
 		hasAlpha=optmethodbool,
+		control=optstring,
+		dialogControl=optstring,
+		dropdownControl=optstring,
 	},
 	keybinding={
-		-- TODO
+		control=optstring,
+		dialogControl=optstring,
+		dropdownControl=optstring,
 	},
 }
 

Libs/AceConsole-3.0/AceConsole-3.0.lua

@@ -9,7 +9,7 @@
 -- make into AceConsole.
 -- @class file
 -- @name AceConsole-3.0
--- @release $Id: AceConsole-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
+-- @release $Id$
 local MAJOR,MINOR = "AceConsole-3.0", 7
 
 local AceConsole, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
@@ -29,10 +29,6 @@ local max = math.max
 -- WoW APIs
 local _G = _G
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: DEFAULT_CHAT_FRAME, SlashCmdList, hash_SlashCmdList
-
 local tmp={}
 local function Print(self,frame,...)
 	local n=0
@@ -174,7 +170,7 @@ function AceConsole:GetArgs(str, numargs, startpos)
 
 	while true do
 		-- find delimiter or hyperlink
-		local ch,_
+		local _
 		pos,_,ch = strfind(str, delim_or_pipe, pos)
 
 		if not pos then break end

Libs/AceDB-3.0/AceDB-3.0.lua

@@ -40,23 +40,19 @@
 -- end
 -- @class file
 -- @name AceDB-3.0.lua
--- @release $Id: AceDB-3.0.lua 1142 2016-07-11 08:36:19Z nevcairiel $
+-- @release $Id$
-local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 26
+local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 27
-local AceDB, oldminor = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)
+local AceDB = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)
 
 if not AceDB then return end -- No upgrade needed
 
 -- Lua APIs
 local type, pairs, next, error = type, pairs, next, error
-local setmetatable, getmetatable, rawset, rawget = setmetatable, getmetatable, rawset, rawget
+local setmetatable, rawset, rawget = setmetatable, rawset, rawget
 
 -- WoW APIs
 local _G = _G
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: LibStub
-
 AceDB.db_registry = AceDB.db_registry or {}
 AceDB.frame = AceDB.frame or CreateFrame("Frame")
 
@@ -98,11 +94,11 @@ local function copyDefaults(dest, src)
 				-- This is a metatable used for table defaults
 				local mt = {
 					-- This handles the lookup and creation of new subtables
-					__index = function(t,k)
+					__index = function(t,k2)
-							if k == nil then return nil end
+							if k2 == nil then return nil end
 							local tbl = {}
 							copyDefaults(tbl, v)
-							rawset(t, k, tbl)
+							rawset(t, k2, tbl)
 							return tbl
 						end,
 				}
@@ -115,7 +111,7 @@ local function copyDefaults(dest, src)
 				end
 			else
 				-- Values are not tables, so this is just a simple return
-				local mt = {__index = function(t,k) return k~=nil and v or nil end}
+				local mt = {__index = function(t,k2) return k2~=nil and v or nil end}
 				setmetatable(dest, mt)
 			end
 		elseif type(v) == "table" then
@@ -397,7 +393,7 @@ AceDB.frame:SetScript("OnEvent", logoutHandler)
 -- @param defaults A table of defaults for this database
 function DBObjectLib:RegisterDefaults(defaults)
 	if defaults and type(defaults) ~= "table" then
-		error("Usage: AceDBObject:RegisterDefaults(defaults): 'defaults' - table or nil expected.", 2)
+		error(("Usage: AceDBObject:RegisterDefaults(defaults): 'defaults' - table or nil expected, got %q."):format(type(defaults)), 2)
 	end
 
 	validateDefaults(defaults, self.keys)
@@ -429,7 +425,7 @@ end
 -- @param name The name of the profile to set as the current profile
 function DBObjectLib:SetProfile(name)
 	if type(name) ~= "string" then
-		error("Usage: AceDBObject:SetProfile(name): 'name' - string expected.", 2)
+		error(("Usage: AceDBObject:SetProfile(name): 'name' - string expected, got %q."):format(type(name)), 2)
 	end
 
 	-- changing to the same profile, dont do anything
@@ -471,7 +467,7 @@ end
 -- @param tbl A table to store the profile names in (optional)
 function DBObjectLib:GetProfiles(tbl)
 	if tbl and type(tbl) ~= "table" then
-		error("Usage: AceDBObject:GetProfiles(tbl): 'tbl' - table or nil expected.", 2)
+		error(("Usage: AceDBObject:GetProfiles(tbl): 'tbl' - table or nil expected, got %q."):format(type(tbl)), 2)
 	end
 
 	-- Clear the container table
@@ -509,15 +505,15 @@ end
 -- @param silent If true, do not raise an error when the profile does not exist
 function DBObjectLib:DeleteProfile(name, silent)
 	if type(name) ~= "string" then
-		error("Usage: AceDBObject:DeleteProfile(name): 'name' - string expected.", 2)
+		error(("Usage: AceDBObject:DeleteProfile(name): 'name' - string expected, got %q."):format(type(name)), 2)
 	end
 
 	if self.keys.profile == name then
-		error("Cannot delete the active profile in an AceDBObject.", 2)
+		error(("Cannot delete the active profile (%q) in an AceDBObject."):format(name), 2)
 	end
 
 	if not rawget(self.profiles, name) and not silent then
-		error("Cannot delete profile '" .. name .. "'. It does not exist.", 2)
+		error(("Cannot delete profile %q as it does not exist."):format(name), 2)
 	end
 
 	self.profiles[name] = nil
@@ -548,15 +544,15 @@ end
 -- @param silent If true, do not raise an error when the profile does not exist
 function DBObjectLib:CopyProfile(name, silent)
 	if type(name) ~= "string" then
-		error("Usage: AceDBObject:CopyProfile(name): 'name' - string expected.", 2)
+		error(("Usage: AceDBObject:CopyProfile(name): 'name' - string expected, got %q."):format(type(name)), 2)
 	end
 
 	if name == self.keys.profile then
-		error("Cannot have the same source and destination profiles.", 2)
+		error(("Cannot have the same source and destination profiles (%q)."):format(name), 2)
 	end
 
 	if not rawget(self.profiles, name) and not silent then
-		error("Cannot copy profile '" .. name .. "'. It does not exist.", 2)
+		error(("Cannot copy profile %q as it does not exist."):format(name), 2)
 	end
 
 	-- Reset the profile before copying
@@ -611,7 +607,7 @@ end
 -- @param defaultProfile The profile name to use as the default
 function DBObjectLib:ResetDB(defaultProfile)
 	if defaultProfile and type(defaultProfile) ~= "string" then
-		error("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or nil expected.", 2)
+		error(("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or nil expected, got %q."):format(type(defaultProfile)), 2)
 	end
 
 	local sv = self.sv
@@ -619,8 +615,6 @@ function DBObjectLib:ResetDB(defaultProfile)
 		sv[k] = nil
 	end
 
-	local parent = self.parent
-
 	initdb(sv, self.defaults, defaultProfile, self)
 
 	-- fix the child namespaces
@@ -647,13 +641,13 @@ end
 -- @param defaults A table of values to use as defaults
 function DBObjectLib:RegisterNamespace(name, defaults)
 	if type(name) ~= "string" then
-		error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - string expected.", 2)
+		error(("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - string expected, got %q."):format(type(name)), 2)
 	end
 	if defaults and type(defaults) ~= "table" then
-		error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'defaults' - table or nil expected.", 2)
+		error(("Usage: AceDBObject:RegisterNamespace(name, defaults): 'defaults' - table or nil expected, got %q."):format(type(defaults)), 2)
 	end
 	if self.children and self.children[name] then
-		error ("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - a namespace with that name already exists.", 2)
+		error(("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - a namespace called %q already exists."):format(name), 2)
 	end
 
 	local sv = self.sv
@@ -677,10 +671,10 @@ end
 -- @return the namespace object if found
 function DBObjectLib:GetNamespace(name, silent)
 	if type(name) ~= "string" then
-		error("Usage: AceDBObject:GetNamespace(name): 'name' - string expected.", 2)
+		error(("Usage: AceDBObject:GetNamespace(name): 'name' - string expected, got %q."):format(type(name)), 2)
 	end
 	if not silent and not (self.children and self.children[name]) then
-		error ("Usage: AceDBObject:GetNamespace(name): 'name' - namespace does not exist.", 2)
+		error(("Usage: AceDBObject:GetNamespace(name): 'name' - namespace %q does not exist."):format(name), 2)
 	end
 	if not self.children then self.children = {} end
 	return self.children[name]
@@ -719,15 +713,15 @@ function AceDB:New(tbl, defaults, defaultProfile)
 	end
 
 	if type(tbl) ~= "table" then
-		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'tbl' - table expected.", 2)
+		error(("Usage: AceDB:New(tbl, defaults, defaultProfile): 'tbl' - table expected, got %q."):format(type(tbl)), 2)
 	end
 
 	if defaults and type(defaults) ~= "table" then
-		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaults' - table expected.", 2)
+		error(("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaults' - table expected, got %q."):format(type(defaults)), 2)
 	end
 
 	if defaultProfile and type(defaultProfile) ~= "string" and defaultProfile ~= true then
-		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string or true expected.", 2)
+		error(("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string or true expected, got %q."):format(type(defaultProfile)), 2)
 	end
 
 	return initdb(tbl, defaults, defaultProfile)

Libs/AceDBOptions-3.0/AceDBOptions-3.0.lua

@@ -1,9 +1,9 @@
 --- AceDBOptions-3.0 provides a universal AceConfig options screen for managing AceDB-3.0 profiles.
 -- @class file
 -- @name AceDBOptions-3.0
--- @release $Id: AceDBOptions-3.0.lua 1140 2016-07-03 07:53:29Z nevcairiel $
+-- @release $Id$
 local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 15
-local AceDBOptions, oldminor = LibStub:NewLibrary(ACEDBO_MAJOR, ACEDBO_MINOR)
+local AceDBOptions = LibStub:NewLibrary(ACEDBO_MAJOR, ACEDBO_MINOR)
 
 if not AceDBOptions then return end -- No upgrade needed
 
@@ -13,10 +13,6 @@ local pairs, next = pairs, next
 -- WoW APIs
 local UnitClass = UnitClass
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: NORMAL_FONT_COLOR_CODE, FONT_COLOR_CODE_CLOSE
-
 AceDBOptions.optionTables = AceDBOptions.optionTables or {}
 AceDBOptions.handlers = AceDBOptions.handlers or {}
 

Libs/AceEvent-3.0/AceEvent-3.0.lua

@@ -9,7 +9,7 @@
 -- make into AceEvent.
 -- @class file
 -- @name AceEvent-3.0
--- @release $Id: AceEvent-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
+-- @release $Id$
 local CallbackHandler = LibStub("CallbackHandler-1.0")
 
 local MAJOR, MINOR = "AceEvent-3.0", 4

Libs/AceGUI-3.0/AceGUI-3.0.lua

@@ -24,28 +24,22 @@
 -- f:AddChild(btn)
 -- @class file
 -- @name AceGUI-3.0
--- @release $Id: AceGUI-3.0.lua 1228 2019-09-06 08:51:17Z nevcairiel $
+-- @release $Id$
-local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 40
+local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 41
 local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR)
 
 if not AceGUI then return end -- No upgrade needed
 
 -- Lua APIs
-local tinsert = table.insert
+local tinsert, wipe = table.insert, table.wipe
 local select, pairs, next, type = select, pairs, next, type
 local error, assert = error, assert
 local setmetatable, rawget = setmetatable, rawget
-local math_max = math.max
+local math_max, math_min, math_ceil = math.max, math.min, math.ceil
 
 -- WoW APIs
 local UIParent = UIParent
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: geterrorhandler, LibStub
-
---local con = LibStub("AceConsole-3.0",true)
-
 AceGUI.WidgetRegistry = AceGUI.WidgetRegistry or {}
 AceGUI.LayoutRegistry = AceGUI.LayoutRegistry or {}
 AceGUI.WidgetBase = AceGUI.WidgetBase or {}
@@ -94,38 +88,38 @@ do
 	AceGUI.objPools = AceGUI.objPools or {}
 	local objPools = AceGUI.objPools
 	--Returns a new instance, if none are available either returns a new table or calls the given contructor
-	function newWidget(type)
+	function newWidget(widgetType)
-		if not WidgetRegistry[type] then
+		if not WidgetRegistry[widgetType] then
 			error("Attempt to instantiate unknown widget type", 2)
 		end
 
-		if not objPools[type] then
+		if not objPools[widgetType] then
-			objPools[type] = {}
+			objPools[widgetType] = {}
 		end
 
-		local newObj = next(objPools[type])
+		local newObj = next(objPools[widgetType])
 		if not newObj then
-			newObj = WidgetRegistry[type]()
+			newObj = WidgetRegistry[widgetType]()
-			newObj.AceGUIWidgetVersion = WidgetVersions[type]
+			newObj.AceGUIWidgetVersion = WidgetVersions[widgetType]
 		else
-			objPools[type][newObj] = nil
+			objPools[widgetType][newObj] = nil
 			-- if the widget is older then the latest, don't even try to reuse it
 			-- just forget about it, and grab a new one.
-			if not newObj.AceGUIWidgetVersion or newObj.AceGUIWidgetVersion < WidgetVersions[type] then
+			if not newObj.AceGUIWidgetVersion or newObj.AceGUIWidgetVersion < WidgetVersions[widgetType] then
-				return newWidget(type)
+				return newWidget(widgetType)
 			end
 		end
 		return newObj
 	end
 	-- Releases an instance to the Pool
-	function delWidget(obj,type)
+	function delWidget(obj,widgetType)
-		if not objPools[type] then
+		if not objPools[widgetType] then
-			objPools[type] = {}
+			objPools[widgetType] = {}
 		end
-		if objPools[type][obj] then
+		if objPools[widgetType][obj] then
 			error("Attempt to Release Widget that is already released", 2)
 		end
-		objPools[type][obj] = true
+		objPools[widgetType][obj] = true
 	end
 end
 
@@ -141,9 +135,9 @@ end
 -- OnAcquire function on it, before returning.
 -- @param type The type of the widget.
 -- @return The newly created widget.
-function AceGUI:Create(type)
+function AceGUI:Create(widgetType)
-	if WidgetRegistry[type] then
+	if WidgetRegistry[widgetType] then
-		local widget = newWidget(type)
+		local widget = newWidget(widgetType)
 
 		if rawget(widget, "Acquire") then
 			widget.OnAcquire = widget.Acquire
@@ -161,7 +155,7 @@ function AceGUI:Create(type)
 		if widget.OnAcquire then
 			widget:OnAcquire()
 		else
-			error(("Widget type %s doesn't supply an OnAcquire Function"):format(type))
+			error(("Widget type %s doesn't supply an OnAcquire Function"):format(widgetType))
 		end
 		-- Set the default Layout ("List")
 		safecall(widget.SetLayout, widget, "List")
@@ -212,6 +206,22 @@ function AceGUI:Release(widget)
 	delWidget(widget, widget.type)
 end
 
+--- Check if a widget is currently in the process of being released
+-- This function check if this widget, or any of its parents (in which case it'll be released shortly as well)
+-- are currently being released. This allows addon to handle any callbacks accordingly.
+-- @param widget The widget to check
+function AceGUI:IsReleasing(widget)
+	if widget.isQueuedForRelease then
+		return true
+	end
+
+	if widget.parent and widget.parent.AceGUIWidgetVersion then
+		return AceGUI:IsReleasing(widget.parent)
+	end
+
+	return false
+end
+
 -----------
 -- Focus --
 -----------
@@ -338,6 +348,10 @@ do
 		AceGUI:Release(self)
 	end
 
+	WidgetBase.IsReleasing = function(self)
+		return AceGUI:IsReleasing(self)
+	end
+
 	WidgetBase.SetPoint = function(self, ...)
 		return self.frame:SetPoint(...)
 	end
@@ -569,25 +583,25 @@ AceGUI.counts = AceGUI.counts or {}
 -- This is used by widgets that require a named frame, e.g. when a Blizzard
 -- Template requires it.
 -- @param type The widget type
-function AceGUI:GetNextWidgetNum(type)
+function AceGUI:GetNextWidgetNum(widgetType)
-	if not self.counts[type] then
+	if not self.counts[widgetType] then
-		self.counts[type] = 0
+		self.counts[widgetType] = 0
 	end
-	self.counts[type] = self.counts[type] + 1
+	self.counts[widgetType] = self.counts[widgetType] + 1
-	return self.counts[type]
+	return self.counts[widgetType]
 end
 
 --- Return the number of created widgets for this type.
 -- In contrast to GetNextWidgetNum, the number is not incremented.
--- @param type The widget type
+-- @param widgetType The widget type
-function AceGUI:GetWidgetCount(type)
+function AceGUI:GetWidgetCount(widgetType)
-	return self.counts[type] or 0
+	return self.counts[widgetType] or 0
 end
 
 --- Return the version of the currently registered widget type.
--- @param type The widget type
+-- @param widgetType The widget type
-function AceGUI:GetWidgetVersion(type)
+function AceGUI:GetWidgetVersion(widgetType)
-	return WidgetVersions[type]
+	return WidgetVersions[widgetType]
 end
 
 -------------
@@ -750,7 +764,6 @@ AceGUI:RegisterLayout("Flow",
 
 				usedwidth = 0
 				rowstart = frame
-				rowstartoffset = frameoffset
 
 				if child.DoLayout then
 					child:DoLayout()
@@ -793,7 +806,8 @@ local GetCellAlign = function (dir, tableObj, colObj, cellObj, cell, child)
 			or colObj and (colObj["align" .. dir] or colObj.align)
 			or tableObj["align" .. dir] or tableObj.align
 			or "CENTERLEFT"
-	local child, cell, val = child or 0, cell or 0, nil
+	local val
+	child, cell = child or 0, cell or 0
 
 	if type(fn) == "string" then
 		fn = fn:lower()
@@ -807,7 +821,7 @@ local GetCellAlign = function (dir, tableObj, colObj, cellObj, cell, child)
 		val = fn
 	end
 
-	return fn, max(0, min(val, cell))
+	return fn, math_max(0, math_min(val, cell))
 end
 
 -- Get width or height for multiple cells combined
@@ -816,7 +830,7 @@ local GetCellDimension = function (dir, laneDim, from, to, space)
 	for cell=from,to do
 		dim = dim + (laneDim[cell] or 0)
 	end
-	return dim + max(0, to - from) * (space or 0)
+	return dim + math_max(0, to - from) * (space or 0)
 end
 
 --[[ Options
@@ -862,7 +876,7 @@ AceGUI:RegisterLayout("Table",
 				repeat
 					n = n + 1
 					local col = (n - 1) % #cols + 1
-					local row = ceil(n / #cols)
+					local row = math_ceil(n / #cols)
 					local rowspan = rowspans[col]
 					local cell = rowspan and rowspan.child or child
 					local cellObj = cell:GetUserData("cell")
@@ -878,7 +892,7 @@ AceGUI:RegisterLayout("Table",
 					end
 
 					-- Colspan
-					local colspan = max(0, min((cellObj and cellObj.colspan or 1) - 1, #cols - col))
+					local colspan = math_max(0, math_min((cellObj and cellObj.colspan or 1) - 1, #cols - col))
 					n = n + colspan
 
 					-- Place the cell
@@ -895,7 +909,7 @@ AceGUI:RegisterLayout("Table",
 			end
 		end
 
-		local rows = ceil(n / #cols)
+		local rows = math_ceil(n / #cols)
 
 		-- Determine fixed size cols and collect weights
 		local extantH, totalWeight = totalH, 0
@@ -920,16 +934,16 @@ AceGUI:RegisterLayout("Table",
 							f:ClearAllPoints()
 							local childH = f:GetWidth() or 0
 
-							laneH[col] = max(laneH[col], childH - GetCellDimension("H", laneH, colStart[child], col - 1, spaceH))
+							laneH[col] = math_max(laneH[col], childH - GetCellDimension("H", laneH, colStart[child], col - 1, spaceH))
 						end
 					end
 
-					laneH[col] = max(colObj.min or colObj[1] or 0, min(laneH[col], colObj.max or colObj[2] or laneH[col]))
+					laneH[col] = math_max(colObj.min or colObj[1] or 0, math_min(laneH[col], colObj.max or colObj[2] or laneH[col]))
 				else
 					-- Rel./Abs. width
 					laneH[col] = colObj.width < 1 and colObj.width * totalH or colObj.width
 				end
-				extantH = max(0, extantH - laneH[col])
+				extantH = math_max(0, extantH - laneH[col])
 			end
 		end
 
@@ -968,7 +982,7 @@ AceGUI:RegisterLayout("Table",
 						child:DoLayout()
 					end
 
-					rowV = max(rowV, (f:GetHeight() or 0) - GetCellDimension("V", laneV, rowStart[child], row - 1, spaceV))
+					rowV = math_max(rowV, (f:GetHeight() or 0) - GetCellDimension("V", laneV, rowStart[child], row - 1, spaceV))
 				end
 			end
 

Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua

@@ -2,7 +2,7 @@
 BlizOptionsGroup Container
 Simple container widget for the integration of AceGUI into the Blizzard Interface Options
 -------------------------------------------------------------------------------]]
-local Type, Version = "BlizOptionsGroup", 21
+local Type, Version = "BlizOptionsGroup", 26
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -99,7 +99,7 @@ local methods = {
 Constructor
 -------------------------------------------------------------------------------]]
 local function Constructor()
-	local frame = CreateFrame("Frame")
+	local frame = CreateFrame("Frame", nil, InterfaceOptionsFramePanelContainer)
 	frame:Hide()
 
 	-- support functions for the Blizzard Interface Options
@@ -108,6 +108,11 @@ local function Constructor()
 	frame.default = default
 	frame.refresh = refresh
 
+	-- 10.0 support function aliases (cancel has been removed)
+	frame.OnCommit = okay
+	frame.OnDefault = default
+	frame.OnRefresh = refresh
+
 	frame:SetScript("OnHide", OnHide)
 	frame:SetScript("OnShow", OnShow)
 

Libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua

@@ -2,7 +2,7 @@
 DropdownGroup Container
 Container controlled by a dropdown on the top.
 -------------------------------------------------------------------------------]]
-local Type, Version = "DropdownGroup", 21
+local Type, Version = "DropdownGroup", 22
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -125,7 +125,7 @@ local function Constructor()
 	dropdown.frame:Show()
 	dropdown:SetLabel("")
 
-	local border = CreateFrame("Frame", nil, frame)
+	local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
 	border:SetPoint("TOPLEFT", 0, -26)
 	border:SetPoint("BOTTOMRIGHT", 0, 3)
 	border:SetBackdrop(PaneBackdrop)

Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua

@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 Frame Container
 -------------------------------------------------------------------------------]]
-local Type, Version = "Frame", 26
+local Type, Version = "Frame", 30
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -13,10 +13,6 @@ local wipe = table.wipe
 local PlaySound = PlaySound
 local CreateFrame, UIParent = CreateFrame, UIParent
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: CLOSE
-
 --[[-----------------------------------------------------------------------------
 Scripts
 -------------------------------------------------------------------------------]]
@@ -83,6 +79,7 @@ local methods = {
 	["OnAcquire"] = function(self)
 		self.frame:SetParent(UIParent)
 		self.frame:SetFrameStrata("FULLSCREEN_DIALOG")
+		self.frame:SetFrameLevel(100) -- Lots of room to draw under it
 		self:SetTitle()
 		self:SetStatusText()
 		self:ApplyStatus()
@@ -179,16 +176,21 @@ local PaneBackdrop  = {
 }
 
 local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
+	local frame = CreateFrame("Frame", nil, UIParent, "BackdropTemplate")
 	frame:Hide()
 
 	frame:EnableMouse(true)
 	frame:SetMovable(true)
 	frame:SetResizable(true)
 	frame:SetFrameStrata("FULLSCREEN_DIALOG")
+	frame:SetFrameLevel(100) -- Lots of room to draw under it
 	frame:SetBackdrop(FrameBackdrop)
 	frame:SetBackdropColor(0, 0, 0, 1)
-	frame:SetMinResize(400, 200)
+	if frame.SetResizeBounds then -- WoW 10.0
+		frame:SetResizeBounds(400, 200)
+	else
+		frame:SetMinResize(400, 200)
+	end
 	frame:SetToplevel(true)
 	frame:SetScript("OnShow", Frame_OnShow)
 	frame:SetScript("OnHide", Frame_OnClose)
@@ -201,7 +203,7 @@ local function Constructor()
 	closebutton:SetWidth(100)
 	closebutton:SetText(CLOSE)
 
-	local statusbg = CreateFrame("Button", nil, frame)
+	local statusbg = CreateFrame("Button", nil, frame, "BackdropTemplate")
 	statusbg:SetPoint("BOTTOMLEFT", 15, 15)
 	statusbg:SetPoint("BOTTOMRIGHT", -132, 15)
 	statusbg:SetHeight(24)
@@ -269,7 +271,7 @@ local function Constructor()
 	line2:SetHeight(8)
 	line2:SetPoint("BOTTOMRIGHT", -8, 8)
 	line2:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border
-	local x = 0.1 * 8/17
+	x = 0.1 * 8/17
 	line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5)
 
 	local sizer_s = CreateFrame("Frame", nil, frame)

Libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua

@@ -2,7 +2,7 @@
 InlineGroup Container
 Simple container widget that creates a visible "box" with an optional title.
 -------------------------------------------------------------------------------]]
-local Type, Version = "InlineGroup", 21
+local Type, Version = "InlineGroup", 22
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -75,7 +75,7 @@ local function Constructor()
 	titletext:SetJustifyH("LEFT")
 	titletext:SetHeight(18)
 
-	local border = CreateFrame("Frame", nil, frame)
+	local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
 	border:SetPoint("TOPLEFT", 0, -17)
 	border:SetPoint("BOTTOMRIGHT", -1, 3)
 	border:SetBackdrop(PaneBackdrop)

Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua

@@ -2,22 +2,18 @@
 TabGroup Container
 Container that uses tabs on top to switch between groups.
 -------------------------------------------------------------------------------]]
-local Type, Version = "TabGroup", 36
+local Type, Version = "TabGroup", 38
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
 -- Lua APIs
-local pairs, ipairs, assert, type, wipe = pairs, ipairs, assert, type, wipe
+local pairs, ipairs, assert, type, wipe = pairs, ipairs, assert, type, table.wipe
 
 -- WoW APIs
 local PlaySound = PlaySound
 local CreateFrame, UIParent = CreateFrame, UIParent
 local _G = _G
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: PanelTemplates_TabResize, PanelTemplates_SetDisabledTabState, PanelTemplates_SelectTab, PanelTemplates_DeselectTab
-
 -- local upvalue storage used by BuildTabs
 local widths = {}
 local rowwidths = {}
@@ -26,6 +22,143 @@ local rowends = {}
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
+
+local function PanelTemplates_TabResize(tab, padding, absoluteSize, minWidth, maxWidth, absoluteTextSize)
+	local tabName = tab:GetName();
+
+	local buttonMiddle = tab.Middle or tab.middleTexture or _G[tabName.."Middle"];
+	local buttonMiddleDisabled = tab.MiddleDisabled or (tabName and _G[tabName.."MiddleDisabled"]);
+	local left = tab.Left or tab.leftTexture or _G[tabName.."Left"];
+	local sideWidths = 2 * left:GetWidth();
+	local tabText = tab.Text or _G[tab:GetName().."Text"];
+	local highlightTexture = tab.HighlightTexture or (tabName and _G[tabName.."HighlightTexture"]);
+
+	local width, tabWidth;
+	local textWidth;
+	if ( absoluteTextSize ) then
+		textWidth = absoluteTextSize;
+	else
+		tabText:SetWidth(0);
+		textWidth = tabText:GetWidth();
+	end
+	-- If there's an absolute size specified then use it
+	if ( absoluteSize ) then
+		if ( absoluteSize < sideWidths) then
+			width = 1;
+			tabWidth = sideWidths
+		else
+			width = absoluteSize - sideWidths;
+			tabWidth = absoluteSize
+		end
+		tabText:SetWidth(width);
+	else
+		-- Otherwise try to use padding
+		if ( padding ) then
+			width = textWidth + padding;
+		else
+			width = textWidth + 24;
+		end
+		-- If greater than the maxWidth then cap it
+		if ( maxWidth and width > maxWidth ) then
+			if ( padding ) then
+				width = maxWidth + padding;
+			else
+				width = maxWidth + 24;
+			end
+			tabText:SetWidth(width);
+		else
+			tabText:SetWidth(0);
+		end
+		if (minWidth and width < minWidth) then
+			width = minWidth;
+		end
+		tabWidth = width + sideWidths;
+	end
+
+	if ( buttonMiddle ) then
+		buttonMiddle:SetWidth(width);
+	end
+	if ( buttonMiddleDisabled ) then
+		buttonMiddleDisabled:SetWidth(width);
+	end
+
+	tab:SetWidth(tabWidth);
+
+	if ( highlightTexture ) then
+		highlightTexture:SetWidth(tabWidth);
+	end
+end
+
+local function PanelTemplates_DeselectTab(tab)
+	local name = tab:GetName();
+
+	local left = tab.Left or _G[name.."Left"];
+	local middle = tab.Middle or _G[name.."Middle"];
+	local right = tab.Right or _G[name.."Right"];
+	left:Show();
+	middle:Show();
+	right:Show();
+	--tab:UnlockHighlight();
+	tab:Enable();
+	local text = tab.Text or _G[name.."Text"];
+	text:SetPoint("CENTER", tab, "CENTER", (tab.deselectedTextX or 0), (tab.deselectedTextY or 2));
+
+	local leftDisabled = tab.LeftDisabled or _G[name.."LeftDisabled"];
+	local middleDisabled = tab.MiddleDisabled or _G[name.."MiddleDisabled"];
+	local rightDisabled = tab.RightDisabled or _G[name.."RightDisabled"];
+	leftDisabled:Hide();
+	middleDisabled:Hide();
+	rightDisabled:Hide();
+end
+
+local function PanelTemplates_SelectTab(tab)
+	local name = tab:GetName();
+
+	local left = tab.Left or _G[name.."Left"];
+	local middle = tab.Middle or _G[name.."Middle"];
+	local right = tab.Right or _G[name.."Right"];
+	left:Hide();
+	middle:Hide();
+	right:Hide();
+	--tab:LockHighlight();
+	tab:Disable();
+	tab:SetDisabledFontObject(GameFontHighlightSmall);
+	local text = tab.Text or _G[name.."Text"];
+	text:SetPoint("CENTER", tab, "CENTER", (tab.selectedTextX or 0), (tab.selectedTextY or -3));
+
+	local leftDisabled = tab.LeftDisabled or _G[name.."LeftDisabled"];
+	local middleDisabled = tab.MiddleDisabled or _G[name.."MiddleDisabled"];
+	local rightDisabled = tab.RightDisabled or _G[name.."RightDisabled"];
+	leftDisabled:Show();
+	middleDisabled:Show();
+	rightDisabled:Show();
+
+	if GameTooltip:IsOwned(tab) then
+		GameTooltip:Hide();
+	end
+end
+
+local function PanelTemplates_SetDisabledTabState(tab)
+	local name = tab:GetName();
+	local left = tab.Left or _G[name.."Left"];
+	local middle = tab.Middle or _G[name.."Middle"];
+	local right = tab.Right or _G[name.."Right"];
+	left:Show();
+	middle:Show();
+	right:Show();
+	--tab:UnlockHighlight();
+	tab:Disable();
+	tab.text = tab:GetText();
+	-- Gray out text
+	tab:SetDisabledFontObject(GameFontDisableSmall);
+	local leftDisabled = tab.LeftDisabled or _G[name.."LeftDisabled"];
+	local middleDisabled = tab.MiddleDisabled or _G[name.."MiddleDisabled"];
+	local rightDisabled = tab.RightDisabled or _G[name.."RightDisabled"];
+	leftDisabled:Hide();
+	middleDisabled:Hide();
+	rightDisabled:Hide();
+end
+
 local function UpdateTabLook(frame)
 	if frame.disabled then
 		PanelTemplates_SetDisabledTabState(frame)
@@ -103,11 +236,64 @@ local methods = {
 
 	["CreateTab"] = function(self, id)
 		local tabname = ("AceGUITabGroup%dTab%d"):format(self.num, id)
-		local tab = CreateFrame("Button", tabname, self.border, "OptionsFrameTabButtonTemplate")
+		local tab = CreateFrame("Button", tabname, self.border)
+		tab:SetSize(115, 24)
+		tab.deselectedTextY = -3
+		tab.selectedTextY = -2
+
+		tab.LeftDisabled = tab:CreateTexture(tabname .. "LeftDisabled", "BORDER")
+		tab.LeftDisabled:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-ActiveTab")
+		tab.LeftDisabled:SetSize(20, 24)
+		tab.LeftDisabled:SetPoint("BOTTOMLEFT", 0, -3)
+		tab.LeftDisabled:SetTexCoord(0, 0.15625, 0, 1.0)
+
+		tab.MiddleDisabled = tab:CreateTexture(tabname .. "MiddleDisabled", "BORDER")
+		tab.MiddleDisabled:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-ActiveTab")
+		tab.MiddleDisabled:SetSize(88, 24)
+		tab.MiddleDisabled:SetPoint("LEFT", tab.LeftDisabled, "RIGHT")
+		tab.MiddleDisabled:SetTexCoord(0.15625, 0.84375, 0, 1.0)
+
+		tab.RightDisabled = tab:CreateTexture(tabname .. "RightDisabled", "BORDER")
+		tab.RightDisabled:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-ActiveTab")
+		tab.RightDisabled:SetSize(20, 24)
+		tab.RightDisabled:SetPoint("LEFT", tab.MiddleDisabled, "RIGHT")
+		tab.RightDisabled:SetTexCoord(0.84375, 1.0, 0, 1.0)
+
+		tab.Left = tab:CreateTexture(tabname .. "Left", "BORDER")
+		tab.Left:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-InActiveTab")
+		tab.Left:SetSize(20, 24)
+		tab.Left:SetPoint("TOPLEFT")
+		tab.Left:SetTexCoord(0, 0.15625, 0, 1.0)
+
+		tab.Middle = tab:CreateTexture(tabname .. "Middle", "BORDER")
+		tab.Middle:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-InActiveTab")
+		tab.Middle:SetSize(88, 24)
+		tab.Middle:SetPoint("LEFT", tab.Left, "RIGHT")
+		tab.Middle:SetTexCoord(0.15625, 0.84375, 0, 1.0)
+
+		tab.Right = tab:CreateTexture(tabname .. "Right", "BORDER")
+		tab.Right:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-InActiveTab")
+		tab.Right:SetSize(20, 24)
+		tab.Right:SetPoint("LEFT", tab.Middle, "RIGHT")
+		tab.Right:SetTexCoord(0.84375, 1.0, 0, 1.0)
+
+		tab.Text = tab:CreateFontString(tabname .. "Text")
+		tab:SetFontString(tab.Text)
+
+		tab:SetNormalFontObject(GameFontNormalSmall)
+		tab:SetHighlightFontObject(GameFontHighlightSmall)
+		tab:SetDisabledFontObject(GameFontHighlightSmall)
+		tab:SetHighlightTexture("Interface\\PaperDollInfoFrame\\UI-Character-Tab-Highlight", "ADD")
+		tab.HighlightTexture = tab:GetHighlightTexture()
+		tab.HighlightTexture:ClearAllPoints()
+		tab.HighlightTexture:SetPoint("LEFT", tab, "LEFT", 10, -4)
+		tab.HighlightTexture:SetPoint("RIGHT", tab, "RIGHT", -10, -4)
+		_G[tabname .. "HighlightTexture"] = tab.HighlightTexture
+
 		tab.obj = self
 		tab.id = id
 
-		tab.text = _G[tabname .. "Text"]
+		tab.text = tab.Text -- compat
 		tab.text:ClearAllPoints()
 		tab.text:SetPoint("LEFT", 14, -3)
 		tab.text:SetPoint("RIGHT", -12, -3)
@@ -316,7 +502,7 @@ local function Constructor()
 	titletext:SetHeight(18)
 	titletext:SetText("")
 
-	local border = CreateFrame("Frame", nil, frame)
+	local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
 	border:SetPoint("TOPLEFT", 1, -27)
 	border:SetPoint("BOTTOMRIGHT", -1, 3)
 	border:SetBackdrop(PaneBackdrop)

Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua

@@ -2,24 +2,18 @@
 TreeGroup Container
 Container that uses a tree control to switch between groups.
 -------------------------------------------------------------------------------]]
-local Type, Version = "TreeGroup", 44
+local Type, Version = "TreeGroup", 47
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
-local WoW80 = select(4, GetBuildInfo()) >= 80000
-
 -- Lua APIs
 local next, pairs, ipairs, assert, type = next, pairs, ipairs, assert, type
-local math_min, math_max, floor = math.min, math.max, floor
+local math_min, math_max, floor = math.min, math.max, math.floor
 local select, tremove, unpack, tconcat = select, table.remove, unpack, table.concat
 
 -- WoW APIs
 local CreateFrame, UIParent = CreateFrame, UIParent
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: FONT_COLOR_CODE_CLOSE
-
 -- Recycling functions
 local new, del
 do
@@ -422,8 +416,7 @@ local methods = {
 		local maxlines = (floor(((self.treeframe:GetHeight()or 0) - 20 ) / 18))
 		if maxlines <= 0 then return end
 
-		-- workaround for lag spikes on WoW 8.0
+		if self.frame:GetParent() == UIParent and not fromOnUpdate then
-		if WoW80 and self.frame:GetParent() == UIParent and not fromOnUpdate then
 			self.frame:SetScript("OnUpdate", FirstFrameUpdate)
 			return
 		end
@@ -570,7 +563,11 @@ local methods = {
 		if maxtreewidth > 100 and status.treewidth > maxtreewidth then
 			self:SetTreeWidth(maxtreewidth, status.treesizable)
 		end
-		treeframe:SetMaxResize(maxtreewidth, 1600)
+		if treeframe.SetResizeBounds then
+			treeframe:SetResizeBounds(100, 1, maxtreewidth, 1600)
+		else
+			treeframe:SetMaxResize(maxtreewidth, 1600)
+		end
 	end,
 
 	["OnHeightSet"] = function(self, height)
@@ -632,7 +629,7 @@ local PaneBackdrop  = {
 local DraggerBackdrop  = {
 	bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
 	edgeFile = nil,
-	tile = true, tileSize = 16, edgeSize = 0,
+	tile = true, tileSize = 16, edgeSize = 1,
 	insets = { left = 3, right = 3, top = 7, bottom = 7 }
 }
 
@@ -640,7 +637,7 @@ local function Constructor()
 	local num = AceGUI:GetNextWidgetNum(Type)
 	local frame = CreateFrame("Frame", nil, UIParent)
 
-	local treeframe = CreateFrame("Frame", nil, frame)
+	local treeframe = CreateFrame("Frame", nil, frame, "BackdropTemplate")
 	treeframe:SetPoint("TOPLEFT")
 	treeframe:SetPoint("BOTTOMLEFT")
 	treeframe:SetWidth(DEFAULT_TREE_WIDTH)
@@ -649,13 +646,17 @@ local function Constructor()
 	treeframe:SetBackdropColor(0.1, 0.1, 0.1, 0.5)
 	treeframe:SetBackdropBorderColor(0.4, 0.4, 0.4)
 	treeframe:SetResizable(true)
-	treeframe:SetMinResize(100, 1)
+	if treeframe.SetResizeBounds then -- WoW 10.0
-	treeframe:SetMaxResize(400, 1600)
+		treeframe:SetResizeBounds(100, 1, 400, 1600)
+	else
+		treeframe:SetMinResize(100, 1)
+		treeframe:SetMaxResize(400, 1600)
+	end
 	treeframe:SetScript("OnUpdate", FirstFrameUpdate)
 	treeframe:SetScript("OnSizeChanged", Tree_OnSizeChanged)
 	treeframe:SetScript("OnMouseWheel", Tree_OnMouseWheel)
 
-	local dragger = CreateFrame("Frame", nil, treeframe)
+	local dragger = CreateFrame("Frame", nil, treeframe, "BackdropTemplate")
 	dragger:SetWidth(8)
 	dragger:SetPoint("TOP", treeframe, "TOPRIGHT")
 	dragger:SetPoint("BOTTOM", treeframe, "BOTTOMRIGHT")
@@ -680,7 +681,7 @@ local function Constructor()
 	scrollbg:SetAllPoints(scrollbar)
 	scrollbg:SetColorTexture(0,0,0,0.4)
 
-	local border = CreateFrame("Frame",nil,frame)
+	local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
 	border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT")
 	border:SetPoint("BOTTOMRIGHT")
 	border:SetBackdrop(PaneBackdrop)

Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua

@@ -7,10 +7,6 @@ local pairs, assert, type = pairs, assert, type
 local PlaySound = PlaySound
 local CreateFrame, UIParent = CreateFrame, UIParent
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: GameFontNormal
-
 ----------------
 -- Main Frame --
 ----------------
@@ -21,7 +17,7 @@ local CreateFrame, UIParent = CreateFrame, UIParent
 ]]
 do
 	local Type = "Window"
-	local Version = 6
+	local Version = 8
 
 	local function frameOnShow(this)
 		this.obj:Fire("OnShow")
@@ -186,7 +182,11 @@ do
 
 		frame:SetScript("OnShow",frameOnShow)
 		frame:SetScript("OnHide",frameOnClose)
-		frame:SetMinResize(240,240)
+		if frame.SetResizeBounds then -- WoW 10.0
+			frame:SetResizeBounds(240,240)
+		else
+			frame:SetMinResize(240,240)
+		end
 		frame:SetToplevel(true)
 
 		local titlebg = frame:CreateTexture(nil, "BACKGROUND")
@@ -300,7 +300,7 @@ do
 		line2:SetHeight(8)
 		line2:SetPoint("BOTTOMRIGHT", -8, 8)
 		line2:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border
-		local x = 0.1 * 8/17
+		x = 0.1 * 8/17
 		line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5)
 
 		local sizer_s = CreateFrame("Frame",nil,frame)

Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua

@@ -12,10 +12,6 @@ local select, pairs = select, pairs
 local PlaySound = PlaySound
 local CreateFrame, UIParent = CreateFrame, UIParent
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: SetDesaturation, GameFontHighlight
-
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
@@ -199,14 +195,14 @@ local methods = {
 	["SetDescription"] = function(self, desc)
 		if desc then
 			if not self.desc then
-				local desc = self.frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
+				local f = self.frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
-				desc:ClearAllPoints()
+				f:ClearAllPoints()
-				desc:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21)
+				f:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21)
-				desc:SetWidth(self.frame.width - 30)
+				f:SetWidth(self.frame.width - 30)
-				desc:SetPoint("RIGHT", self.frame, "RIGHT", -30, 0)
+				f:SetPoint("RIGHT", self.frame, "RIGHT", -30, 0)
-				desc:SetJustifyH("LEFT")
+				f:SetJustifyH("LEFT")
-				desc:SetJustifyV("TOP")
+				f:SetJustifyV("TOP")
-				self.desc = desc
+				self.desc = f
 			end
 			self.desc:Show()
 			--self.text:SetFontObject(GameFontNormal)

Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua

@@ -11,10 +11,6 @@ local pairs = pairs
 -- WoW APIs
 local CreateFrame, UIParent = CreateFrame, UIParent
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: ColorPickerFrame, OpacitySliderFrame
-
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]

Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua

@@ -1,4 +1,4 @@
---[[ $Id: AceGUIWidget-DropDown-Items.lua 1202 2019-05-15 23:11:22Z nevcairiel $ ]]--
+--[[ $Id$ ]]--
 
 local AceGUI = LibStub("AceGUI-3.0")
 
@@ -41,7 +41,7 @@ local ItemBase = {
 	-- NOTE: The ItemBase version is added to each item's version number
 	--       to ensure proper updates on ItemBase changes.
 	--       Use at least 1000er steps.
-	version = 1000,
+	version = 2000,
 	counter = 0,
 }
 
@@ -178,7 +178,7 @@ function ItemBase.Create(type)
 	highlight:Hide()
 	self.highlight = highlight
 
-	local check = frame:CreateTexture("OVERLAY")
+	local check = frame:CreateTexture(nil, "OVERLAY")
 	check:SetWidth(16)
 	check:SetHeight(16)
 	check:SetPoint("LEFT",frame,"LEFT",3,-1)
@@ -186,7 +186,7 @@ function ItemBase.Create(type)
 	check:Hide()
 	self.check = check
 
-	local sub = frame:CreateTexture("OVERLAY")
+	local sub = frame:CreateTexture(nil, "OVERLAY")
 	sub:SetWidth(16)
 	sub:SetHeight(16)
 	sub:SetPoint("RIGHT",frame,"RIGHT",-3,-1)

Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua

@@ -1,4 +1,4 @@
---[[ $Id: AceGUIWidget-DropDown.lua 1209 2019-06-24 21:01:01Z nevcairiel $ ]]--
+--[[ $Id$ ]]--
 local AceGUI = LibStub("AceGUI-3.0")
 
 -- Lua APIs
@@ -11,10 +11,6 @@ local PlaySound = PlaySound
 local UIParent, CreateFrame = UIParent, CreateFrame
 local _G = _G
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: CLOSE
-
 local function fixlevels(parent,...)
 	local i = 1
 	local child = select(i, ...)
@@ -39,7 +35,7 @@ end
 
 do
 	local widgetType = "Dropdown-Pullout"
-	local widgetVersion = 3
+	local widgetVersion = 5
 
 	--[[ Static data ]]--
 
@@ -193,12 +189,7 @@ do
 
 		local height = 8
 		for i, item in pairs(items) do
-			if i == 1 then
+			item:SetPoint("TOP", itemFrame, "TOP", 0, -2 + (i - 1) * -16)
-				item:SetPoint("TOP", itemFrame, "TOP", 0, -2)
-			else
-				item:SetPoint("TOP", items[i-1].frame, "BOTTOM", 0, 1)
-			end
-
 			item:Show()
 
 			height = height + 16
@@ -258,7 +249,7 @@ do
 
 	local function Constructor()
 		local count = AceGUI:GetNextWidgetNum(widgetType)
-		local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent)
+		local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent, "BackdropTemplate")
 		local self = {}
 		self.count = count
 		self.type = widgetType
@@ -309,7 +300,7 @@ do
 		scrollFrame.obj = self
 		itemFrame.obj = self
 
-		local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame)
+		local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame, "BackdropTemplate")
 		slider:SetOrientation("VERTICAL")
 		slider:SetHitRectInsets(0, 0, -10, 0)
 		slider:SetBackdrop(sliderBackdrop)
@@ -356,7 +347,7 @@ end
 
 do
 	local widgetType = "Dropdown"
-	local widgetVersion = 34
+	local widgetVersion = 36
 
 	--[[ Static data ]]--
 
@@ -381,7 +372,6 @@ do
 
 	local function Dropdown_TogglePullout(this)
 		local self = this.obj
-		PlaySound(856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON
 		if self.open then
 			self.open = nil
 			self.pullout:Close()
@@ -465,6 +455,7 @@ do
 		self:SetWidth(200)
 		self:SetLabel()
 		self:SetPulloutWidth(nil)
+		self.list = {}
 	end
 
 	-- exported, AceGUI callback
@@ -535,9 +526,7 @@ do
 
 	-- exported
 	local function SetValue(self, value)
-		if self.list then
+		self:SetText(self.list[value] or "")
-			self:SetText(self.list[value] or "")
-		end
 		self.value = value
 	end
 
@@ -601,7 +590,7 @@ do
 		end
 	end
 	local function SetList(self, list, order, itemType)
-		self.list = list
+		self.list = list or {}
 		self.pullout:Clear()
 		self.hasClose = nil
 		if not list then return end
@@ -629,10 +618,8 @@ do
 
 	-- exported
 	local function AddItem(self, value, text, itemType)
-		if self.list then
+		self.list[value] = text
-			self.list[value] = text
+		AddListItem(self, value, text, itemType)
-			AddListItem(self, value, text, itemType)
-		end
 	end
 
 	-- exported

Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua

@@ -14,10 +14,6 @@ local GetCursorInfo, ClearCursor, GetSpellInfo = GetCursorInfo, ClearCursor, Get
 local CreateFrame, UIParent = CreateFrame, UIParent
 local _G = _G
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: AceGUIEditBoxInsertLink, ChatFontNormal, OKAY
-
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]

Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua

@@ -2,7 +2,7 @@
 Keybinding Widget
 Set Keybindings in the Config UI.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Keybinding", 25
+local Type, Version = "Keybinding", 26
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -13,10 +13,6 @@ local pairs = pairs
 local IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown = IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown
 local CreateFrame, UIParent = CreateFrame, UIParent
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: NOT_BOUND
-
 --[[-----------------------------------------------------------------------------
 Scripts
 -------------------------------------------------------------------------------]]
@@ -214,7 +210,7 @@ local function Constructor()
 	label:SetJustifyH("CENTER")
 	label:SetHeight(18)
 
-	local msgframe = CreateFrame("Frame", nil, UIParent)
+	local msgframe = CreateFrame("Frame", nil, UIParent, "BackdropTemplate")
 	msgframe:SetHeight(30)
 	msgframe:SetBackdrop(ControlBackdrop)
 	msgframe:SetBackdropColor(0,0,0)

Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua

@@ -2,7 +2,7 @@
 Label Widget
 Displays text and optionally an icon.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Label", 26
+local Type, Version = "Label", 28
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -12,10 +12,6 @@ local max, select, pairs = math.max, select, pairs
 -- WoW APIs
 local CreateFrame, UIParent = CreateFrame, UIParent
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: GameFontHighlightSmall
-
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
@@ -129,11 +125,16 @@ local methods = {
 	end,
 
 	["SetFont"] = function(self, font, height, flags)
-		self.label:SetFont(font, height, flags)
+		if not self.fontObject then
+			self.fontObject = CreateFont("AceGUI30LabelFont" .. AceGUI:GetNextWidgetNum(Type))
+		end
+		self.fontObject:SetFont(font, height, flags)
+		self:SetFontObject(self.fontObject)
 	end,
 
 	["SetFontObject"] = function(self, font)
-		self:SetFont((font or GameFontHighlightSmall):GetFont())
+		self.label:SetFontObject(font or GameFontHighlightSmall)
+		UpdateImageAnchor(self)
 	end,
 
 	["SetImageSize"] = function(self, width, height)

Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua

@@ -1,4 +1,4 @@
-local Type, Version = "MultiLineEditBox", 28
+local Type, Version = "MultiLineEditBox", 32
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -10,10 +10,6 @@ local GetCursorInfo, GetSpellInfo, ClearCursor = GetCursorInfo, GetSpellInfo, Cl
 local CreateFrame, UIParent = CreateFrame, UIParent
 local _G = _G
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: ACCEPT, ChatFontNormal
-
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
@@ -145,6 +141,14 @@ local function OnVerticalScroll(self, offset)
 	editBox:SetHitRectInsets(0, 0, offset, editBox:GetHeight() - offset - self:GetHeight())
 end
 
+local function OnScrollRangeChanged(self, xrange, yrange)
+	if yrange == 0 then
+		self.obj.editBox:SetHitRectInsets(0, 0, 0, 0)
+	else
+		OnVerticalScroll(self, self:GetVerticalScroll())
+	end
+end
+
 local function OnShowFocus(frame)
 	frame.obj.editBox:SetFocus()
 	frame:SetScript("OnShow", nil)
@@ -257,8 +261,6 @@ local methods = {
 	["SetCursorPosition"] = function(self, ...)
 		return self.editBox:SetCursorPosition(...)
 	end,
-
-
 }
 
 --[[-----------------------------------------------------------------------------
@@ -297,7 +299,7 @@ local function Constructor()
 	text:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -5, 1)
 	text:SetJustifyV("MIDDLE")
 
-	local scrollBG = CreateFrame("Frame", nil, frame)
+	local scrollBG = CreateFrame("Frame", nil, frame, "BackdropTemplate")
 	scrollBG:SetBackdrop(backdrop)
 	scrollBG:SetBackdropColor(0, 0, 0)
 	scrollBG:SetBackdropBorderColor(0.4, 0.4, 0.4)
@@ -321,6 +323,7 @@ local function Constructor()
 	scrollFrame:SetScript("OnReceiveDrag", OnReceiveDrag)
 	scrollFrame:SetScript("OnSizeChanged", OnSizeChanged)
 	scrollFrame:HookScript("OnVerticalScroll", OnVerticalScroll)
+	scrollFrame:HookScript("OnScrollRangeChanged", OnScrollRangeChanged)
 
 	local editBox = CreateFrame("EditBox", ("%s%dEdit"):format(Type, widgetNum), scrollFrame)
 	editBox:SetAllPoints()

Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua

@@ -2,7 +2,7 @@
 Slider Widget
 Graphical Slider, like, for Range values.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Slider", 22
+local Type, Version = "Slider", 23
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -14,10 +14,6 @@ local tonumber, pairs = tonumber, pairs
 local PlaySound = PlaySound
 local CreateFrame, UIParent = CreateFrame, UIParent
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: GameFontHighlightSmall
-
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
@@ -31,13 +27,13 @@ local function UpdateText(self)
 end
 
 local function UpdateLabels(self)
-	local min, max = (self.min or 0), (self.max or 100)
+	local min_value, max_value = (self.min or 0), (self.max or 100)
 	if self.ispercent then
-		self.lowtext:SetFormattedText("%s%%", (min * 100))
+		self.lowtext:SetFormattedText("%s%%", (min_value * 100))
-		self.hightext:SetFormattedText("%s%%", (max * 100))
+		self.hightext:SetFormattedText("%s%%", (max_value * 100))
 	else
-		self.lowtext:SetText(min)
+		self.lowtext:SetText(min_value)
-		self.hightext:SetText(max)
+		self.hightext:SetText(max_value)
 	end
 end
 
@@ -175,13 +171,13 @@ local methods = {
 		self.label:SetText(text)
 	end,
 
-	["SetSliderValues"] = function(self, min, max, step)
+	["SetSliderValues"] = function(self, min_value, max_value, step)
 		local frame = self.slider
 		frame.setup = true
-		self.min = min
+		self.min = min_value
-		self.max = max
+		self.max = max_value
 		self.step = step
-		frame:SetMinMaxValues(min or 0,max or 100)
+		frame:SetMinMaxValues(min_value or 0,max_value or 100)
 		UpdateLabels(self)
 		frame:SetValueStep(step or 1)
 		if self.value then
@@ -225,7 +221,7 @@ local function Constructor()
 	label:SetJustifyH("CENTER")
 	label:SetHeight(15)
 
-	local slider = CreateFrame("Slider", nil, frame)
+	local slider = CreateFrame("Slider", nil, frame, "BackdropTemplate")
 	slider:SetOrientation("HORIZONTAL")
 	slider:SetHeight(15)
 	slider:SetHitRectInsets(0, 0, -10, 0)
@@ -247,7 +243,7 @@ local function Constructor()
 	local hightext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
 	hightext:SetPoint("TOPRIGHT", slider, "BOTTOMRIGHT", -2, 3)
 
-	local editbox = CreateFrame("EditBox", nil, frame)
+	local editbox = CreateFrame("EditBox", nil, frame, "BackdropTemplate")
 	editbox:SetAutoFocus(false)
 	editbox:SetFontObject(GameFontHighlightSmall)
 	editbox:SetPoint("TOP", slider, "BOTTOM")

Libs/AceHook-3.0/AceHook-3.0.lua

@@ -9,8 +9,8 @@
 -- make into AceHook.
 -- @class file
 -- @name AceHook-3.0
--- @release $Id: AceHook-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
+-- @release $Id$
-local ACEHOOK_MAJOR, ACEHOOK_MINOR = "AceHook-3.0", 8
+local ACEHOOK_MAJOR, ACEHOOK_MINOR = "AceHook-3.0", 9
 local AceHook, oldminor = LibStub:NewLibrary(ACEHOOK_MAJOR, ACEHOOK_MINOR)
 
 if not AceHook then return end -- No upgrade needed
@@ -195,7 +195,6 @@ function hook(self, obj, method, handler, script, secure, raw, forceSecure, usag
 			registry[self][method] = nil
 		end
 		handlers[uid], actives[uid], scripts[uid] = nil, nil, nil
-		uid = nil
 	end
 
 	local orig
@@ -478,10 +477,10 @@ function AceHook:UnhookAll()
 	for key, value in pairs(registry[self]) do
 		if type(key) == "table" then
 			for method in pairs(value) do
-				self:Unhook(key, method)
+				AceHook.Unhook(self, key, method)
 			end
 		else
-			self:Unhook(key)
+			AceHook.Unhook(self, key)
 		end
 	end
 end

Libs/AceLocale-3.0/AceLocale-3.0.lua

@@ -1,7 +1,7 @@
 --- **AceLocale-3.0** manages localization in addons, allowing for multiple locale to be registered with fallback to the base locale for untranslated strings.
 -- @class file
 -- @name AceLocale-3.0
--- @release $Id: AceLocale-3.0.lua 1035 2011-07-09 03:20:13Z kaelten $
+-- @release $Id$
 local MAJOR,MINOR = "AceLocale-3.0", 6
 
 local AceLocale, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
@@ -12,10 +12,6 @@ if not AceLocale then return end -- no upgrade needed
 local assert, tostring, error = assert, tostring, error
 local getmetatable, setmetatable, rawset, rawget = getmetatable, setmetatable, rawset, rawget
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: GAME_LOCALE, geterrorhandler
-
 local gameLocale = GetLocale()
 if gameLocale == "enGB" then
 	gameLocale = "enUS"
@@ -93,7 +89,7 @@ local writedefaultproxy = setmetatable({}, {
 function AceLocale:NewLocale(application, locale, isDefault, silent)
 
 	-- GAME_LOCALE allows translators to test translations of addons without having that wow client installed
-	local gameLocale = GAME_LOCALE or gameLocale
+	local activeGameLocale = GAME_LOCALE or gameLocale
 
 	local app = AceLocale.apps[application]
 
@@ -111,7 +107,7 @@ function AceLocale:NewLocale(application, locale, isDefault, silent)
 		AceLocale.appnames[app] = application
 	end
 
-	if locale ~= gameLocale and not isDefault then
+	if locale ~= activeGameLocale and not isDefault then
 		return -- nop, we don't need these translations
 	end
 

Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua

@@ -1,5 +1,5 @@
---[[ $Id: CallbackHandler-1.0.lua 22 2018-07-21 14:17:22Z nevcairiel $ ]]
+--[[ $Id$ ]]
-local MAJOR, MINOR = "CallbackHandler-1.0", 7
+local MAJOR, MINOR = "CallbackHandler-1.0", 8
 local CallbackHandler = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not CallbackHandler then return end -- No upgrade needed
@@ -7,26 +7,16 @@ if not CallbackHandler then return end -- No upgrade needed
 local meta = {__index = function(tbl, key) tbl[key] = {} return tbl[key] end}
 
 -- Lua APIs
-local tconcat = table.concat
+local securecallfunction, error = securecallfunction, error
-local assert, error, loadstring = assert, error, loadstring
+local setmetatable, rawget = setmetatable, rawget
-local setmetatable, rawset, rawget = setmetatable, rawset, rawget
 local next, select, pairs, type, tostring = next, select, pairs, type, tostring
 
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: geterrorhandler
-
-local xpcall = xpcall
-
-local function errorhandler(err)
-	return geterrorhandler()(err)
-end
 
 local function Dispatch(handlers, ...)
 	local index, method = next(handlers)
 	if not method then return end
 	repeat
-		xpcall(method, errorhandler, ...)
+		securecallfunction(method, ...)
 		index, method = next(handlers, index)
 	until not method
 end
@@ -39,7 +29,7 @@ end
 --   UnregisterName    - name of the callback unregistration API, default "UnregisterCallback"
 --   UnregisterAllName - name of the API to unregister all callbacks, default "UnregisterAllCallbacks". false == don't publish this API.
 
-function CallbackHandler:New(target, RegisterName, UnregisterName, UnregisterAllName)
+function CallbackHandler.New(_self, target, RegisterName, UnregisterName, UnregisterAllName)
 
 	RegisterName = RegisterName or "RegisterCallback"
 	UnregisterName = UnregisterName or "UnregisterCallback"
@@ -67,13 +57,13 @@ function CallbackHandler:New(target, RegisterName, UnregisterName, UnregisterAll
 
 		if registry.insertQueue and oldrecurse==0 then
 			-- Something in one of our callbacks wanted to register more callbacks; they got queued
-			for eventname,callbacks in pairs(registry.insertQueue) do
+			for event,callbacks in pairs(registry.insertQueue) do
-				local first = not rawget(events, eventname) or not next(events[eventname])	-- test for empty before. not test for one member after. that one member may have been overwritten.
+				local first = not rawget(events, event) or not next(events[event])	-- test for empty before. not test for one member after. that one member may have been overwritten.
-				for self,func in pairs(callbacks) do
+				for object,func in pairs(callbacks) do
-					events[eventname][self] = func
+					events[event][object] = func
 					-- fire OnUsed callback?
 					if first and registry.OnUsed then
-						registry.OnUsed(registry, target, eventname)
+						registry.OnUsed(registry, target, event)
 						first = nil
 					end
 				end

Libs/LibDBIcon-1.0/LibDBIcon-1.0.lua

@@ -6,7 +6,7 @@
 --
 
 local DBICON10 = "LibDBIcon-1.0"
-local DBICON10_MINOR = 43 -- Bump on changes
+local DBICON10_MINOR = 44 -- Bump on changes
 if not LibStub then error(DBICON10 .. " requires LibStub.") end
 local ldb = LibStub("LibDataBroker-1.1", true)
 if not ldb then error(DBICON10 .. " requires LibDataBroker-1.1.") end
@@ -18,8 +18,8 @@ lib.callbackRegistered = lib.callbackRegistered or nil
 lib.callbacks = lib.callbacks or LibStub("CallbackHandler-1.0"):New(lib)
 lib.notCreated = lib.notCreated or {}
 lib.radius = lib.radius or 5
+local next, Minimap, CreateFrame = next, Minimap, CreateFrame
 lib.tooltip = lib.tooltip or CreateFrame("GameTooltip", "LibDBIconTooltip", UIParent, "GameTooltipTemplate")
-local next, Minimap = next, Minimap
 local isDraggingButton = false
 
 function lib:IconCallback(event, name, key, value)
@@ -218,8 +218,14 @@ local function createButton(name, object, db)
 	button.dataObject = object
 	button.db = db
 	button:SetFrameStrata("MEDIUM")
-	button:SetSize(31, 31)
+	if button.SetFixedFrameStrata then -- Classic support
+		button:SetFixedFrameStrata(true)
+	end
 	button:SetFrameLevel(8)
+	if button.SetFixedFrameLevel then -- Classic support
+		button:SetFixedFrameLevel(true)
+	end
+	button:SetSize(31, 31)
 	button:RegisterForClicks("anyUp")
 	button:RegisterForDrag("LeftButton")
 	button:SetHighlightTexture(136477) --"Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight"

Libs/LibStub/LibStub.lua

@@ -10,7 +10,7 @@ if not LibStub or LibStub.minor < LIBSTUB_MINOR then
 
 	function LibStub:NewLibrary(major, minor)
 		assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)")
-		minor = assert(tonumber(strmatch(minor, "%d+")), "Minor version must either be a number or contain a number.")
+		minor = assert(tonumber(string.match(minor, "%d+")), "Minor version must either be a number or contain a number.")
 
 		local oldminor = self.minors[major]
 		if oldminor and oldminor >= minor then return nil end

Libs/LibStub/LibStub.toc

@@ -1,9 +0,0 @@
-## Interface: 20400
-## Title: Lib: LibStub
-## Notes: Universal Library Stub
-## Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel
-## X-Website: http://jira.wowace.com/browse/LS
-## X-Category: Library
-## X-License: Public Domain	
-
-LibStub.lua

README.md

@@ -1,6 +1,6 @@
 # Grichelde - Text replacer
 
-Grichelde is a WoW Classic Addon that replaces any characters or words you typed in a chat input line according to your replacement rules.
+Grichelde is a WoW Addon for Classic, Wrath of the Lich King Classic and Retail (Shadowlands) that replaces any characters or words you typed in a chat input line according to your replacement rules.
 The replacement is done **before** the text is send to other players/in the target channel. It does **not** change text other players have written in the chat, but the text they will see **from you**.
 
 Its purpose is to simulate a speaking disability of your toon and hereby strengthen immersion in roleplay. 
@@ -39,7 +39,7 @@ Only slash commands, item links, textures, placeholders and ooc-markers are excl
 
 After entering a search or replacement text, you see a button "Okay" next to your input. This is **not** a validation message, 
 but the save button for text. This is a restriction from the UI library and can be seen in other addons as well. 
-Please click on "Okay" to save the input permanently, otherwise it will not be stored..
+Please click on "Okay" to save the input permanently, otherwise it will not be stored.
 
 ![click "Okay" on text changes](https://media.forgecdn.net/attachments/305/887/text-okay.jpg "change confirmation")
 

libs.xml

@@ -1,17 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-
-  <Script file="Libs\LibStub\LibStub.lua"/>
-  <Include file="Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml"/>
-  <Include file="Libs\AceAddon-3.0\AceAddon-3.0.xml"/>
-  <Include file="Libs\AceLocale-3.0\AceLocale-3.0.xml" />
-  <Include file="Libs\AceEvent-3.0\AceEvent-3.0.xml" />
-  <Include file="Libs\AceHook-3.0\AceHook-3.0.xml"/>
-  <Include file="Libs\AceConsole-3.0\AceConsole-3.0.xml"/>
-  <Include file="Libs\AceDB-3.0\AceDB-3.0.xml"/>
-  <Include file="Libs\AceDBOptions-3.0\AceDBOptions-3.0.xml"/>
-  <Include file="Libs\AceGUI-3.0\AceGUI-3.0.xml"/>
-  <Include file="Libs\AceConfig-3.0\AceConfig-3.0.xml"/>
-  <Script file="Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua" />
-  <Script file="Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua" />
-</Ui>

localisation/deDE.lua

@@ -15,7 +15,7 @@ local cPrefix    = Grichelde.F.cPrefix
 L.AddonName = "Grichelde"
 L.AddonNamePlusVersion = "%s v%s"
 L.AddonLoaded = "%s unterst\195\188tzt Euch jetzt bei euren Sprachschwierigkeiten."
-L.AddonUnloaded = "%s wartet geduldig Euch weiter unterst\195\188tzen zu d\195\188rfen."
+L.AddonUnloaded = "%s erwartet geduldig Euch weiter unterst\195\188tzen zu d\195\188rfen."
 L.Upgrade_ToVersion = "Hebe Databank auf Version %s an."
 L.Upgrade_Successful = "Upgrade erfolgreich."
 L.Upgrade_Error = "Upgrade fehlgeschlagen!"

localisation/enUS.lua

@@ -15,7 +15,7 @@ local cPrefix    = Grichelde.F.cPrefix
 L.AddonName = "Grichelde"
 L.AddonNamePlusVersion = "%s v%s"
 L.AddonLoaded = "%s happily assists you with your spelling disabilities now."
-L.AddonUnloaded = "%s patiently waits to support you again when needed."
+L.AddonUnloaded = "%s patiently awaits to support you again."
 L.Upgrade_ToVersion = "Upgrade database to version %s."
 L.Upgrade_Successful = "Upgrade successful."
 L.Upgrade_Error = "Upgrade failed!"