Version 1.1.7

- messages during encounters are sent unchanged, with a one-time notice
- handling of german umlauts (and other unicode characters)
- updated libraries and bumped version for all incarnations of WoW (Classic Era, Forever, Classic, Retail)
- adaptations to Retail v12 new Chat handling (API changes, encounter lockdown, instance chat)
- "/r" no longer sends to an empty whisper target if the last told target is unavailable
- fixed replacements in instance chats
- messages to unknown numbered channels are now discarded
- right-click on the minimap button

.gitignore

@@ -1,43 +1,124 @@
-# Gradle
+### Artifacts ###
-.gradle
+# Compilation
-build/
-
-# Android built artifacts
-*.apk
-*.ap_
-*.dex
-
-# Java build artifacts class files
 *.class
 
-# other generated files
+# Package Files
-gen/
+*.jar
+*.war
+*.nar
+*.ear
+
+### Maven ###
+
+pom.xml.*
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
 target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
 
-# local configuration file (for Android sdk path, etc)
+### Java ###
-local.properties
 
-# OSX files
+# Mobile Tools for Java (J2ME)
-.DS_Store
+.mtj.tmp/
 
-# Eclipse
+# crash logs and heap dumps
-/.classpath
+hs_err_pid*
-/.settings/
+replay_pid*
-/.project
-/.metadata
-bin/
 
-# IntelliJ
+### Backup ###
-*.iws
+*.bak
-*.uml
+*.ori
-.idea/
+*.orig
-out/
+*.tmp
+*.zip
+*.tar.gz
+*.rar
 
-# NDK
+### CREDENTIALS ###
-obj/
 
-# Misc
+**/secret
-.bin/
+
+### LOCAL-DEV ###
+*-local.xml
+*-local.yml
+*-local.yaml
+*-settings.*
+
+drivers/*.jar
 *.log
-*.graphml
+
-coverage.db*
+### IntelliJ ###
+.idea/
+*.iws
+*.iml
+*.ipr
+out/
+!.idea/**/vcs.xml
+!.idea/**/encodings.xml
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.metadata
+.project
+.classpath
+.settings/
+.springBeans
+.sts4-cache
+/bin/
+/tmp/
+*.swp
+*~.nib
+
+### NetBeans ###
+**/nbproject/*
+build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+.history/
+*.vsix
+
+### Windows ###
+
+Thumbs.db
+[Dd]esktop.ini
+*.lnk
+
+### Linux ###
+*~
+.fuse_hidden*
+.directory
+.Trash-*
+.nfs*
+
+### MacOS ###
+.DS_Store
+.AppleDouble
+.LSOverride
+
+### AI harness ###
+.claude/
+.codex/
+
+### Lokale Umgebung ###
+.env
+.env.*
+!.env.example

.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,98 @@ 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 - 2026-11-01
+### Added
+- messages during encounters are sent unchanged, with a one-time notice
+### Changed
+- handling of german umlauts (and other unicode characters)
+- updated libraries and bumped version for all incarnations of WoW (Classic Era, Forever, Classic, Retail)
+- adaptations to Retail v12 new Chat handling (API changes, encounter lockdown, instance chat)
+### Fixed
+- "/r" no longer sends to an empty whisper target if the last told target is unavailable
+- fixed replacements in instance chats
+- messages to unknown numbered channels are now discarded
+- right-click on the minimap button
+ 
+## 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
+### Fixed
+- minor clarifications and spellings errors on help texts
+
+## Version 0.9.1-rc - 2020-08-01 [Release Candidate]
+### Fixed
+- emote detection mixed in other channels
+- minimap button and dialog no longer resets active state after profile change
+- default entries are no longer shown after example import
+- better handling of capture groups and character sets
+
+## Version 0.9.0-rc - 2020-07-25 [Release Candidate]
+### Added
+- enable/disable from slash command
+- matching conditions (never, always, start, end, start or end)
+- support capturing groups
+- import examples
+- testing capabilities
+- compatibility with WoW Retail
+### Changed
+- adapted help texts
+- spelling errors
+
+## Version 0.8.1-beta - 2020-06-16
+### Added
+- stop replacements per mapping
+- more ooc recognition patterns
+### Fixed
+- keep cases of replacements with excessive length
+
 ## Version 0.8.0-beta - 2020-06-14 [Feature Complete]
 ### Added
 - handle replacement via slash command
@@ -69,7 +161,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

@@ -2,7 +2,7 @@
 
   Grichelde - Text Replacer
 
-  Copyright 2020 Teilzeit-Jedi <tj@teilzeit-jedi.de>
+  Copyright 2020 - 2026 Teilzeit-Jedi <tj@teilzeit-jedi.de>
 
   This addon is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +20,11 @@ local _G = _G
 
 -- initialize addon
 local Grichelde = LibStub("AceAddon-3.0"):NewAddon(AddonTable, AddonName, "AceConsole-3.0", "AceEvent-3.0", "AceHook-3.0")
+local GetAddOnMetadata = (_G.C_AddOns and _G.C_AddOns.GetAddOnMetadata) or _G.GetAddOnMetadata
 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
@@ -39,23 +41,24 @@ end
 
 function Grichelde:OnEnable()
     -- Hook in before message is sent to replace all character occurrences where replacements have been defined in the options
-    self:RawHook("SendChatMessage", true)
+    self:HookSendChatMessage()
 
     self.options, self.dialog = self:SetupOptions()
-    self:RefreshOptions("OnProfileChanged")
-
     self.ldb, self.icon = self:MinimapButton()
+
+    self:RefreshProfiles("OnEnable")
     self:SetupSlashCommands()
 
     -- tell the world we are listening
-    if self.db.profile.enabled then
+    if (self.db.profile.enabled == true) then
         local namePlusVersion = self:Format(self.L.AddonNamePlusVersion, self.L.AddonName, self.version)
-        self:Print(self.L.AddonLoaded, self.COLOR_CODES.PREFIX .. namePlusVersion .. self.COLOR_CODES.CLOSE)
+        self.F.print(self:Format(self.L.AddonLoaded, self.COLOR_CODES.PREFIX .. namePlusVersion .. self.COLOR_CODES.CLOSE))
     end
 end
 
 function Grichelde:OnDisable()
-    self:Unhook("SendChatMessage")
+    self:UnhookAll()
+    self.originalSend = nil
     self:CloseOptions()
     self:HideMinimapButton()
     self:UnregisterChatCommand("grichelde")
@@ -70,7 +73,7 @@ end
 
 function Grichelde:HandleSlashCommand(input, ...)
     -- Show the GUI if no input is supplied, otherwise handle the chat input.
-    if self.functions.nilOrEmpty(input) then
+    if (self.F.nilOrEmpty(input)) then
         self:ToggleOptions()
     else
         -- handle slash ourselves
@@ -81,6 +84,10 @@ function Grichelde:HandleSlashCommand(input, ...)
             self:ToggleOptions()
         elseif input == "profile" then
             self:PrintProfile()
+        elseif input == "on" or input == "enable" then
+             self:Activate()
+        elseif input == "off" or input == "disable" then
+             self:Deactivate()
         else
             self:SendChatMessageOverride(input, ...)
         end

Grichelde.toc

@@ -1,23 +1,36 @@
-## Interface: 11304
+## Interface: 120105, 16001, 11509, 20506, 38002, 50504 
 
 ## Title: Grichelde
-## Notes: Replaces characters from the chat box
+## Notes: Replaces characters of your chat input line before sending.
-## Notes-de: Ersetzt eingegebene Zeichen in der Chat-Zeile
+## Notes-de: Ersetzt eingegebene Zeichen in der Chat-Zeile vor dem Versenden.
-## Version: 0.8.0-beta
+## Version: 1.1.7
 ## Author: Teilzeit-Jedi
 ## eMail: tj@teilzeit-jedi.de
+## AllowLoadGameType: standard, classic, camelot, forever
 
-## X-Build: Classic
 ## X-Curse-Project-ID: 385480
 ## X-License: GPLv3
 ## X-Category: Chat/Communication
-## X-Credits: Teilzeit-Jedi
+## X-Website: https://www.curseforge.com/wow/addons/grichelde
+## X-Maintainer: Teilzeit-Jedi
 ## X-Embeds: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
 
 ## 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,3 +43,6 @@ GricheldeUpgrade.lua
 GricheldeOptions.lua
 GricheldeMinimap.lua
 GricheldeChat.lua
+#@do-not-package@
+GricheldeTest.lua
+#@end-do-not-package@

GricheldeConstants.lua

@@ -1,45 +1,52 @@
 -- read namespace from global env
-local _G = _G
+local _G = _G or getfenv()
-local Grichelde = _G.Grichelde
+local Grichelde = _G.Grichelde or {}
 
 -- constants and upvalues
-Grichelde.LOG_LEVEL = {}
+Grichelde.LOG_LEVEL = { DEBUG = 1, TRACE = 2 }
-Grichelde.LOG_LEVEL.DEBUG = 1
-Grichelde.LOG_LEVEL.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
 
-Grichelde.ICONS = {}
+Grichelde.ICONS = {
-Grichelde.ICONS.MOVE_UP = "Interface\\MainMenuBar\\UI-MainMenu-ScrollUpButton-Up"
+    MOVE_UP = "Interface\\MainMenuBar\\UI-MainMenu-ScrollUpButton-Up",
-Grichelde.ICONS.MOVE_UP_DISABLED = "Interface\\MainMenuBar\\UI-MainMenu-ScrollUpButton-Disabled"
+    MOVE_UP_DISABLED = "Interface\\MainMenuBar\\UI-MainMenu-ScrollUpButton-Disabled",
-Grichelde.ICONS.MOVE_DOWN = "Interface\\MainMenuBar\\UI-MainMenu-ScrollDownButton-Up"
+    MOVE_DOWN = "Interface\\MainMenuBar\\UI-MainMenu-ScrollDownButton-Up",
-Grichelde.ICONS.MOVE_DOWN_DISABLED = "Interface\\MainMenuBar\\UI-MainMenu-ScrollDownButton-Disabled"
+    MOVE_DOWN_DISABLED = "Interface\\MainMenuBar\\UI-MainMenu-ScrollDownButton-Disabled",
-Grichelde.ICONS.DELETE = "Interface\\Buttons\\UI-Panel-MinimizeButton-Up"
+    DELETE = "Interface\\Buttons\\UI-Panel-MinimizeButton-Up",
-Grichelde.ICONS.DELETE_DISABLED = "Interface\\Buttons\\UI-Panel-MinimizeButton-Disabled"
+    DELETE_DISABLED = "Interface\\Buttons\\UI-Panel-MinimizeButton-Disabled",
+}
 
 -- colors:
-Grichelde.COLORS = {}
+Grichelde.COLORS = {
-Grichelde.COLORS.NORMAL    = _G.NORMAL_FONT_COLOR
+    NORMAL    = _G.NORMAL_FONT_COLOR,
-Grichelde.COLORS.HIGHLIGHT = _G.HIGHLIGHT_FONT_COLOR
+    HIGHLIGHT = _G.HIGHLIGHT_FONT_COLOR,
-Grichelde.COLORS.RED       = _G.RED_FONT_COLOR
+    RED       = _G.RED_FONT_COLOR,
-Grichelde.COLORS.GREEN     = _G.GREEN_FONT_COLOR
+    GREEN     = _G.GREEN_FONT_COLOR,
+}
 
-Grichelde.COLOR_CODES = {}
+Grichelde.COLOR_CODES = {
-Grichelde.COLOR_CODES.PREFIX      = "|c00FFAA00"
+    PREFIX      = "|c00FFAA00",
--- https://github.com/stoneharry/Misc-WoW-Stuff/blob/master/EoC%20Interface/FrameXML/Constants.lua
+    -- https://github.com/stoneharry/Misc-WoW-Stuff/blob/master/EoC%20Interface/FrameXML/Constants.lua
-Grichelde.COLOR_CODES.NORMAL      = _G.NORMAL_FONT_COLOR_CODE      or "|cffffd200"
+    NORMAL      = _G.NORMAL_FONT_COLOR_CODE      or "|cffffd200",
-Grichelde.COLOR_CODES.HIGHLIGHT	  = _G.HIGHLIGHT_FONT_COLOR_CODE   or "|cffffffff"
+    HIGHLIGHT   = _G.HIGHLIGHT_FONT_COLOR_CODE   or "|cffffffff",
-Grichelde.COLOR_CODES.RED         = _G.RED_FONT_COLOR_CODE         or "|cffff2020"
+    RED         = _G.RED_FONT_COLOR_CODE         or "|cffff2020",
-Grichelde.COLOR_CODES.GREEN       = _G.GREEN_FONT_COLOR_CODE       or "|cff20ff20"
+    GREEN       = _G.GREEN_FONT_COLOR_CODE       or "|cff20ff20",
-Grichelde.COLOR_CODES.LIGHTGRAY   = "|cffC0C0C0"
+    LIGHTGRAY   = "|cffC0C0C0",
-Grichelde.COLOR_CODES.GRAY        = _G.GRAY_FONT_COLOR_CODE        or "|cff808080"
+    GRAY        = _G.GRAY_FONT_COLOR_CODE        or "|cff808080",
-Grichelde.COLOR_CODES.DARKGRAY    = "|cff404040"
+    DARKGRAY    = "|cff404040",
-Grichelde.COLOR_CODES.YELLOW      = _G.YELLOW_FONT_COLOR_CODE      or "|cffffff00"
+    YELLOW      = _G.YELLOW_FONT_COLOR_CODE      or "|cffffff00",
-Grichelde.COLOR_CODES.LIGHTYELLOW = _G.LIGHTYELLOW_FONT_COLOR_CODE or "|cffffff9a"
+    LIGHTYELLOW = _G.LIGHTYELLOW_FONT_COLOR_CODE or "|cffffff9a",
-Grichelde.COLOR_CODES.ORANGE      = _G.ORANGE_FONT_COLOR_CODE      or "|cffff7f3f"
+    ORANGE      = _G.ORANGE_FONT_COLOR_CODE      or "|cffff7f3f",
-Grichelde.COLOR_CODES.CLOSE       = _G.FONT_COLOR_CODE_CLOSE       or "|r"
+    BLUE        = "|cff0000ff",
+    HYPERLINK   = "|cff4040ff",
+    CLOSE       = _G.FONT_COLOR_CODE_CLOSE       or "|r",
+}
 
 Grichelde.SLASH_COMMANDS = { "gri", "grichelde" }
 
@@ -107,31 +114,27 @@ Grichelde.BLIZZ_TYPE_TO_OPTIONS = {
     ["OFFICER"]       = "officer",
     ["RAID"]          = "raid",
     ["RAID_WARNING"]  = "raidWarning",
-    ["INSTANCE"]     = "instance",
+    ["INSTANCE_CHAT"] = "instance",
     ["BATTLEGROUND"]  = "battleground",
     ["WHISPER"]       = "whisper",
 }
 
 -- do not replace these patterns
-Grichelde.IGNORE_PATTERNS_CASE_SENSITIVE = {
+-- 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)
         "|H.-|h",     -- item links (http://www.wowwiki.com/ItemLink)
         "|T.-|t",     -- textures
         "|K.-|k",     -- Battle.net
         "|n",         -- newline
-
+    },
-    "%(%(.-%)%)", -- (( ooc ))
+    EMOTES = {
-}
-
--- for separate emote detection
-Grichelde.EMOTE_PATTERNS = {
         "%*.-%*",     -- emotes *
         "%*%*.-%*%*", -- emotes **
-    "%<.-%>"      -- emotes < >
+        "%<.-%>",     -- emotes < >
-}
+    },
-
+    SUBSTITUTES = {
-Grichelde.IGNORE_PATTERNS_CASE_INSENSITIVE = {
-    "{rt[1-8]}",  -- rumbered raid target icons, localized raid targets are handled differently
         "%%n",   -- player's name
         "%%z",   -- player's currnt zone
         "%%sz",  -- player's current sub-zone
@@ -140,193 +143,426 @@ Grichelde.IGNORE_PATTERNS_CASE_INSENSITIVE = {
         "%%f",   -- name of focus target
         "%%m",   -- name of mouseover unit
         "%%p",   -- name of player pet
-    "%%tt"        -- name of player's target's target
+        "%%tt",  -- name of player's target's target
+    },
+    RAID_TARGETS = {
+        "{rt[1-8]}", -- rumbered raid target icons, localized raid targets are handled differently
+    },
+    LOCALIZED_RAID_TARGETS = {
+        "Star",
+        "Circle",
+        "Diamond",
+        "Triangle",
+        "Moon",
+        "Square",
+        "Cross",
+        "Skull",
+    },
+    OOC_BRACKETS = {
+        "%(%(.-%)%)",           -- (( ... ))
+        "%(%s*ooc[%:%s].-%)",   -- ( ooc )
+    },
+    OOC_NO_BRACKETS = {
+        "ooc[%:%s]",
+    },
 }
 
-Grichelde.LOCALIZED_RAID_TARGETS = { "Star", "Circle", "Diamond", "Triangle", "Moon", "Square", "Cross", "Skull" }
-
 local function nilOrEmpty(s)
-    return s == nil or s:trim() == ""
+    return s == nil or Grichelde.F.trim(s) == ""
 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.functions.pairs(t) do
+    for key, _ in Grichelde.F.pairs(tbl) do
-        Grichelde.functions.tInsert(sortedKeys, key)
+        Grichelde.F.tInsert(sortedKeys, key)
     end
 
-    if orderFunc then
+    if (orderFunc ~= nil) then
-        Grichelde.functions.tSort(sortedKeys, function(a, b) return orderFunc(sortedKeys, a, b) end)
+        Grichelde.F.tSort(sortedKeys, function(a, b) return orderFunc(sortedKeys, a, b) end)
     else
         -- lexicographical order
-        Grichelde.functions.tSort(sortedKeys)
+        Grichelde.F.tSort(sortedKeys)
     end
 
     -- return the iterator function
     local it = 0
     return function()
         it = it + 1
-        if sortedKeys[it] then
+        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.functions.pairs(t) do
+    for key, value in Grichelde.F.pairs(type) do
         local cond = false
-        if condition then
+        if (condition) then
-            local t = Grichelde.functions.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
 
-        if cond then
+        if (cond) then
             local val = value
-            if extract and Grichelde.functions.type(extract) == "function" then
+            if (extract and (Grichelde.F.type(extract) == "function")) then
-                val = extract(t, key, value)
+                val = extract(type, key, value)
             end
-            Grichelde.functions.tInsert(filtered, val)
+            Grichelde.F.tInsert(filtered, val)
         end
     end
     return filtered
 end
 
-local function tSize(t)
+local function tSize(tbl)
     local size = 0
-    if (t) then
+    if (tbl ~= nil) then
         -- for every non-nil value
-        for _, _ in Grichelde.functions.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.functions.tNext(t) == nil
+    return Grichelde.F.tNext(tbl) == nil
 end
 
 local function tClone(orig)
-    local orig_type = Grichelde.functions.type(orig)
+    local orig_type = Grichelde.F.type(orig)
     local copy
-    if orig_type == 'table' then
+    if (orig_type == 'table') then
         copy = {}
         -- for every non-nil value
-        for orig_key, orig_value in Grichelde.functions.tNext, orig, nil do
+        for orig_key, orig_value in Grichelde.F.tNext, orig, nil do
             copy[tClone(orig_key)] = tClone(orig_value)
         end
-        Grichelde.functions.setmetatable(copy, tClone(Grichelde.functions.getmetatable(orig)))
+        Grichelde.F.setmetatable(copy, tClone(Grichelde.F.getmetatable(orig)))
     else -- number, string, boolean, etc
         copy = orig
     end
     return copy
 end
 
-local function isChar(word)
+local function getNextCharUtf8(word)
-    return Grichelde.functions.find(word, "[%z\65-\90\97-\122\195-\197][\128-\191]?")
+    if ((word == nil) or (Grichelde.F.type(word) ~= "string") or (Grichelde.F.length(word) < 1)) then
+        return nil, nil
+    end
+
+    local wordLength = Grichelde.F.length(word)
+    local c1 = Grichelde.F.toByte(word, 1)
+    if (c1 > 0) and (c1 <= 127) then
+        -- UTF8-1
+        return Grichelde.F.bytes2Char(c1), Grichelde.F.sub(word, 2)
+    elseif (c1 >= 194) and (c1 <= 223) then
+        -- UTF8-2
+        Grichelde.F.assert(wordLength >= 2, "broken UTF-8 character")
+        local c2 = Grichelde.F.toByte(word, 2)
+        return Grichelde.F.bytes2Char(c1, c2), Grichelde.F.sub(word, 3)
+    elseif (c1 >= 224) and (c1 <= 239) then
+        -- UTF8-3
+        Grichelde.F.assert(wordLength >= 3, "broken UTF-8 character")
+        local c2 = Grichelde.F.toByte(word, 2)
+        local c3 = Grichelde.F.toByte(word, 3)
+        return Grichelde.F.bytes2Char(c1, c2, c3), Grichelde.F.sub(word, 4)
+    elseif (c1 >= 240) and (c1 <= 244) then
+        -- UTF8-4
+        Grichelde.F.assert(wordLength >= 4, "broken UTF-8 character")
+        local c2 = Grichelde.F.toByte(word, 2)
+        local c3 = Grichelde.F.toByte(word, 3)
+        local c4 = Grichelde.F.toByte(word, 4)
+        return Grichelde.F.bytes2Char(c1, c2, c3, c4), Grichelde.F.sub(word, 5)
+    else
+        return nil, nil
+    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
+
+--- handles UTF-8 characters like äöü (except ß, ÿ, × and ÷)
+local function toUpper(word)
+    return (Grichelde.F.gsub(_G.strupper(word), "\195([\160-\190])", function(c)
+        if (c ~= "\183") then
+            return "\195" .. Grichelde.F.bytes2Char(Grichelde.F.toByte(c) - 32)
+        end
+    end))
+end
+
+--- handles UTF-8 characters like äöü (except ß, ÿ, × and ÷)
+local function toLower(word)
+    return (Grichelde.F.gsub(_G.strlower(word), "\195([\128-\158])", function(c)
+        if (c ~= "\151") then
+            return "\195" .. Grichelde.F.bytes2Char(Grichelde.F.toByte(c) + 32)
+        end
+    end))
+end
+
+local function isLetter(word)
+    local char = Grichelde.F.getNextCharUtf8(word)
+    return (char ~= nil) and (Grichelde.F.toUpper(char) ~= Grichelde.F.toLower(char))
 end
 
 local function isNumber(digit)
-    return Grichelde.functions.find(digit, "%d+")
+    if ((digit == nil) or (Grichelde.F.type(digit) ~= "string") or (Grichelde.F.length(digit) < 1)) then
+        return false
+    else
+        return Grichelde.F.find(digit, "%d+") ~= nil
+    end
 end
 
 local function isUpper(word)
-    return Grichelde.functions.isChar(word) and word == Grichelde.functions.toUpper(word)
+    if ((word == nil) or (Grichelde.F.type(word) ~= "string") or (Grichelde.F.length(word) < 1)) then
+        return false
+    elseif (Grichelde.F.toUpper(word) == Grichelde.F.toLower(word)) then
+        return false
+    else
+        return word == Grichelde.F.toUpper(word)
+    end
 end
 
 local function isLower(word)
-    return Grichelde.functions.isChar(word) and word == Grichelde.functions.toLower(word)
+    if ((word == nil) or (Grichelde.F.type(word) ~= "string") or (Grichelde.F.length(word) < 1)) then
+        return false
+    elseif (Grichelde.F.toUpper(word) == Grichelde.F.toLower(word)) then
+        return false
+    else
+        return word == Grichelde.F.toLower(word)
+    end
 end
 
 local function isCapital(word)
-    return Grichelde.functions.legnth(word) > 1
+    if ((word == nil) or (Grichelde.F.type(word) ~= "string") or (Grichelde.F.length(word) < 1)) then
-        and Grichelde.functions.isUpper(Grichelde.functions.sub(word,1,1))
+        return false
-        and Grichelde.functions.isLower(Grichelde.functions.sub(word,2))
+    else
+        local first, rest = Grichelde.F.getNextCharUtf8(word)
+        local isCap = Grichelde.F.isUpper(first)
+        if (rest ~= nil) then
+            return isCap and Grichelde.F.isLower(rest)
+        else
+           return isCap
+        end
+    end
 end
 
-local function color(color, text)
+local function capitalize(word)
-    return color .. text .. Grichelde.COLOR_CODES.CLOSE
+    if ((word == nil) or (Grichelde.F.type(word) ~= "string") or (Grichelde.F.length(word) < 1)) then
+        return ""
+    else
+        local first, rest = Grichelde.F.getNextCharUtf8(word)
+        local capital = Grichelde.F.toUpper(first)
+        if (rest ~= nil) then
+            return capital .. Grichelde.F.toLower(rest)
+        else
+           return capital
+        end
+    end
+end
+
+local function trim(s)
+    if ((s == nil) or (Grichelde.F.type(s) ~= "string")) then
+        return nil
+    end
+
+    local n = Grichelde.F.find(s, "%S")
+    return n and Grichelde.F.match(s, ".*%S", n) or ""
+end
+
+local function color(colour, text)
+    return colour .. text .. Grichelde.COLOR_CODES.CLOSE
 end
 
 local function cPrefix(text)
-    return Grichelde.functions.color(Grichelde.COLOR_CODES.PREFIX, text)
+    return Grichelde.F.color(Grichelde.COLOR_CODES.PREFIX, text)
 end
 
 local function cYellow(text)
-    return Grichelde.functions.color(Grichelde.COLOR_CODES.NORMAL, text)
+    return Grichelde.F.color(Grichelde.COLOR_CODES.NORMAL, text)
 end
 
 local function cGray(text)
-    return Grichelde.functions.color(Grichelde.COLOR_CODES.GRAY, text)
+    return Grichelde.F.color(Grichelde.COLOR_CODES.GRAY, text)
 end
 
 local function cDarkgray(text)
-    return Grichelde.functions.color(Grichelde.COLOR_CODES.DARKGRAY, text)
+    return Grichelde.F.color(Grichelde.COLOR_CODES.DARKGRAY, text)
+end
+
+local function cGreen(text)
+    return Grichelde.F.color(Grichelde.COLOR_CODES.GREEN, text)
 end
 
 local function cOrange(text)
-    return Grichelde.functions.color(Grichelde.COLOR_CODES.ORANGE, text)
+    return Grichelde.F.color(Grichelde.COLOR_CODES.ORANGE, text)
+end
+
+local function cRed(text)
+    return Grichelde.F.color(Grichelde.COLOR_CODES.RED, text)
+end
+
+local function cHyperlink(text)
+    return Grichelde.F.color(Grichelde.COLOR_CODES.HYPERLINK, text)
 end
 
 -- faster function lookups by mapping to local refs
-Grichelde.functions = {}
+Grichelde.F = {
-Grichelde.functions.IsAddOnLoaded = _G.IsAddOnLoaded
+    assert          = _G.assert,
-Grichelde.functions.assert        = _G.assert
+    type            = _G.type,
-Grichelde.functions.type          = _G.type
+    print           = _G.print,
-Grichelde.functions.print         = _G.print
+    nilOrEmpty      = nilOrEmpty,
-Grichelde.functions.nilOrEmpty    = nilOrEmpty
+    pairs           = _G.pairs,
-Grichelde.functions.pairs         = _G.pairs
+    ipairs          = _G.ipairs,
-Grichelde.functions.ipairs        = _G.ipairs
+    spairs          = spairs,
-Grichelde.functions.spairs        = spairs
+    tContains       = _G.tContains,
-Grichelde.functions.tContains     = _G.tContains
+    tFilter         = tFilter,
-Grichelde.functions.tFilter       = tFilter
+    tInsert         = _G.table.insert,
-Grichelde.functions.tInsert       = _G.table.insert
+    tConcat         = _G.table.concat,
-Grichelde.functions.tConcat       = _G.table.concat
+    tSize           = tSize,
-Grichelde.functions.tSize         = tSize
+    tIsEmpty        = tIsEmpty,
-Grichelde.functions.tIsEmpty      = tIsEmpty
+    tSort           = _G.table.sort,
-Grichelde.functions.tSort         = _G.table.sort
+    tClone          = tClone,
-Grichelde.functions.tClone        = tClone
+    tNext           = _G.next,
-Grichelde.functions.tNext         = _G.next
+    tWipe           = _G.wipe,
-Grichelde.functions.tWipe         = _G.wipe
+    setmetatable    = _G.setmetatable,
-Grichelde.functions.setmetatable  = _G.setmetatable
+    getmetatable    = _G.getmetatable,
-Grichelde.functions.getmetatable  = _G.getmetatable
+    select          = _G.select,
-Grichelde.functions.select        = _G.select
+    unpack          = _G.unpack,
-Grichelde.functions.unpack        = _G.unpack
+    find            = _G.string.find,
-Grichelde.functions.find          = _G.string.find
+    sub             = _G.string.sub,
-Grichelde.functions.sub           = _G.string.sub
+    gsub            = _G.string.gsub,
-Grichelde.functions.gsub          = _G.string.gsub
+    match           = _G.strmatch,
-Grichelde.functions.match         = _G.strmatch
+    gmatch          = _G.string.gmatch,
-Grichelde.functions.join          = _G.strjoin
+    join            = _G.strjoin,
-Grichelde.functions.split         = _G.strsplit
+    split           = _G.strsplit,
-Grichelde.functions.toUpper       = _G.strupper
+    toUpper         = toUpper,
-Grichelde.functions.toLower       = _G.strlower
+    toLower         = toLower,
-Grichelde.functions.isChar        = isChar
+    getNextCharUtf8 = getNextCharUtf8,
-Grichelde.functions.isNumber      = isNumber
+    isUtf8MultiByte = isUtf8MultiByte,
-Grichelde.functions.isUpper       = isUpper
+    getUtf8Sequence = getUtf8Sequence,
-Grichelde.functions.isLower       = isLower
+    getUtf8Table    = getUtf8Table,
-Grichelde.functions.isCapital     = isCapital
+    isLetter        = isLetter,
-Grichelde.functions.color         = color
+    isNumber        = isNumber,
-Grichelde.functions.cPrefix       = cPrefix
+    isUpper         = isUpper,
-Grichelde.functions.cYellow       = cYellow
+    isLower         = isLower,
-Grichelde.functions.cGray         = cGray
+    isCapital       = isCapital,
-Grichelde.functions.cDarkgray     = cDarkgray
+    capitalize      = capitalize,
-Grichelde.functions.cOrange       = cOrange
+    color           = color,
-Grichelde.functions.format        = _G.string.format
+    cPrefix         = cPrefix,
-Grichelde.functions.rep           = _G.string.rep
+    cYellow         = cYellow,
-Grichelde.functions.trim          = _G.strtrim
+    cGray           = cGray,
-Grichelde.functions.length        = _G.string.len
+    cDarkgray       = cDarkgray,
-Grichelde.functions.lenUtf8       = _G.strlenutf8
+    cGreen          = cGreen,
-Grichelde.functions.toString      = _G.tostring
+    cOrange         = cOrange,
-Grichelde.functions.toNumber      = _G.tonumber
+    cRed            = cRed,
-Grichelde.functions.max           = _G.math.max
+    cHyperlink      = cHyperlink,
-Grichelde.functions.min           = _G.math.min
+    toByte          = _G.string.byte,
+    bytes2Char      = _G.string.char,
+    format          = _G.string.format,
+    rep             = _G.string.rep,
+    -- trim            = _G.strtrim,
+    trim            = trim,
+    length          = _G.string.len,
+    lengthUtf8      = _G.strlenutf8,
+    toString        = _G.tostring,
+    toNumber        = _G.tonumber,
+    max             = _G.math.max,
+    min             = _G.math.min,
+}

GricheldeDatabase.lua

@@ -1,11 +1,11 @@
 -- read namespace from global env
-local _G = _G
+local _G = _G or getfenv()
-local Grichelde = _G.Grichelde
+local Grichelde = _G.Grichelde or {}
 
-local pairs, tInsert, tClone, unpack, join, toString
+local pairs, tInsert, tClone, tSize, unpack, join, toString
-    = Grichelde.functions.pairs, Grichelde.functions.tInsert, Grichelde.functions.tClone, Grichelde.functions.unpack, Grichelde.functions.join, Grichelde.functions.toString
+    = Grichelde.F.pairs, Grichelde.F.tInsert, Grichelde.F.tClone, Grichelde.F.tSize, Grichelde.F.unpack, Grichelde.F.join, Grichelde.F.toString
 
-function Grichelde:GetDefaultConfig()
+function Grichelde.getDefaultConfig()
     return {
         global = {},
         profile = {
@@ -24,89 +24,115 @@ function Grichelde:GetDefaultConfig()
             },
             replacements = {
                 ["**"] = {
-                    active = true,
+                    order = 999,
-                    order = 9999,
                     searchText = "",
                     replaceText = "",
                     exactCase = false,
                     consolidate = true,
-                },
+                    matchWhen = 2,
-                replacement_10 = {
+                    stopOnMatch = false,
-                    order = 10,
-                    searchText = "s",
-                    replaceText = "ch",
-                },
-                replacement_11 = {
-                    order = 11,
-                    searchText = "t",
-                    replaceText = "ck",
                 },
             }
         }
     }
 end
 
-function Grichelde:LoadDatabase()
+function Grichelde.getDefaultSampleMappings()
-    local db = LibStub("AceDB-3.0"):New(self.name .."DB", self:GetDefaultConfig(), true)
+    return {
+        replacement_10 = {
+            order = 10,
+            searchText = "s",
+            replaceText = "ch",
+            exactCase = false,
+            consolidate = true,
+            matchWhen = 2,
+            stopOnMatch = false,
+        },
+        replacement_11 = {
+            order = 11,
+            searchText = "t",
+            replaceText = "ck",
+            exactCase = false,
+            consolidate = true,
+            matchWhen = 2,
+            stopOnMatch = false,
+        },
+        replacement_12 = {
+            order = 12,
+            searchText = "p",
+            replaceText = "b",
+            exactCase = false,
+            consolidate = true,
+            matchWhen = 2,
+            stopOnMatch = false,
+        }
+    }
+end
 
-    db.RegisterCallback(self, "OnNewProfile", "RefreshOptions")
+function Grichelde:LoadDatabase()
-    db.RegisterCallback(self, "OnProfileChanged", "RefreshOptions")
+    local db = LibStub("AceDB-3.0"):New(self.name .."DB", self.getDefaultConfig(), true)
-    db.RegisterCallback(self, "OnProfileDeleted", "RefreshOptions")
+
-    db.RegisterCallback(self, "OnProfileCopied", "RefreshOptions")
+    db.RegisterCallback(self, "OnNewProfile", "RefreshProfiles")
-    db.RegisterCallback(self, "OnProfileReset", "RefreshOptions")
+    db.RegisterCallback(self, "OnProfileChanged", "RefreshProfiles")
+    db.RegisterCallback(self, "OnProfileDeleted", "RefreshProfiles")
+    db.RegisterCallback(self, "OnProfileCopied", "RefreshProfiles")
+    db.RegisterCallback(self, "OnProfileReset", "RefreshProfiles")
+    db.RegisterCallback(self, "OnProfileShutdown", "RefreshProfiles")
 
     return db
 end
 
 function Grichelde:SyncToDatabase(info, val)
     self:TracePrint("SyncToDatabase : info")
-    for i = 0, #info do
+    local n = #info
+    for i = 0, n do
         self:TracePrint("%d = %s", i, info[i])
     end
 
     local option = self.db.profile
     local path = 1
-    while (path < #info) do
+    while (path < n) do
-        if info[path] ~= "mappings" then
+        if (info[path] ~= "mappings") then
-            option = option[info[path]] -- or nil
+            option = option[info[path]]
         end
         path = path + 1
     end
-    local optionPath = join(".", unpack(info, 1, #info))
+    local optionPath = join(".", unpack(info, 1, n))
     self:DebugPrint("change option \"%s\" from %s to %s", optionPath, toString(option[info[path]]), toString(val))
     option[info[path]] = val
 end
 
 function Grichelde:ReadFromDatabase(info)
     self:TracePrint("ReadFromDatabase : info")
-    for i = 0, #info do
+    local n = #info
+    for i = 0, n do
         self:TracePrint("%d = %s", i, info[i])
     end
 
     local option = self.db.profile
     local path = 1
-    while (path <= #info) do
+    while (path <= n) do
-        if info[path] ~= "mappings" then
+        if (info[path] ~= "mappings") then
-            option = option[info[path]] -- or nil
+            option = option[info[path]]
         end
         path = path + 1
     end
-    local optionPath = join(".", unpack(info, 1, #info))
+    local optionPath = join(".", unpack(info, 1, n))
     self:DebugPrint("read option \"%s\": %s", optionPath, toString(option))
     return option
 end
 
 --- Sorts a replacements table by order sub-field and rename.
 --- Do NOT reassign self.db.profile.replacements here or with its output as it will break defaults
-function Grichelde:ReorderReplacements()
+function Grichelde:ReorderReplacements(replacements)
-    local replacements = self.db.profile.replacements or {}
+    local repls = replacements or self.db.profile.replacements or {}
 
     self:TracePrint("ReorderReplacements : unsorted table")
-    self:TracePrint(replacements)
+    self:TracePrint(repls)
 
     local orderToName = {}
     local size = 0
-    for replName, replTable in pairs(replacements) do
+    for replName, replTable in pairs(repls) do
         size = size + 1
         tInsert(orderToName, replTable.order, replName)
     end
@@ -119,31 +145,19 @@ function Grichelde:ReorderReplacements()
 
     while count < size do
         local replName = orderToName[index]
-        if replName and replacements[replName] then
+        if (replName ~= nil) and (repls[replName] ~= nil) then
             self:TracePrint("ReorderReplacements : replName: %s, replTable", replName)
-            self:TracePrint(replacements[replName])
+            self:TracePrint(repls[replName])
             local order = Grichelde.MAPPING_OFFSET + count
-            sorted["replacement_" .. order] = tClone(replacements[replName])
+            sorted["replacement_" .. order] = tClone(repls[replName])
             sorted["replacement_" .. order].order = order
             count = count + 1
         end
         index = index + 1
-        if ( index > 10000) then break end
+        if (index > 999) then break end
     end
 
 --  self:TracePrint("ReorderReplacements : sorted")
 --  self:TracePrint(sorted)
-
+    return sorted
-    -- do NOT set self.db.profile.replacements = {} it will break defaults
-    for replName, _ in pairs(replacements) do
-        replacements[replName] = nil
-    end
-
-    -- copy over sorted replacements
-    for replName, replTable in pairs(sorted) do
-        replacements[replName] = replTable
-    end
-
-    self:DebugPrint("ReorderReplacements : sorted table")
-    self:DebugPrint(self.db.profile.replacements)
 end

GricheldeMinimap.lua

@@ -1,19 +1,22 @@
 -- read namespace from global env
-local _G = _G
+local _G = _G or getfenv()
-local Grichelde = _G.Grichelde
+local Grichelde = _G.Grichelde or {}
+
+local cGreen, cRed = Grichelde.F.cGreen, Grichelde.F.cRed
+
 
 --- add Minimap button
 function Grichelde:MinimapButton()
     local function clickHandler(_, button)
-        if button == 'LeftButton' then
+        if (button == "LeftButton") then
             self:ToggleOptions()
-        elseif button == 'RightButton' then
+        elseif (button == "RightButton") then
             self:ToggleActivation()
         end
     end
 
     local function updateTooltip(tooltip)
-        if not tooltip or not tooltip.AddLine then return end
+        if (tooltip == nil) or (tooltip.AddLine == nil) then return end
 
         local tooltipTitle = self:Format(self.L.Minimap_Tooltip_Enabled, self.L.AddonName)
         if not self.db.profile.enabled then
@@ -35,7 +38,7 @@ function Grichelde:MinimapButton()
     end
 
     local darkened = Grichelde.MINIMAP_ENABLED
-    if not self.db.profile.enabled then
+    if (self.db.profile.enabled == false) then
         darkened = Grichelde.MINIMAP_DARKENDED
     end
 
@@ -45,7 +48,7 @@ function Grichelde:MinimapButton()
         icon = "Interface\\Icons\\Spell_Holy_Silence",
         --icon = ([[Interface\Addons\%s\%s]]):format(self.name, self.name),
         OnClick = clickHandler,
-        OnRightClick = function() self:ShowMappings() end,
+        OnRightClick = function() self:ToogleMappings() end,
         OnTooltipShow = updateTooltip,
         iconR = darkened,
         iconG = darkened,
@@ -63,7 +66,7 @@ function Grichelde:ToggleMinimapButton()
     self.db.profile.minimapButton.hide = not self.db.profile.minimapButton.hide
     self:DebugPrint("ToggleMinimapButton : hidden: ", self.db.profile.minimapButton.hide)
 
-    if self.db.profile.minimapButton.hide then
+    if (self.db.profile.minimapButton.hide == true) then
         self:HideMinimapButton()
     else
         self:ShowMinimapButton()
@@ -71,37 +74,72 @@ function Grichelde:ToggleMinimapButton()
 end
 
 function Grichelde:ShowMinimapButton()
-    if self.icon then
+    if (self.icon ~= nil) then
         self.icon:Show(self.name)
     end
 end
 
 function Grichelde:HideMinimapButton()
-    if self.icon then
+    if (self.icon ~= nil) then
         self.icon:Hide(self.name)
     end
 end
 
 function Grichelde:ToggleActivation()
-    self.db.profile.enabled = not self.db.profile.enabled
+    if (self.db.profile.enabled == true) then
-    -- refresh option UI if open at the moment
+        if (self.dialog == nil) or (self.dialog.OpenFrames[self.name] == nil) then
-    self.dialog:SelectGroup(self.name, "enabled")
+            self:PrefixedPrint(self.L.Profiles_Deactivated, cRed(self.db:GetCurrentProfile()))
-
-    local formatString = self.L.AddonLoaded
-    local darkened = Grichelde.MINIMAP_ENABLED
-    if not self.db.profile.enabled then
-        formatString = self.L.AddonUnloaded
-        darkened = Grichelde.MINIMAP_DARKENDED
         end
+        self:Deactivate()
+    else
+        if (self.dialog == nil) or (self.dialog.OpenFrames[self.name] == nil) then
+            self:PrefixedPrint(self.L.Profiles_Activated, cGreen(self.db:GetCurrentProfile()))
+        end
+        self:Activate()
+    end
+end
 
-    if self.dialog ~= nil and self.dialog.OpenFrames[self.name] ~= nil then
+function Grichelde:RefreshMinimap()
+    if (self.db.profile.enabled == true) then
+        self:Activate()
+    else
+        self:Deactivate()
+    end
+end
+
+function Grichelde:Activate()
+    self.db.profile.enabled = true
+
+    -- refresh option UI if open at the moment
+    if (self.dialog ~= nil) and (self.dialog.OpenFrames[self.name] ~= nil) then
+        self.dialog:SelectGroup(self.name)
         local namePlusVersion = self:Format(self.L.AddonNamePlusVersion, self.L.AddonName, self.version)
-        local statusText = self:Format(formatString, namePlusVersion)
+        local statusText = self:Format(self.L.AddonLoaded, namePlusVersion)
         self.dialog.OpenFrames[self.name]:SetStatusText(statusText)
     end
 
-    self.ldb.iconR = darkened
+    if (self.ldb ~= nil) then
-    self.ldb.iconG = darkened
+        self.ldb.iconR = Grichelde.MINIMAP_ENABLED
-    self.ldb.iconB = darkened
+        self.ldb.iconG = Grichelde.MINIMAP_ENABLED
+        self.ldb.iconB = Grichelde.MINIMAP_ENABLED
+    end
+end
+
+function Grichelde:Deactivate()
+    self.db.profile.enabled = false
+
+    -- refresh option UI if open at the moment
+    if (self.dialog ~= nil) and (self.dialog.OpenFrames[self.name] ~= nil) then
+        self.dialog:SelectGroup(self.name)
+        local namePlusVersion = self:Format(self.L.AddonNamePlusVersion, self.L.AddonName, self.version)
+        local statusText = self:Format(self.L.AddonUnloaded, namePlusVersion)
+        self.dialog.OpenFrames[self.name]:SetStatusText(statusText)
+    end
+
+    if (self.ldb ~= nil) then
+        self.ldb.iconR = Grichelde.MINIMAP_DARKENDED
+        self.ldb.iconG = Grichelde.MINIMAP_DARKENDED
+        self.ldb.iconB = Grichelde.MINIMAP_DARKENDED
+    end
 end
 

GricheldeOptions.lua

@@ -1,9 +1,9 @@
 -- read namespace from global env
-local _G = _G
+local _G = _G or getfenv()
-local Grichelde = _G.Grichelde
+local Grichelde = _G.Grichelde or {}
 
-local nilOrEmpty, pairs, tContains, tWipe, find, match, color, toString, toNumber
+local assert, nilOrEmpty, pairs, ipairs, spairs, tContains, tInsert, tClone, tSize, tWipe, find, match, cPrefix, cGray, cGreen, cOrange, cRed, format, toString, toNumber
-    = Grichelde.functions.nilOrEmpty, Grichelde.functions.pairs, Grichelde.functions.tContains, Grichelde.functions.tWipe, Grichelde.functions.find, Grichelde.functions.match, Grichelde.functions.color, Grichelde.functions.toString, Grichelde.functions.toNumber
+    = Grichelde.F.assert, Grichelde.F.nilOrEmpty, Grichelde.F.pairs, Grichelde.F.ipairs, Grichelde.F.spairs, Grichelde.F.tContains, Grichelde.F.tInsert, Grichelde.F.tClone, Grichelde.F.tSize, Grichelde.F.tWipe, Grichelde.F.find, Grichelde.F.match, Grichelde.F.cPrefix, Grichelde.F.cGray, Grichelde.F.cGreen, Grichelde.F.cOrange, Grichelde.F.cRed, Grichelde.F.format, Grichelde.F.toString, Grichelde.F.toNumber
 
 local selectedExample = 1
 
@@ -164,9 +164,23 @@ function Grichelde:CreateOptionsUI()
                 desc = self.L.Options_Help_Group_Desc,
                 disabled = false,
                 args = {
-                    basics = {
+                    info = {
                         order = 10,
                         type = "group",
+                        name = self.L.Options_Help_Tab_Info_Name,
+                        desc = self.L.Options_Help_Tab_Info_Desc,
+                        args = {
+                            paragraph1 = {
+                                order = 1,
+                                type = "description",
+                                name = self:Format(self.L.Options_Help_Info, self.L.AddonName),
+                                fontSize = "medium",
+                            },
+                        },
+                    },
+                    basics = {
+                        order = 11,
+                        type = "group",
                         name = self.L.Options_Help_Tab_Basics_Name,
                         desc = self.L.Options_Help_Tab_Basics_Desc,
                         args = {
@@ -179,7 +193,7 @@ function Grichelde:CreateOptionsUI()
                         },
                     },
                     expert = {
-                        order = 11,
+                        order = 12,
                         type = "group",
                         name = self.L.Options_Help_Tab_Expert_Name,
                         desc = self.L.Options_Help_Tab_Expert_Desc,
@@ -193,7 +207,7 @@ function Grichelde:CreateOptionsUI()
                         },
                     },
                     examples = {
-                        order = 12,
+                        order = 13,
                         type = "group",
                         name = self.L.Options_Help_Tab_Examples_Name,
                         desc = self.L.Options_Help_Tab_Examples_Desc,
@@ -206,47 +220,58 @@ function Grichelde:CreateOptionsUI()
                             header = {
                                 order = 2,
                                 type = "description",
-                                name = self.L.Options_Help_Examples0_Header,
+                                name = self.L.Options_Help_Examples_Header,
                                 fontSize = "medium",
-                                width = 2.5,
+                                width = 2.1
                             },
                             dropDown = {
                                 order = 3,
                                 type = "select",
                                 name = "",
-                                --width = 1,
+                                width = 1.2,
-                                values = {
+                                values = function(_) return self:ExtractExampleNames() end,
-                                    self.L.Options_Help_Examples1_Select,
+                                set = function(_, val) selectedExample = val end,
-                                    self.L.Options_Help_Examples2_Select,
-                                    self.L.Options_Help_Examples3_Select,
-                                    self.L.Options_Help_Examples4_Select,
-                                    self.L.Options_Help_Examples5_Select,
-                                    self.L.Options_Help_Examples6_Select,
---                                  self.L.Options_Help_Examples7_Select,
-                                },
-                                set = function(info, val) selectedExample = val end,
                                 get = function(_)
-                                    self.options.args.help.args.examples.args.header.name = self.L["Options_Help_Examples" .. selectedExample .. "_Header"]
+                                    self.options.args.help.args.examples.args.header.name = self.L.Options_Help_Examples[selectedExample].desc
-                                    self.options.args.help.args.examples.args.example.name = self.L["Options_Help_Examples" .. selectedExample .. "_Text"]
+                                    self.options.args.help.args.examples.args.example.name = self:ExtractExampleCodes(selectedExample),
                                     self.dialog:SelectGroup(self.name, "help", "examples", "header.name")
                                     return selectedExample
                                 end,
                             },
+
                             spacer3 = {
+                                order = 3,
+                                type = "description",
+                                name = "",
+                                desc = "",
+                                width = 2.3,
+                            },
+                            import = {
                                 order = 4,
+                                type = "execute",
+                                width = 1,
+                                confirm = selectedExample > 0,
+                                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(_) self:ImportExample(selectedExample) end,
+                            },
+
+                            spacer4 = {
+                                order = 6,
                                 type = "header",
                                 name = "",
                             },
                             example = {
-                                order = 5,
+                                order = 7,
                                 type = "description",
-                                name = self.L.Options_Help_Examples0_Text,
+                                name = self.L.Options_Help_Examples_Text,
                                 fontSize = "medium",
                             },
                         },
                     },
                     disclaimer = {
-                        order = 20,
+                        order = 14,
                         type = "description",
                         name = self.L.Options_Help_Disclaimer,
                     },
@@ -283,14 +308,14 @@ function Grichelde:CreateMapping(offset)
                 width = 0.15,
                 func = function(info) self:MoveDown(info) end,
             },
---[[
+            spacer5 = {
-            spacer4 = {
                 order = 2,
                 type = "description",
                 name = "",
-                width = 0.1,
+                desc = "",
+                width = 0.05,
             },
-]]
+--[[
             active = {
                 order = 3,
                 type = "toggle",
@@ -298,8 +323,40 @@ function Grichelde:CreateMapping(offset)
                 desc = self.L.Options_Mapping_Enabled_Desc,
                 width = 2.2,
             },
-            delete = {
+]]
+            matchWhenLabel = {
+                order = 3,
+                type = "description",
+                name = self.L.Options_Mapping_MatchWhen_Name,
+                desc = self.L.Options_Mapping_MatchWhen_Desc,
+                fontSize = "medium",
+                width = 0.3,
+            },
+            matchWhen = {
                 order = 4,
+                type = "select",
+                name = " ",
+                desc = self.L.Options_Mapping_MatchWhen_Desc,
+                values = {
+                    self.L.Options_Mapping_MatchWhen_Select1,
+                    self.L.Options_Mapping_MatchWhen_Select2,
+                    self.L.Options_Mapping_MatchWhen_Select3,
+                    self.L.Options_Mapping_MatchWhen_Select4,
+                    self.L.Options_Mapping_MatchWhen_Select5,
+                    self.L.Options_Mapping_MatchWhen_Select6,
+                },
+                width = 1.4,
+            },
+            spacer6 = {
+                order = 5,
+                type = "description",
+                name = "",
+                desc = "",
+                width = 0.1,
+            },
+
+            delete = {
+                order = 6,
                 type = "execute",
                 confirm = true,
                 confirmText = self.L.Options_Mapping_Delete_ConfirmText,
@@ -324,35 +381,33 @@ function Grichelde:CreateMapping(offset)
             },
 
             exactCase = {
-                order = 20,
+                order = 21,
                 type = "toggle",
                 name = self.L.Options_Mapping_ExactCase_Name,
                 desc = self.L.Options_Mapping_ExactCase_Desc,
                 width = "full",
             },
             consolidate = {
-                order = 21,
+                order = 22,
                 type = "toggle",
                 name = self.L.Options_Mapping_Consolidate_Name,
                 desc = self.L.Options_Mapping_Consolidate_Desc,
                 width = "full",
             },
---[[
             stopOnMatch = {
-                order = 22,
+                order = 23,
                 type = "toggle",
                 name = self.L.Options_Mapping_StopOnMatch_Name,
                 desc = self.L.Options_Mapping_StopOnMatch_Desc,
                 width = "full",
             }
-]]
         }
     }
 end
 
 function Grichelde:SetupOptions()
     -- add DB-backed profiles to UI options
-    local options = self:CreateOptionsUI()
+    local options = self:CreateOptionsUI(self)
     options.args.profiles = LibStub("AceDBOptions-3.0"):GetOptionsTable(self.db)
     options.args.profiles.order = 8
     options.args.profiles.disabled = false
@@ -361,34 +416,57 @@ function Grichelde:SetupOptions()
     LibStub("AceConfig-3.0"):RegisterOptionsTable(self.name, options)
     local dialog = LibStub("AceConfigDialog-3.0")
     dialog:AddToBlizOptions(self.name, self.L.AddonName)
-
     return options, dialog
 end
 
-function Grichelde:RefreshOptions(event)
+function Grichelde:RefreshProfiles(event, _, profileName)
-    self:DebugPrint("RefreshOptions : event:", event)
+    local function replaceReplacements(replacements)
-    local currentProfile = color(Grichelde.COLOR_CODES.GREEN, self.db:GetCurrentProfile())
+        -- do NOT set self.db.profile.replacements = {} it will break defaults
-    if event == "OnNewProfile" then
+        tWipe(self.db.profile.replacements)
-        self:PrefixedPrint(self.L.Profiles_Created, currentProfile)
+
-    elseif event == "OnProfileChanged" then
+        -- copy over sorted replacements
-        self:PrefixedPrint(self.L.Profiles_Loaded, currentProfile)
+        for replName, replTable in pairs(replacements) do
-    elseif event == "OnProfileDeleted" then
+            self.db.profile.replacements[replName] = replTable
-        self:PrefixedPrint(self.L.Profiles_Deleted, currentProfile)
+        end
-    elseif event == "OnProfileCopied" then
+
-        self:PrefixedPrint(self.L.Profiles_Copied, currentProfile)
+        self:DebugPrint("RefreshProfiles : reorderReplacements : sorted table")
-    elseif event == "OnProfileReset" then
+        self:DebugPrint(self.db.profile.replacements)
-        self:PrefixedPrint(self.L.Profiles_Reset, currentProfile)
+    end
+
+    local function addEmptyMappingWithoutRefresh()
+        self:DebugPrint("RefreshProfiles : addEmptyMappingWithoutRefresh")
+        self.db.profile.replacements.replacement_10.order = 10
+    end
+
+    self:DebugPrint("RefreshProfiles : event:", event)
+    --- AceDB will call OnProfileShutdown, OnProfileChanged and OnNewProfile in this order
+    if (event == "OnNewProfile") then
+        addEmptyMappingWithoutRefresh()
+        self:PrefixedPrint(self.L.Profiles_Created, cGreen(self.db:GetCurrentProfile()))
+    elseif (event == "OnProfileChanged") then
+        self:DebugPrint(self.L.Profiles_Loaded, cGreen(self.db:GetCurrentProfile()))
+    elseif (event == "OnProfileDeleted") then
+        self:PrefixedPrint(self.L.Profiles_Deleted, cRed(profileName))
+    elseif (event == "OnProfileCopied") then
+        self:DebugPrint(self.L.Profiles_Copied, cOrange(profileName))
+    elseif (event == "OnProfileReset") then
+        addEmptyMappingWithoutRefresh()
+        self:PrefixedPrint(self.L.Profiles_Reset, cOrange(self.db:GetCurrentProfile()))
     else
         self:DebugPrint("Refreshing Profile %s on options change: %s", self.db:GetCurrentProfile(), event)
     end
 
-    self:ReorderReplacements()
+    local repls = self:ReorderReplacements()
-    self:RefreshReplacements(self.db.profile.replacements)
+    replaceReplacements(repls)
+    self:RefreshOptions(repls)
+    self:RefreshDialog()
+    self:RefreshMinimap()
 end
 
 function Grichelde:ToggleOptions()
-    self:DebugPrint("ToggleOptions : options open: ", not not self.dialog.OpenFrames[self.name])
+    local isOpen = (self.dialog ~= nil) and (self.dialog.OpenFrames[self.name] ~= nil)
-    if self.dialog ~= nil and self.dialog.OpenFrames[self.name] ~= nil then
+    self:DebugPrint("ToggleOptions : options open: ", isOpen)
+    if (isOpen) then
         self:CloseOptions()
     else
         self:OpenOptions()
@@ -396,11 +474,11 @@ function Grichelde:ToggleOptions()
 end
 
 function Grichelde:OpenOptions()
-    if self.dialog ~= nil then
+    if (self.dialog ~= nil) then
         self.dialog:Open(self.name)
 
         local formatString = self.L.AddonLoaded
-        if not self.db.profile.enabled then
+        if (self.db.profile.enabled == false) then
             formatString = self.L.AddonUnloaded
         end
 
@@ -411,7 +489,7 @@ function Grichelde:OpenOptions()
 end
 
 function Grichelde:CloseOptions()
-    if self.dialog ~= nil then
+    if (self.dialog ~= nil) then
         self.dialog:Close(self.name)
     end
 end
@@ -419,7 +497,7 @@ end
 --- If all replacements were disabled
 -- @return (boolean)
 function Grichelde:IsDisabled(info)
-    if info and info.option.type == "group" then
+    if (info and (info.option.type == "group")) then
         return false
     end
     return not self.db.profile.enabled
@@ -430,13 +508,13 @@ end
 function Grichelde:IsMappingActive(info)
     self:TracePrint("IsMappingActive : info")
     for i = 0, #info do
-        self:TracePrint("%d = %s", i, info[i])
+        self:TracePrint("IsMappingActive : info[%d] = %s", i, info[i])
     end
 
-    if info and info.option.type == "group" then
+    if (info and (info.option.type == "group")) then
         return true
     end
-    if not self.db.profile.enabled then
+    if (self.db.profile.enabled == false) then
         return false
     end
 
@@ -447,10 +525,10 @@ function Grichelde:IsMappingActive(info)
     self:DebugPrint("IsMappingActive : \"%s\"", currentName)
     self:DebugPrint(replacements[currentName])
 
-    if (tContains({"moveUp", "moveDown", "active", "delete"}, uiElem)) then
+    if (tContains({"moveUp", "moveDown", "matchWhen", "delete"}, uiElem)) then
         return true
     else
-        return not not replacements[currentName].active
+        return replacements[currentName].matchWhen > 1
     end
 end
 
@@ -459,30 +537,92 @@ function Grichelde:MappingName(info)
 --  self:TracePrint(info)
     local option = self.db.profile.replacements[info[2]]
 
-    if nilOrEmpty(option.searchText) and nilOrEmpty(option.replaceText) then
+    if (nilOrEmpty(option.searchText) and nilOrEmpty(option.replaceText)) then
-        return color(Grichelde.COLOR_CODES.GRAY, self.L.Options_Mapping_EmptyMapping)
+        return cGray(self.L.Options_Mapping_EmptyMapping)
     else
         local name = self:Format(self.L.Options_Mapping_Group_Name, option.searchText or "", option.replaceText or "")
-        if option.active == true then
+        if (option.matchWhen > 1) then
             return name
         else
-            return color(Grichelde.COLOR_CODES.GRAY, name)
+            return cGray(name)
         end
     end
 end
 
+function Grichelde:ExtractExampleNames()
+    local exampleNames = {}
+    for _, example in ipairs(self.L.Options_Help_Examples) do
+        tInsert(exampleNames, example.name)
+    end
+    return exampleNames
+end
 
---- Create UI options for rhe given replacement table (from DB).
+function Grichelde:ExtractExampleCodes(num)
+    self:TracePrint("ExtractExampleCodes : number is: %d", num)
+    if (self.L.Options_Help_Examples[num] == nil) or (tSize(self.L.Options_Help_Examples) < num) then
+        self:DebugPrint("ExtractExampleCodes : invalid number: %d", num)
+        return self.L.Options_Help_Examples_Text
+    end
+
+    local exampleCodes = ""
+    for replName, replTable in spairs(self.L.Options_Help_Examples[num].replacements) do
+        self:TracePrint("ExtractExampleCodes : replacement: %s", replName)
+        self:TracePrint(replTable)
+
+        if (replTable ~= nil) and (replTable.searchText ~= nil) then
+            if (exampleCodes ~= "") then
+                exampleCodes = exampleCodes .. "|n|n"
+            end
+            exampleCodes = exampleCodes .. cPrefix(format("%s => %s", replTable.searchText, replTable.replaceText))
+        end
+    end
+    return exampleCodes
+end
+
+function Grichelde:ImportExample(num)
+    self:TracePrint("ImportExample : number is: %d", num)
+    if (self.L.Options_Help_Examples[num] == nil) or (tSize(self.L.Options_Help_Examples) < num) then
+        self:DebugPrint("ImportExample : invalid number: %d", num)
+        return
+    end
+
+    local profileName = self.L.Options_Help_Examples[num].name
+    self:DebugPrint("ImportExample : profile name: %s", profileName)
+    local allProfiles = self.db:GetProfiles()
+
+    if (not tContains(allProfiles, profileName)) then
+        -- create new profile if not exists
+        self.db:SetProfile(profileName)
+        assert(self.db:GetCurrentProfile() == profileName, "profile was not loaded")
+
+        tWipe(self.db.profile.replacements)
+        for replName, replTable in spairs(self.L.Options_Help_Examples[num].replacements) do
+            self:TracePrint("ImportExample : replacement: %s", replName)
+            self:TracePrint(replTable)
+
+            if (replName ~= nil) and (replTable ~= nil) and (replTable.searchText ~= nil) then
+                self.db.profile.replacements[replName] = tClone(replTable)
+            end
+        end
+
+        self:RefreshProfiles("ImportExample" .. num)
+    else
+        self:ErrorPrint(self.L.Profiles_AlreadyExistsError, profileName)
+    end
+end
+
+--- Create UI options for the given replacement table (from DB).
 --- Usually called with with self.db.profile.replacements
 -- @param replacementsTable
-function Grichelde:RefreshReplacements(replacementsTable)
+function Grichelde:RefreshOptions(replacementsTable)
-    self:TracePrint("RefreshReplacements : DB table:")
+    self:TracePrint("RefreshOptions : DB table:")
     self:TracePrint(replacementsTable)
 
+    if (self.options ~= nil) then
         -- remove all previous replacements from options (not DB), except header and buttons
         local replacements = self.options.args.replacements.args or {}
         for k, _ in pairs(replacements) do
-        if k and find(k, "^replacement_") then
+            if (k and (find(k, "^replacement_") ~= nil)) then
                 replacements[k] = nil
             end
         end
@@ -491,11 +631,16 @@ function Grichelde:RefreshReplacements(replacementsTable)
             local _, replNumber = self:SplitOnFirstMatch(replName, "_")
             replacements[replName] = self:CreateMapping(toNumber(replNumber))
         end
+    end
 
---  self:TracePrint("RefreshReplacements : UI options:")
+--  self:TracePrint("RefreshOptions : UI options:")
 --  self:TracePrint(replacements)
+end
 
+function Grichelde:RefreshDialog()
+    if (self.dialog ~= nil) then
         self.dialog:ConfigTableChanged(nil, self.name)
+    end
 end
 
 function Grichelde:AddEmptyMapping()
@@ -504,10 +649,10 @@ function Grichelde:AddEmptyMapping()
     self:DebugPrint("AddEmptyMapping : old DB entries:")
     self:DebugPrint(replacements)
 
-    local maxRepl = Grichelde.MAPPING_OFFSET
+    local maxRepl = Grichelde.MAPPING_OFFSET - 1
     for replName, _ in pairs(replacements) do
         local num = match(replName, "^replacement_(%d+)")
-        if num and maxRepl < toNumber(num) then
+        if (num ~= nil) and (maxRepl < toNumber(num)) then
             maxRepl = toNumber(num)
         end
     end
@@ -520,7 +665,7 @@ function Grichelde:AddEmptyMapping()
     self:DebugPrint("AddEmptyMapping : new DB entries:")
     self:DebugPrint(replacements)
 
-    self:RefreshOptions("AddEmptyMapping " .. newMapping)
+    self:RefreshProfiles("AddEmptyMapping " .. newMapping)
     self.dialog:SelectGroup(self.name, "replacements", newMapping)
 end
 
@@ -540,7 +685,7 @@ function Grichelde:MoveUp(info)
     local currentOrder = toNumber(replNumber)
 
     -- if not on top
-    if currentOrder ~= Grichelde.MAPPING_OFFSET then
+    if (currentOrder ~= Grichelde.MAPPING_OFFSET) then
         local swapName = "replacement_" .. toString(currentOrder - 1)
 
         -- swap ordering
@@ -549,7 +694,7 @@ function Grichelde:MoveUp(info)
         replacements[swapName].order = currentOrder
         replacements[currentName].order = currentOrder - 1
 
-        self:RefreshOptions("MoveUp " .. currentName)
+        self:RefreshProfiles("MoveUp " .. currentName)
 
         self:DebugPrint("MoveUp : refresh focus on %s", swapName)
         self.dialog:SelectGroup(self.name, "replacements", swapName)
@@ -583,7 +728,7 @@ function Grichelde:MoveDown(info)
 
     -- if not last element
     self:DebugPrint("MoveDown : maxRepl: %d", maxRepl)
-    if currentOrder < maxRepl then
+    if (currentOrder < maxRepl) then
         local swapName = "replacement_" .. toString(currentOrder + 1)
 
         -- swap ordering
@@ -592,7 +737,7 @@ function Grichelde:MoveDown(info)
         replacements[swapName].order = currentOrder
         replacements[currentName].order = currentOrder + 1
 
-        self:RefreshOptions("MoveDown " .. currentName)
+        self:RefreshProfiles("MoveDown " .. currentName)
 
         self:DebugPrint("MoveDown : refresh focus on %s", swapName)
         self.dialog:SelectGroup(self.name, "replacements", swapName)
@@ -613,7 +758,7 @@ function Grichelde:GetMoveUpImage(info)
     local _, replNumber = self:SplitOnFirstMatch(currentName, "_")
     local currentOrder = toNumber(replNumber)
 
-    if (self:IsMappingActive(info) and currentOrder > Grichelde.MAPPING_OFFSET ) then
+    if (self:IsMappingActive(info) and (currentOrder > Grichelde.MAPPING_OFFSET)) then
         return Grichelde.ICONS.MOVE_UP
     else
         return Grichelde.ICONS.MOVE_UP_DISABLED
@@ -636,12 +781,12 @@ function Grichelde:GetMoveDownImage(info)
     local replacements = self.db.profile.replacements or {}
     for replName, _ in pairs(replacements) do
         local num = match(replName, "^replacement_(%d+)")
-        if num and maxRepl < toNumber(num) then
+        if (num ~= nil) and (maxRepl < toNumber(num)) then
             maxRepl = toNumber(num)
         end
     end
 
-    if (self:IsMappingActive(info) and currentOrder < maxRepl) then
+    if (self:IsMappingActive(info) and (currentOrder < maxRepl)) then
         return Grichelde.ICONS.MOVE_DOWN
     else
         return Grichelde.ICONS.MOVE_DOWN_DISABLED
@@ -672,7 +817,7 @@ function Grichelde:DeleteMapping(info)
     self:DebugPrint("delete option: %s", currentName)
     self.db.profile.replacements[currentName] = nil
 
-    self:RefreshOptions("DeleteMapping " .. currentName)
+    self:RefreshProfiles("DeleteMapping " .. currentName)
 
     local _, replNumber = self:SplitOnFirstMatch(currentName, "_")
     local newMapping = "replacement_" .. toNumber(replNumber - 1)
@@ -686,5 +831,5 @@ function Grichelde:DeleteAllMappings()
     tWipe(self.db.profile.replacements)
     self:AddEmptyMapping()
 
-    self:RefreshOptions("DeleteAllMappings")
+    self:RefreshProfiles("DeleteAllMappings")
 end

GricheldeTest.lua

@@ -0,0 +1,838 @@
+-- import addon read namespace from global env
+local _G = _G or getfenv()
+local Grichelde = _G.Grichelde or {}
+
+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
+    local oldLogLevel = Grichelde.logLevel
+    Grichelde.logLevel = 0
+
+    local pos1, pos2, cap1, cap2, cap3, cap4, cap5, cap6, cap7, cap8, cap9 = find(text, pattern)
+    self:PrefixedPrint("TestMatch : text: %s, pattern: %s, pos1: %d, pos2: %d", text, pattern, pos1, pos2)
+    self:PrefixedPrint("TestMatch : 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)
+
+    -- restore old loglevel
+    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)
+        for input, expected in pairs(testData) do
+            local actual = self:ReplaceText(input, replacements, replaceEmotes or false)
+            i = i + 1
+            if (actual == expected) then
+                ok = ok + 1
+                self:PrefixedPrint("Test \"%s\" (%d/%d) %s: \"%s\" => \"%s\"", name, i, size, cGreen("passed"), input, expected)
+            else
+                self:PrefixedPrint("Test \"%s\" (%d/%d) %s: \"%s\" => \"%s\", but was \"%s\"", name, i, size, cRed("failed"), input, expected, actual)
+            end
+        end
+        return ok, size
+    end
+
+    -- disable debug print out for testing
+    local oldLogLevel = Grichelde.logLevel
+    Grichelde.logLevel = 0
+
+    local ok, all, o, a = 0, 0, 0, 0
+
+    -- basic tests
+    o, a = test(
+        "fehlender Unterkiefer",
+        {
+            replacement_10 = {
+                order = 10,
+                searchText = "s",
+                replaceText = "ch",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+        },
+        {
+            ["abc"] = "abc",
+            ["soo"] = "choo",
+            ["oos"] = "ooch",
+            ["oso"] = "ocho",
+            ["sos"] = "choch",
+            ["ssoo"] = "choo",
+            ["osso"] = "ocho",
+            ["ooss"] = "ooch",
+            ["ABC"] = "ABC",
+            ["Soo"] = "Choo",
+            ["ooS"] = "ooCH",
+            ["oSo"] = "oCho",
+            ["SOS"] = "CHOCH",
+            ["SSoo"] = "CHoo",
+            ["OSSO"] = "OCHO",
+            ["ooSS"] = "ooCH",
+            ["schmeissen"] = "chmeichen",
+            ["Schön"] = "Chön",
+        }
+    )
+    ok = ok + o
+    all = all + a
+
+    -- case sensivity and extended replacements
+    o, a = test(
+        "Zark",
+        {
+            replacement_10 = {
+                order = 10,
+                searchText = "Zark",
+                replaceText = "Schami",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+        },
+        {
+            ["Zark"] = "Schami",
+            ["ZARK"] = "SCHAMI",
+            ["Zarkilein"] = "Schamiilein",
+            ["ZARKILEIN"] = "SCHAMIILEIN",
+            ["Zark!"] = "Schami!",
+            ["ZARK!"] = "SCHAMI!",
+            ["Zark ist tot"] = "Schami ist tot",
+            ["ZARK ist tot"] = "SCHAMI ist tot",
+            ["Zark ist der Tod"] = "Schami ist der Tod",
+            ["ZARK IST DER TOD"] = "SCHAMI IST DER TOD",
+        }
+    )
+    ok = ok + o
+    all = all + a
+
+    -- start/end of sentence/words
+    o, a = test(
+        "wann",
+        {
+            replacement_10 = {
+                order = 10,
+                searchText = "bcd",
+                replaceText = "efg",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "uio",
+                replaceText = "bnm",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "hij",
+                replaceText = "klm",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 4,
+                stopOnMatch = false,
+            },
+            replacement_13 = {
+                order = 13,
+                searchText = "nop",
+                replaceText = "qrs",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 5,
+                stopOnMatch = false,
+            },
+            replacement_14 = {
+                order = 14,
+                searchText = "tuv",
+                replaceText = "wxy",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 6,
+                stopOnMatch = false,
+            },
+            replacement_15 = {
+                order = 15,
+                searchText = "wer",
+                replaceText = "sdf",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 7,
+                stopOnMatch = false,
+            },
+        },
+        {
+            -- replacement_10
+            ["bcd"] = "efg",
+            ["abcdz"] = "aefgz",
+            ["abcd"] = "aefg",
+            ["bcdz"] = "efgz",
+            -- replacement_11
+            ["uio"] = "bnm",
+            ["auioz"] = "auioz",
+            ["auio"] = "auio",
+            ["uioz"] = "uioz",
+            -- replacement_12
+            ["hij"] = "klm",
+            ["ahijz"] = "ahijz",
+            ["ahij"] = "ahij",
+            ["hijz"] = "klmz",
+            -- replacement_13
+            ["nop"] = "qrs",
+            ["anopz"] = "anopz",
+            ["anop"] = "aqrs",
+            ["nopz"] = "nopz",
+            -- replacement_14
+            ["tuv"] = "wxy",
+            ["atuvz"] = "atuvz",
+            ["atuv"] = "awxy",
+            ["tuvz"] = "wxyz",
+            -- replacement_15
+            ["wer"] = "wer",
+            ["awerz"] = "asdfz",
+            ["awer"] = "awer",
+            ["werz"] = "werz",
+
+            -- replacement_10
+            ["bcd abcdz abcd bcdz"] = "efg aefgz aefg efgz",
+            -- replacement_11
+            ["uio auioz auio uioz"] = "bnm auioz auio uioz",
+            -- replacement_12
+            ["hij ahijz ahij hijz"] = "klm ahijz ahij klmz",
+            -- replacement_13
+            ["nop anopz anop nopz"] = "qrs anopz aqrs nopz",
+            -- replacement_14
+            ["tuv atuvz atuv tuvz"] = "wxy atuvz awxy wxyz",
+            -- replacement_15
+            ["wer awerz awer werz"] = "wer asdfz awer werz",
+        }
+    )
+    ok = ok + o
+    all = all + a
+
+    o, a = test(
+        "consolidate",
+        {
+            replacement_10 = {
+                order = 10,
+                searchText = "a",
+                replaceText = "b",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "b",
+                replaceText = "c",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "d",
+                replaceText = "e",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+        },
+        {
+            ["aaa"] = "c",
+            ["abb"] = "c",
+            ["abc"] = "c",
+            ["bbc"] = "c",
+            ["ace"] = "ce",
+            ["abe"] = "ce",
+            ["bbe"] = "ce",
+            ["ece"] = "ece",
+            ["ede"] = "ee",
+        }
+    )
+    ok = ok + o
+    all = all + a
+
+    -- stop on match
+    o, a = test(
+        "stopOnMatch",
+        {
+            replacement_10 = {
+                order = 10,
+                searchText = "a",
+                replaceText = "b",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 2,
+                stopOnMatch = true,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "b",
+                replaceText = "c",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "c",
+                replaceText = "d",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 2,
+                stopOnMatch = true,
+            },
+        },
+        {
+            ["aaa"] = "bbb",
+            ["abc"] = "bbc",
+            ["bbc"] = "ddd",
+            ["bca"] = "bcb",
+        }
+    )
+    ok = ok + o
+    all = all + a
+
+    o, a = test(
+        "Jar Jar Binks (DE)",
+        {
+            replacement_10 = {
+                order = 10,
+                searchText = "ver",
+                replaceText = "va",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 4,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "en",
+                replaceText = "'n",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 5,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "er",
+                replaceText = "a",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 5,
+                stopOnMatch = false,
+            },
+            replacement_13 = {
+                order = 13,
+                searchText = "(%w?)ich",
+                replaceText = "%1ichse",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_14 = {
+                order = 14,
+                searchText = "(d?m?)ir",
+                replaceText = "%1ichse",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_15 = {
+                order = 15,
+                searchText = "du",
+                replaceText = "du da",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_16 = {
+                order = 16,
+                searchText = "er",
+                replaceText = "erse",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_17 = {
+                order = 17,
+                searchText = "sie",
+                replaceText = "sie da",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_18 = {
+                order = 18,
+                searchText = "wir",
+                replaceText = "wirse",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_19 = {
+                order = 19,
+                searchText = "ihr",
+                replaceText = "ihrse",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_20 = {
+                order = 20,
+                searchText = "nicht",
+                replaceText = "nich",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_21 = {
+                order = 21,
+                searchText = "die",
+                replaceText = "de",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+        },
+        {
+            ["Ich kann dich verstehen."] = "Ichse kann dichse vasteh'n.",
+            ["Wir haben sie die ganze Zeit über nicht verstanden"] = "Wirse hab'n sie da de ganze Zeit üba nich vastand'n",
+        }
+    )
+    ok = ok + o
+    all = all + a
+
+    o, a = test(
+        "Stottern 1",
+        {
+            replacement_10 = {
+                order = 10,
+                searchText = "^([^aeiouy]-)([aeiouy])",
+                replaceText = "%1%2-%1%2-%1%2",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 4,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "([^bwp%s]-)([bwp])",
+                replaceText = "%1%2-%1%2-%1%2",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+        },
+        {
+            ["Ich mag dich."] = "I-I-Ich mag dich.",
+            ["Dich mag ich."] = "Di-Di-Dich mag ich.",
+            ["Bmm rrpss w"] = "B-B-Bmm rrp-rrp-rrpss w-w-w",
+        }
+    )
+    ok = ok + o
+    all = all + a
+
+    o, a = test(
+        "trollifier",
+        {
+            replacement_10 = {
+                order = 10,
+                searchText = "(%w)(%p?)$",
+                replaceText = "%1, mon%2",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 5,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "th",
+                replaceText = "d",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "what are you",
+                replaceText = "whatcha",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_13 = {
+                order = 13,
+                searchText = "your?s?",
+                replaceText = "ya",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_14 = {
+                order = 14,
+                searchText = "going to",
+                replaceText = "gonna",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_15 = {
+                order = 15,
+                searchText = "want to",
+                replaceText = "wanna",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_16 = {
+                order = 16,
+                searchText = "ing",
+                replaceText = "in'",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 5,
+                stopOnMatch = false,
+            },
+        },
+        {
+            ["What are you going to do when they come for you?"] = "Whatcha gonna do when dey come for ya, mon?",
+            ["That's what young people are doing"] = "Dat's what young people are doin', mon",
+        }
+    )
+    ok = ok + o
+    all = all + a
+
+    o, a = test(
+        "Jar Jar Binks (EN)",
+        {
+            replacement_10 = {
+                order = 10,
+                searchText = "me",
+                replaceText = "mesa",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "I am",
+                replaceText = "Mesa",
+                exactCase = true,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "I'm",
+                replaceText = "Mesa",
+                exactCase = true,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_13 = {
+                order = 13,
+                searchText = "I",
+                replaceText = "Me",
+                exactCase = true,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_14 = {
+                order = 14,
+                searchText = "you are",
+                replaceText = "yousa",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_15 = {
+                order = 15,
+                searchText = "you're",
+                replaceText = "yousa",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_16 = {
+                order = 16,
+                searchText = "your",
+                replaceText = "yous",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_17 = {
+                order = 17,
+                searchText = "(s?)he is",
+                replaceText = "%1hesa",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_18 = {
+                order = 18,
+                searchText = "(s?)he's",
+                replaceText = "%1hesa",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_19 = {
+                order = 19,
+                searchText = "they",
+                replaceText = "daysa",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_20 = {
+                order = 20,
+                searchText = "them",
+                replaceText = "them-sa",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_21 = {
+                order = 21,
+                searchText = "ing",
+                replaceText = "in'",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 5,
+                stopOnMatch = false,
+            },
+            replacement_22 = {
+                order = 22,
+                searchText = "the",
+                replaceText = "da",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_23 = {
+                order = 23,
+                searchText = "th",
+                replaceText = "d",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_24 = {
+                order = 24,
+                searchText = "yes",
+                replaceText = "yesa",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_25 = {
+                order = 25,
+                searchText = "oka?y?",
+                replaceText = "okeeday",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+        },
+        {
+            ["I hear your voice through the thrilling grapewine."] = "Me hear yous voice drough da drillin' grapewine.",
+            ["They gave them their OK"] = "Daysa gave dem-sa deir OKEEDAY",
+        }
+    )
+    ok = ok + o
+    all = all + a
+
+    o, a = test(
+        "old-fashioned",
+        {
+            replacement_10 = {
+                order = 10,
+                searchText = "oi",
+                replaceText = "oy",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "([^aeiou]*)([aeiou])",
+                replaceText = "%1%2e",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 5,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "yours",
+                replaceText = "thy",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_13 = {
+                order = 13,
+                searchText = "youe",
+                replaceText = "thou",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+        },
+        {
+            ["Do you want to kill yours?"] = "Doe thou want toe kill thy?",
+        }
+    )
+    ok = ok + o
+    all = all + a
+
+    o, a = test(
+        "emote detection on",
+        {
+            replacement_10 = {
+                order = 10,
+                searchText = "r",
+                replaceText = "rr",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+        },
+        {
+            ["Der Herr Richter *schaut Herrn Richter an*"] = "Derr Herrrr Rrichterr *schaut Herrn Richter an*",
+            ["*schaut Herrn Richter an*"] = "*schaut Herrn Richter an*",
+        }
+    )
+    ok = ok + o
+    all = all + a
+
+    o, a = test(
+        "emote detection ignored",
+        {
+            replacement_10 = {
+                order = 10,
+                searchText = "r",
+                replaceText = "rr",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+        },
+        {
+            ["Der Herr Richter *schaut Herrn Richter an*"] = "Derr Herrrr Rrichterr *schaut Herrrrn Rrichterr an*",
+            ["*schaut Herrn Richter an*"] = "*schaut Herrrrn Rrichterr an*",
+        },
+        true
+    )
+    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 = true,
+                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öluü"] = "Haelloeluue",
+            ["ÜöÄ"] = "UeoeAE",
+            ["Ää"] = "Aeae",
+        }
+    )
+    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 %s, %d tests %s", all - ok, all - ok > 1 and "s" or "", cRed("failed"), ok, cGreen("passed"))
+    end
+
+    -- restore old loglevel
+    Grichelde.logLevel = oldLogLevel
+end

GricheldeUpgrade.lua

@@ -1,8 +1,9 @@
 -- read namespace from global env
-local _G = _G
+local _G = _G or getfenv()
-local Grichelde = _G.Grichelde
+local Grichelde = _G.Grichelde or {}
 
-local pairs, find, color, cOrange, toNumber = Grichelde.functions.pairs, Grichelde.functions.find, Grichelde.functions.color, Grichelde.functions.cOrange, Grichelde.functions.toNumber
+local pairs, tClone, find, sub, cGreen, cOrange, cRed, 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"))
@@ -67,43 +68,118 @@ function Grichelde:Upgrade_To_v080()
     return 0, 8, 0
 end
 
+function Grichelde:Upgrade_To_v090()
+    self:PrefixedPrint(self.L.Upgrade_ToVersion, cOrange("0.9.0"))
+
+    local replacements = self.db.profile.replacements or {}
+    self:DebugPrint("Upgrade_To_v090 : old replacements")
+    self:DebugPrint(replacements)
+
+    for _, replTable in pairs(replacements) do
+        if (replTable["active"] == true) then
+            replTable["matchWhen"] = 2
+        else
+            replTable["matchWhen"] = 1
+        end
+        replTable["active"] = nil
+    end
+
+    self:DebugPrint("Upgrade_To_v090 : new replacements")
+    self:DebugPrint(self.db.profile)
+    return 0, 9, 0
+end
+
 function Grichelde:UpgradeDatabase()
-    local dbVersion = self.db.global.version or "0.0.0"
+    local function parseVersion(version)
-    self:DebugPrint("Database version:", dbVersion)
+        local _, _, major, minor, patch, ext = find(version, "(%d+)%.(%d+)%.(%d+)(.*)")
+        local preBuild, build = ext, ""
+        if (sub(ext, 1, 1) == "-") then
+            local b = find(ext, "+", 2)
+            if (b ~= nil) then
+                preBuild = sub(ext, 1, b)
+                build = sub(ext, b + 1)
+            else
+                preBuild = sub(ext, 1, b)
+            end
+        end
+        return toNumber(major) or 0, toNumber(minor) or 0, toNumber(patch) or 0, preBuild, build
+    end
 
-    local _, _, maj, min, pat = find(dbVersion, "(%d+)%.(%d+)%.(%d+).*")
+    local gMajor, gMinor, gPatch = parseVersion(self.version)
-    local major, minor, patch = toNumber(maj) or 0, toNumber(min) or 0, toNumber(pat) or 0
+    local dbVersion = self.db.global.version
 
+    if (dbVersion == nil) then
+        self:DebugPrint("New installation detected, add sample mappings")
+        -- do NOT set self.db.profile.replacements = {} it will break defaults
+        local sampleRepl = self.getDefaultSampleMappings()
+        for replName, replTable in pairs(sampleRepl) do
+            self:TracePrint("UpgradeDatabase : copySampleMappings %s", replName)
+            self.db.profile.replacements[replName] = tClone(replTable)
+        end
+
+        self.db.global.version = self:Format("%d.%d.%d", gMajor, gMinor, gPatch)
+        self:DebugPrint("Database version %s sucessfully created", self.db.global.version)
+    else
+        -- detect if upgrade is neccessary or downgrade was done
+        self:DebugPrint("Detected database version:", dbVersion)
+
+        local dbMajor, dbMinor, dbPatch = parseVersion(dbVersion)
+        local downGrade = false
+        if (dbMajor > gMajor) then
+            downGrade = true
+        elseif dbMajor == gMajor then
+            if (dbMinor > gMinor) then
+                downGrade = true
+            elseif dbMinor == gMinor then
+                if (dbPatch > gPatch) then
+                    downGrade = true
+                end
+            end
+        end
+
+        if downGrade then
+            self:PrefixedPrint(cRed(self.L.Downgrade_Detected), self.L.AddonName)
+        else
             local upgrade = 0
             local error = false
 
-    if major == 0 then
+            if (dbMajor == 0) then
-        if minor < 6 then
+                if (dbMinor < 6) then
                     upgrade = upgrade + 1
-            major, minor, patch = self:Upgrade_To_v060(dbVersion)
+                    dbMajor, dbMinor, dbPatch = self:Upgrade_To_v060(dbVersion)
                 end
-        if minor < 7 then
+                if (dbMinor < 7) then
                     upgrade = upgrade + 1
-            major, minor, patch = self:Upgrade_To_v070(dbVersion)
+                    dbMajor, dbMinor, dbPatch = self:Upgrade_To_v070(dbVersion)
                 end
-        if minor == 7 then
+                if (dbMinor == 7) then
-            if patch < 2 then
+                    if (dbPatch < 2) then
                         upgrade = upgrade + 1
-                major, minor, patch = self:Upgrade_To_v072(dbVersion)
+                        dbMajor, dbMinor, dbPatch = self:Upgrade_To_v072(dbVersion)
                     end
                 end
-        if minor < 8 then
+                if (dbMinor < 8) then
                     upgrade = upgrade + 1
-            major, minor, patch = self:Upgrade_To_v080(dbVersion)
+                    dbMajor, dbMinor, dbPatch = self:Upgrade_To_v080(dbVersion)
+                end
+                if (dbMinor < 9) then
+                    upgrade = upgrade + 1
+                    dbMajor, dbMinor, dbPatch = self:Upgrade_To_v090(dbVersion)
                 end
             end
 
-    if upgrade == 0 then
+            if (upgrade == 0) or (error == false) then
-        self:DebugPrint("Database up-to-date")
+                -- bump version number even if no update is required
+                self.db.global.version = self:Format("%d.%d.%d", gMajor, gMinor, gPatch)
+            end
+
+            if (upgrade == 0) then
+                self:DebugPrint("Database was up-to-date")
+            elseif (error == false) then
+                self:PrefixedPrint(cGreen(self.L.Upgrade_Successful))
             else
-        if not error then
+                self:PrefixedPrint(cRed(self.L.Upgrade_Error))
-            self.db.global.version = self.version
+            end
-            self:PrefixedPrint(color(Grichelde.COLOR_CODES.GREEN, self.L.Upgrade_Successful))
         end
     end
 end

GricheldeUtils.lua

@@ -1,18 +1,18 @@
 -- import addon read namespace from global env
-local _G = _G
+local _G = _G or getfenv()
-local Grichelde = _G.Grichelde
+local Grichelde = _G.Grichelde or {}
 
-local type, print, pairs, tSize, select, unpack, find, color, cGray, cDarkgray, cPrefix, format, rep, toString
+local type, print, pairs, tSize, select, unpack, find, cGray, cDarkgray, cRed, cPrefix, format, rep, toString
-    = Grichelde.functions.type, Grichelde.functions.print, Grichelde.functions.pairs, Grichelde.functions.tSize, Grichelde.functions.select, Grichelde.functions.unpack, Grichelde.functions.find, Grichelde.functions.color,  Grichelde.functions.cGray, Grichelde.functions.cDarkgray, Grichelde.functions.cPrefix, Grichelde.functions.format, Grichelde.functions.rep, Grichelde.functions.toString
+    = Grichelde.F.type, Grichelde.F.print, Grichelde.F.pairs, Grichelde.F.tSize, Grichelde.F.select, Grichelde.F.unpack, Grichelde.F.find, Grichelde.F.cGray, Grichelde.F.cDarkgray, Grichelde.F.cRed, Grichelde.F.cPrefix, Grichelde.F.format, Grichelde.F.rep, Grichelde.F.toString
 
 -- show strings differently to distinguish them from numbers
-local function plainValue(val)
+function Grichelde:plainValue(val)
-    if val == nil then
+    if (val == nil) then
         return "<nil>"
-    elseif type(val) == "string" then
+    elseif (type(val) == "string") then
         return '"' .. val .. '"'
-    elseif type(val) == "table" then
+    elseif (type(val) == "table") then
-        if tSize(val) > 0 then
+        if (tSize(val) > 0) then
             return toString(val)
         else
             return "{}"
@@ -23,33 +23,36 @@ local function plainValue(val)
 end
 
 --- Prints any value to default channel, do NOT return a string.
-local function tPrint(val, indent, known, printFunc)
+function Grichelde:tPrint(val, indent, known, printFunc)
     local printF = printFunc or print
     indent = indent or 0
     known = known or {}
 
-    if val == nil then
+    if (val == nil) then
         printF(rep(" ", indent) .. "<nil>")
-    elseif type(val) == "string" then
+    elseif (type(val) == "string") then
         printF(rep(" ", indent) .. "\"" .. val .. "\"")
-    elseif type(val) == "table" then
+    elseif (type(val) == "table") then
-        if tSize(val) > 0 then
+        if (tSize(val) > 0) then
             for key, value in pairs(val) do
-                if value == nil then
+                if (value == nil) then
-                    printF(rep(" ", indent) .. plainValue(key) .. " = <nil>")
+                    printF(rep(" ", indent) .. self:plainValue(key) .. " = <nil>")
-                elseif type(value) == "table" then
+                elseif (type(value) == "table") then
-                    printF(rep(" ", indent) .. plainValue(key) .. " = {")
+                    printF(rep(" ", indent) .. self:plainValue(key) .. " = {")
-                    if tSize(value) > 0 then
+                    if (tSize(value) > 0) then
                         if not known[value] then
-                            tPrint(value, indent + 4, known, printF)
+                            self:tPrint(value, indent + 4, known, printF)
                             known[value] = true
                         else
-                            printF("<known table> " .. plainValue(value))
+                            printF("<known table> " .. self:plainValue(value))
                         end
                     end
                     printF(rep(" ", indent) .. "}")
                 else
-                    printF(rep(" ", indent) .. plainValue(key) .. " = " .. plainValue(value))
+                    local k = self:plainValue(key)
+                    local v = self:plainValue(value)
+                    --print( "k: " .. k .. ", v: " ..v)
+                    printF(rep(" ", indent) .. k .. " = " .. v)
                 end
             end
         else
@@ -62,7 +65,7 @@ end
 
 --- Splits at first word of a text line
 function Grichelde:SplitOnFirstMatch(text, delimPattern, start)
-    if text == nil then return nil end
+    if (text == nil) then return nil end
     local pattern = "^(.-)" .. (delimPattern or " " ) .."(.*)"
     local pos = start or 1
     self:TracePrint("SplitOnFirstMatch : text: %s, pattern: %s, start: %d", text, pattern, start)
@@ -81,70 +84,68 @@ 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 ( not message ) then
+    if (message == nil) then
         return "<nil>"
-    elseif type(message) == "string" then
+    elseif (type(message) == "string") then
-        if ( not find(message, "%%")) then
+        if (find(message, "%%") == nil) then
+            --print("message: ", message)
+            --print("...: ", ...)
             return message, ...
         else
             local l = select("#", ...)
-            if l > 0 then
+            if (l > 0) then
                 -- sanitize nil values in vararg
                 local packed = { ... }
                 for i = 1, l do
                     packed[i] = toString(packed[i]) or "nil"
+                    --print("packed[i] = ", packed[i])
+                    --packed[i] = gsub(packed[i], "%%(%d)", "%%%%%1")
                 end
 --              print("packed = ", packed)
 --              self:tPrint(packed)
                 -- cannot assign unpacked to a vararg variable and print it for debug
                 -- Manually set count as unpack() stops on nil (bug with #table)
                 return format(message, unpack(packed, 1, l))
+            else
+                return message
             end
         end
     end
 end
 
---- deprecated
-function Grichelde:Print(...)
-    print(self:Format(...))
-end
-
 function Grichelde:PrefixedPrint(...)
     print(cPrefix(self.L.AddonName) .. ":", self:Format(...))
 end
 
 function Grichelde:ErrorPrint(...)
-    print(cPrefix(self.L.AddonName) .. ": " .. color(self.COLOR_CODES.RED, self:Format(...)))
+    print(cPrefix(self.L.AddonName) .. ": " .. cRed(self:Format(...)))
 end
 
 function Grichelde:DebugPrint(obj, ...)
-    self:LogPrint(Grichelde.LOG_LEVEL.DEBUG, function(...)
+    if (self.logLevel >= Grichelde.LOG_LEVEL.DEBUG) then
+        self:LogPrint(function(...)
             print(cGray(self.L.AddonName) .. ":", self:Format(...))
         end, obj, ...)
+    end
 end
 
 function Grichelde:TracePrint(obj, ...)
-    self:LogPrint(Grichelde.LOG_LEVEL.TRACE, function(...)
+    if (self.logLevel >= Grichelde.LOG_LEVEL.TRACE) then
+        self:LogPrint(function(...)
             print(cDarkgray(self.L.AddonName) .. ":", self:Format(...))
         end, obj, ...)
+    end
 end
 
-function Grichelde:LogPrint(logLevel, printFunc, obj, ...)
+function Grichelde:LogPrint(printFunc, obj, ...)
-    if (self.logLevel >= logLevel) then
     local printF = printFunc or print
     if obj == nil then
         printF("<nil>")
     else
         if type(obj) == "string" then
             local l = select("#", ...)
-                if ( l == 0 or not find(obj, "%%")) then
+            if (l == 0) or (find(obj, "%%") == nil) then
                 printF(obj, ...)
             else
                 -- sanitize nil values in vararg
@@ -159,11 +160,10 @@ function Grichelde:LogPrint(logLevel, printFunc, obj, ...)
                 local fmtMsg = format(obj, unpack(packed, 1, l)) -- manually set count as unpack() stops on nil (bug with #table)
                 printF(fmtMsg)
             end
-            elseif type(obj) == "table" then
+        elseif (type(obj) == "table") then
-                tPrint(obj, 0, {}, printF)
+            self:tPrint(obj, 0, {}, printF)
         else
-                printF(plainValue(obj))
+            printF(self:plainValue(obj))
-            end
         end
     end
 end
@@ -171,7 +171,7 @@ end
 --- Print UI options to chat frame
 function Grichelde:PrintOptions()
     self:PrefixedPrint(cPrefix(self.L.Debug_Options))
-    self:LogPrint(-1, function(...)
+    self:LogPrint(function(...)
         print(cPrefix(self.L.AddonName) .. ":", self:Format(...))
     end, self.options.args.replacements.args)
 end
@@ -179,7 +179,7 @@ end
 --- Print current DB profile
 function Grichelde:PrintProfile()
     self:PrefixedPrint(cPrefix(self.L.Debug_Profile))
-    self:LogPrint(-1, function(...)
+    self:LogPrint(function(...)
         print(cPrefix(self.L.AddonName) .. ":", self:Format(...))
     end, self.db.profile)
 end
@@ -187,7 +187,7 @@ end
 --- Print DB replacements to chat frame
 function Grichelde:PrintMappings()
     self:PrefixedPrint(cPrefix(self.L.Debug_Mappings))
-    self:LogPrint(-1, function(...)
+    self:LogPrint(function(...)
         print(cPrefix(self.L.AddonName) .. ":", self:Format(...))
     end, self.db.profile.replacements)
 end
@@ -196,7 +196,7 @@ end
 function Grichelde:ToogleMappings()
     local AceGUI = LibStub("AceGUI-3.0")
 
-    if self.debugFrame then
+    if (self.debugFrame ~= nil) then
         AceGUI:Release(self.debugFrame)
         self.debugFrame = nil
     else
@@ -231,7 +231,7 @@ function Grichelde:ToogleMappings()
         local configBox = AceGUI:Create("MultiLineEditBox");
         configBox:SetLabel("")
         local text = ""
-        tPrint(replacements, 0, {}, function(s) text = text .. s .. "|n" end)
+        self:tPrint(replacements, 0, {}, function(s) text = text .. s .. "|n" end)
         configBox:SetText(text)
         configBox:SetFullWidth(true)
         --configBox:SetFullHeight(true)

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
@@ -27,7 +27,7 @@ if not AceConfig then return end
 local pcall, error, type, pairs = pcall, error, type, pairs
 
 -- -------------------------------------------------------------------
--- :RegisterOptionsTable(appName, options, slashcmd, persist)
+-- :RegisterOptionsTable(appName, options, slashcmd)
 --
 -- - appName - (string) application name
 -- - options - table or function ref, see AceConfigRegistry

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", 93
 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
@@ -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,141 @@ 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, 1, 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, 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 InCombatLockdown = InCombatLockdown
-		StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] = {}
+	local frame = AceConfigDialog.popup
+	if not frame or oldminor < 93 then
+		frame = CreateFrame("Frame", nil, UIParent)
+		AceConfigDialog.popup = frame
+		frame:Hide()
+		frame:SetPoint("CENTER", UIParent, "CENTER")
+		frame:SetSize(400, 72)
+		frame:EnableMouse(true) -- Do not allow click-through on the frame
+		frame:SetFrameStrata("TOOLTIP")
+		frame:SetFrameLevel(100) -- Lots of room to draw under it
+		frame:SetScript("OnKeyDown", function(self, key)
+			if key == "ESCAPE" then
+				if not InCombatLockdown() then
+					self:SetPropagateKeyboardInput(false)
 				end
-	local t = StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"]
+				if self.cancel:IsShown() then
-	for k in pairs(t) do
+					self.cancel:Click()
-		t[k] = nil
+				else -- Showing a validation error
+					self:Hide()
 				end
-	t.text = message
+			elseif not InCombatLockdown() then
-	t.button1 = ACCEPT
+				self:SetPropagateKeyboardInput(true)
-	t.button2 = CANCEL
-	t.preferredIndex = STATICPOPUP_NUMDIALOGS
-	local dialog, oldstrata
-	t.OnAccept = function()
-		safecall(func, unpack(t))
-		if dialog and oldstrata then
-			dialog:SetFrameStrata(oldstrata)
 			end
-		AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
+		end)
-		del(info)
-	end
-	t.OnCancel = function()
-		if dialog and oldstrata then
-			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(370, 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)
+	local height = 70 + 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 +674,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 +738,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 +752,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 +790,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 +903,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
@@ -1062,8 +1079,30 @@ local function InjectInfo(control, options, option, path, rootframe, appName)
 	control:SetCallback("OnRelease", CleanUserData)
 	control:SetCallback("OnLeave", OptionOnMouseLeave)
 	control:SetCallback("OnEnter", OptionOnMouseOver)
+
+	-- forward custom arg data directly
+	if control.SetCustomData and option.arg then
+		safecall(control.SetCustomData, control, option.arg)
+	end
 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 +1144,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 +1172,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 +1191,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 +1214,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 +1228,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 +1239,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
+							sorting = {}
 							for value, text in pairs(values) do
-							t[#t+1]=value
+								sorting[#sorting+1]=value
 							end
-						tsort(t)
+							tsort(sorting, sortTblAsStrings)
-						for k, value in ipairs(t) do
+						end
+						for _, value in ipairs(sorting) do
 							local text = values[value]
 							local radio = gui:Create("CheckBox")
 							radio:SetLabel(text)
@@ -1238,19 +1273,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 +1293,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 +1301,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 +1328,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 +1341,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 +1359,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 +1375,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 +1383,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,20 +1429,23 @@ 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
 				if control then
 					if control.width ~= "fill" then
 						local width = GetOptionsMemberValue("width",v,options,path,appName)
+						local relWidth = GetOptionsMemberValue("relWidth",v,options,path,appName)
 						if width == "double" then
 							control:SetWidth(width_multiplier * 2)
 						elseif width == "half" then
 							control:SetWidth(width_multiplier / 2)
 						elseif (type(width) == "number") then
 							control:SetWidth(width_multiplier * width)
+						elseif width == "relative" and relWidth then
+							control:SetRelativeWidth(relWidth)
 						elseif width == "full" then
 							control.width = "fill"
 						else
@@ -1453,6 +1485,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 +1502,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, 1, 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 +1567,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 +1688,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,17 +1938,19 @@ 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
 
+AceConfigDialog.BlizOptionsIDMap = AceConfigDialog.BlizOptionsIDMap or {}
+
 local function FeedToBlizPanel(widget, event)
 	local path = widget:GetUserData("path")
 	AceConfigDialog:Open(widget:GetUserData("appName"), widget, unpack(path or emptyTbl))
@@ -1940,15 +1972,17 @@ end
 -- has to be a head-level note.
 --
 -- This function returns a reference to the container frame registered with the Interface
--- Options. You can use this reference to open the options with the API function
+-- Options, as well as the registered ID. You can use the ID to open the options with
--- `InterfaceOptionsFrame_OpenToCategory`.
+-- the API function `Settings.OpenToCategory`.
 -- @param appName The application name as given to `:RegisterOptionsTable()`
 -- @param name A descriptive name to display in the options tree (defaults to appName)
 -- @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
 function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
 	local BlizOptions = AceConfigDialog.BlizOptions
+	local BlizOptionsIDMap = AceConfigDialog.BlizOptionsIDMap
 
 	local key = appName
 	for n = 1, select("#", ...) do
@@ -1962,7 +1996,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 +2008,33 @@ function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
 		end
 		group:SetCallback("OnShow", FeedToBlizPanel)
 		group:SetCallback("OnHide", ClearBlizPanel)
-		InterfaceOptions_AddCategory(group.frame)
+
-		return group.frame
+		local categoryName = name or appName
+		if parent then
+			local parentID = BlizOptionsIDMap[parent] or parent
+			local category = Settings.GetCategory(parentID)
+			if not category then
+				error(("The parent category '%s' was not found"):format(parent), 2)
+			end
+			local subcategory = Settings.RegisterCanvasLayoutSubcategory(category, group.frame, categoryName)
+			group:SetName(subcategory.ID, parentID)
+		else
+			if BlizOptionsIDMap[categoryName] then
+				error(("%s has already been added to the Blizzard Options Window with the given name: %s"):format(appName, categoryName), 2)
+			end
+
+			local category = Settings.RegisterCanvasLayoutCategory(group.frame, categoryName)
+			if not (C_SettingsUtil and C_SettingsUtil.OpenSettingsPanel) then
+				-- override the ID so the name can be used in Settings.OpenToCategory
+				-- unfortunately with incoming API changes in 12.0 (and likely classic at some point) this override is no longer possible
+				category.ID = categoryName
+			end
+			group:SetName(category.ID)
+			BlizOptionsIDMap[categoryName] = category.ID
+			Settings.RegisterAddOnCategory(category)
+		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", 22
 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,
@@ -92,16 +92,24 @@ local basekeys={
 	func=optmethodfalse,
 	arg={["*"]=true},
 	width=optstringnumber,
+	relWidth=optnumber,
 }
 
 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 +126,9 @@ local typedkeys={
 		imageCoords=optmethodtable,
 		imageHeight=optnumber,
 		imageWidth=optnumber,
+		control=optstring,
+		dialogControl=optstring,
+		dropdownControl=optstring,
 	},
 	input={
 		pattern=optstring,
@@ -131,6 +142,9 @@ local typedkeys={
 		tristate=optbool,
 		image=optstringnumberfunc,
 		imageCoords=optmethodtable,
+		control=optstring,
+		dialogControl=optstring,
+		dropdownControl=optstring,
 	},
 	tristate={
 	},
@@ -142,9 +156,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 +183,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,20 @@
 -- 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", 40
-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
+local strlenutf8 = strlenutf8
 
 -- 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 +95,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 +112,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
@@ -255,17 +252,43 @@ local preserve_keys = {
 	["children"] = true,
 }
 
-local realmKey = GetRealmName()
-local charKey = UnitName("player") .. " - " .. realmKey
-local _, classKey = UnitClass("player")
-local _, raceKey = UnitRace("player")
 local factionKey = UnitFactionGroup("player")
-local factionrealmKey = factionKey .. " - " .. realmKey
 local localeKey = GetLocale():lower()
+local charKey, realmKey, classKey, raceKey, factionrealmKey, factionrealmregionKey
+do
+	local _
+	_, classKey = UnitClass("player")
+	_, raceKey = UnitRace("player")
 
-local regionTable = { "US", "KR", "EU", "TW", "CN" }
+	if RegionalUniqueNamesEnabled and RegionalUniqueNamesEnabled() then
-local regionKey = regionTable[GetCurrentRegion()]
+		local isRP = C_GameRules.IsGameRuleActive(Enum.GameRule.RPRuleset)
-local factionrealmregionKey = factionrealmKey .. " - " .. regionKey
+		local isPVP = C_GameRules.IsGameRuleActive(Enum.GameRule.PvPRuleset)
+		if C_GameRules.IsGameRuleActive(Enum.GameRule.HardcoreRuleset) then
+			realmKey = "Hardcore"
+		elseif isRP and isPVP then
+			realmKey = "RP-PvP"
+		elseif isRP then
+			realmKey = "RP"
+		elseif isPVP then
+			realmKey = "PvP"
+		else
+			realmKey = "PvE"
+		end
+		local name, surname = UnitNameUnmodified("player")
+		charKey = name .. " " .. surname
+	else
+		realmKey = GetRealmName()
+		charKey = UnitNameUnmodified("player") .. " - " .. realmKey
+	end
+
+	local regionTable = { "US", "KR", "EU", "TW", "CN" }
+	local regionName = GetCurrentRegionName()
+	if regionName and regionName == "" then regionName = nil end -- PTR/Beta tends to be ""
+	local regionKey = regionTable[GetCurrentRegion()] or regionName or "TR"
+
+	factionrealmKey = factionKey .. " - " .. realmKey
+	factionrealmregionKey = factionrealmKey .. " - " .. regionKey
+end
 
 -- Actual database initialization function
 local function initdb(sv, defaults, defaultProfile, olddb, parent)
@@ -279,6 +302,18 @@ local function initdb(sv, defaults, defaultProfile, olddb, parent)
 		-- Make a container for profile keys
 		if not sv.profileKeys then sv.profileKeys = {} end
 
+		-- Validate any existing profile name
+		if sv.profileKeys[charKey] then
+			if type(sv.profileKeys[charKey]) ~= "string" then
+				sv.profileKeys[charKey] = defaultProfile or charKey
+			else
+				local profileNameLength = strlenutf8(sv.profileKeys[charKey])
+				if profileNameLength == 0 or profileNameLength > 50 or sv.profileKeys[charKey]:find("^ +$") then
+					sv.profileKeys[charKey] = defaultProfile or charKey
+				end
+			end
+		end
+
 		-- Try to get the profile selected from the char db
 		profileKey = sv.profileKeys[charKey] or defaultProfile or charKey
 
@@ -364,7 +399,7 @@ local function logoutHandler(frame, event)
 
 			-- cleanup sections that are empty without defaults
 			local sv = rawget(db, "sv")
-			for section in pairs(db.keys) do
+			for section in pairs(rawget(db, "keys")) do
 				if rawget(sv, section) then
 					-- global is special, all other sections have sub-entrys
 					-- also don't delete empty profiles on main dbs, only on namespaces
@@ -381,6 +416,26 @@ local function logoutHandler(frame, event)
 				end
 			end
 		end
+
+		-- second pass after everything else is cleaned up to remove empty namespaces
+		-- can't be run in-loop above since there is no guaranteed order
+		for db in pairs(AceDB.db_registry) do
+			local sv = rawget(db, "sv")
+			local namespaces = rawget(sv, "namespaces")
+			if namespaces then
+				for name in pairs(namespaces) do
+					-- cleanout empty profiles table, if still present
+					if namespaces[name].profiles and not next(namespaces[name].profiles) then
+						namespaces[name].profiles = nil
+					end
+
+					-- remove entire namespace, if needed
+					if not next(namespaces[name]) then
+						namespaces[name] = nil
+					end
+				end
+			end
+		end
 	end
 end
 
@@ -397,7 +452,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 +484,12 @@ 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)
+	else
+		local profileNameLength = strlenutf8(name)
+		if profileNameLength == 0 or profileNameLength > 50 or name:find("^ +$") then
+			error("Usage: AceDBObject:SetProfile(name): 'name' - string length must be between 1 and 50 characters.", 2)
+		end
 	end
 
 	-- changing to the same profile, dont do anything
@@ -471,7 +531,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 +569,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
@@ -529,6 +589,17 @@ function DBObjectLib:DeleteProfile(name, silent)
 		end
 	end
 
+	-- remove from unloaded namespaces
+	if self.sv.namespaces then
+		for nsname, data in pairs(self.sv.namespaces) do
+			if self.children and self.children[nsname] then
+				-- already a mapped namespace
+			elseif data.profiles then
+				data.profiles[name] = nil
+			end
+		end
+	end
+
 	-- switch all characters that use this profile back to the default
 	if self.sv.profileKeys then
 		for key, profile in pairs(self.sv.profileKeys) do
@@ -548,15 +619,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
@@ -574,6 +645,20 @@ function DBObjectLib:CopyProfile(name, silent)
 		end
 	end
 
+	-- copy unloaded namespaces
+	if self.sv.namespaces then
+		for nsname, data in pairs(self.sv.namespaces) do
+			if self.children and self.children[nsname] then
+				-- already a mapped namespace
+			elseif data.profiles then
+				-- reset the current profile
+				data.profiles[self.keys.profile] = {}
+				-- copy data
+				copyTable(data.profiles[name], data.profiles[self.keys.profile])
+			end
+		end
+	end
+
 	-- Callback: OnProfileCopied, database, sourceProfileKey
 	self.callbacks:Fire("OnProfileCopied", self, name)
 end
@@ -600,6 +685,18 @@ function DBObjectLib:ResetProfile(noChildren, noCallbacks)
 		end
 	end
 
+	-- reset unloaded namespaces
+	if self.sv.namespaces and not noChildren then
+		for nsname, data in pairs(self.sv.namespaces) do
+			if self.children and self.children[nsname] then
+				-- already a mapped namespace
+			elseif data.profiles then
+				-- reset the current profile
+				data.profiles[self.keys.profile] = nil
+			end
+		end
+	end
+
 	-- Callback: OnProfileReset, database
 	if not noCallbacks then
 		self.callbacks:Fire("OnProfileReset", self)
@@ -610,8 +707,8 @@ end
 -- profile.
 -- @param defaultProfile The profile name to use as the default
 function DBObjectLib:ResetDB(defaultProfile)
-	if defaultProfile and type(defaultProfile) ~= "string" then
+	if defaultProfile and type(defaultProfile) ~= "string" and defaultProfile ~= true then
-		error("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or nil expected.", 2)
+		error(("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or true expected, got %q."):format(type(defaultProfile)), 2)
 	end
 
 	local sv = self.sv
@@ -619,8 +716,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 +742,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 +772,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 +814,22 @@ 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
+	if defaultProfile then
-		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string or true expected.", 2)
+		if type(defaultProfile) == "string" then
+			local profileNameLength = strlenutf8(defaultProfile)
+			if profileNameLength == 0 or profileNameLength > 50 or defaultProfile:find("^ +$") then
+				error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string length must be between 1 and 50 characters.", 2)
+			end
+		elseif defaultProfile ~= true then
+			error(("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string or true expected, got %q."):format(type(defaultProfile)), 2)
+		end
 	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 ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 17
-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 {}
 
@@ -37,6 +33,7 @@ local L = {
 	delete_desc = "Delete existing and unused profiles from the database to save space, and cleanup the SavedVariables file.",
 	delete_sub = "Deletes a profile from the database.",
 	intro = "You can change the active database profile, so you can have different settings for every character.",
+	name_too_long = "Profile names cannot be longer than 50 characters.",
 	new = "New",
 	new_sub = "Create a new empty profile.",
 	profiles = "Profiles",
@@ -60,6 +57,7 @@ if LOCALE == "deDE" then
 	L["delete_desc"] = "Lösche vorhandene oder unbenutzte Profile aus der Datenbank, um Platz zu sparen und die SavedVariables-Datei 'sauber' zu halten."
 	L["delete_sub"] = "Löscht ein Profil aus der Datenbank."
 	L["intro"] = "Hier kannst du das aktive Datenbankprofil ändern, damit du verschiedene Einstellungen für jeden Charakter erstellen kannst, wodurch eine sehr flexible Konfiguration möglich wird."
+	L["name_too_long"] = "Profilnamen können nicht länger als 50 Zeichen sein."
 	L["new"] = "Neu"
 	L["new_sub"] = "Ein neues Profil erstellen."
 	L["profiles"] = "Profile"
@@ -80,6 +78,7 @@ elseif LOCALE == "frFR" then
 	L["delete_desc"] = "Supprime les profils existants inutilisés de la base de données afin de gagner de la place et de nettoyer le fichier SavedVariables."
 	L["delete_sub"] = "Supprime un profil de la base de données."
 	L["intro"] = "Vous pouvez changer le profil actuel afin d'avoir des paramètres différents pour chaque personnage, permettant ainsi d'avoir une configuration très flexible."
+	L["name_too_long"] = "Les noms de profil ne peuvent pas dépasser 50 caractères."
 	L["new"] = "Nouveau"
 	L["new_sub"] = "Créée un nouveau profil vierge."
 	L["profiles"] = "Profils"
@@ -88,25 +87,26 @@ elseif LOCALE == "frFR" then
 	L["reset_desc"] = "Réinitialise le profil actuel au cas où votre configuration est corrompue ou si vous voulez tout simplement faire table rase."
 	L["reset_sub"] = "Réinitialise le profil actuel avec les paramètres par défaut."
 elseif LOCALE == "koKR" then
-	L["choose"] = "저장 중인 프로필"
+	L["choose"] = "기존 프로필"
-	L["choose_desc"] = "입력창에 새로운 이름을 입력하거나 저장 중인 프로필 중 하나를 선택하여 새로운 프로필을 만들 수 있습니다."
+	L["choose_desc"] = "편집 상자에 이름을 입력하여 새로운 프로필을 만들거나 이미 존재하는 프로필 중 하나를 선택할 수 있습니다."
 	L["choose_sub"] = "현재 이용할 수 있는 프로필 중 하나를 선택합니다."
-	L["copy"] = "복사해오기"
+	L["copy"] = "복사해 올 프로필"
-	L["copy_desc"] = "현재 사용 중인 프로필에 선택한 프로필의 설정을 복사합니다."
+	L["copy_desc"] = "기존 프로필의 설정을 현재 활성화된 프로필로 복사합니다."
 	L["current"] = "현재 프로필:"
 	L["default"] = "기본값"
 	L["delete"] = "프로필 삭제"
-	L["delete_confirm"] = "정말로 선택한 프로필을 삭제할까요?"
+	L["delete_confirm"] = "선택한 프로필을 삭제하시겠습니까?"
-	L["delete_desc"] = "저장 공간 절약과 SavedVariables 파일의 정리를 위해 데이터베이스에서 사용하지 않는 프로필을 삭제하세요."
+	L["delete_desc"] = "데이터베이스에서 기존 프로필과 사용하지 않는 프로필을 삭제하여 공간을 절약하고 SavedVariables 파일을 정리합니다."
-	L["delete_sub"] = "데이터베이스의 프로필을 삭제합니다."
+	L["delete_sub"] = "데이터베이스에서 프로필을 삭제합니다."
-	L["intro"] = "활성 데이터베이스 프로필을 변경할 수 있고, 각 캐릭터 별로 다른 설정을 할 수 있습니다."
+	L["intro"] = "활성 데이터베이스 프로필을 변경할 수 있으며, 모든 캐릭터마다 서로 다른 설정을 지정할 수 있습니다."
+	L["name_too_long"] = "프로필 이름은 50자리를 초과할 수 없습니다."
 	L["new"] = "새로운 프로필"
-	L["new_sub"] = "새로운 프로필을 만듭니다."
+	L["new_sub"] = "비어 있는 프로필을 새로 만듭니다."
 	L["profiles"] = "프로필"
 	L["profiles_sub"] = "프로필 관리"
-	L["reset"] = "프로필 초기화"
+	L["reset"] = "프로필 재설정"
-	L["reset_desc"] = "설정이 깨졌거나 처음부터 다시 설정을 원하는 경우, 현재 프로필을 기본값으로 초기화하세요."
+	L["reset_desc"] = "구성이 손상되었거나 처음부터 다시 시작하고 싶은 경우 현재 프로필을 기본값으로 재설정하세요."
-	L["reset_sub"] = "현재 프로필을 기본값으로 초기화합니다"
+	L["reset_sub"] = "현재 프로필을 기본값으로 재설정합니다"
 elseif LOCALE == "esES" or LOCALE == "esMX" then
 	L["choose"] = "Perfiles existentes"
 	L["choose_desc"] = "Puedes crear un nuevo perfil introduciendo un nombre en el recuadro o puedes seleccionar un perfil de los ya existentes."
@@ -120,6 +120,7 @@ elseif LOCALE == "esES" or LOCALE == "esMX" then
 	L["delete_desc"] = "Borra los perfiles existentes y sin uso de la base de datos para ganar espacio y limpiar el archivo SavedVariables."
 	L["delete_sub"] = "Borra un perfil de la base de datos."
 	L["intro"] = "Puedes cambiar el perfil activo de tal manera que cada personaje tenga diferentes configuraciones."
+	L["name_too_long"] = "Los nombres de perfil no pueden exceder los 50 caracteres."
 	L["new"] = "Nuevo"
 	L["new_sub"] = "Crear un nuevo perfil vacio."
 	L["profiles"] = "Perfiles"
@@ -140,6 +141,7 @@ elseif LOCALE == "zhTW" then
 	L["delete_desc"] = "從資料庫裡刪除不再使用的設定檔，以節省空間，並且清理 SavedVariables 檔案。"
 	L["delete_sub"] = "從資料庫裡刪除一個設定檔。"
 	L["intro"] = "您可以從資料庫中選擇一個設定檔來使用，如此就可以讓每個角色使用不同的設定。"
+	L["name_too_long"] = "設定檔名稱不能超過50個字元。"
 	L["new"] = "新建"
 	L["new_sub"] = "新建一個空的設定檔。"
 	L["profiles"] = "設定檔"
@@ -160,6 +162,7 @@ elseif LOCALE == "zhCN" then
 	L["delete_desc"] = "从数据库里删除不再使用的配置文件，以节省空间，并且清理SavedVariables文件。"
 	L["delete_sub"] = "从数据库里删除一个配置文件。"
 	L["intro"] = "你可以选择一个活动的数据配置文件，这样你的每个角色就可以拥有不同的设置值，可以给你的插件配置带来极大的灵活性。"
+	L["name_too_long"] = "配置文件名称不能超过50个字符。"
 	L["new"] = "新建"
 	L["new_sub"] = "新建一个空的配置文件。"
 	L["profiles"] = "配置文件"
@@ -170,36 +173,38 @@ elseif LOCALE == "zhCN" then
 elseif LOCALE == "ruRU" then
 	L["choose"] = "Существующие профили"
 	L["choose_desc"] = "Вы можете создать новый профиль, введя название в поле ввода, или выбрать один из уже существующих профилей."
-	L["choose_sub"] = "Выбор одиного из уже доступных профилей"
+	L["choose_sub"] = "Выбор одного из уже доступных профилей."
 	L["copy"] = "Скопировать из"
-	L["copy_desc"] = "Скопировать настройки из выбранного профиля в активный."
+	L["copy_desc"] = "Копирование настроек из выбранного профиля в активный."
 	L["current"] = "Текущий профиль:"
 	L["default"] = "По умолчанию"
 	L["delete"] = "Удалить профиль"
-	L["delete_confirm"] = "Вы уверены, что вы хотите удалить выбранный профиль?"
+	L["delete_confirm"] = "Вы уверены, что хотите удалить выбранный профиль?"
-	L["delete_desc"] = "Удалить существующий и неиспользуемый профиль из БД для сохранения места, и очистить SavedVariables файл."
+	L["delete_desc"] = "Удаление существующего и неиспользуемого профиля из базы данных для сохранения места, и очистка файла SavedVariables."
-	L["delete_sub"] = "Удаление профиля из БД"
+	L["delete_sub"] = "Удаление профиля из базы данных."
-	L["intro"] = "Изменяя активный профиль, вы можете задать различные настройки модификаций для каждого персонажа."
+	L["intro"] = "Изменяя активный профиль, Вы можете задать разные настройки для каждого персонажа."
+	L["name_too_long"] = "Имена профилей не могут превышать 50 символов."
 	L["new"] = "Новый"
-	L["new_sub"] = "Создать новый чистый профиль"
+	L["new_sub"] = "Создание нового чистого профиля."
 	L["profiles"] = "Профили"
 	L["profiles_sub"] = "Управление профилями"
-	L["reset"] = "Сброс профиля"
+	L["reset"] = "Сбросить профиль"
-	L["reset_desc"] = "Сбросить текущий профиль к стандартным настройкам, если ваша конфигурация испорчена или вы хотите настроить всё заново."
+	L["reset_desc"] = "Сброс текущего профиля к стандартным настройкам, если Ваша конфигурация испорчена или Вы хотите настроить все заново."
 	L["reset_sub"] = "Сброс текущего профиля на стандартный"
 elseif LOCALE == "itIT" then
 	L["choose"] = "Profili Esistenti"
 	L["choose_desc"] = "Puoi creare un nuovo profilo digitando il nome della casella di testo, oppure scegliendone uno tra i profili già esistenti."
 	L["choose_sub"] = "Seleziona uno dei profili attualmente disponibili."
 	L["copy"] = "Copia Da"
-	L["copy_desc"] = "Copia le impostazioni da un profilo esistente, nel profilo attivo in questo momento."
+	L["copy_desc"] = "Copia le impostazioni da un profilo esistente nel profilo attivo in questo momento."
 	L["current"] = "Profilo Attivo:"
-	L["default"] = "Standard"
+	L["default"] = "Predefinito"
 	L["delete"] = "Cancella un Profilo"
 	L["delete_confirm"] = "Sei sicuro di voler cancellare il profilo selezionato?"
 	L["delete_desc"] = "Cancella i profili non utilizzati dal database per risparmiare spazio e mantenere puliti i file di configurazione SavedVariables."
 	L["delete_sub"] = "Cancella un profilo dal Database."
 	L["intro"] = "Puoi cambiare il profilo attivo, in modo da usare impostazioni diverse per ogni personaggio."
+	L["name_too_long"] = "Il nome del profilo non può superare i 50 caratteri."
 	L["new"] = "Nuovo"
 	L["new_sub"] = "Crea un nuovo profilo vuoto."
 	L["profiles"] = "Profili"
@@ -220,6 +225,7 @@ elseif LOCALE == "ptBR" then
 	L["delete_desc"] = "Remove perfis existentes e inutilizados do banco de dados para economizar espaço, e limpar o arquivo SavedVariables."
 	L["delete_sub"] = "Remove um perfil do banco de dados."
 	L["intro"] = "Você pode alterar o perfil do banco de dados ativo, para que possa ter definições diferentes para cada personagem."
+	L["name_too_long"] = "O nome do perfil não pode exceder 50 caracteres."
 	L["new"] = "Novo"
 	L["new_sub"] = "Cria um novo perfil vazio."
 	L["profiles"] = "Perfis"
@@ -350,6 +356,7 @@ end
 --[[
 	the real options table
 ]]
+local strlenutf8 = strlenutf8
 local optionsTable = {
 	desc = {
 		order = 1,
@@ -386,6 +393,15 @@ local optionsTable = {
 		order = 30,
 		get = false,
 		set = "SetProfile",
+		usage = L["name_too_long"],
+		validate = function(_, text)
+			local length = strlenutf8(text)
+			if length > 50 or length == 0 or text:find("^ +$") then
+				return false
+			end
+			return true
+		end,
+		width = 2,
 	},
 	choose = {
 		name = L["choose"],
@@ -396,6 +412,7 @@ local optionsTable = {
 		set = "SetProfile",
 		values = "ListProfiles",
 		arg = "common",
+		width = 2,
 	},
 	copydesc = {
 		order = 50,
@@ -412,6 +429,7 @@ local optionsTable = {
 		values = "ListProfiles",
 		disabled = "HasNoProfiles",
 		arg = "nocurrent",
+		width = 2,
 	},
 	deldesc = {
 		order = 70,
@@ -430,6 +448,7 @@ local optionsTable = {
 		arg = "nocurrent",
 		confirm = true,
 		confirmText = L["delete_confirm"],
+		width = 2,
 	},
 }
 

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)
+	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", 49
 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
@@ -212,7 +206,7 @@ local function Button_OnEnter(frame)
 		tooltip:SetOwner(frame, "ANCHOR_NONE")
 		tooltip:ClearAllPoints()
 		tooltip:SetPoint("LEFT",frame,"RIGHT")
-		tooltip:SetText(frame.text:GetText() or "", 1, .82, 0, true)
+		tooltip:SetText(frame.text:GetText() or "", 1, .82, 0, 1, true)
 
 		tooltip:Show()
 	end
@@ -393,10 +387,6 @@ local methods = {
 	["RefreshTree"] = function(self,scrollToSelection,fromOnUpdate)
 		local buttons = self.buttons
 		local lines = self.lines
-
-		for i, v in ipairs(buttons) do
-			v:Hide()
-		end
 		while lines[1] do
 			local t = tremove(lines)
 			for k in pairs(t) do
@@ -422,8 +412,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
@@ -506,6 +495,10 @@ local methods = {
 			buttonnum = buttonnum + 1
 		end
 
+		-- We hide the remaining buttons after updating others to avoid a blizzard bug that keeps them interactable even if hidden when hidden before updating the buttons.
+		for i = buttonnum, #buttons do
+			buttons[i]:Hide()
+		end
 	end,
 
 	["SetSelected"] = function(self, value)
@@ -570,7 +563,11 @@ local methods = {
 		if maxtreewidth > 100 and status.treewidth > maxtreewidth then
 			self:SetTreeWidth(maxtreewidth, status.treesizable)
 		end
+		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)
+	if treeframe.SetResizeBounds then -- WoW 10.0
+		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)
+		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

@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 Checkbox Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "CheckBox", 26
+local Type, Version = "CheckBox", 27
 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 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
 -------------------------------------------------------------------------------]]
@@ -101,7 +97,7 @@ local methods = {
 		if disabled then
 			self.frame:Disable()
 			self.text:SetTextColor(0.5, 0.5, 0.5)
-			SetDesaturation(self.check, true)
+			self.check:SetDesaturated(true)
 			if self.desc then
 				self.desc:SetTextColor(0.5, 0.5, 0.5)
 			end
@@ -109,9 +105,9 @@ local methods = {
 			self.frame:Enable()
 			self.text:SetTextColor(1, 1, 1)
 			if self.tristate and self.checked == nil then
-				SetDesaturation(self.check, true)
+				self.check:SetDesaturated(true)
 			else
-				SetDesaturation(self.check, false)
+				self.check:SetDesaturated(false)
 			end
 			if self.desc then
 				self.desc:SetTextColor(1, 1, 1)
@@ -123,15 +119,15 @@ local methods = {
 		local check = self.check
 		self.checked = value
 		if value then
-			SetDesaturation(check, false)
+			self.check:SetDesaturated(false)
 			check:Show()
 		else
 			--Nil is the unknown tristate value
 			if self.tristate and value == nil then
-				SetDesaturation(check, true)
+				self.check:SetDesaturated(true)
 				check:Show()
 			else
-				SetDesaturation(check, false)
+				self.check:SetDesaturated(false)
 				check:Hide()
 			end
 		end
@@ -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

@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 ColorPicker Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "ColorPicker", 25
+local Type, Version = "ColorPicker", 29
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -11,17 +11,24 @@ 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
+-- Unfortunately we have no way to realistically detect if a client uses inverted alpha
--- List them here for Mikk's FindGlobals script
+-- as no API will tell you. Wrath uses the old colorpicker, era uses the new one, both are inverted
--- GLOBALS: ColorPickerFrame, OpacitySliderFrame
+local INVERTED_ALPHA = (WOW_PROJECT_ID ~= WOW_PROJECT_MAINLINE and WOW_PROJECT_ID ~= WOW_PROJECT_CAMELOT)
 
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
 local function ColorCallback(self, r, g, b, a, isAlpha)
+	if INVERTED_ALPHA and a then
+		a = 1 - a
+	end
 	if not self.HasAlpha then
 		a = 1
 	end
+	-- no change, skip update
+	if r == self.r and g == self.g and b == self.b and a == self.a then
+		return
+	end
 	self:SetColor(r, g, b, a)
 	if ColorPickerFrame:IsVisible() then
 		--colorpicker is still open
@@ -54,22 +61,54 @@ local function ColorSwatch_OnClick(frame)
 		ColorPickerFrame:SetFrameLevel(frame:GetFrameLevel() + 10)
 		ColorPickerFrame:SetClampedToScreen(true)
 
+		if ColorPickerFrame.SetupColorPickerAndShow then -- 10.2.5 color picker overhaul
+			local r2, g2, b2, a2 = self.r, self.g, self.b, (self.a or 1)
+			if INVERTED_ALPHA then
+				a2 = 1 - a2
+			end
+
+			local info = {
+				swatchFunc = function()
+					local r, g, b = ColorPickerFrame:GetColorRGB()
+					local a = ColorPickerFrame:GetColorAlpha()
+					ColorCallback(self, r, g, b, a)
+				end,
+
+				hasOpacity = self.HasAlpha,
+				opacityFunc = function()
+					local r, g, b = ColorPickerFrame:GetColorRGB()
+					local a = ColorPickerFrame:GetColorAlpha()
+					ColorCallback(self, r, g, b, a, true)
+				end,
+				opacity = a2,
+
+				cancelFunc = function()
+					ColorCallback(self, r2, g2, b2, a2, true)
+				end,
+
+				r = r2,
+				g = g2,
+				b = b2,
+			}
+
+			ColorPickerFrame:SetupColorPickerAndShow(info)
+		else
 			ColorPickerFrame.func = function()
 				local r, g, b = ColorPickerFrame:GetColorRGB()
-			local a = 1 - OpacitySliderFrame:GetValue()
+				local a = OpacitySliderFrame:GetValue()
 				ColorCallback(self, r, g, b, a)
 			end
 
 			ColorPickerFrame.hasOpacity = self.HasAlpha
 			ColorPickerFrame.opacityFunc = function()
 				local r, g, b = ColorPickerFrame:GetColorRGB()
-			local a = 1 - OpacitySliderFrame:GetValue()
+				local a = OpacitySliderFrame:GetValue()
 				ColorCallback(self, r, g, b, a, true)
 			end
 
-		local r, g, b, a = self.r, self.g, self.b, self.a
+			local r, g, b, a = self.r, self.g, self.b, 1 - (self.a or 1)
 			if self.HasAlpha then
-			ColorPickerFrame.opacity = 1 - (a or 0)
+				ColorPickerFrame.opacity = a
 			end
 			ColorPickerFrame:SetColorRGB(r, g, b)
 
@@ -79,6 +118,7 @@ local function ColorSwatch_OnClick(frame)
 
 			ColorPickerFrame:Show()
 		end
+	end
 	AceGUI:ClearFocus()
 end
 

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 "")
-		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,11 +618,9 @@ do
 
 	-- exported
 	local function AddItem(self, value, text, itemType)
-		if self.list then
 		self.list[value] = text
 		AddListItem(self, value, text, itemType)
 	end
-	end
 
 	-- exported
 	local function SetMultiselect(self, multi)

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

@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 EditBox Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "EditBox", 28
+local Type, Version = "EditBox", 29
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -10,20 +10,20 @@ local tostring, pairs = tostring, pairs
 
 -- WoW APIs
 local PlaySound = PlaySound
-local GetCursorInfo, ClearCursor, GetSpellInfo = GetCursorInfo, ClearCursor, GetSpellInfo
+local GetCursorInfo, ClearCursor = GetCursorInfo, ClearCursor
 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
 -------------------------------------------------------------------------------]]
 if not AceGUIEditBoxInsertLink then
 	-- upgradeable hook
+	if ChatFrameUtil and ChatFrameUtil.InsertLink then
+		hooksecurefunc(ChatFrameUtil, "InsertLink", function(...) return _G.AceGUIEditBoxInsertLink(...) end)
+	elseif ChatEdit_InsertLink then
 		hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIEditBoxInsertLink(...) end)
+	end
 end
 
 function _G.AceGUIEditBoxInsertLink(text)
@@ -80,12 +80,16 @@ end
 
 local function EditBox_OnReceiveDrag(frame)
 	local self = frame.obj
-	local type, id, info = GetCursorInfo()
+	local type, id, info, extra = GetCursorInfo()
 	local name
 	if type == "item" then
 		name = info
 	elseif type == "spell" then
+		if C_Spell and C_Spell.GetSpellName then
+			name = C_Spell.GetSpellName(extra)
+		else
 			name = GetSpellInfo(id, info)
+		end
 	elseif type == "macro" then
 		name = GetMacroInfo(id)
 	end

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

@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 Heading Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "Heading", 20
+local Type, Version = "Heading", 21
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -9,7 +9,7 @@ if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 local pairs = pairs
 
 -- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
+local CreateFrame, UIParent, issecretvalue = CreateFrame, UIParent, issecretvalue
 
 --[[-----------------------------------------------------------------------------
 Methods
@@ -21,11 +21,16 @@ local methods = {
 		self:SetHeight(18)
 	end,
 
-	-- ["OnRelease"] = nil,
+	["OnRelease"] = function(self)
+		self.label:ClearText()
+		self.label:ClearAllPoints()
+		self.label:SetPoint("TOP")
+		self.label:SetPoint("BOTTOM")
+	end,
 
 	["SetText"] = function(self, text)
 		self.label:SetText(text or "")
-		if text and text ~= "" then
+		if issecretvalue(text) or (text and text ~= "") then
 			self.left:SetPoint("RIGHT", self.label, "LEFT", -5, 0)
 			self.right:Show()
 		else

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

@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 Icon Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "Icon", 21
+local Type, Version = "Icon", 22
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -67,6 +67,11 @@ local methods = {
 		end
 	end,
 
+	["SetImageByAtlas"] = function(self, atlasString)
+		local image = self.image
+		image:SetAtlas(atlasString)
+	end,
+
 	["SetImageSize"] = function(self, width, height)
 		self.image:SetWidth(width)
 		self.image:SetHeight(height)

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", 27
 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
 -------------------------------------------------------------------------------]]
@@ -35,12 +31,14 @@ local function Keybinding_OnClick(frame, button)
 		if self.waitingForKey then
 			frame:EnableKeyboard(false)
 			frame:EnableMouseWheel(false)
+			frame:EnableGamePadButton(false)
 			self.msgframe:Hide()
 			frame:UnlockHighlight()
 			self.waitingForKey = nil
 		else
 			frame:EnableKeyboard(true)
 			frame:EnableMouseWheel(true)
+			frame:EnableGamePadButton(true)
 			self.msgframe:Show()
 			frame:LockHighlight()
 			self.waitingForKey = true
@@ -76,6 +74,7 @@ local function Keybinding_OnKeyDown(frame, key)
 
 		frame:EnableKeyboard(false)
 		frame:EnableMouseWheel(false)
+		frame:EnableGamePadButton(false)
 		self.msgframe:Hide()
 		frame:UnlockHighlight()
 		self.waitingForKey = nil
@@ -123,6 +122,7 @@ local methods = {
 		self:SetDisabled(false)
 		self.button:EnableKeyboard(false)
 		self.button:EnableMouseWheel(false)
+		self.button:EnableGamePadButton(false)
 	end,
 
 	-- ["OnRelease"] = nil,
@@ -199,10 +199,12 @@ local function Constructor()
 	button:SetScript("OnKeyDown", Keybinding_OnKeyDown)
 	button:SetScript("OnMouseDown", Keybinding_OnMouseDown)
 	button:SetScript("OnMouseWheel", Keybinding_OnMouseWheel)
+	button:SetScript("OnGamePadButtonDown", Keybinding_OnKeyDown)
 	button:SetPoint("BOTTOMLEFT")
 	button:SetPoint("BOTTOMRIGHT")
 	button:SetHeight(24)
 	button:EnableKeyboard(false)
+	button:EnableGamePadButton(false)
 
 	local text = button:GetFontString()
 	text:SetPoint("LEFT", 7, 0)
@@ -214,7 +216,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", 29
 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
 -------------------------------------------------------------------------------]]
@@ -128,12 +124,24 @@ local methods = {
 		UpdateImageAnchor(self)
 	end,
 
+	["SetImageByAtlas"] = function(self, atlasString)
+		self.imageshown = true
+		local image = self.image
+		image:SetAtlas(atlasString)
+		UpdateImageAnchor(self)
+	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", 33
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -6,21 +6,21 @@ if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 local pairs = pairs
 
 -- WoW APIs
-local GetCursorInfo, GetSpellInfo, ClearCursor = GetCursorInfo, GetSpellInfo, ClearCursor
+local GetCursorInfo, ClearCursor = GetCursorInfo, ClearCursor
 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
 -------------------------------------------------------------------------------]]
 
 if not AceGUIMultiLineEditBoxInsertLink then
 	-- upgradeable hook
+	if ChatFrameUtil and ChatFrameUtil.InsertLink then
+		hooksecurefunc(ChatFrameUtil, "InsertLink", function(...) return _G.AceGUIMultiLineEditBoxInsertLink(...) end)
+	elseif ChatEdit_InsertLink then
 		hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIMultiLineEditBoxInsertLink(...) end)
+	end
 end
 
 function _G.AceGUIMultiLineEditBoxInsertLink(text)
@@ -104,9 +104,13 @@ local function OnMouseUp(self)
 end
 
 local function OnReceiveDrag(self)                                               -- EditBox / ScrollFrame
-	local type, id, info = GetCursorInfo()
+	local type, id, info, extra = GetCursorInfo()
 	if type == "spell" then
+		if C_Spell and C_Spell.GetSpellName then
+			info = C_Spell.GetSpellName(extra)
+		else
 			info = GetSpellInfo(id, info)
+		end
 	elseif type ~= "item" then
 		return
 	end
@@ -145,6 +149,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 +269,6 @@ local methods = {
 	["SetCursorPosition"] = function(self, ...)
 		return self.editBox:SetCursorPosition(...)
 	end,
-
-
 }
 
 --[[-----------------------------------------------------------------------------
@@ -297,7 +307,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 +331,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", 24
 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")
@@ -277,6 +273,7 @@ local function Constructor()
 		widget[method] = func
 	end
 	slider.obj, editbox.obj = widget, widget
+	C_Timer.After(0.3, function() editbox:SetText(" ") UpdateText(widget) end) -- Workaround for font loading issue, making the editboxes blank until the text is changed
 
 	return AceGUI:RegisterAsWidget(widget)
 end

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: CallbackHandler-1.0.lua 25 2022-12-12 15:02:36Z nevcairiel $ ]]
-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

@@ -1,4 +1,4 @@
-
+--@curseforge-project-slug: libdbicon-1-0@
 -----------------------------------------------------------------------
 -- LibDBIcon-1.0
 --
@@ -6,7 +6,7 @@
 --
 
 local DBICON10 = "LibDBIcon-1.0"
-local DBICON10_MINOR = 43 -- Bump on changes
+local DBICON10_MINOR = 57 -- 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
@@ -16,16 +16,24 @@ if not lib then return end
 lib.objects = lib.objects or {}
 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, AddonCompartmentFrame = next, Minimap, CreateFrame, AddonCompartmentFrame
 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)
 	if lib.objects[name] then
 		if key == "icon" then
 			lib.objects[name].icon:SetTexture(value)
+			if lib:IsButtonInCompartment(name) and lib:IsButtonCompartmentAvailable() then
+				local addonList = AddonCompartmentFrame.registeredAddons
+				for i =1, #addonList do
+					if addonList[i].text == name then
+						addonList[i].icon = value
+						return
+					end
+				end
+			end
 		elseif key == "iconCoords" then
 			lib.objects[name].icon:UpdateCoord()
 		elseif key == "iconR" then
@@ -95,6 +103,33 @@ local function onLeave(self)
 	end
 end
 
+local function onEnterCompartment(self, menu)
+	local buttonName = menu.text
+	local object = lib.objects[buttonName]
+	if object and object.dataObject then
+		if object.dataObject.OnTooltipShow then
+			lib.tooltip:SetOwner(self, "ANCHOR_NONE")
+			lib.tooltip:SetPoint(getAnchors(self))
+			object.dataObject.OnTooltipShow(lib.tooltip)
+			lib.tooltip:Show()
+		elseif object.dataObject.OnEnter then
+			object.dataObject.OnEnter(self)
+		end
+	end
+end
+
+local function onLeaveCompartment(self, menu)
+	lib.tooltip:Hide()
+
+	local buttonName = menu.text
+	local object = lib.objects[buttonName]
+	if object and object.dataObject then
+		if object.dataObject.OnLeave then
+			object.dataObject.OnLeave(self)
+		end
+	end
+end
+
 --------------------------------------------------------------------------------
 
 local onDragStart, updatePosition
@@ -213,37 +248,39 @@ local function updateCoord(self)
 	self:SetTexCoord(coords[1] + deltaX, coords[2] - deltaX, coords[3] + deltaY, coords[4] - deltaY)
 end
 
-local function createButton(name, object, db)
+local function createButton(name, object, db, customCompartmentIcon)
 	local button = CreateFrame("Button", "LibDBIcon10_"..name, Minimap)
 	button.dataObject = object
 	button.db = db
+	lib.objects[name] = button
+
 	button:SetFrameStrata("MEDIUM")
-	button:SetSize(31, 31)
+	button:SetFixedFrameStrata(true)
 	button:SetFrameLevel(8)
+	button:SetFixedFrameLevel(true)
 	button:RegisterForClicks("anyUp")
 	button:RegisterForDrag("LeftButton")
-	button:SetHighlightTexture(136477) --"Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight"
+	lib:ResetButtonHighlightTexture(name)
-	local overlay = button:CreateTexture(nil, "OVERLAY")
+	lib:ResetButtonSize(name)
-	overlay:SetSize(53, 53)
-	overlay:SetTexture(136430) --"Interface\\Minimap\\MiniMap-TrackingBorder"
-	overlay:SetPoint("TOPLEFT")
-	local background = button:CreateTexture(nil, "BACKGROUND")
-	background:SetSize(20, 20)
-	background:SetTexture(136467) --"Interface\\Minimap\\UI-Minimap-Background"
-	background:SetPoint("TOPLEFT", 7, -5)
-	local icon = button:CreateTexture(nil, "ARTWORK")
-	icon:SetSize(17, 17)
-	icon:SetTexture(object.icon)
-	icon:SetPoint("TOPLEFT", 7, -6)
-	button.icon = icon
-	button.isMouseDown = false
 
+	local border = button:CreateTexture(nil, "OVERLAY")
+	button.border = border
+	lib:ResetButtonBorder(name)
+
+	local background = button:CreateTexture(nil, "BACKGROUND")
+	button.background = background
+	lib:ResetButtonBackground(name)
+
+	local icon = button:CreateTexture(nil, "ARTWORK")
+	icon:SetTexture(object.icon)
 	local r, g, b = icon:GetVertexColor()
 	icon:SetVertexColor(object.iconR or r, object.iconG or g, object.iconB or b)
-
 	icon.UpdateCoord = updateCoord
 	icon:UpdateCoord()
+	button.icon = icon
+	lib:ResetButtonIcon(name)
 
+	button.isMouseDown = false
 	button:SetScript("OnEnter", onEnter)
 	button:SetScript("OnLeave", onLeave)
 	button:SetScript("OnClick", onClick)
@@ -263,8 +300,6 @@ local function createButton(name, object, db)
 	animOut:SetStartDelay(1)
 	button.fadeOut:SetToFinalAlpha(true)
 
-	lib.objects[name] = button
-
 	if lib.loggedIn then
 		updatePosition(button, db and db.minimapPos)
 		if not db or not db.hide then
@@ -273,23 +308,18 @@ local function createButton(name, object, db)
 			button:Hide()
 		end
 	end
-	lib.callbacks:Fire("LibDBIcon_IconCreated", button, name) -- Fire 'Icon Created' callback
-end
 
--- We could use a metatable.__index on lib.objects, but then we'd create
+	if db and db.showInCompartment then
--- the icons when checking things like :IsRegistered, which is not necessary.
+		lib:AddButtonToCompartment(name, customCompartmentIcon)
-local function check(name)
-	if lib.notCreated[name] then
-		createButton(name, lib.notCreated[name][1], lib.notCreated[name][2])
-		lib.notCreated[name] = nil
 	end
+	lib.callbacks:Fire("LibDBIcon_IconCreated", button, name) -- Fire 'Icon Created' callback
 end
 
 -- Wait a bit with the initial positioning to let any GetMinimapShape addons
 -- load up.
 if not lib.loggedIn then
-	local f = CreateFrame("Frame")
+	local frame = CreateFrame("Frame")
-	f:SetScript("OnEvent", function(f)
+	frame:SetScript("OnEvent", function(self)
 		for _, button in next, lib.objects do
 			updatePosition(button, button.db and button.db.minimapPos)
 			if not button.db or not button.db.hide then
@@ -299,90 +329,9 @@ if not lib.loggedIn then
 			end
 		end
 		lib.loggedIn = true
-		f:SetScript("OnEvent", nil)
+		self:SetScript("OnEvent", nil)
 	end)
-	f:RegisterEvent("PLAYER_LOGIN")
+	frame:RegisterEvent("PLAYER_LOGIN")
-end
-
-local function getDatabase(name)
-	return lib.notCreated[name] and lib.notCreated[name][2] or lib.objects[name].db
-end
-
-function lib:Register(name, object, db)
-	if not object.icon then error("Can't register LDB objects without icons set!") end
-	if lib.objects[name] or lib.notCreated[name] then error(DBICON10.. ": Object '".. name .."' is already registered.") end
-	if not db or not db.hide then
-		createButton(name, object, db)
-	else
-		lib.notCreated[name] = {object, db}
-	end
-end
-
-function lib:Lock(name)
-	if not lib:IsRegistered(name) then return end
-	if lib.objects[name] then
-		lib.objects[name]:SetScript("OnDragStart", nil)
-		lib.objects[name]:SetScript("OnDragStop", nil)
-	end
-	local db = getDatabase(name)
-	if db then
-		db.lock = true
-	end
-end
-
-function lib:Unlock(name)
-	if not lib:IsRegistered(name) then return end
-	if lib.objects[name] then
-		lib.objects[name]:SetScript("OnDragStart", onDragStart)
-		lib.objects[name]:SetScript("OnDragStop", onDragStop)
-	end
-	local db = getDatabase(name)
-	if db then
-		db.lock = nil
-	end
-end
-
-function lib:Hide(name)
-	if not lib.objects[name] then return end
-	lib.objects[name]:Hide()
-end
-
-function lib:Show(name)
-	check(name)
-	local button = lib.objects[name]
-	if button then
-		button:Show()
-		updatePosition(button, button.db and button.db.minimapPos or button.minimapPos)
-	end
-end
-
-function lib:IsRegistered(name)
-	return (lib.objects[name] or lib.notCreated[name]) and true or false
-end
-
-function lib:Refresh(name, db)
-	check(name)
-	local button = lib.objects[name]
-	if db then
-		button.db = db
-	end
-	updatePosition(button, button.db and button.db.minimapPos or button.minimapPos)
-	if not button.db or not button.db.hide then
-		button:Show()
-	else
-		button:Hide()
-	end
-	if not button.db or not button.db.lock then
-		button:SetScript("OnDragStart", onDragStart)
-		button:SetScript("OnDragStop", onDragStop)
-	else
-		button:SetScript("OnDragStart", nil)
-		button:SetScript("OnDragStop", nil)
-	end
-end
-
-function lib:GetMinimapButton(name)
-	return lib.objects[name]
 end
 
 do
@@ -405,9 +354,83 @@ do
 	end
 	Minimap:HookScript("OnEnter", OnMinimapEnter)
 	Minimap:HookScript("OnLeave", OnMinimapLeave)
+end
 
-	function lib:ShowOnEnter(name, value)
+--------------------------------------------------------------------------------
-		local button = lib.objects[name]
+-- Button API
+--
+
+function lib:Register(name, object, db, customCompartmentIcon)
+	if not object.icon then error("Can't register LDB objects without icons set!") end
+	if lib:GetMinimapButton(name) then error(DBICON10.. ": Object '".. name .."' is already registered.") end
+	createButton(name, object, db, customCompartmentIcon)
+end
+
+function lib:Lock(name)
+	local button = lib:GetMinimapButton(name)
+	if button then
+		button:SetScript("OnDragStart", nil)
+		button:SetScript("OnDragStop", nil)
+		if button.db then
+			button.db.lock = true
+		end
+	end
+end
+
+function lib:Unlock(name)
+	local button = lib:GetMinimapButton(name)
+	if button then
+		button:SetScript("OnDragStart", onDragStart)
+		button:SetScript("OnDragStop", onDragStop)
+		if button.db then
+			button.db.lock = nil
+		end
+	end
+end
+
+function lib:Hide(name)
+	local button = lib:GetMinimapButton(name)
+	if button then
+		button:Hide()
+	end
+end
+
+function lib:Show(name)
+	local button = lib:GetMinimapButton(name)
+	if button then
+		button:Show()
+		updatePosition(button, button.db and button.db.minimapPos or button.minimapPos)
+	end
+end
+
+function lib:IsRegistered(name)
+	return lib.objects[name] and true or false
+end
+
+function lib:Refresh(name, db)
+	local button = lib:GetMinimapButton(name)
+	if button then
+		if db then
+			button.db = db
+		end
+		updatePosition(button, button.db and button.db.minimapPos or button.minimapPos)
+		if not button.db or not button.db.hide then
+			button:Show()
+		else
+			button:Hide()
+		end
+		if not button.db or not button.db.lock then
+			button:SetScript("OnDragStart", onDragStart)
+			button:SetScript("OnDragStop", onDragStop)
+		else
+			button:SetScript("OnDragStart", nil)
+			button:SetScript("OnDragStop", nil)
+		end
+	end
+end
+
+function lib:ShowOnEnter(name, value)
+	local button = lib:GetMinimapButton(name)
 	if button then
 		if value then
 			button.showOnMouseover = true
@@ -419,7 +442,10 @@ do
 			button:SetAlpha(1)
 		end
 	end
-	end
+end
+
+function lib:GetMinimapButton(name)
+	return lib.objects[name]
 end
 
 function lib:GetButtonList()
@@ -443,9 +469,224 @@ function lib:SetButtonToPosition(button, position)
 	updatePosition(lib.objects[button] or button, position)
 end
 
--- Upgrade!
+-- Button Configuration
+function lib:SetButtonSize(name, size)
+	local button = lib:GetMinimapButton(name)
+	if button and type(size) == "number" then
+		button:SetSize(size, size)
+	end
+end
+
+function lib:ResetButtonSize(name)
+	local button = lib:GetMinimapButton(name)
+	if button then
+		button:SetSize(31, 31)
+	end
+end
+
+function lib:SetButtonHighlightTexture(name, highlightTexture)
+	local button = lib:GetMinimapButton(name)
+	if button and (type(highlightTexture) == "number" or type(highlightTexture) == "string") then
+		button:SetHighlightTexture(highlightTexture)
+	end
+end
+
+function lib:ResetButtonHighlightTexture(name)
+	local button = lib:GetMinimapButton(name)
+	if button then
+		button:SetHighlightTexture(136477) --"Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight"
+	end
+end
+
+-- Border configuration
+function lib:RemoveButtonBorder(name)
+	local button = lib:GetMinimapButton(name)
+	if button.border then
+		button.border:Hide()
+	end
+end
+
+function lib:SetButtonBorder(name, borderTexture, size, framePoint, offsetX, offsetY)
+	local button = lib:GetMinimapButton(name)
+	if button.border then
+		lib:ResetButtonBorder(name)
+		if type(borderTexture) == "number" or type(borderTexture) == "string" then
+			button.border:SetTexture(borderTexture)
+		end
+		if type(size) == "number" then
+			button.border:SetSize(size, size)
+		end
+		if type(framePoint) == "string" then
+			button.border:ClearAllPoints()
+			button.border:SetPoint(framePoint, type(offsetX) == "number" and offsetX or 0, type(offsetY) == "number" and offsetY or 0)
+		end
+	end
+end
+
+function lib:ResetButtonBorder(name)
+	local button = lib:GetMinimapButton(name)
+	if button.border then
+		button.border:Show()
+		button.border:ClearAllPoints()
+		button.border:SetPoint("TOPLEFT", 0, 0)
+		button.border:SetTexture(136430) --"Interface\\Minimap\\MiniMap-TrackingBorder"
+		if lib:IsButtonCompartmentAvailable() then
+			button.border:SetSize(50, 50)
+		else
+			button.border:SetSize(53, 53)
+		end
+	end
+end
+
+-- Background configuration
+function lib:RemoveButtonBackground(name)
+	local button = lib:GetMinimapButton(name)
+	if button.background then
+		button.background:Hide()
+	end
+end
+
+function lib:SetButtonBackground(name, backgroundTexture, size, framePoint, offsetX, offsetY)
+	local button = lib:GetMinimapButton(name)
+	if button.background then
+		lib:ResetButtonBackground(name)
+		if type(backgroundTexture) == "number" or type(backgroundTexture) == "string" then
+			button.background:SetTexture(backgroundTexture)
+		end
+		if type(size) == "number" then
+			button.background:SetSize(size, size)
+		end
+		if type(framePoint) == "string" then
+			button.background:ClearAllPoints()
+			button.background:SetPoint(framePoint, type(offsetX) == "number" and offsetX or 0, type(offsetY) == "number" and offsetY or 0)
+		end
+	end
+end
+
+function lib:ResetButtonBackground(name)
+	local button = lib:GetMinimapButton(name)
+	if button.background then
+		button.background:Show()
+		button.background:ClearAllPoints()
+		button.background:SetTexture(136467) --"Interface\\Minimap\\UI-Minimap-Background"
+		if lib:IsButtonCompartmentAvailable() then
+			button.background:SetSize(24, 24)
+			button.background:SetPoint("CENTER", 0, 0)
+		else
+			button.background:SetSize(20, 20)
+			button.background:SetPoint("TOPLEFT", 7, -5)
+		end
+	end
+end
+
+-- Icon Configuration
+function lib:SetButtonIcon(name, iconTexture, size, framePoint, offsetX, offsetY)
+	local button = lib:GetMinimapButton(name)
+	if button.icon then
+		lib:ResetButtonIcon(name)
+		if type(iconTexture) == "number" or type(iconTexture) == "string" then
+			button.icon:SetTexture(iconTexture)
+		end
+		if type(size) == "number" then
+			button.icon:SetSize(size, size)
+		end
+		if type(framePoint) == "string" then
+			button.icon:ClearAllPoints()
+			button.icon:SetPoint(framePoint, type(offsetX) == "number" and offsetX or 0, type(offsetY) == "number" and offsetY or 0)
+		end
+	end
+end
+
+function lib:ResetButtonIcon(name)
+	local button = lib:GetMinimapButton(name)
+	if button.icon then
+		button.icon:SetTexture(button.dataObject.icon)
+		button.icon:UpdateCoord()
+		local r, g, b = button.icon:GetVertexColor()
+		button.icon:SetVertexColor(button.dataObject.iconR or r, button.dataObject.iconG or g, button.dataObject.iconB or b)
+		if lib:IsButtonCompartmentAvailable() then
+			button.icon:SetSize(18, 18)
+			button.icon:ClearAllPoints()
+			button.icon:SetPoint("CENTER")
+		else
+			button.icon:SetSize(17, 17)
+			button.icon:ClearAllPoints()
+			button.icon:SetPoint("TOPLEFT", 7, -6)
+		end
+	end
+end
+
+--------------------------------------------------------------------------------
+-- Addon Compartment API
+--
+
+if AddonCompartmentFrame then
+	function lib:IsButtonCompartmentAvailable()
+		return true
+	end
+else
+	function lib:IsButtonCompartmentAvailable()
+		return false
+	end
+end
+
+function lib:IsButtonInCompartment(buttonName)
+	local object = lib.objects[buttonName]
+	if object and object.db and object.db.showInCompartment then
+		return true
+	end
+	return false
+end
+
+function lib:AddButtonToCompartment(buttonName, customIcon)
+	if lib:IsButtonCompartmentAvailable() then
+		local object = lib.objects[buttonName]
+		if object and not object.compartmentData then
+			if object.db then
+				object.db.showInCompartment = true
+			end
+			object.compartmentData = {
+				text = buttonName,
+				icon = customIcon or object.dataObject.icon,
+				notCheckable = true,
+				registerForAnyClick = true,
+				func = function(_, menuInputData, menu)
+					object.dataObject.OnClick(menu, menuInputData.buttonName)
+				end,
+				funcOnEnter = onEnterCompartment,
+				funcOnLeave = onLeaveCompartment,
+			}
+			AddonCompartmentFrame:RegisterAddon(object.compartmentData)
+		end
+	end
+end
+
+function lib:RemoveButtonFromCompartment(buttonName)
+	if lib:IsButtonCompartmentAvailable() then
+		local object = lib.objects[buttonName]
+		if object and object.compartmentData then
+			for i = 1, #AddonCompartmentFrame.registeredAddons do
+				local entry = AddonCompartmentFrame.registeredAddons[i]
+				if entry == object.compartmentData then
+					object.compartmentData = nil
+					if object.db then
+						object.db.showInCompartment = nil
+					end
+					table.remove(AddonCompartmentFrame.registeredAddons, i)
+					AddonCompartmentFrame:UpdateDisplay()
+					return
+				end
+			end
+		end
+	end
+end
+
+--------------------------------------------------------------------------------
+-- Upgrades
+--
+
 for name, button in next, lib.objects do
-	local db = getDatabase(name)
+	local db = button.db
 	if not db or not db.lock then
 		button:SetScript("OnDragStart", onDragStart)
 		button:SetScript("OnDragStop", onDragStop)
@@ -468,3 +709,9 @@ for name, button in next, lib.objects do
 	end
 end
 lib:SetButtonRadius(lib.radius) -- Upgrade to 40
+if lib.notCreated then -- Upgrade to 50
+	for name in next, lib.notCreated do
+		createButton(name, lib.notCreated[name][1], lib.notCreated[name][2])
+	end
+	lib.notCreated = nil
+end

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,13 +1,19 @@
 # Grichelde - Text replacer
 
-Grichelde is a WoW Classic Addon that replaces characters you typed in a chatbox with any replacement text you specified in the addon options.   
+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. 
+Initially started as a helper addon for a roleplaying friend, Grichelde can be used for much more, like 
 
-Intentionally started as a helper addon for a roleplaying friend, Grichelde can be used for much more, like 
 * fixing your common spelling errors :)
 * replacing toon names with their nick names
 * write out abbreviations for you
 * create hilarious moments during roleplay
 
+However it does not replace slash commands with other slash commands, it only works for chat text. It you want to replace commands, 
+please look at more sophisticated chat addons like [Prat](https://www.curseforge.com/wow/addons/prat-3-0).  
+
 ## Disclaimer
 #### No Warranty
 The addon is provided "AS IS" and comes without warranty of any kind of function or correctness (for more details, consult the GPL 3 license).
@@ -31,34 +37,38 @@ Only slash commands, item links, textures, placeholders and ooc-markers are excl
 
 #### My replacement is not taken.
 
-After entering a search or replacement text, you see a button "Okay" next to yout input. This is **not** a validation message, 
+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" button to save the input permanently.
+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")
 
 If it still does not work or gives you errors, please read the next question. 
 
-#### I have to disable the Addon frequently. Is there a more elegant solution
+#### I have to disable the Addon frequently. Is there a more elegant solution?
 
 Actually there are two solutions:
 1. A right-click on the minimap button will disable Grichelde instantly. Right-click a second time will activate it again. Easy, isn't it?
-2. You can disable Grichelde permanently and forcefully replace the sentence in the chatbox. I call it "Grichelde-On-Demand" :) 
+2. You can disable Grichelde permanently and forcefully replace a sentence in the chatbox with manual override. I call it "Grichelde-On-Demand" :) 
    In the chatbox put `/gri` or `/grichelde` in front of your typed text, you can also include the target channel, 
-   i.e. `/gri /guild hello there` and Grichelde will apply the active replacements even if guild channel or Grichelde was disabled.
+   i.e. `/gri /guild hello there` and Grichelde will apply the active replacements and rules even if guild channel or Grichelde was disabled.
 
 #### I get errors, what should I do?
 
-Please report your errors here. Make a screenshot or copy both the error message as well as your recent mappings.
+Please report your errors on [project website](https://www.curseforge.com/wow/addons/grichelde) at curse forge. Make a screenshot or copy both the error message as well as your recent mappings.
-You can bring up a small windows with your mapping by entering the `/gri mappings` command.
+You can bring up a small windows with your mapping by entering the `/gri mappings` command on copy them.
 
 #### Why that strange name?
 
-Grichelde is the name of an undead rogue without a jaw, who was played in RP sessions with a guild member.
+Grichelde is the name of an Undead rogue without a jaw, who was played in RP sessions by a guild member.
-She started replacing "s" and "t" letters manually for each line in the chat, which became cumbersome over time.
+She started replacing `s` and `t` letters manually for each word in the chat, which became cumbersome over time.
 (If you ever wondered how an Undead without a jaw sounds like, its really hilarious, you should try it.) 
 Without spelling errors, "Griselde" in German is an old-fashioned female first name.
 
-#### I'm a pro. Does it support regular expressions?
+#### I'm a Pro. Does it support regular expressions?
 
-This is actually an unofficial feature. In general the searchText is passed in as Lua, so yes regex can be used in lookups.
+RegEx are very powerful search and replacement patterns commonly used in programming. Technically all searches the addon performs on the input are done 
-There are two caveats: first, Lua does not support PCRE syntax, as it would bloat Lua's simplicity and performance (read [here](http://www.lua.org/pil/20.1.html) why).
+with regular expression methods, however Lua unfortunately does not support full [PCRE](https://en.wikipedia.org/wiki/Perl_Compatible_Regular_Expressions) syntax and is very limited (read [here](http://www.lua.org/pil/20.1.html) why).
-Secondly, Grichelde does not support capture groups in the replacement text, so matches get lost. 
+Nevertheless some patterns can be used like the anchors start of line `^` or end of line `$`, capturing groups `(hello) (world)`, character classes like numbers `%d` or (inversed) sets `[^%p]`.
+
+Capture groups can be accessed in the replacement text with `%<number>` like in `%2 %1`. Also there are some mappings using RegEx in the Example section. 

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

@@ -6,17 +6,20 @@ local Grichelde = _G.Grichelde
 local L = LibStub('AceLocale-3.0'):NewLocale(AddonName, 'deDE')
 if not L then return end
 
-local cYellow = Grichelde.functions.cYellow
+local cYellow    = Grichelde.F.cYellow
-local cGray = Grichelde.functions.cGray
+local cGray      = Grichelde.F.cGray
-local cPrefix = Grichelde.functions.cPrefix
+local cHyperlink = Grichelde.F.cHyperlink
+local cPrefix    = Grichelde.F.cPrefix
 
 -- system messages
 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!"
+L.Downgrade_Detected = "Downgrade erkannt, %s kann sich m\195\182glichweise fehlerhaft verhalten!"
 
 -- debug
 L.Debug_Options = "Optionen"
@@ -30,17 +33,22 @@ L.Error_InvalidCommand = "Ung\195\188ltiger Befehl"
 L.Error_InvalidChannel = "Ung\195\188ltiger Kanal"
 L.Error_InvalidWhisperTarget = "Ung\195\188ltiger Fl\195\188sterziel"
 L.Error_UnsupportedChannel = "Nicht unterst\195\188tzter Kanal"
+L.Chat_Lockdown_Notice = "Der Chat ist w\195\164hrend dieses Kampfes durch das Spiel gesperrt, Grichelde hält sich zurück."
+L.Chat_Lockdown_Suffix = "(ignoriert von Grichelde)"
 
 -- profiles
 L.Profiles_Available = "Verf\195\188gbare Profile:"
 L.Profiles_Created = "Neues Profil %s angelegt."
 L.Profiles_Loaded = "Profil %s geladen."
+L.Profiles_Activated = "Profil %s aktiviert."
+L.Profiles_Deactivated = "Profil %s deaktiviert."
 L.Profiles_Refreshed = "Profil %s aktualisiert."
 L.Profiles_Deleted = "Profil %s gel\195\182scht."
 L.Profiles_Copied = "Einstellungen von Profil %s \195\188bernommen."
 L.Profiles_Reset = "Profil %s zur\195\188ckgesetzt."
 L.Profiles_Invalid = "Ung\195\188ltiges Profil %s!"
 L.Profiles_DeleteError = "Das aktive Profil kann nicht gel\195\182scht werden!"
+L.Profiles_AlreadyExistsError = "Das Profil %s existiert bereits!"
 
 -- minimap
 L.Minimap_Tooltip_Enabled = "%s"
@@ -100,8 +108,19 @@ L.Options_Replacements_Header = "Die Vorkommen links vom Pfeil \"=>\" werden in
 L.Options_Mapping_Group_Name = "%s => %s"
 L.Options_Mapping_Group_Desc = "Dieses Vorkommen wird in den aktivierten Kan\195\164len ersetzt."
 L.Options_Mapping_EmptyMapping = "(keine)"
-L.Options_Mapping_Enabled_Name = "Aktiv"
+L.Options_Mapping_MoveUp_Name = "^"
-L.Options_Mapping_Enabled_Desc = "Diese Ersetzung wird durchgef\195\188hrt"
+L.Options_Mapping_MoveUp_Desc = "nach oben verschieben"
+L.Options_Mapping_MoveDown_Name = "v"
+L.Options_Mapping_MoveDown_Desc = "nach unten verschieben"
+L.Options_Mapping_MatchWhen_Name = "wann:"
+L.Options_Mapping_MatchWhen_Desc = "F\195\188hrt die Ersetzung nur durch, wenn der Suchtext |nirgendwo vorkommt (<immer>), |nwenn der Suchtext <als ganzes Wort> \195\188bereinstimmt, |n<nur am Anfang eines Worts>, |noder <nur am Ende eines Worts>, |noder <nur am Anfang oder Ende eines Worts> aber nicht dazwischen, |noder nur in der Wortmitte aber <nie am Anfang und Ende eines Worts>."
+L.Options_Mapping_MatchWhen_Select1 = "nie (deaktivert)"
+L.Options_Mapping_MatchWhen_Select2 = "immer"
+L.Options_Mapping_MatchWhen_Select3 = "als ganzes Wort"
+L.Options_Mapping_MatchWhen_Select4 = "nur am Anfang eines Worts"
+L.Options_Mapping_MatchWhen_Select5 = "nur am Ende eines Worts"
+L.Options_Mapping_MatchWhen_Select6 = "nur am Anfang oder Ende eines Worts"
+L.Options_Mapping_MatchWhen_Select7 = "nie am Anfang und Ende eines Worts"
 L.Options_Mapping_SearchText_Name = "Suchtext:"
 L.Options_Mapping_SearchText_Desc = "Dieser Text wird in der Chateingabe gesucht."
 L.Options_Mapping_ReplaceText_Name = "Ersetzung:"
@@ -112,10 +131,6 @@ L.Options_Mapping_Consolidate_Name = "Zusammenfassen aufeinanderfolgender Treffe
 L.Options_Mapping_Consolidate_Desc = "Wenn durch die Ersetzung die Zeichenfolge mehrfach hintereinander steht,|nfasse sie zu einem Vorkommen zusammen."
 L.Options_Mapping_StopOnMatch_Name = "Anhalten nach Treffer"
 L.Options_Mapping_StopOnMatch_Desc = "F\195\188hrt keine nachfolgenden Ersetzungen mehr durch, wenn dieser Eintrag ein Suchtreffer war."
-L.Options_Mapping_MoveUp_Name = "^"
-L.Options_Mapping_MoveUp_Desc = "nach oben verschieben"
-L.Options_Mapping_MoveDown_Name = "v"
-L.Options_Mapping_MoveDown_Desc = "nach unten verschieben"
 L.Options_Mapping_Delete_Name = "L\195\182schen"
 L.Options_Mapping_Delete_Desc = "L\195\182scht diese Zuweisung."
 L.Options_Mapping_Delete_ConfirmText="Diese Zuweisung l\195\182schen?"
@@ -125,6 +140,8 @@ L.Options_Help_Group_Desc = "Hilfstellungen zu den Suchmustern und zur Ersetzung
 L.Options_Help_Disclaimer = cYellow("Haftungsausschlu\195\159:") .. " Das Addon wird im reinen Ist-Zustand zur Verf\195\188gung gestellt, ohne Garantie auf Funktion und Fehlerfreiheit (f\195\188r mehr Details siehe GPL 3 Lizenzdokument). "
                             .. "Ferner \195\188bernimmt der Autor keinerlei Haftung oder Gew\195\164hrleistung f\195\188r durch das Addon oder dessen Nutzung entstandene Fehler oder Sch\195\164den, "
                             .. "insb. den Verlust von Spielfortschritt oder Daten aufgrund von Abst\195\188rzen des WoW-Clients."
+L.Options_Help_Tab_Info_Name = "Info"
+L.Options_Help_Tab_Info_Desc = "\195\156ber dieses Addon."
 L.Options_Help_Tab_Basics_Name = "Grundlagen"
 L.Options_Help_Tab_Basics_Desc = "Erl\195\164utert die Grundlagen des Addons"
 L.Options_Help_Tab_Expert_Name = "Experte"
@@ -132,62 +149,432 @@ L.Options_Help_Tab_Expert_Desc = "Beleuchtet die Besonderheiten bei der Textsuch
 L.Options_Help_Tab_Examples_Name = "Beispiele"
 L.Options_Help_Tab_Examples_Desc = "Beispiele f\195\188r bestimmte Szenarien."
 
+L.Options_Help_Info = cYellow("\195\156ber dieses Addon")
+                        .. "|n%s ersetzt beliebige, selbstdefinierte Zeichenfolgen durch andere selbstdefinierte Zeichenfolgen, die ihr eingebt. Die Ersetzung findet vor dem Versenden an andere Spieler oder Kanäle statt. "
+                        .. "Es \195\164ndert nicht den Text den andere Spieler im Chat geschrieben haben, nur eure eigenen Eingaben. Es soll den individuellen Sprachfehler eures Charakters simulieren und dadurch die Immersion erh\195\182hen."
+                        .. "|n|nNat\195\188rlich kann man es auch f\195\188r andere Dinge zweckentfremden (Trollifizierer, Abk\195\188rzungen, Kosenamen, etc.). Eine ausf\195\188hrliche Beschreibung aller Optionen, der Funktionsweise und viele Beispiele befinden sich auf den nachfolgenden Reitern."
+                        .. "|n|n" .. cYellow("Kontakt")
+                        .. "|nBitte Fehler und Erfahrungsberichte direkt als Kommentar auf der Projektwebseite bei " .. cPrefix("CurseForge") .. " (" .. cHyperlink("https://www.curseforge.com/wow/addons/grichelde") .. ") einmelden. "
+                        .. "Ihr k\195\182nnt auch gern Screenshots der Fehlermeldungen und eurer Zuweisungen anh\195\164ngen. Ein \195\156bersichtsfenster aller Mappings kann mit dem Kommando " .. cPrefix("\"/gri mappings\"") .. " aufgerufen und herauskopiert werden. "
+                        .. "|nIch freue mich \195\188ber euere Erfahrungsberichte und Fehlerreports."
+                        .. "|n|n" .. cYellow("Dank")
+                        .. "|nMein Dank geht an meine lieben Beta-Tester " .. cPrefix("Chamera") .. ", " .. cPrefix("Tabenoca") .. " und " .. cPrefix("Nordraka") .. ", und besondereren Dank an " .. cPrefix("Shinue") .. " f\195\188r die Inspiration und lustigen Momente."
 L.Options_Help_Basics = cYellow("Reihenfolge")
                         .. "|nEs sind unbegrenzt viele Textersetzung m\195\182glich, und sie werden in der Reihenfolge der definierten Zuordnungen abgearbeitet, von oben nach unten. "
                         .. "Ersetzungen sind transitiv, d.h. nachfolgende Zuordnungen beziehen sich nicht auf den Originaltext, sondern das Resultat der vorherigen Ersetzung. "
                         .. "|nMit der Zuordnung " .. cPrefix("\"a\" => \"b\"") .. " und " .. cPrefix("\"b\" => \"c\"") .. " wird bei Eingabe von " .. cPrefix("\"a\" => \"c\"") .. "."
                         .. "|n|n" .. cYellow("Exakte Gro\195\159- und Kleinschreibung")
-                        .. "|nBei exakter Gro\195\159- und Kleinschreibung muss die Schreibweise genau \195\188berstimmen, sonst findet keine Textersetzug f\195\188r diese Zuordnung statt. "
+                        .. "|nBei exakter Gro\195\159- und Kleinschreibung muss die Schreibweise genau \195\188berstimmen, sonst wird diese Zuordnung \195\188bersprungen. "
                         .. "Wird die Gro\195\159- und Kleinschreibung ignoriert, wird die Gro\195\159schreibung jedes Zeichens bei der Ersetzung \195\188bernommen. "
                         .. "|nMit der Zuordnung " .. cPrefix("\"aBcDeF\" => \"uvWXYz\"") .. " wird aus " .. cPrefix("\"abcdef\" => \"uvwxyz\"") .. ", "
                         .."aus " .. cPrefix("\"ABCDEF\" => \"UVWXYZ\"") .. " und aus " .. cPrefix("\"AbCdEf\" => \"UvWxYz\"") .. "."
                         .. "|n|n" .. cYellow("Zusammenfassen aufeinanderfolgender Treffer")
                         .. "|nDas Zusammenfassen aufeinanderfolgender Treffer vermeidet unsch\195\182ne Wiederholungen, die durch die Ersetzung entstehen k\195\182nnen. "
-                        .. "Die Zusammenfassung wird erst nach der Ersetzung vorgenommen, d.h. am vollst\195\164ndig ersetzten Text f\195\188r jede Zuordnung. "
+                        .. "Die Zusammenfassung wird erst nach der Ersetzung vorgenommen, d.h. am vollst\195\164ndig ersetzten Text f\195\188r alle Zuordnungen. "
                         .. "|nMit der Zuordnung " .. cPrefix("\"s\" => \"sch\"") .. " wird aus " .. cPrefix("\"Tasse\" => \"Tasche\"") .. " statt " .. cPrefix("\"Taschsche\"") .. ", "
-                        .. "aber " .. cPrefix("\"schmeissen\" => \"schchmeischen\"") .. ". Solche Randbedingungen beseitigt in der Regel eine weitere Zuordnung wie " .. cPrefix("\"chch\" => \"ch\"") .. "."
+                        .. "aber aus " .. cPrefix("\"schmeissen\" => \"schchmeischen\"") .. ". Solche Randbedingungen beseitigt in der Regel eine weitere Zuordnung: " .. cPrefix("\"schch\" => \"sch\"") .. "."
+                        .. "|n|n" .. cYellow("Anhalten nach Treffer")
+                        .. "|nAlle nachfolgenden Ersetzungen mehr \195\188bersprungen, wenn die aktuelle Zuordnung zutreffend ist. Wenn bei der aktuelle Zuordnung kein Treffer vorliegt, werden die restlichen Zuordnung ganz normal weiter abgearbeitet."
 L.Options_Help_Expert = cYellow("verk\195\188rzende/verl\195\163ngernde Ersetzungen")
                         .. "|nIst der Ersetzungstext k\195\188rzer als der eigentliche Suchtext, werden die \195\188bersch\195\188\195\159igen Zeichen des Suchtreffers entfernt. "
                         .. "Ist der Ersetzungstext l\195\163nger, werden die \195\188brigen Zeichen nach dem Treffer hinten drangehangen. Dabei wird die Gro\195\159- und Kleinschreibung des letzten Zeichens ber\195\188cksichtigt, "
                         .. "ebenso wie die Gro\195\159- und Kleinschreibung des nachfolgenden Zeichens. Gro\195\159geschriebene Abk\195\188rzungen und Ausdr\195\188cke bleiben so einheitlich. "
                         .. "|nMit der Zuordnung " .. cPrefix("\"Kr\195\164uter\" => \"Gr\195\188nzeugs\"") .. " wird aus " .. cPrefix("\"KR\195\132UTER\" => \"GR\195\156NZEUGS\"") .. " statt " .. cPrefix("\"GR\195\156NZEUgs\"") .. " "
-                        .. "unter Beibehaltung von absichtlicher Gro\195\159schreibung wie " .. cPrefix("\"Kr\195\132utERGarten\" => \"Gr195\156nzEUGSgarten\"") .. " statt " .. cPrefix("\"Gr\195\188nzeugsGarten\"") .. "."
+                        .. "unter Beibehaltung von absichtlicher Gro\195\159schreibung wie " .. cPrefix("\"Kr\195\132utERGarten\" => \"Gr\195\156nzEUGSgarten\"") .. " statt " .. cPrefix("\"Gr\195\188nzeugsGarten\"") .. "."
                         .. "|n|n" .. cYellow("Standby")
                         .. "|nErsetzungen k\195\182nnen auch nur bei Bedarf durchgef\195\188hrt werden, selbst wenn das Addon oder ein Kanal deaktivert wurde. "
                         .. "Vor der Eingabe in der Chatbox schreibt man " .. cPrefix("/gri").. " oder " .. cPrefix("/grichelde").. " und optional noch den Zielkanal "
-                        .. "z.B. " .. cPrefix("\"/gri /p hallo da dr\195\188ben\"") .. " und alle aktiven Zuordnungen werden ersetzt, selbst wenn der Gruppenkanal oder das Addon nicht aktiv sind."
+                        .. "z.B. " .. cPrefix("\"/gri /g Hallo Leute\"") .. " und alle aktiven Zuordnungen werden ersetzt, selbst wenn der Gildenkanal oder das Addon nicht aktiv sind."
                         .. "|n|n" .. cYellow("Regul\195\164re Ausdr\195\188cke")
-                        .. "|nRegEx sind sehr m\195\163chtige Such- und Ersetzunsgmuster die h\195\163ufig in der Programmierung verwendet werden. Technisch gesehen benutzt das Addon f\195\188r die Suchen des Eingabetextes bereits regul\195\163ren Ausdr\195\188cke. "
+                        .. "|nRegEx sind sehr m\195\163chtige Such- und Ersetzunsgmuster die h\195\163ufig in der Programmierung verwendet werden. Generell werden RegEx in den Suchtexten \195\188bernommen, "
-                        .. "Das Eingeben von RegEx als Suchtext ist allerings eine inoffizielle Funktion und hat zwei gro\195\159e Einschr\195\163nkungen: "
+                        .. "aber Lua unterst\195\188tzt nicht den vollst\195\163ndigen Umfang von PCRE. Trotzdem funktionieren viele Muster wie Anker bei Zeilenanfang " .. cPrefix("\"^\"") .. " oder Zeilenende " .. cPrefix("\"$\"")
-                        .. "|n1. Leider unterst\195\188tzt Lua nicht den vollst\195\163ndigen Umfang von PCRE. Trotzdem k\195\182nnen einige Muster verwendet werden wie Zeilenanfang " .. cPrefix("\"^\"") .. " "
+                        .. ", Gruppen " .. cPrefix("\"(Hallo) (Welt)\"") .. "Zeichenklassen wie Zahlen " .. cPrefix("\"%d\"") .. " oder (negierte) Auswahlen " .. cPrefix("\"[^%p]\"") .. ". "
-                        .."oder Zeilenende " .. cPrefix("\"$\"") .. ", Zeichenklassen wie Zahlen " .. cPrefix("\"%d\"") .. " oder (negierte) Auswahlen " .. cPrefix("\"[^%p]\"") .. ". "
+                        .. "Auf Gruppen kann im Ersetzungtext mit %<Nummer> zugegriffen werden" .. cPrefix("\"%2 %1\"") .. "."
-                        .. "|n2. Es werden keine Gruppen im Ersetzungstest unterst\195\188tzt, so da\195\159 Gruppen einfach verloren gehen. Wegen der Gro\195\159- und Kleinschreibung und steigender Komplexit\195\163t ist diese Funktion auch f\195\188r die Zukunft nicht geplant. "
                         .. "|nIm Beispiel-Reiter gibt es einige Ersetzungen, welche mit regul\195\164ren Ausdr\195\188cke umgesetzt wurden."
 
 L.Options_Help_Examples_Note = cYellow("Hinweis:") .. " Dieses Addon bef\195\188rwortet nicht und beabsichtig nicht Personen mit (Fremd-)Sprachproblemen |nzu verletztem oder herabzuw\195\188rdigen. Die Verantwortung f\195\188r den Einsatz des Addons obliegt dem Benutzer. |nBitte verwendet die Funktion respektvoll und zur\195\188ckhaltend gegen\195\188ber anderen Mitspielern."
-L.Options_Help_Examples0_Header = cYellow("Beispiel")
+L.Options_Help_Examples_Header = cYellow("Beispiel")
-L.Options_Help_Examples0_Text = "Bitte ein Beispiel aus der Auswahlbox ausw\195\164hlen."
+L.Options_Help_Examples_Text = "Bitte ein Beispiel aus der Auswahlbox ausw\195\164hlen."
-L.Options_Help_Examples1_Select = "fehlender Unterkiefer"
+L.Options_Help_Examples_Import_Name = "Importieren"
-L.Options_Help_Examples1_Header = cYellow("S und P werden durch Zisch- und Klacklaute ersetzt.")
+L.Options_Help_Examples_Import_Desc = "Importiert das ausgew\195\164hlte Beispiel in ein neues Profil %s."
-L.Options_Help_Examples1_Text = cPrefix("s => ch") .. "|n|n" .. cPrefix("t => ck")
+L.Options_Help_Examples_Import_ConfirmText = "Wird das Beispiel %s in das neue Profil %s importieren."
-L.Options_Help_Examples2_Select = "Trollifizierung"
+
-L.Options_Help_Examples2_Header = cYellow("L\195\164\195\159t euch fast wie ein echter Troll klingen.")
+L.Options_Help_Examples = {
-L.Options_Help_Examples2_Text = cPrefix("%.$ => , maan.") .. "|n|n" .. cPrefix("ir => ia") .. "|n|n" .. cPrefix("ch => ck") .. "|n|n" .. cPrefix("g => ch") .. "|n|n" .. cPrefix("qu => kw") .. "|n|n" .. cPrefix("t => d")
+    {
-L.Options_Help_Examples3_Select = "Altmodisch"
+        name = "fehlender Unterkiefer",
-L.Options_Help_Examples3_Header = cYellow("Benutzt eine antiquiertere Schreibweise.")
+        desc = cYellow("S und P werden durch Zisch- und Klacklaute ersetzt."),
-L.Options_Help_Examples3_Text = cPrefix("ei => ey") .. "|n|n" .. cPrefix("\195\159 => sz")
+        replacements = {
-L.Options_Help_Examples4_Select = "Abk\195\188rzungen"
+            replacement_10 = {
-L.Options_Help_Examples4_Header = cYellow("Viel sagen, wenig tippen.")
+                order = 10,
-L.Options_Help_Examples4_Text = cPrefix("gz => Herzlichen Gl\195\188ckwunsch") .. "|n|n" .. cPrefix("gn8 => Gute Nacht") .. "|n|n" .. cPrefix("afk => Bin mal eben weg (AFK)") .. "|n|n" .. cPrefix("MC => Geschmolzener Kern")
+                searchText = "s",
-L.Options_Help_Examples5_Select = "Eigennamen"
+                replaceText = "ch",
-L.Options_Help_Examples5_Header = cYellow("Ersetzt Spielernamen, NPCs oder Orte durch andere Ausdr\195\188cke.")
+                exactCase = false,
-L.Options_Help_Examples5_Text = cPrefix("Sylvanas => die rachs\195\188chtige Bansheek\195\182nigin") .. "|n|n" .. cPrefix("R\195\188tzkn\195\188bbel => R\195\188tzi") .. "|n|n" .. cPrefix("Unterstadt => Undercity")
+                consolidate = true,
-L.Options_Help_Examples6_Select = "Lispeln"
+                matchWhen = 2,
-L.Options_Help_Examples6_Header = cYellow("Aussprache von S und Z wird zu einem Zischlaut")
+                stopOnMatch = false,
-L.Options_Help_Examples6_Text = cPrefix("sch => ch") .. "|n|n" .. cPrefix("s => fs") .. "|n|n" .. cPrefix("z => ts") .. "|n|n" .. cPrefix("chs => x")
+            },
-L.Options_Help_Examples7_Select = "Stottern"
+            replacement_11 = {
-L.Options_Help_Examples7_Header = cYellow("Stottern")
+                order = 11,
-L.Options_Help_Examples7_Text = "p[%s]-$"
+                searchText = "t",
+                replaceText = "ck",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "p",
+                replaceText = "b",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+        }
+    }, {
+        name = "Trollifizierung",
+        desc = cYellow("L\195\164\195\159t euch fast wie Vol'jin klingen."),
+        replacements = {
+            replacement_10 = {
+                order = 10,
+                searchText = "(%w)(%p?)$",
+                replaceText = "%1, maan%2",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 5,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "ir(r?)",
+                replaceText = "ia",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "ch",
+                replaceText = "ck",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_13 = {
+                order = 13,
+                searchText = "g",
+                replaceText = "ch",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_14 = {
+                order = 14,
+                searchText = "qu",
+                replaceText = "kw",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_15 = {
+                order = 15,
+                searchText = "t",
+                replaceText = "d",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_16 = {
+                order = 16,
+                searchText = "er",
+                replaceText = "a",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 5,
+                stopOnMatch = false,
+            },
+        }
+    }, {
+        name = "Jar Jar Binks",
+        desc = cYellow("L\195\164\195\159t euch sprechen wie ein ungeschickter Gungan"),
+        replacements = {
+            replacement_10 = {
+                order = 10,
+                searchText = "ver",
+                replaceText = "va",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 4,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "en",
+                replaceText = "'n",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 5,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "er",
+                replaceText = "a",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 5,
+                stopOnMatch = false,
+            },
+            replacement_13 = {
+                order = 13,
+                searchText = "(%w?)ich",
+                replaceText = "%1ichse",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_14 = {
+                order = 14,
+                searchText = "(d?m?)ir",
+                replaceText = "%1ichse",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_15 = {
+                order = 15,
+                searchText = "du",
+                replaceText = "du da",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_16 = {
+                order = 16,
+                searchText = "er",
+                replaceText = "erse",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_17 = {
+                order = 17,
+                searchText = "sie",
+                replaceText = "sie da",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_18 = {
+                order = 18,
+                searchText = "wir",
+                replaceText = "wirse",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_19= {
+                order = 19,
+                searchText = "ihr",
+                replaceText = "ihrse",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_20 = {
+                order = 20,
+                searchText = "nicht",
+                replaceText = "nich",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_21 = {
+                order = 21,
+                searchText = "die",
+                replaceText = "de",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+        }
+    }, {
+        name = "Altmodisch",
+        desc = cYellow("Benutzt eine antiquiertere Schreibweise."),
+        replacements = {
+            replacement_10 = {
+                order = 10,
+                searchText = "ei",
+                replaceText = "ey",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "eu",
+                replaceText = "oy",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "\195\159",
+                replaceText = "sz",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+        }
+    }, {
+        name = "Abk\195\188rzungen",
+        desc = cYellow("Viel sagen, wenig tippen."),
+        replacements = {
+            replacement_10 = {
+                order = 10,
+                searchText = "gz",
+                replaceText = "Herzlichen Gl\195\188ckwunsch",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "gn8",
+                replaceText = "Gute Nacht",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "afk",
+                replaceText = "Bin mal kurz weg. (AFK)",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_13 = {
+                order = 13,
+                searchText = "MC",
+                replaceText = "Geschmolzener Kern",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+        }
+    }, {
+        name = "Eigen-, Kose- und Ortsnamen",
+        desc = cYellow("Ersetzt Spielernamen, NPCs oder Orte durch andere Ausdr\195\188cke."),
+        replacements = {
+            replacement_10 = {
+                order = 10,
+                searchText = "Sylvanas",
+                replaceText = "die rachs\195\188chtige Bansheek\195\182nigin",
+                exactCase = true,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "R\195\188tzkn\195\188bbel",
+                replaceText = "R\195\188tzi",
+                exactCase = true,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "Unterstadt",
+                replaceText = "Undercity",
+                exactCase = true,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+        }
+    }, {
+        name = "Lispeln",
+        desc = cYellow("Aussprache von S und Z wird zu einem Zischlaut"),
+        replacements = {
+            replacement_10 = {
+                order = 10,
+                searchText = "sch",
+                replaceText = "ch",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "s",
+                replaceText = "fs",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "z",
+                replaceText = "ts",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_13 = {
+                order = 13,
+                searchText = "chs",
+                replaceText = "x",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+        }
+    }, {
+        name = "Stottern",
+        desc = cYellow("Wiederholt Vokale am Satzanfang"),
+        replacements = {
+            replacement_10 = {
+                order = 10,
+                searchText = "^([^aeiouy]-)([aeiouy])",
+                replaceText = "%1%2-%1%2-%1%2",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 4,
+                stopOnMatch = false,
+            },
+        }
+    },
+}
 
 L.IgnorePattern_Star = "Stern"
 L.IgnorePattern_Circle = "Kreis"

localisation/enUS.lua

@@ -6,17 +6,20 @@ local Grichelde = _G.Grichelde
 local L = LibStub('AceLocale-3.0'):NewLocale(AddonName, 'enUS', true)
 if not L then return end
 
-local cYellow = Grichelde.functions.cYellow
+local cYellow    = Grichelde.F.cYellow
-local cGray = Grichelde.functions.cGray
+local cGray      = Grichelde.F.cGray
-local cPrefix = Grichelde.functions.cPrefix
+local cHyperlink = Grichelde.F.cHyperlink
+local cPrefix    = Grichelde.F.cPrefix
 
 -- system messages
 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!"
+L.Downgrade_Detected = "Downgrade detected, %s might not work correctly!"
 
 -- debug
 L.Debug_Options = "Options"
@@ -30,17 +33,22 @@ L.Error_InvalidCommand = "Invalid command"
 L.Error_InvalidChannel = "Invalid channel"
 L.Error_InvalidWhisperTarget = "Invalid whisper target"
 L.Error_UnsupportedChannel = "Unsupported channel"
+L.Chat_Lockdown_Notice = "Chat is locked by the game during this encounter. Grichelde will remain passive."
+L.Chat_Lockdown_Suffix = "(ignored by Grichelde)"
 
 -- profiles
 L.Profiles_Available = "Available profiles:"
 L.Profiles_Created = "New profile %s created."
 L.Profiles_Loaded = "Profile %s is loaded."
-L.Profiles_Refreshed = "Profil %s refreshed."
+L.Profiles_Activated = "Profile %s activated."
+L.Profiles_Deactivated = "Profile %s deactivated."
+L.Profiles_Refreshed = "Profile %s refreshed."
 L.Profiles_Deleted = "Profile %s deleted."
 L.Profiles_Copied = "Settings applied from profile %s."
-L.Profiles_Reset = "Profil %s reset."
+L.Profiles_Reset = "Profile %s reset."
 L.Profiles_Invalid = "Invalid profile %s!"
 L.Profiles_DeleteError = "The active profile cannot be deleted!"
+L.Profiles_AlreadyExistsError = "The profile %s already exists!"
 
 -- minimap
 L.Minimap_Tooltip_Enabled = "%s"
@@ -100,8 +108,19 @@ L.Options_Replacements_Header = "All matches on the lefthand side of the arrow \
 L.Options_Mapping_Group_Name = "%s => %s"
 L.Options_Mapping_Group_Desc = "This lookup will be replaced in activated channels."
 L.Options_Mapping_EmptyMapping = "(none)"
-L.Options_Mapping_Enabled_Name = "active"
+L.Options_Mapping_MoveUp_Name = "^"
-L.Options_Mapping_Enabled_Desc = "This replacement will be processed."
+L.Options_Mapping_MoveUp_Desc = "move up"
+L.Options_Mapping_MoveDown_Name = "v"
+L.Options_Mapping_MoveDown_Desc = "move down"
+L.Options_Mapping_MatchWhen_Name = "when:"
+L.Options_Mapping_MatchWhen_Desc = "Replacement is only done if the search text matches either |nanywhere (<always>), |nif the search text mantches <as a whole word>, |nolny at the <start of each word>, |nor at the <end of each word>, |nor <only at the start or end of each word> but not in between, |nor only in the middle of each word, but <never at start or end of any word>."
+L.Options_Mapping_MatchWhen_Select1 = "never (disabled)"
+L.Options_Mapping_MatchWhen_Select2 = "always"
+L.Options_Mapping_MatchWhen_Select3 = "as a whole word"
+L.Options_Mapping_MatchWhen_Select4 = "start of each word"
+L.Options_Mapping_MatchWhen_Select5 = "end of each word"
+L.Options_Mapping_MatchWhen_Select6 = "only at start and end of each word"
+L.Options_Mapping_MatchWhen_Select7 = "never at start or end of any word"
 L.Options_Mapping_SearchText_Name = "Search for:"
 L.Options_Mapping_SearchText_Desc = "This text is looked up in your chat input box."
 L.Options_Mapping_ReplaceText_Name = "Replacement:"
@@ -112,10 +131,6 @@ L.Options_Mapping_Consolidate_Name = "consolidate consecutive matches"
 L.Options_Mapping_Consolidate_Desc = "If after the replacement a text sequence is repeated|ndirectly after another, treat them as one occurrence."
 L.Options_Mapping_StopOnMatch_Name = "stop on match"
 L.Options_Mapping_StopOnMatch_Desc = "Stops looking for any following replacements, when this one matched."
-L.Options_Mapping_MoveUp_Name = "^"
-L.Options_Mapping_MoveUp_Desc = "move up"
-L.Options_Mapping_MoveDown_Name = "v"
-L.Options_Mapping_MoveDown_Desc = "move down"
 L.Options_Mapping_Delete_Name = "Delete"
 L.Options_Mapping_Delete_Desc = "Deletes this replacement mapping."
 L.Options_Mapping_Delete_ConfirmText = "Delete this replacement mapping?"
@@ -125,6 +140,8 @@ L.Options_Help_Group_Desc = "Guideance to search patterns and replacement logic.
 L.Options_Help_Disclaimer = cYellow("Disclaimer of warranty:") .. " The addon is provided \"AS IS\" and comes without warranty of any kind of function or correctness (for more details, consult the GPL 3 license). "
                             .."Also the author is not held responsible for any risk or damage the addon or its use might cause, especially lost of progress or data due to crashes of the WoW client."
 
+L.Options_Help_Tab_Info_Name = "Info"
+L.Options_Help_Tab_Info_Desc = "About this addon."
 L.Options_Help_Tab_Basics_Name = "Basics"
 L.Options_Help_Tab_Basics_Desc = "Some explanatory notes the the basic behaviour."
 L.Options_Help_Tab_Expert_Name = "Expert"
@@ -132,6 +149,16 @@ L.Options_Help_Tab_Expert_Desc = "More details on special search options."
 L.Options_Help_Tab_Examples_Name = "Examples"
 L.Options_Help_Tab_Examples_Desc = "Templates for particular scenarios."
 
+L.Options_Help_Info = cYellow("About this addon")
+                        .. "|n%s replaces any characters or words you typed in a chatbox according to your replacement rules and text. 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 to strengthen immersion in roleplay."
+                        .. "|n|nOf course it can be used for many other things, too (trollifier, abbreviations, nick names, etc.). A extensive description of all options, the general replacement workflow and a lot of examples can be found on the next tabs."
+                        .. "|n|n" .. cYellow("Contact")
+                        .. "|nPlease report errors and your experiences directly as a comment on the project website at " .. cPrefix("CurseForge") .. " (" .. cHyperlink("https://www.curseforge.com/wow/addons/grichelde") .. "). "
+                        .. "You are encouraged to attach screenshots of error messages and your mappings. An overview of all your mappings is shnown by using the command " .. cPrefix("\"/gri mappings\"") .. " and copy it out. "
+                        .. "|nI'm looking forward for your feedback and reports."
+                        .. "|n|n" .. cYellow("Thanks")
+                        .. "|Many thanks to my beta testers " .. cPrefix("Chamera") .. ", " .. cPrefix("Tabenoca") .. " and " .. cPrefix("Nordraka") .. ", and very special thanks to " .. cPrefix("Shinue") .. " for the inspiration and hilarious moments."
 L.Options_Help_Basics = cYellow("Ordering")
                         .. "|nYou can have an unlimited number of replacements. All mappings will be processed in same order as defined, from top down. "
                         .. "Replacements are also transitive, so consecutive mappings do not work on the original input but the resulting text from the previous replacements. "
@@ -146,6 +173,8 @@ L.Options_Help_Basics = cYellow("Ordering")
                         .. "Consolidation takes place after all replacements were done, meaning it's applied to the completely replaced text. "
                         .. "|nWith mapping " .. cPrefix("\"s\" => \"sh\"") .. " text becomes " .. cPrefix("\"tossing\" => \"toshing\"") .. " instead of " .. cPrefix("\"toshshing\"") .. ", yet still " .. cPrefix("\"paths\" => \"pathsh\"") .. ". "
                         .. "Such edge cases can usually be mitigated with an additional mapping at the end: " .. cPrefix("\"thsh\" => \"thz\"") .. "."
+                        .. "|n|n" .. cYellow("stop on match")
+                        .. "|nAll other consecutive replacements are skipped, when the current mapping matched. When the current mapping does not match, the remaining mappings are processed as usual."
 L.Options_Help_Expert = cYellow("shortening/lengthening replacements")
                         .. "|nIf the replacement is shorter than the actual match, all remaining characters will be skipped. If the replacement is longer, all remaining characters will be appended. "
                         .. "The case of the replaced character is considered as well as the case of the next character in the original text. That way capital case abbreviations and expressions will not be distorted. "
@@ -156,38 +185,440 @@ L.Options_Help_Expert = cYellow("shortening/lengthening replacements")
                         .. "In the chatbox put " .. cPrefix("/gri") .. " or " .. cPrefix("/grichelde") .. " in front of your typed text, you can also include the target channel, "
                         .. "i.e. " .. cPrefix("\"/gri /guild hello there\"") .. " and the active replacements are applied even if the guild channel or global switch was disabled."
                         .. "|n|n" .. cYellow("Regular Expressions")
-                        .. "|nRegex are very powerful search and replacement patterns commonly used in programming. Technically all searches the addon performs on the input text are done with regular expression methods. "
+                        .. "|nRegEx are very powerful search and replacement patterns commonly used in programming. Technically all searches the addon performs on the input are done with regular expression methods, "
-                        .. "Entering regex as search text however is an unofficial feature and has two major caveats: "
+                        .. "however Lua unfortunately does not support full PCRE syntax and is very limited. Nevertheless some patterns can be used like the anchors start of line " .. cPrefix("\"^\"") .. " or end of line " .. cPrefix("\"$\"")
-                        .. "|n1. Unfornately Lua does not support full PCRE syntax and is very limited. Nethertheless some patterns can be used like start of line " .. cPrefix("\"^\"") .. " or end of line " .. cPrefix("\"$\"") .. ", "
+                        .. ", capturing groups " .. cPrefix("\"(hello) (world)\"") .. "character classes like numbers " .. cPrefix("\"%d\"") .. " or (inversed) sets " .. cPrefix("\"[^%p]\"") .. ". "
-                        .. "character classes like numbers " .. cPrefix("\"%d\"") .. " or (inversed) sets " .. cPrefix("\"[^%p]\"") .. ". "
+                        .. "Capture groups can be accessed in the replacement text with %<number> like in " .. cPrefix("\"%2 %1\"").. "."
-                        .. "|n2. There is no support for capture groups in the replacement text, so matches get lost. Because of case sensivity and complexity there are no plans to support this."
+                        .. "|nAlso there are some mappings using RegEx in the Example section."
-                        .. "|nAnyway, there are some mappings using RegEx in the Example secion."
-
 
 L.Options_Help_Examples_Note = cYellow("Note:") .. " This addon does not encourange or intend to hurt or to tease people with speaking disabilities or language disorders. The responsibility rest on the user completely. Please use the features with care and respect to other players."
-L.Options_Help_Examples0_Header = cYellow("Example")
+L.Options_Help_Examples_Header = cYellow("Example")
-L.Options_Help_Examples0_Text = "Select an example from the dropdown above."
+L.Options_Help_Examples_Text = "Select an example from the dropdown above."
-L.Options_Help_Examples1_Select = "absent jaw"
+L.Options_Help_Examples_Import_Name = "Import"
-L.Options_Help_Examples1_Header = cYellow("S and P will be replaced by sibilant and clack sounds.")
+L.Options_Help_Examples_Import_Desc = "Imports the selected example into a new profile."
-L.Options_Help_Examples1_Text = cPrefix("s => ch") .. "|n|n" .. cPrefix("t => ck")
+L.Options_Help_Examples_Import_ConfirmText = "This will import the example %s into the nre profile %s."
-L.Options_Help_Examples2_Select = "trollifier"
+
-L.Options_Help_Examples2_Header = cYellow("Almost sound like a real Troll.")
+L.Options_Help_Examples = {
-L.Options_Help_Examples2_Text = cPrefix("%.$ => , mon.") .. "|n|n" .. cPrefix("th => d") .. "|n|n" .. cPrefix("you => ya") .. "|n|n" .. cPrefix("ing => in'")
+    {
-L.Options_Help_Examples3_Select = "old-fashioned"
+        name = "absent jaw",
-L.Options_Help_Examples3_Header = cYellow("Use an outdate pronounciation.")
+        desc = cYellow("S and P will be replaced by sibilant and clack sounds."),
-L.Options_Help_Examples3_Text = cPrefix("oi => oy") .. "|n|n" .. cPrefix("do => doe") .. "|n|n" .. cPrefix("go => goe") .. "|n|n" .. cPrefix("you => thou") .. "|n|n" .. cPrefix("yours => thy") .. "|n|n" .. cPrefix("be => bee") .. "|n|n" .. cPrefix("we => wee")
+        replacements = {
-L.Options_Help_Examples4_Select = "abbreviations"
+            replacement_10 = {
-L.Options_Help_Examples4_Header = cYellow("Say much, type less.")
+                order = 10,
-L.Options_Help_Examples4_Text = cPrefix("gz => Congratulations") .. "|n|n" .. cPrefix("gn8 => Good night") .. "|n|n" .. cPrefix("afk => I'm temporarikly not available (AFK)") .. "|n|n" .. cPrefix("MC => Molten Core")
+                searchText = "s",
-L.Options_Help_Examples5_Select = "Proper names"
+                replaceText = "ch",
-L.Options_Help_Examples5_Header = cYellow("Replace player names, NPCs or locations.")
+                exactCase = false,
-L.Options_Help_Examples5_Text = cPrefix("Sylvanas => the revengeful banshee queen") .. "|n|n" .. cPrefix("Asmongold => Asmon") .. "|n|n" .. cPrefix("Crossroads => X-roads")
+                consolidate = true,
-L.Options_Help_Examples6_Select = "lisp"
+                matchWhen = 2,
-L.Options_Help_Examples6_Header = cYellow("S and Z will become a sibilant")
+                stopOnMatch = false,
-L.Options_Help_Examples6_Text = cPrefix("s => th") .. "|n|n" .. cPrefix("ch => tsh") .. "|n|n" .. cPrefix("z => tsh") .. "|n|n" .. cPrefix("dg => ck")
+            },
-L.Options_Help_Examples7_Select = "stammer"
+            replacement_11 = {
-L.Options_Help_Examples7_Header = cYellow("stammer")
+                order = 11,
-L.Options_Help_Examples7_Text = "p[% s]-$"
+                searchText = "t",
+                replaceText = "ck",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "p",
+                replaceText = "b",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+        }
+    }, {
+        name = "trollifier",
+        desc = cYellow("Almost sound like Vol'jin."),
+        replacements = {
+            replacement_10 = {
+                order = 10,
+                searchText = "(%w)(%p?)$",
+                replaceText = "%1, mon%2",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 5,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "th",
+                replaceText = "d",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "what are you",
+                replaceText = "whatcha",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_13 = {
+                order = 13,
+                searchText = "your?s?",
+                replaceText = "ya",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_14 = {
+                order = 14,
+                searchText = "going to",
+                replaceText = "gonna",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_15 = {
+                order = 15,
+                searchText = "want to",
+                replaceText = "wanna",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_16 = {
+                order = 16,
+                searchText = "ing",
+                replaceText = "in'",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 5,
+                stopOnMatch = false,
+            },
+        }
+    }, {
+        name = "Jar Jar Binks",
+        desc = cYellow("Lets you sound like a clumsy Gungan"),
+        replacements = {
+            replacement_10 = {
+                order = 10,
+                searchText = "me",
+                replaceText = "mesa",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "I am",
+                replaceText = "Mesa",
+                exactCase = true,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "I'm",
+                replaceText = "Mesa",
+                exactCase = true,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_13 = {
+                order = 13,
+                searchText = "I",
+                replaceText = "Me",
+                exactCase = true,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_14 = {
+                order = 14,
+                searchText = "you are",
+                replaceText = "yousa",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_15 = {
+                order = 15,
+                searchText = "you're",
+                replaceText = "yousa",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_16 = {
+                order = 16,
+                searchText = "your",
+                replaceText = "yous",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_17 = {
+                order = 17,
+                searchText = "(s?)he is",
+                replaceText = "%1hesa",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_18 = {
+                order = 18,
+                searchText = "(s?)he's",
+                replaceText = "%1hesa",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_19 = {
+                order = 19,
+                searchText = "they",
+                replaceText = "daysa",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_20 = {
+                order = 20,
+                searchText = "them",
+                replaceText = "them-sa",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_21 = {
+                order = 21,
+                searchText = "ing",
+                replaceText = "in'",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 5,
+                stopOnMatch = false,
+            },
+            replacement_22 = {
+                order = 22,
+                searchText = "the",
+                replaceText = "da",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_23 = {
+                order = 23,
+                searchText = "th",
+                replaceText = "d",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_24 = {
+                order = 24,
+                searchText = "yes",
+                replaceText = "yesa",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_25 = {
+                order = 25,
+                searchText = "oka?y?",
+                replaceText = "okeeday",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+        }
+    }, {
+        name = "old-fashioned",
+        desc = cYellow("Use an outdated pronounciation."),
+        replacements = {
+            replacement_10 = {
+                order = 10,
+                searchText = "oi",
+                replaceText = "oy",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "([^aeiou]*)([aeiou])",
+                replaceText = "%1%2e",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 5,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "yours",
+                replaceText = "thy",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_13 = {
+                order = 13,
+                searchText = "youe",
+                replaceText = "thou",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+        }
+    }, {
+        name = "abbreviations",
+        desc = cYellow("Say much, type less."),
+        replacements = {
+            replacement_10 = {
+                order = 10,
+                searchText = "gz",
+                replaceText = "Congratulations",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "gn8",
+                replaceText = "Good night",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "afk",
+                replaceText = "I'm temporarily unavailable (AFK)",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_13 = {
+                order = 13,
+                searchText = "MC",
+                replaceText = "Molten Core",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+        }
+    }, {
+        name = "Proper names",
+        desc = cYellow("Replace player names, NPCs or locations."),
+        replacements = {
+            replacement_10 = {
+                order = 10,
+                searchText = "Sylvanas",
+                replaceText = "the revengeful banshee queen",
+                exactCase = true,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "Asmon",
+                replaceText = "Asmongold",
+                exactCase = true,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "x%-?roads",
+                replaceText = "Crossroads",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 3,
+                stopOnMatch = false,
+            },
+        }
+    }, {
+        name = "Lisp",
+        desc = cYellow("S and Z will become sibilant"),
+        replacements = {
+            replacement_10 = {
+                order = 10,
+                searchText = "s",
+                replaceText = "th",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "ch",
+                replaceText = "tsh",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "z",
+                replaceText = "tsh",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_13 = {
+                order = 13,
+                searchText = "dg",
+                replaceText = "ck",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+        }
+    }, {
+        name = "stammer",
+        desc = cYellow("Repeats vowels at the beginning of a sentence"),
+        replacements = {
+            replacement_10 = {
+                order = 10,
+                searchText = "^([^aeiouy]-)([aeiouy])",
+                replaceText = "%1%2-%1%2-%1%2",
+                exactCase = false,
+                consolidate = true,
+                matchWhen = 4,
+                stopOnMatch = false,
+            },
+        }
+    },
+}
 
 L.IgnorePattern_Star = "Star"
 L.IgnorePattern_Circle = "Circle"

twitch/announcements.txt

@@ -0,0 +1,17 @@
+https://wow.gamepedia.com/Localizing_an_addon
+https://wow.gamepedia.com/Pattern_matching
+https://wow.gamepedia.com/Lua_functions#String_Functions
+https://wow.gamepedia.com/API_SetRaidTarget
+https://www.wowace.com/projects/ace3/pages/ace-db-3-0-tutorial
+https://www.wowace.com/projects/ace3/pages/api/ace-db-3-0
+https://wowwiki.fandom.com/wiki/Events_A-Z_(full_list)
+
+
+Liebe RP-Gemeinde, ich benötige eure Mithilfe beim Test meines ersten WoW-Addons. :handshake: 
+
+Es heißt "Grichelde" und ersetzt beliebige, selbstdefinierte Zeichenfolgen durch andere selbstdefinierte Zeichenfolgen, die ihr eingebt. Es ändert nicht den Text den andere im Chat geschrieben haben, nur eure eigenen Eingaben. Die Idee wurde nach mehreren lustigen RP-Sitzungen mit einer Untoten ohne Unterkiefer geboren, deren Spielerin den Sprachfehler immer mühsam per Hand eintippen musste. Es soll den individuellen Sprachfehler eures Charakters simulieren und dadurch die Immersion erhöhen. Auf der Webseite findet ihr ein paar Screenshots, die euch die Funktion einfach verbildlichen sollten: https://www.curseforge.com/wow/addons/grichelde/screenshots
+
+Natürlich kann man es auch für andere Dinge zweckentfremden (Trollifizierer :dragon_face: , Abkürzungen, Kosenamen, etc.). Es gibt ein nettes UI zum Konfigurieren der Ersetzungen und der aktiven Kanäle und auch eine großzügige Hilfesektion mit vielen Beispielen. Die Suchtreffer können auf ganze Wörter oder am Anfang, der Mitte und/oder am Ende eines Wortes eingeschränkt werden. Für die Profis gibt es sogar Unterstützung für reguläre Ausdrücke :sunglasses:, das ermöglicht auch schwierigere Ersetzungen mit Wiederholungen, wie Stottern. Für Rollenspieler gibts auch eine eigene Emote- und OOC-Erkennung.
+
+Installieren kann man es über Twitch, dort muss aktuell noch die Suche und Installation von Beta-Versionen aktiviert sein, oder manuell über diesen Link runterladen und in den WoW\Interface\Addons Ordner kopieren: https://www.curseforge.com/wow/addons/grichelde
+Bitte Fehler auf der Projektwebseite bei CurseForge einmelden, damit wir den Discord nicht zweckentfremden. Ich freue mich über euere Erfahrungsberichte und Fehlerreports.

twitch/image-descriptions.txt

@@ -1,6 +1,9 @@
 Sample replacement
 Text is replaced in the "Say" channel.
 
+Replacements
+Define your own set of replacements rules
+
 Replacements
 Create multiple mappings between search text and replacement with additional conditions.
 
@@ -8,10 +11,16 @@ Channel configuration
 individual channel activation
 
 Profiles
-global, per server, per class, per character
+global, per server, per class, per character or custom
 
-New: Examples
+Examples
-Templates for various situations
+Templates for various situations, now also with import possibility
+
+Help
+Built-in help texts
+
+Confirm text changes
+When you enter a search or replacement text, please confirm your input with the Okay button. Otherwise its not saved.
 
 
 
@@ -19,7 +28,7 @@ Beispielersetzung
 Eine Texteingabe wird im "Sagen"-Kanal ersetzt.
 
 Zeichenersetzung
-Erzeuge bedingte Zuordnungen zwischen Such- und Ersetzungetext.
+Erzeuge bedingte Zuordnungen zwischen Such- und Ersetzungstext.
 
 Kanälekonfiguration
 einzeln pro Kanal aktivierbar
@@ -28,13 +37,13 @@ Profile:
 Global, pro Server, pro Klasse, pro Character
 
 Neu: Beispiele
-Vorlagen für verschiedene Zwecke
+Vorlagen für verschiedene Zwecke, jetzt mit Import-Funktion
 
 
 
 Error Reporting
 In case of errors please send me the exact error message and please also provide the mapping from "/gri mappings" (see next screen).
 
-Debug Mappings
-In case of errors please send me the exact error message and please also provide the mapping from "/gri mappings".
 
+Debug Mappings
+In case of errors please send me the exact error message and please also provide the mapping from "/gri mappings"