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
- fixes german umlauts
2026-11-01 16:06:37 +01:00 · 2026-11-01 16:05:54 +01:00 · 2026-11-01 15:37:09 +01:00 · 2026-11-01 01:03:16 +01:00 · 2026-11-01 00:57:12 +01:00 · 2026-11-01 00:07:10 +01:00
61 changed files with 1735 additions and 3414 deletions
@@ -1,44 +1,124 @@
-# Gradle
-.gradle
-build/
-
-# Android built artifacts
-*.apk
-*.ap_
-*.dex
-
-# Java build artifacts class files
+### Artifacts ###
+# Compilation
 *.class

-# other generated files
-gen/
+# Package Files
+*.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)
-local.properties
+### Java ###

-# OSX files
-.DS_Store
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/

-# Eclipse
-/.classpath
-/.settings/
-/.project
-/.metadata
-bin/
+# crash logs and heap dumps
+hs_err_pid*
+replay_pid*

-# IntelliJ
-*.iws
-*.uml
-.idea/
-out/
+### Backup ###
+*.bak
+*.ori
+*.orig
+*.tmp
+*.zip
+*.tar.gz
+*.rar

-# NDK
-obj/
+### CREDENTIALS ###

-# Misc
-.bin/
-.release/
+**/secret
+
+### 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
@@ -3,9 +3,39 @@ 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 versions of WoW (Classic Era, Season of Mastery, BCC, Retail)
+- 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
@@ -131,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
@@ -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,6 +20,7 @@ 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 "Development"
 --Grichelde.era = _G.WOW_PROJECT_ID == _G.WOW_PROJECT_CLASSIC
@@ -40,7 +41,7 @@ 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.ldb, self.icon = self:MinimapButton()
@@ -56,7 +57,8 @@ function Grichelde:OnEnable()
 end

 function Grichelde:OnDisable()
-    self:Unhook("SendChatMessage")
+    self:UnhookAll()
+    self.originalSend = nil
    self:CloseOptions()
    self:HideMinimapButton()
    self:UnregisterChatCommand("grichelde")
@@ -1,48 +1,23 @@
-## Interface: 11401
-## Interface-Classic: 11401
-## Interface-BCC: 20502
-## Interface-Retail: 90100
+## Interface: 120105, 16001, 11509, 20506, 38002, 50504 

 ## Title: Grichelde
 ## Notes: Replaces characters of your chat input line before sending.
 ## Notes-de: Ersetzt eingegebene Zeichen in der Chat-Zeile vor dem Versenden.
-#@debug@
-## Version: 1.1.3
-#@end-debug@
-#@non-debug@
-# ## Version: @project-version@
-#@end-non-debug@
+## Version: 1.1.7
 ## Author: Teilzeit-Jedi
 ## eMail: tj@teilzeit-jedi.de
-
-#@version-classic@
-## X-Build: Classic
-## X-Compatible: 20502
-## X-Compatible: 90100
-#@end-version-classic@
-#@non-version-classic@
-#@version-bcc@
-# ## X-Build: BCC
-# ## X-Compatible: 11401
-# ## X-Compatible: 90100
-#@end-version-bcc@
-#@version-retail@
-# ## X-Build: Retail
-# ## X-Compatible: 11401
-# ## X-Compatible: 20502
-#@end-version-retail@
-#@end-non-version-classic@
+## AllowLoadGameType: standard, classic, camelot, forever

 ## 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

-#@no-lib-strip@
 Libs\LibStub\LibStub.lua
 Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml
 Libs\AceAddon-3.0\AceAddon-3.0.xml
@@ -56,7 +31,6 @@ 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
-#@end-no-lib-strip@

 Grichelde.lua
 GricheldeConstants.lua
@@ -69,7 +43,6 @@ GricheldeUpgrade.lua
 GricheldeOptions.lua
 GricheldeMinimap.lua
 GricheldeChat.lua
-
 #@do-not-package@
 GricheldeTest.lua
-#@end-do-not-package@
+#@end-do-not-package@
@@ -1,10 +1,10 @@
 -- import addon read namespace from global env
-local _G = _G
+local _G = _G or getfenv()
 local Grichelde = _G.Grichelde or {}

-local IsAddOnLoaded, assert, nilOrEmpty, pairs, ipairs, spairs, tContains, tFilter, tInsert, tConcat, tSize, tIsEmpty, find, sub, gsub, gmatch, getNextCharUtf8, isLetter, isUpper, isLower, toUpper, toLower, capitalize, bytes2Char, trim, length, lengthUtf8
-    = Grichelde.F.IsAddOnLoaded, Grichelde.F.assert, Grichelde.F.nilOrEmpty, Grichelde.F.pairs, Grichelde.F.ipairs, Grichelde.F.spairs, Grichelde.F.tContains, Grichelde.F.tFilter, Grichelde.F.tInsert, Grichelde.F.tConcat, Grichelde.F.tSize, Grichelde.F.tIsEmpty,
-      Grichelde.F.find, Grichelde.F.sub, Grichelde.F.gsub, Grichelde.F.gmatch, Grichelde.F.getNextCharUtf8, Grichelde.F.isLetter, Grichelde.F.isUpper, Grichelde.F.isLower, Grichelde.F.toUpper, Grichelde.F.toLower, Grichelde.F.capitalize, Grichelde.F.bytes2Char, Grichelde.F.trim, Grichelde.F.length, Grichelde.F.lengthUtf8
+local assert, nilOrEmpty, pairs, ipairs, spairs, tContains, tFilter, tInsert, tIsEmpty, tSize, find, sub, gsub, getNextCharUtf8, isUtf8MultiByte, getUtf8Sequence, isUpper, isLower, toUpper, toLower, bytes2Char, trim, length, lengthUtf8
+    = Grichelde.F.assert, Grichelde.F.nilOrEmpty, Grichelde.F.pairs, Grichelde.F.ipairs, Grichelde.F.spairs, Grichelde.F.tContains, Grichelde.F.tFilter, Grichelde.F.tInsert, Grichelde.F.tIsEmpty, Grichelde.F.tSize,
+      Grichelde.F.find, Grichelde.F.sub, Grichelde.F.gsub, Grichelde.F.getNextCharUtf8, Grichelde.F.isUtf8MultiByte, Grichelde.F.getUtf8Sequence, Grichelde.F.isUpper, Grichelde.F.isLower, Grichelde.F.toUpper, Grichelde.F.toLower, Grichelde.F.bytes2Char, Grichelde.F.trim, Grichelde.F.length, Grichelde.F.lengthUtf8

 --- Splits a long text in longest possible chunks of <= 255 length, split at last available space
 -- @param text string
@@ -58,7 +58,6 @@ function Grichelde:SplitText(text)
        -- must not enforce UTF-8 support here, as the positions are used
        while ((length(newText) > 0) and (escape < Grichelde.ENDLESS_LOOP_LIMIT)) do
            escape = escape + 1
-            local previousChar = currentChar
            local first, textAhead = getNextCharUtf8(newText)
            currentChar = first
            self:DebugPrint("SplitText : currentChar, escape: %s, %s", currentChar, escape)
@@ -143,17 +142,35 @@ end
 function Grichelde:SendChunkifiedChatMessage(message, ...)
    if (length(message) > 255) then
        local chunks = self:SplitText(message)
-        self:DebugPrint("SendChunkifiedChatMessage : #chunks:", #chunks)
+        self:DebugPrint("SendChunkifiedChatMessage : #chunks:", tSize(chunks))

        for _, chunk in ipairs(chunks) do
-            self.hooks["SendChatMessage"](chunk, ...);
+            self:SendOriginal(chunk, ...)
        end
    else
-        self.hooks["SendChatMessage"](message, ...);
+        self:SendOriginal(message, ...)
    end
 end

 function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, replacedTexts)
+    local function convertToCaseInsensitivePatternGroup(p)
+        local upperP, lowerP = toUpper(p), toLower(p)
+--[[
+        if (isUtf8MultiByte(p)) then
+            local sequence = nil
+            for _, byteSequence in spairs(getUtf8Table(upperP)) do
+                sequence = sequence .. byteSequence
+            end
+        else
+]]
+            if (upperP ~= lowerP) then
+                return upperP .. lowerP
+            else
+                return p
+            end
+        --end
+    end
+
    local function convertToCaseInsensitivePattern(pattern)
        local ciPattern = ""
        local ignored = {'^', '$', '(', ')', '.'}
@@ -184,18 +201,22 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
                            ciPattern = ciPattern .. "%" .. p
                        end
                    else
-                        local upperP, lowerP = toUpper(p), toLower(p)
-                        if (upperP ~= lowerP) then
-                            ciPattern = ciPattern .. upperP .. lowerP
-                        else
-                            ciPattern = ciPattern .. p
-                        end
+                        ciPattern = ciPattern .. convertToCaseInsensitivePatternGroup(p)
                    end
                    p, patRest = getNextCharUtf8(patRest)
                end
                ciPattern = ciPattern .. "]"
+            elseif (isUtf8MultiByte(p)) then
+                -- a set like [Ää] would match single bytes, so only group the differing last byte
+                local upperP, lowerP = toUpper(p), toLower(p)
+                local lead = sub(p, 1, -2)
+                if (upperP ~= lowerP) and (sub(upperP, 1, -2) == lead) and (sub(lowerP, 1, -2) == lead) then
+                    ciPattern = ciPattern .. lead .. "[" .. sub(upperP, -1) .. sub(lowerP, -1) .. "]"
+                else
+                    ciPattern = ciPattern .. p
+                end
            else
-                ciPattern = ciPattern .. "[" ..  Grichelde.F.toUpper(p) .. Grichelde.F.toLower(p) .. "]"
+                ciPattern = ciPattern .. "[" .. convertToCaseInsensitivePatternGroup(p) .. "]"
            end

            p, patRest = getNextCharUtf8(patRest)
@@ -204,11 +225,12 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
        return ciPattern
    end

-    local function replaceCaptures(text, replaceText, captures)
+    local function replaceCaptures(txt, replaceText, captures)
        local replText = replaceText
-        self:TracePrint("replaceCaptures : text: %s, #captures: %d", text, #captures)
+        local n = tSize(captures)
+        self:TracePrint("replaceCaptures : txt: %s, #captures: %d", txt, n)

-        if (#captures > 0) then
+        if (n > 0) then
            for i, cap in ipairs(captures) do
                --self:TracePrint("replaceCaptures : i: %d, cap: %s", i, cap)
                if (cap == nil) then
@@ -285,9 +307,6 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
    self:TracePrint("ReplaceCharacters : pos1: %d, pos2: %d", pos1, pos2)
    self:TracePrint("ReplaceCharacters : cap1: %s, cap2: %s, cap3: %s, cap4: %s, cap5: %s, cap6: %s, cap7: %s, cap8: %s, cap9: %s", cap1, cap2, cap3, cap4, cap5, cap6, cap7, cap8, cap9)
    while (pos1 ~= nil) and (pos2 ~= nil) and (pos1 <= pos2) do
-        -- continue from that position later
-        pos = pos2 + 1
-
        if doStopOnMatch then
            stopOnMatch = true
        end
@@ -297,6 +316,24 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
        local post = sub(result, pos2 + 1)
        local wordStart = sub(pre, -1, -1)
        local wordEnd = sub(post, 1, 1)
+        self:TracePrint("ReplaceCharacters : result: %s", result)
+        self:TracePrint("ReplaceCharacters : pre: %s, match: %s, post: %s, wordStart: %s, wordEnd: %s", pre, match, post, wordStart, wordEnd)
+
+--[[
+        self:TracePrint("ReplaceCharacters : pos2: %d, isChar: %s", pos2, isChar(match))
+        while (not isChar(match) and pos2 < length(result)) do
+            pos2 = pos2 + 1
+            pre = sub(result, 1, pos1 - 1)
+            match = sub(result, pos1, pos2)
+            post = sub(result, pos2 + 1)
+            wordStart = sub(pre, -1, -1)
+            wordEnd = sub(post, 1, 1)
+            self:TracePrint("ReplaceCharacters : pos2: %d, isChar: %s", pos2, isChar(match))
+        end
+]]
+
+        -- continue from that position later
+        pos = pos2 + 1

        -- additional checks for word boundaries
        local doesMatchWhen = false
@@ -400,8 +437,9 @@ function Grichelde:ReplaceCharacters(text, replName, replTable, consolidate, rep
            end

            -- update previous consolidate markers
-            local diff = lengthUtf8(replText) - lengthUtf8(match)
-            self:TracePrint("ReplaceCharacters : diff = %d - %d", lengthUtf8(replText), lengthUtf8(match))
+            -- positions are byte offsets, so the difference must be counted in bytes as well
+            local diff = length(replText) - length(match)
+            self:TracePrint("ReplaceCharacters : diff = %d - %d", length(replText), length(match))
            for key, posList in pairs(consolidate) do
                if (key ~= replName) then
                    for i, pc in ipairs(posList) do
@@ -441,8 +479,8 @@ end
 -- @param text string
 -- @param replacements table of mappings
 -- @return string
-function Grichelde:ReplaceAndConsolidate(text, replacements)
-    local replacements = replacements or self.db.profile.replacements or {}
+function Grichelde:ReplaceAndConsolidate(text, _replacements)
+    local replacements = _replacements or self.db.profile.replacements or {}
    self:TracePrint("ReplaceAndConsolidate : replacements")
    self:TracePrint(replacements)

@@ -531,7 +569,6 @@ function Grichelde:CheckForLink(text, currentChar)
        for _, pattern in ipairs(Grichelde.IGNORE_PATTERNS.LINKS) do
            local pos1, pos2 = find(text, "^" .. pattern)
            if (pos1 == 1) and (pos2 ~= nil) then
-                local match = sub(text, pos1, pos2)
                self:DebugPrint("CheckForLink : Found link or texture pattern \"%s\" at (%d, %d)", pattern, pos1, pos2)
                return pos2
            end
@@ -590,10 +627,10 @@ function Grichelde:CheckForRaidTargetMarkers(text, currentChar)
            local translation = toLower(self.L["IgnorePattern_" .. localizedRT])
            local localizedPattern = "^{" .. translation .. "}"
            self:TracePrint("CheckForPreversableText : localizedPattern:", localizedPattern)
-            local pos1, pos2 = find(lowerText, localizedPattern)
-            if (pos1 == 1) and (pos2 ~= nil) then
-                self:DebugPrint("CheckForPreversableText : Found localized raid target marker \"%s\" at (%d, %d)", localizedPattern, pos1, pos2)
-                return pos2
+            local p1, p2 = find(lowerText, localizedPattern)
+            if (p1 == 1) and (p2 ~= nil) then
+                self:DebugPrint("CheckForPreversableText : Found localized raid target marker \"%s\" at (%d, %d)", localizedPattern, p1, p2)
+                return p2
            end
        end
    end
@@ -636,9 +673,9 @@ end
 -- @param previousChar string(1) previous character of the text, otherwise unreachable
 -- @param preserveEmotes boolean ignore replacements for emotes, for testing purposes
 -- @return number
-function Grichelde:CheckForPreversableText(text, currentChar, previousChar, replaceEmotes)
+function Grichelde:CheckForPreversableText(text, currentChar, previousChar, _replaceEmotes)
    self:DebugPrint("CheckForPreversableText : text:", text)
-    local replaceEmotes = replaceEmotes or self.db.profile.channels.emote or false
+    local replaceEmotes = _replaceEmotes or self.db.profile.channels.emote or false

    local linkPos = self:CheckForLink(text, currentChar)
    if (linkPos ~= nil) then
@@ -679,11 +716,11 @@ end
 -- @param text string the text to apply the mappings on
 -- @param preserveEmotes boolean ignore replacements for emotes, for testing purposes
 -- @return string
-function Grichelde:ReplaceText(text, replacements, replaceEmotes)
+function Grichelde:ReplaceText(text, _replacements, _replaceEmotes)
    local lookAheads = { '|', '*', '<', '%', '{', '(', 'o' }
    local newText = text
-    local preserveEmotes = replaceEmotes or self.db.profile.channels.emote or false
-    local replacements = replacements or self.db.profile.replacements or {}
+    local preserveEmotes = _replaceEmotes or self.db.profile.channels.emote or false
+    local replacements = _replacements or self.db.profile.replacements or {}
    local finalText, replaceText = "", ""
    local currentChar
    local escape = 0
@@ -849,7 +886,7 @@ function Grichelde:CheckAndExtractMessageTypeTarget(message)
        local type = tFilter(self.SUPPORTED_CHAT_COMMANDS,
            function(_, k, _) return chatCmd == k end
        )
-        assert(#type < 2)
+        assert(tSize(type) < 2)

        if (not tIsEmpty(type)) then
            self:DebugPrint("CheckAndExtractMessageTypeTarget : determined type: %s", type[1])
@@ -859,8 +896,18 @@ function Grichelde:CheckAndExtractMessageTypeTarget(message)
                -- special reply handling
                if ("/r" == chatCmd) or ("/reply" == chatCmd) then
                    -- reuse last type and target if possible
-                    local lastTold, lastToldType = ChatEdit_GetLastToldTarget()
+                    local getLastToldTarget = (_G.ChatFrameUtil and _G.ChatFrameUtil.GetLastToldTarget) or _G.ChatEdit_GetLastToldTarget
+                    local lastTold, lastToldType
+                    if (getLastToldTarget ~= nil) then
+                        lastTold, lastToldType = getLastToldTarget()
+                    end
                    self:DebugPrint("CheckAndExtractMessageTypeTarget : lastTell, lastTellType =", lastTold, lastToldType)
+
+                    if (nilOrEmpty(lastTold)) then
+                        self:ErrorPrint(self.L.Error_InvalidWhisperTarget)
+                        -- dont send text at all
+                        return nil
+                    end
                    return targetAndText, lastToldType or "WHISPER", lastTold
                elseif ("/tt" == chatCmd) then
                    -- determine target from game world selection
@@ -904,7 +951,7 @@ function Grichelde:CheckAndExtractMessageTypeTarget(message)
            local _, _, channelNumber = find(chatCmd, "^/(%d+)")
            if (channelNumber ~= nil) then
                local channelId = GetChannelName(channelNumber)
-                if (channelId ~= nil) then
+                if (channelId ~= nil) and (channelId > 0) then
                    return targetAndText, "CHANNEL", channelId
                end
            end
@@ -923,8 +970,50 @@ function Grichelde:CheckAndExtractMessageTypeTarget(message)
    end
 end

+--- Hooks C_ChatInfo.SendChatMessage (Retail) and the global SendChatMessage (Classic, deprecated alias on Retail).
+--- The original C_ChatInfo function is preferred for sending.
+function Grichelde:HookSendChatMessage()
+    local chatInfo = _G.C_ChatInfo
+    if (chatInfo ~= nil) and (chatInfo.SendChatMessage ~= nil) then
+        self:RawHook(chatInfo, "SendChatMessage", "SendChatMessage", true)
+        self.originalSend = self.hooks[chatInfo]["SendChatMessage"]
+    end
+
+    if (_G.SendChatMessage ~= nil) then
+        self:RawHook("SendChatMessage", true)
+        self.originalSend = self.originalSend or self.hooks["SendChatMessage"]
+    end
+end
+
+--- Sends a message with the original (unhooked) send function.
+function Grichelde:SendOriginal(...)
+    return self.originalSend(...)
+end
+
+--- Midnight blocks chat modifications by addons during instance encounters.
+--- Prints a notice once per lockdown.
+-- @return boolean
+function Grichelde:IsChatLockedDown()
+    local chatInfo = _G.C_ChatInfo
+    if (chatInfo == nil) or (chatInfo.InChatMessagingLockdown == nil) then
+        return false
+    end
+
+    if (chatInfo.InChatMessagingLockdown()) then
+        if (not self.lockdownNoticeShown) then
+            self.lockdownNoticeShown = true
+            self:PrefixedPrint(self.L.Chat_Lockdown_Notice)
+        end
+        return true
+    end
+
+    self.lockdownNoticeShown = false
+    return false
+end
+
 function Grichelde:CleanseMessage(message)
    local text = message or ""
+    local IsAddOnLoaded = (_G.C_AddOns and _G.C_AddOns.IsAddOnLoaded) or _G.IsAddOnLoaded
    if (IsAddOnLoaded("Misspelled")) then
        self:DebugPrint("Misspelled detected: cleansing message")
        text = _G.Misspelled:RemoveHighlighting(message)
@@ -944,7 +1033,12 @@ function Grichelde:SendChatMessageOverride(message, ...)
    local msg, type, chan = self:CheckAndExtractMessageTypeTarget(cleasendText)

    if (msg ~= nil) then
-        msg = self:ReplaceText(msg)
+        if (not self:IsChatLockedDown()) then
+            msg = self:ReplaceText(msg)
+        else
+            -- do not modify message in any way during encounters
+            -- msg = msg .. self.L.Chat_Lockdown_Suffix
+        end

        if (type ~= nil) then
            self:SendChunkifiedChatMessage(msg, type, fallbackLang, chan, ...)
@@ -962,19 +1056,39 @@ end
 -- @param language string
 -- @param channel string
 function Grichelde:SendChatMessage(message, type, ...)
+    if (self.isReplacing) then
+        -- re-entered through the other hooked send function, text is already replaced
+        self:DebugPrint("SendChatMessage : already replacing")
+        self:SendOriginal(message, type, ...)
+        return
+    end
+
+    self.isReplacing = true
+    -- always reset the guard, even if replacing fails
+    local ok, err = pcall(self.ReplaceAndSendChatMessage, self, message, type, ...)
+    self.isReplacing = false
+    if (not ok) then
+        error(err, 0)
+    end
+end
+
+function Grichelde:ReplaceAndSendChatMessage(message, type, ...)
    if (not self.db.profile.enabled) then
        self:DebugPrint("SendChatMessage : disabled")
-        self.hooks["SendChatMessage"](message, type, ...);
+        self:SendOriginal(message, type, ...)
    elseif (nilOrEmpty(message)) then
        self:DebugPrint("SendChatMessage : no text")
-        self.hooks["SendChatMessage"](message, type, ...);
+        self:SendOriginal(message, type, ...)
+    elseif (self:IsChatLockedDown()) then
+        self:DebugPrint("SendChatMessage : chat lockdown")
+        self:SendOriginal(message, type, ...)
    else
        local cleasendText = self:CleanseMessage(message)
        if (self:CheckReplacementAllowed(cleasendText, type)) then
            cleasendText = self:ReplaceText(cleasendText)
            self:SendChunkifiedChatMessage(cleasendText, type, ...)
        else
-            self.hooks["SendChatMessage"](message, type, ...);
+            self:SendOriginal(message, type, ...)
        end
    end
 end
@@ -1,11 +1,13 @@
 -- read namespace from global env
-local _G = _G
+local _G = _G or getfenv()
 local Grichelde = _G.Grichelde or {}

 -- constants and upvalues
 Grichelde.LOG_LEVEL = { DEBUG = 1, TRACE = 2 }

+-- chat input in client is limited to 255 bytes (unicode length is less)
 Grichelde.INPUT_LIMIT = 255
+-- safety measure in case malformed user input causes infinite loops on string parsing
 Grichelde.ENDLESS_LOOP_LIMIT = 10000
 Grichelde.MAPPING_OFFSET = 10
 Grichelde.MINIMAP_ENABLED = 1.0
@@ -104,17 +106,17 @@ Grichelde.SUPPORTED_CHAT_COMMANDS = {
 }

 Grichelde.BLIZZ_TYPE_TO_OPTIONS = {
-    ["SAY"]          = "say",
-    ["EMOTE"]        = "emote",
-    ["YELL"]         = "yell",
-    ["PARTY"]        = "party",
-    ["GUILD"]        = "guild",
-    ["OFFICER"]      = "officer",
-    ["RAID"]         = "raid",
-    ["RAID_WARNING"] = "raidWarning",
-    ["INSTANCE"]     = "instance",
-    ["BATTLEGROUND"] = "battleground",
-    ["WHISPER"]      = "whisper",
+    ["SAY"]           = "say",
+    ["EMOTE"]         = "emote",
+    ["YELL"]          = "yell",
+    ["PARTY"]         = "party",
+    ["GUILD"]         = "guild",
+    ["OFFICER"]       = "officer",
+    ["RAID"]          = "raid",
+    ["RAID_WARNING"]  = "raidWarning",
+    ["INSTANCE_CHAT"] = "instance",
+    ["BATTLEGROUND"]  = "battleground",
+    ["WHISPER"]       = "whisper",
 }

 -- do not replace these patterns
@@ -166,14 +168,14 @@ Grichelde.IGNORE_PATTERNS = {
 }

 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.F.pairs(t) do
+    for key, _ in Grichelde.F.pairs(tbl) do
        Grichelde.F.tInsert(sortedKeys, key)
    end

@@ -189,22 +191,22 @@ local function spairs(t, orderFunc)
    return function()
        it = it + 1
        if (sortedKeys[it] ~= nil) then
-            return sortedKeys[it], t[sortedKeys[it]]
+            return sortedKeys[it], tbl[sortedKeys[it]]
        else
            return nil
        end
    end
 end

-local function tFilter(t, condition, extract)
+local function tFilter(type, condition, extract)
    local filtered = {}
-    for key, value in Grichelde.F.pairs(t) do
+    for key, value in Grichelde.F.pairs(type) do
        local cond = false
        if (condition) then
-            local t = Grichelde.F.type(condition)
-            if (t == "function") then
-                cond = condition(t, key, value)
-            elseif (t == "string") or (t == "number") then
+            local typ = Grichelde.F.type(condition)
+            if (typ == "function") then
+                cond = condition(typ, key, value)
+            elseif (typ == "string") or (typ == "number") then
                cond = (value == condition)
            end
        end
@@ -212,7 +214,7 @@ local function tFilter(t, condition, extract)
        if (cond) then
            local val = value
            if (extract and (Grichelde.F.type(extract) == "function")) then
-                val = extract(t, key, value)
+                val = extract(type, key, value)
            end
            Grichelde.F.tInsert(filtered, val)
        end
@@ -220,20 +222,20 @@ local function tFilter(t, condition, extract)
    return filtered
 end

-local function tSize(t)
+local function tSize(tbl)
    local size = 0
-    if (t ~= nil) then
+    if (tbl ~= nil) then
        -- for every non-nil value
-        for _, _ in Grichelde.F.pairs(t) do
+        for _, _ in Grichelde.F.pairs(tbl) do
            size = size + 1
        end
    end
    return size
 end

-local function tIsEmpty(t)
-    if (not t) then return true end
-    return Grichelde.F.tNext(t) == nil
+local function tIsEmpty(tbl)
+    if (not tbl) then return true end
+    return Grichelde.F.tNext(tbl) == nil
 end

 local function tClone(orig)
@@ -285,6 +287,115 @@ local function getNextCharUtf8(word)
    end
 end

+local function isUtf8MultiByte(word)
+    return Grichelde.F.length(word) ~= Grichelde.F.lengthUtf8(word)
+end
+
+local function getUtf8Sequence(word)
+    if ((word == nil) or (Grichelde.F.type(word) ~= "string") or (Grichelde.F.lengthUtf8(word) ~= 1)) then
+        return nil
+    end
+
+    --[[
+     You could use the following code snippet to iterate over UTF-8 sequences
+     (this will simply skip over most invalid codes):
+
+        for uchar in string.gmatch(ustring, "([%z\1-\127\194-\244][\128-\191]*)") do
+          ...
+        end
+    ]]--
+
+    local sequence = "%z"
+    local c1 = Grichelde.F.toByte(word, 1)
+    sequence = sequence .. "\\" .. c1
+
+    if (c1 > 0) and (c1 <= 127) then
+        -- UTF8-1
+        return sequence
+    end
+
+    local c2 = Grichelde.F.toByte(word, 2)
+    sequence = sequence .. "\\" .. c2
+    if (c1 >= 194) and (c1 <= 223) then
+        -- UTF8-2
+        return sequence
+    end
+
+    local c3 = Grichelde.F.toByte(word, 3)
+    sequence = sequence .. "\\" .. c3
+    if (c1 >= 224) and (c1 <= 239) then
+        -- UTF8-3
+        return sequence
+    end
+
+    local c4 = Grichelde.F.toByte(word, 4)
+    sequence = sequence .. "\\" .. c4
+    if (c1 >= 240) and (c1 <= 244) then
+        -- UTF8-4
+        return sequence
+    end
+
+    return nil
+end
+
+local function getUtf8Table(word)
+    if ((word == nil) or (Grichelde.F.type(word) ~= "string") or (Grichelde.F.lengthUtf8(word) ~= 1)) then
+        return nil
+    end
+
+    --[[
+     You could use the following code snippet to iterate over UTF-8 sequences
+     (this will simply skip over most invalid codes):
+
+        for uchar in string.gmatch(ustring, "([%z\1-\127\194-\244][\128-\191]*)") do
+          ...
+        end
+    ]]--
+
+    local tbl = {}
+
+    local c1 = Grichelde.F.toByte(word, 1)
+    Grichelde.F.tInsert(tbl, "%z\\" .. c1)
+
+    local c2 = Grichelde.F.toByte(word, 2)
+    if (c1 >= 194) and (c1 <= 223) then
+        -- UTF8-2
+        Grichelde.F.tInsert(tbl, "\\" .. c2)
+    end
+
+    local c3 = Grichelde.F.toByte(word, 3)
+    if (c1 >= 224) and (c1 <= 239) then
+        -- UTF8-3
+        Grichelde.F.tInsert(tbl, "\\" .. c3)
+    end
+
+    local c4 = Grichelde.F.toByte(word, 4)
+    if (c1 >= 240) and (c1 <= 244) then
+        -- UTF8-4
+        Grichelde.F.tInsert(tbl, "\\" .. c4)
+    end
+
+    return tbl
+end
+
+--- 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))
@@ -323,11 +434,11 @@ local function isCapital(word)
        return false
    else
        local first, rest = Grichelde.F.getNextCharUtf8(word)
-        local isCapital = Grichelde.F.isUpper(first)
+        local isCap = Grichelde.F.isUpper(first)
        if (rest ~= nil) then
-            return isCapital and Grichelde.F.isLower(rest)
+            return isCap and Grichelde.F.isLower(rest)
        else
-           return isCapital
+           return isCap
        end
    end
 end
@@ -346,8 +457,17 @@ local function capitalize(word)
    end
 end

-local function color(color, text)
-    return color .. text .. Grichelde.COLOR_CODES.CLOSE
+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)
@@ -384,7 +504,6 @@ end

 -- faster function lookups by mapping to local refs
 Grichelde.F = {
-    IsAddOnLoaded   = _G.IsAddOnLoaded,
    assert          = _G.assert,
    type            = _G.type,
    print           = _G.print,
@@ -413,9 +532,12 @@ Grichelde.F = {
    gmatch          = _G.string.gmatch,
    join            = _G.strjoin,
    split           = _G.strsplit,
-    toUpper         = _G.strupper,
-    toLower         = _G.strlower,
+    toUpper         = toUpper,
+    toLower         = toLower,
    getNextCharUtf8 = getNextCharUtf8,
+    isUtf8MultiByte = isUtf8MultiByte,
+    getUtf8Sequence = getUtf8Sequence,
+    getUtf8Table    = getUtf8Table,
    isLetter        = isLetter,
    isNumber        = isNumber,
    isUpper         = isUpper,
@@ -435,7 +557,8 @@ Grichelde.F = {
    bytes2Char      = _G.string.char,
    format          = _G.string.format,
    rep             = _G.string.rep,
-    trim            = _G.strtrim,
+    -- trim            = _G.strtrim,
+    trim            = trim,
    length          = _G.string.len,
    lengthUtf8      = _G.strlenutf8,
    toString        = _G.tostring,
@@ -1,9 +1,9 @@
 -- read namespace from global env
-local _G = _G
+local _G = _G or getfenv()
 local Grichelde = _G.Grichelde or {}

-local pairs, tInsert, tClone, tWipe, unpack, join, toString
-    = Grichelde.F.pairs, Grichelde.F.tInsert, Grichelde.F.tClone, Grichelde.F.tWipe, Grichelde.F.unpack, Grichelde.F.join, Grichelde.F.toString
+local pairs, tInsert, tClone, tSize, unpack, join, 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()
    return {
@@ -84,38 +84,40 @@ 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
            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
            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
@@ -1,9 +1,8 @@
 -- read namespace from global env
-local _G = _G
+local _G = _G or getfenv()
 local Grichelde = _G.Grichelde or {}

-local cPrefix, cGreen, cRed
-    = Grichelde.F.cPrefix, Grichelde.F.cGreen, Grichelde.F.cRed
+local cGreen, cRed = Grichelde.F.cGreen, Grichelde.F.cRed


 --- add Minimap button
@@ -49,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,
@@ -1,9 +1,9 @@
 -- read namespace from global env
-local _G = _G
+local _G = _G or getfenv()
 local Grichelde = _G.Grichelde or {}

-local assert, nilOrEmpty, pairs, ipairs, spairs, tContains, tInsert, tClone, tWipe, find, match, cPrefix, cGray, cGreen, cOrange, cRed, format, toString, 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.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 assert, nilOrEmpty, pairs, ipairs, spairs, tContains, tInsert, tClone, tSize, tWipe, find, match, cPrefix, cGray, cGreen, cOrange, cRed, format, toString, 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

@@ -416,7 +416,6 @@ 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

@@ -465,8 +464,9 @@ function Grichelde:RefreshProfiles(event, _, profileName)
 end

 function Grichelde:ToggleOptions()
-    self:DebugPrint("ToggleOptions : options open: ", not not self.dialog.OpenFrames[self.name])
-    if (self.dialog ~= nil) and (self.dialog.OpenFrames[self.name] ~= nil) then
+    local isOpen = (self.dialog ~= nil) and (self.dialog.OpenFrames[self.name] ~= nil)
+    self:DebugPrint("ToggleOptions : options open: ", isOpen)
+    if (isOpen) then
        self:CloseOptions()
    else
        self:OpenOptions()
@@ -559,7 +559,7 @@ end

 function Grichelde:ExtractExampleCodes(num)
    self:TracePrint("ExtractExampleCodes : number is: %d", num)
-    if (self.L.Options_Help_Examples[num] == nil) or (#self.L.Options_Help_Examples < num) then
+    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
@@ -581,8 +581,9 @@ end

 function Grichelde:ImportExample(num)
    self:TracePrint("ImportExample : number is: %d", num)
-    if (self.L.Options_Help_Examples[num] == nil) or (#self.L.Options_Help_Examples < num) then
+    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
@@ -1,8 +1,8 @@
 -- import addon read namespace from global env
-local _G = _G
+local _G = _G or getfenv()
 local Grichelde = _G.Grichelde or {}

-local find, pairs, tSize, cRed, cGreen, format = Grichelde.F.find, Grichelde.F.pairs, Grichelde.F.tSize, Grichelde.F.cRed, Grichelde.F.cGreen, Grichelde.F.format
+local find, pairs, tSize, cRed, cGreen = Grichelde.F.find, Grichelde.F.pairs, Grichelde.F.tSize, Grichelde.F.cRed, Grichelde.F.cGreen

 function Grichelde:TestMatch(text, pattern)
    -- disable debug print out for testing
@@ -17,6 +17,7 @@ function Grichelde:TestMatch(text, pattern)
    Grichelde.logLevel = oldLogLevel
 end

+--- Invoke ingame with /run Grichelde:RunTests()
 function Grichelde:RunTests()
    local function test(name, replacements, testData, replaceEmotes)
        local i, ok, size = 0, 0, tSize(testData)
@@ -775,10 +776,61 @@ function Grichelde:RunTests()
    ok = ok + o
    all = all + a

+    o, a = test(
+        "umlauts",
+        {
+            replacement_10 = {
+                order = 10,
+                searchText = "ä",
+                replaceText = "ae",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_11 = {
+                order = 11,
+                searchText = "ö",
+                replaceText = "oe",
+                exactCase = false,
+                consolidate = false,
+                matchWhen = 2,
+                stopOnMatch = false,
+            },
+            replacement_12 = {
+                order = 12,
+                searchText = "ü",
+                replaceText = "ue",
+                exactCase = false,
+                consolidate = 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, %d tests %s", all - ok, cRed("failed"), ok, cGreen("passed"))
+        self:PrefixedPrint("%d test%s %s, %d tests %s", all - ok, all - ok > 1 and "s" or "", cRed("failed"), ok, cGreen("passed"))
    end

    -- restore old loglevel
@@ -1,9 +1,9 @@
 -- read namespace from global env
-local _G = _G
+local _G = _G or getfenv()
 local Grichelde = _G.Grichelde or {}

-local pairs, tSize, tClone, find, sub, cGreen, cOrange, cRed, toNumber
-    = Grichelde.F.pairs, Grichelde.F.tSize,Grichelde.F.tClone, Grichelde.F.find, Grichelde.F.sub, Grichelde.F.cGreen, Grichelde.F.cOrange, Grichelde.F.cRed, Grichelde.F.toNumber
+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"))
@@ -1,5 +1,5 @@
 -- import addon read namespace from global env
-local _G = _G
+local _G = _G or getfenv()
 local Grichelde = _G.Grichelde or {}

 local type, print, pairs, tSize, select, unpack, find, cGray, cDarkgray, cRed, cPrefix, format, rep, toString
@@ -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
@@ -28,7 +28,7 @@
 -- end
 -- @class file
 -- @name AceAddon-3.0.lua
-- @release $Id: AceAddon-3.0.lua 1238 2020-08-28 16:18:42Z nevcairiel $
+-- @release $Id$

 local MAJOR, MINOR = "AceAddon-3.0", 13
 local AceAddon, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
@@ -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
 ]]
@@ -1,4 +1,4 @@
 <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="AceAddon-3.0.lua"/>
-</Ui>
+</Ui>
@@ -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 1202 2019-05-15 23:11:22Z nevcairiel $
+-- @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
@@ -5,4 +5,4 @@
 	<Include file="AceConfigDialog-3.0\AceConfigDialog-3.0.xml"/>
 	<!--<Include file="AceConfigDropdown-3.0\AceConfigDropdown-3.0.xml"/>-->
 	<Script file="AceConfig-3.0.lua"/>
-</Ui>
+</Ui>
@@ -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 1202 2019-05-15 23:11:22Z nevcairiel $
+-- @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 not strmatch(str, tab.pattern) then
-				usererr(info, inputpos, "'"..str.."' - " .. L["invalid input"])
+			if type(tab.pattern)~="string" then err(info, inputpos, "'pattern' - expected a string") end
+			if not strmatch(strInput, tab.pattern) then
+				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
@@ -1,4 +1,4 @@
 <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="AceConfigCmd-3.0.lua"/>
-</Ui>
+</Ui>
@@ -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 1248 2021-02-05 14:27:49Z funkehdude $
+-- @release $Id$

 local LibStub = LibStub
 local gui = LibStub("AceGUI-3.0")
 local reg = LibStub("AceConfigRegistry-3.0")

-local MAJOR, MINOR = "AceConfigDialog-3.0", 81
+local MAJOR, MINOR = "AceConfigDialog-3.0", 93
 local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)

 if not AceConfigDialog then return end
@@ -29,12 +29,6 @@ local pairs, next, select, type, unpack, ipairs = pairs, next, select, type, unp
 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, ACCEPT, CANCEL
-- GLOBALS: PlaySound, GameFontHighlight, GameFontHighlightSmall, GameFontHighlightLarge
-- GLOBALS: CloseSpecialWindows, InterfaceOptions_AddCategory, geterrorhandler
-
 local emptyTbl = {}

 --[[
@@ -153,6 +147,7 @@ local stringIsLiteral = {
 	width = true,
 	image = true,
 	fontSize = true,
+	tooltipHyperlink = true
 }

 --Is Never a function or method
@@ -194,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])
@@ -508,6 +502,14 @@ local function OptionOnMouseOver(widget, event)
 	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
+
 	local name = GetOptionsMemberValue("name", opt, options, path, appName)
 	local desc = GetOptionsMemberValue("desc", opt, options, path, appName)
 	local usage = GetOptionsMemberValue("usage", opt, options, path, appName)
@@ -515,7 +517,7 @@ local function OptionOnMouseOver(widget, event)

 	if descStyle and descStyle ~= "tooltip" then return end

-	tooltip:SetText(name, 1, .82, 0, true)
+	tooltip:SetText(name, 1, .82, 0, 1, true)

 	if opt.type == "multiselect" then
 		tooltip:AddLine(user.text, 0.5, 0.5, 0.8, true)
@@ -524,7 +526,7 @@ local function OptionOnMouseOver(widget, event)
 		tooltip:AddLine(desc, 1, 1, 1, true)
 	end
 	if type(usage) == "string" then
-		tooltip: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

 	tooltip:Show()
@@ -535,59 +537,50 @@ local function OptionOnMouseLeave(widget, event)
 end

 local function GetFuncName(option)
-	local type = option.type
-	if type == "execute" then
+	if option.type == "execute" then
 		return "func"
 	else
 		return "set"
 	end
 end
 do
+	local InCombatLockdown = InCombatLockdown
 	local frame = AceConfigDialog.popup
-	if not frame or oldminor < 81 then
+	if not frame or oldminor < 93 then
 		frame = CreateFrame("Frame", nil, UIParent)
 		AceConfigDialog.popup = frame
 		frame:Hide()
 		frame:SetPoint("CENTER", UIParent, "CENTER")
-		frame:SetSize(320, 72)
+		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
-				self:SetPropagateKeyboardInput(false)
+				if not InCombatLockdown() then
+					self:SetPropagateKeyboardInput(false)
+				end
 				if self.cancel:IsShown() then
 					self.cancel:Click()
 				else -- Showing a validation error
 					self:Hide()
 				end
-			else
+			elseif not InCombatLockdown() then
 				self:SetPropagateKeyboardInput(true)
 			end
 		end)

-		if not frame.SetFixedFrameStrata then -- API capability check (classic check)
-			frame:SetBackdrop({
-				bgFile = [[Interface\DialogFrame\UI-DialogBox-Background-Dark]],
-				edgeFile = [[Interface\DialogFrame\UI-DialogBox-Border]],
-				tile = true,
-				tileSize = 32,
-				edgeSize = 32,
-				insets = { left = 11, right = 11, top = 11, bottom = 11 },
-			})
-		else
-			local border = CreateFrame("Frame", nil, frame, "DialogBorderOpaqueTemplate")
-			border:SetAllPoints(frame)
-			frame:SetFixedFrameStrata(true)
-			frame:SetFixedFrameLevel(true)
-		end
+		local border = CreateFrame("Frame", nil, frame, "DialogBorderOpaqueTemplate")
+		border:SetAllPoints(frame)
+		frame:SetFixedFrameStrata(true)
+		frame:SetFixedFrameLevel(true)

 		local text = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlight")
-		text:SetSize(290, 0)
+		text:SetSize(370, 0)
 		text:SetPoint("TOP", 0, -16)
 		frame.text = text

-		local function newButton(text)
+		local function newButton(newText)
 			local button = CreateFrame("Button", nil, frame)
 			button:SetSize(128, 21)
 			button:SetNormalFontObject(GameFontNormal)
@@ -598,7 +591,7 @@ do
 			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(text)
+			button:SetText(newText)
 			return button
 		end

@@ -615,11 +608,7 @@ local function confirmPopup(appName, rootframe, basepath, info, message, func, .
 	local frame = AceConfigDialog.popup
 	frame:Show()
 	frame.text:SetText(message)
-	-- From StaticPopup.lua
-	-- local height = 32 + text:GetHeight() + 2;
-	-- height = height + 6 + accept:GetHeight()
-	-- We add 32 + 2 + 6 + 21 (button height) == 61
-	local height = 61 + frame.text:GetHeight()
+	local height = 70 + frame.text:GetHeight()
 	frame:SetHeight(height)

 	frame.accept:ClearAllPoints()
@@ -685,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
@@ -749,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
@@ -764,8 +752,8 @@ local function ActivateControl(widget, event, ...)
 		end

 		-- show validate message
-		if rootframe.SetStatusText then
-			rootframe:SetStatusText(validated)
+		if user.rootframe.SetStatusText then
+			user.rootframe:SetStatusText(validated)
 		else
 			validationErrorPopup(validated)
 		end
@@ -802,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
-					if type(name) == "function" then
-						name = name(info)
+					local option_name, desc = option.name, option.desc
+					if type(option_name) == "function" then
+						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
@@ -1091,6 +1079,11 @@ 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)
@@ -1151,8 +1144,6 @@ 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)
@@ -1255,7 +1246,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 							end
 							tsort(sorting, sortTblAsStrings)
 						end
-						for k, value in ipairs(sorting) do
+						for _, value in ipairs(sorting) do
 							local text = values[value]
 							local radio = gui:Create("CheckBox")
 							radio:SetLabel(text)
@@ -1337,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
-							local key = valuesort[i]
+						for s = 1, #valuesort do
+							local key = valuesort[s]
 							local value = GetOptionsMemberValue("get",v, options, path, appName, key)
 							control:SetItemValue(key,value)
 						end
@@ -1350,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
-							local value = valuesort[i]
+						for s = 1, #valuesort do
+							local value = valuesort[s]
 							local text = values[value]
 							local check = gui:Create("CheckBox")
 							check:SetLabel(text)
@@ -1368,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
@@ -1438,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)
-					control.width = not width and "fill"
+					local controlWidth = GetOptionsMemberValue("width",v,options,path,appName)
+					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
@@ -1516,7 +1510,7 @@ local function TreeOnButtonEnter(widget, event, uniquevalue, button)
 		tooltip:SetPoint("LEFT",button,"RIGHT")
 	end

-	tooltip:SetText(name, 1, .82, 0, true)
+	tooltip:SetText(name, 1, .82, 0, 1, true)

 	if type(desc) == "string" then
 		tooltip:AddLine(desc, 1, 1, 1, true)
@@ -1694,29 +1688,29 @@ function AceConfigDialog:FeedGroup(appName,options,container,rootframe,path, isR

 		elseif grouptype == "select" then

-			local select = gui:Create("DropdownGroup")
-			select:SetTitle(name)
-			InjectInfo(select, options, group, path, rootframe, appName)
-			select:SetCallback("OnGroupSelected", GroupSelected)
+			local selectGroup = gui:Create("DropdownGroup")
+			selectGroup:SetTitle(name)
+			InjectInfo(selectGroup, options, group, path, rootframe, appName)
+			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)
-			select:SetUserData("grouplist", grouplist)
-			select:SetUserData("orderlist", orderlist)
+			selectGroup:SetGroupList(grouplist, orderlist)
+			selectGroup:SetUserData("grouplist", grouplist)
+			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"
-			select.height = "fill"
+			selectGroup.width = "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
@@ -1944,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
-		new[appName][key] = widget
+		if not newOpt[appName] then newOpt[appName] = {} end
+		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))
@@ -1976,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
-- `InterfaceOptionsFrame_OpenToCategory`.
+-- Options, as well as the registered ID. You can use the ID to open the options with
+-- 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
@@ -1998,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)
@@ -2011,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
@@ -1,4 +1,4 @@
 <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="AceConfigDialog-3.0.lua"/>
-</Ui>
+</Ui>
@@ -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 1207 2019-06-23 12:08:33Z nevcairiel $
+-- @release $Id$
 local CallbackHandler = LibStub("CallbackHandler-1.0")

-local MAJOR, MINOR = "AceConfigRegistry-3.0", 20
+local MAJOR, MINOR = "AceConfigRegistry-3.0", 22
 local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR)

 if not AceConfigRegistry then return end
@@ -83,6 +83,7 @@ local basekeys={
 		dialogHidden=optmethodbool,
 		dropdownHidden=optmethodbool,
 	cmdHidden=optmethodbool,
+	tooltipHyperlink=optstringfunc,
 	icon=optstringnumberfunc,
 	iconCoords=optmethodtable,
 	handler=opttable,
@@ -91,6 +92,7 @@ local basekeys={
 	func=optmethodfalse,
 	arg={["*"]=true},
 	width=optstringnumber,
+	relWidth=optnumber,
 }

 local typedkeys={
@@ -1,4 +1,4 @@
 <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="AceConfigRegistry-3.0.lua"/>
-</Ui>
+</Ui>
@@ -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
@@ -1,4 +1,4 @@
 <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="AceConsole-3.0.lua"/>
-</Ui>
+</Ui>
@@ -40,8 +40,8 @@
 -- end
 -- @class file
 -- @name AceDB-3.0.lua
-- @release $Id: AceDB-3.0.lua 1217 2019-07-11 03:06:18Z funkydude $
-local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 27
+-- @release $Id$
+local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 40
 local AceDB = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)

 if not AceDB then return end -- No upgrade needed
@@ -49,14 +49,11 @@ if not AceDB then return end -- No upgrade needed
 -- Lua APIs
 local type, pairs, next, error = type, pairs, next, error
 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)
-							if k == nil then return nil end
+					__index = function(t,k2)
+							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" }
-local regionKey = regionTable[GetCurrentRegion()]
-local factionrealmregionKey = factionrealmKey .. " - " .. regionKey
+	if RegionalUniqueNamesEnabled and RegionalUniqueNamesEnabled() then
+		local isRP = C_GameRules.IsGameRuleActive(Enum.GameRule.RPRuleset)
+		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

@@ -430,6 +485,11 @@ end
 function DBObjectLib:SetProfile(name)
 	if type(name) ~= "string" then
 		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
@@ -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
@@ -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
-		error(("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or nil expected, got %q."):format(type(defaultProfile)), 2)
+	if defaultProfile and type(defaultProfile) ~= "string" and defaultProfile ~= true then
+		error(("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or true expected, got %q."):format(type(defaultProfile)), 2)
 	end

 	local sv = self.sv
@@ -724,8 +821,15 @@ function AceDB:New(tbl, defaults, defaultProfile)
 		error(("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaults' - table expected, got %q."):format(type(defaults)), 2)
 	end

-	if defaultProfile and type(defaultProfile) ~= "string" and defaultProfile ~= true then
-		error(("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string or true expected, got %q."):format(type(defaultProfile)), 2)
+	if defaultProfile then
+		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)
@@ -1,4 +1,4 @@
 <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="AceDB-3.0.lua"/>
-</Ui>
+</Ui>
@@ -1,8 +1,8 @@
 --- 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 1202 2019-05-15 23:11:22Z nevcairiel $
-local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 15
+-- @release $Id$
+local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 17
 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_desc"] = "입력창에 새로운 이름을 입력하거나 저장 중인 프로필 중 하나를 선택하여 새로운 프로필을 만들 수 있습니다."
+	L["choose"] = "기존 프로필"
+	L["choose_desc"] = "편집 상자에 이름을 입력하여 새로운 프로필을 만들거나 이미 존재하는 프로필 중 하나를 선택할 수 있습니다."
 	L["choose_sub"] = "현재 이용할 수 있는 프로필 중 하나를 선택합니다."
-	L["copy"] = "복사해오기"
-	L["copy_desc"] = "현재 사용 중인 프로필에 선택한 프로필의 설정을 복사합니다."
+	L["copy"] = "복사해 올 프로필"
+	L["copy_desc"] = "기존 프로필의 설정을 현재 활성화된 프로필로 복사합니다."
 	L["current"] = "현재 프로필:"
 	L["default"] = "기본값"
 	L["delete"] = "프로필 삭제"
-	L["delete_confirm"] = "정말로 선택한 프로필을 삭제할까요?"
-	L["delete_desc"] = "저장 공간 절약과 SavedVariables 파일의 정리를 위해 데이터베이스에서 사용하지 않는 프로필을 삭제하세요."
-	L["delete_sub"] = "데이터베이스의 프로필을 삭제합니다."
-	L["intro"] = "활성 데이터베이스 프로필을 변경할 수 있고, 각 캐릭터 별로 다른 설정을 할 수 있습니다."
+	L["delete_confirm"] = "선택한 프로필을 삭제하시겠습니까?"
+	L["delete_desc"] = "데이터베이스에서 기존 프로필과 사용하지 않는 프로필을 삭제하여 공간을 절약하고 SavedVariables 파일을 정리합니다."
+	L["delete_sub"] = "데이터베이스에서 프로필을 삭제합니다."
+	L["intro"] = "활성 데이터베이스 프로필을 변경할 수 있으며, 모든 캐릭터마다 서로 다른 설정을 지정할 수 있습니다."
+	L["name_too_long"] = "프로필 이름은 50자리를 초과할 수 없습니다."
 	L["new"] = "새로운 프로필"
-	L["new_sub"] = "새로운 프로필을 만듭니다."
+	L["new_sub"] = "비어 있는 프로필을 새로 만듭니다."
 	L["profiles"] = "프로필"
 	L["profiles_sub"] = "프로필 관리"
-	L["reset"] = "프로필 초기화"
-	L["reset_desc"] = "설정이 깨졌거나 처음부터 다시 설정을 원하는 경우, 현재 프로필을 기본값으로 초기화하세요."
-	L["reset_sub"] = "현재 프로필을 기본값으로 초기화합니다"
+	L["reset"] = "프로필 재설정"
+	L["reset_desc"] = "구성이 손상되었거나 처음부터 다시 시작하고 싶은 경우 현재 프로필을 기본값으로 재설정하세요."
+	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_desc"] = "Удалить существующий и неиспользуемый профиль из БД для сохранения места, и очистить SavedVariables файл."
-	L["delete_sub"] = "Удаление профиля из БД"
-	L["intro"] = "Изменяя активный профиль, вы можете задать различные настройки модификаций для каждого персонажа."
+	L["delete_confirm"] = "Вы уверены, что хотите удалить выбранный профиль?"
+	L["delete_desc"] = "Удаление существующего и неиспользуемого профиля из базы данных для сохранения места, и очистка файла SavedVariables."
+	L["delete_sub"] = "Удаление профиля из базы данных."
+	L["intro"] = "Изменяя активный профиль, Вы можете задать разные настройки для каждого персонажа."
+	L["name_too_long"] = "Имена профилей не могут превышать 50 символов."
 	L["new"] = "Новый"
-	L["new_sub"] = "Создать новый чистый профиль"
+	L["new_sub"] = "Создание нового чистого профиля."
 	L["profiles"] = "Профили"
 	L["profiles_sub"] = "Управление профилями"
-	L["reset"] = "Сброс профиля"
-	L["reset_desc"] = "Сбросить текущий профиль к стандартным настройкам, если ваша конфигурация испорчена или вы хотите настроить всё заново."
+	L["reset"] = "Сбросить профиль"
+	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,
 	},
 }

@@ -1,4 +1,4 @@
 <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="AceDBOptions-3.0.lua"/>
-</Ui>
+</Ui>
@@ -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
@@ -1,4 +1,4 @@
 <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="AceEvent-3.0.lua"/>
-</Ui>
+</Ui>
@@ -24,7 +24,7 @@
 -- f:AddChild(btn)
 -- @class file
 -- @name AceGUI-3.0
-- @release $Id: AceGUI-3.0.lua 1247 2021-01-23 23:16:39Z funkehdude $
+-- @release $Id$
 local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 41
 local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR)

@@ -35,17 +35,11 @@ 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)
-		if not WidgetRegistry[type] then
+	function newWidget(widgetType)
+		if not WidgetRegistry[widgetType] then
 			error("Attempt to instantiate unknown widget type", 2)
 		end

-		if not objPools[type] then
-			objPools[type] = {}
+		if not objPools[widgetType] then
+			objPools[widgetType] = {}
 		end

-		local newObj = next(objPools[type])
+		local newObj = next(objPools[widgetType])
 		if not newObj then
-			newObj = WidgetRegistry[type]()
-			newObj.AceGUIWidgetVersion = WidgetVersions[type]
+			newObj = WidgetRegistry[widgetType]()
+			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
-				return newWidget(type)
+			if not newObj.AceGUIWidgetVersion or newObj.AceGUIWidgetVersion < WidgetVersions[widgetType] then
+				return newWidget(widgetType)
 			end
 		end
 		return newObj
 	end
 	-- Releases an instance to the Pool
-	function delWidget(obj,type)
-		if not objPools[type] then
-			objPools[type] = {}
+	function delWidget(obj,widgetType)
+		if not objPools[widgetType] then
+			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)
-	if WidgetRegistry[type] then
-		local widget = newWidget(type)
+function AceGUI:Create(widgetType)
+	if WidgetRegistry[widgetType] then
+		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")
@@ -589,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)
-	if not self.counts[type] then
-		self.counts[type] = 0
+function AceGUI:GetNextWidgetNum(widgetType)
+	if not self.counts[widgetType] then
+		self.counts[widgetType] = 0
 	end
-	self.counts[type] = self.counts[type] + 1
-	return self.counts[type]
+	self.counts[widgetType] = self.counts[widgetType] + 1
+	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
-function AceGUI:GetWidgetCount(type)
-	return self.counts[type] or 0
+-- @param widgetType The widget type
+function AceGUI:GetWidgetCount(widgetType)
+	return self.counts[widgetType] or 0
 end

 --- Return the version of the currently registered widget type.
-- @param type The widget type
-function AceGUI:GetWidgetVersion(type)
-	return WidgetVersions[type]
+-- @param widgetType The widget type
+function AceGUI:GetWidgetVersion(widgetType)
+	return WidgetVersions[widgetType]
 end

 -------------
@@ -770,7 +764,6 @@ AceGUI:RegisterLayout("Flow",

 				usedwidth = 0
 				rowstart = frame
-				rowstartoffset = frameoffset

 				if child.DoLayout then
 					child:DoLayout()
@@ -813,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()
@@ -827,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
@@ -836,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
@@ -882,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")
@@ -898,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
@@ -915,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
@@ -940,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

@@ -988,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

@@ -2,7 +2,7 @@
 BlizOptionsGroup Container
 Simple container widget for the integration of AceGUI into the Blizzard Interface Options
 -------------------------------------------------------------------------------]]
-local Type, Version = "BlizOptionsGroup", 22
+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

@@ -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)

@@ -125,7 +125,7 @@ local function Constructor()
 	dropdown.frame:Show()
 	dropdown:SetLabel("")

-	local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
+	local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
 	border:SetPoint("TOPLEFT", 0, -26)
 	border:SetPoint("BOTTOMRIGHT", 0, 3)
 	border:SetBackdrop(PaneBackdrop)
@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 Frame Container
 -------------------------------------------------------------------------------]]
-local Type, Version = "Frame", 28
+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
 -------------------------------------------------------------------------------]]
@@ -180,7 +176,7 @@ local PaneBackdrop  = {
 }

 local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil)
+	local frame = CreateFrame("Frame", nil, UIParent, "BackdropTemplate")
 	frame:Hide()

 	frame:EnableMouse(true)
@@ -190,7 +186,11 @@ local function Constructor()
 	frame:SetFrameLevel(100) -- Lots of room to draw under it
 	frame:SetBackdrop(FrameBackdrop)
 	frame:SetBackdropColor(0, 0, 0, 1)
-	frame:SetMinResize(400, 200)
+	if frame.SetResizeBounds then -- WoW 10.0
+		frame:SetResizeBounds(400, 200)
+	else
+		frame:SetMinResize(400, 200)
+	end
 	frame:SetToplevel(true)
 	frame:SetScript("OnShow", Frame_OnShow)
 	frame:SetScript("OnHide", Frame_OnClose)
@@ -203,7 +203,7 @@ local function Constructor()
 	closebutton:SetWidth(100)
 	closebutton:SetText(CLOSE)

-	local statusbg = CreateFrame("Button", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
+	local statusbg = CreateFrame("Button", nil, frame, "BackdropTemplate")
 	statusbg:SetPoint("BOTTOMLEFT", 15, 15)
 	statusbg:SetPoint("BOTTOMRIGHT", -132, 15)
 	statusbg:SetHeight(24)
@@ -271,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)
@@ -75,7 +75,7 @@ local function Constructor()
 	titletext:SetJustifyH("LEFT")
 	titletext:SetHeight(18)

-	local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
+	local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
 	border:SetPoint("TOPLEFT", 0, -17)
 	border:SetPoint("BOTTOMRIGHT", -1, 3)
 	border:SetBackdrop(PaneBackdrop)
@@ -2,7 +2,7 @@
 TabGroup Container
 Container that uses tabs on top to switch between groups.
 -------------------------------------------------------------------------------]]
-local Type, Version = "TabGroup", 37
+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

@@ -14,10 +14,6 @@ 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, BackdropTemplateMixin and "BackdropTemplate" or nil)
+	local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
 	border:SetPoint("TOPLEFT", 1, -27)
 	border:SetPoint("BOTTOMRIGHT", -1, 3)
 	border:SetBackdrop(PaneBackdrop)
@@ -2,22 +2,18 @@
 TreeGroup Container
 Container that uses a tree control to switch between groups.
 -------------------------------------------------------------------------------]]
-local Type, Version = "TreeGroup", 45
+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

 -- 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
@@ -210,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
@@ -391,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
@@ -503,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)
@@ -567,7 +563,11 @@ local methods = {
 		if maxtreewidth > 100 and status.treewidth > maxtreewidth then
 			self:SetTreeWidth(maxtreewidth, status.treesizable)
 		end
-		treeframe:SetMaxResize(maxtreewidth, 1600)
+		if treeframe.SetResizeBounds then
+			treeframe:SetResizeBounds(100, 1, maxtreewidth, 1600)
+		else
+			treeframe:SetMaxResize(maxtreewidth, 1600)
+		end
 	end,

 	["OnHeightSet"] = function(self, height)
@@ -637,7 +637,7 @@ local function Constructor()
 	local num = AceGUI:GetNextWidgetNum(Type)
 	local frame = CreateFrame("Frame", nil, UIParent)

-	local treeframe = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
+	local treeframe = CreateFrame("Frame", nil, frame, "BackdropTemplate")
 	treeframe:SetPoint("TOPLEFT")
 	treeframe:SetPoint("BOTTOMLEFT")
 	treeframe:SetWidth(DEFAULT_TREE_WIDTH)
@@ -646,13 +646,17 @@ local function Constructor()
 	treeframe:SetBackdropColor(0.1, 0.1, 0.1, 0.5)
 	treeframe:SetBackdropBorderColor(0.4, 0.4, 0.4)
 	treeframe:SetResizable(true)
-	treeframe:SetMinResize(100, 1)
-	treeframe:SetMaxResize(400, 1600)
+	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, BackdropTemplateMixin and "BackdropTemplate" or nil)
+	local dragger = CreateFrame("Frame", nil, treeframe, "BackdropTemplate")
 	dragger:SetWidth(8)
 	dragger:SetPoint("TOP", treeframe, "TOPRIGHT")
 	dragger:SetPoint("BOTTOM", treeframe, "BOTTOMRIGHT")
@@ -677,7 +681,7 @@ local function Constructor()
 	scrollbg:SetAllPoints(scrollbar)
 	scrollbg:SetColorTexture(0,0,0,0.4)

-	local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
+	local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
 	border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT")
 	border:SetPoint("BOTTOMRIGHT")
 	border:SetBackdrop(PaneBackdrop)
@@ -7,10 +7,6 @@ local pairs, assert, type = pairs, assert, type
 local PlaySound = PlaySound
 local CreateFrame, UIParent = CreateFrame, UIParent

-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
-- List them here for Mikk's FindGlobals script
-- GLOBALS: GameFontNormal
-
 ----------------
 -- Main Frame --
 ----------------
@@ -21,7 +17,7 @@ local CreateFrame, UIParent = CreateFrame, UIParent
 ]]
 do
 	local Type = "Window"
-	local Version = 6
+	local Version = 8

 	local function frameOnShow(this)
 		this.obj:Fire("OnShow")
@@ -186,7 +182,11 @@ do

 		frame:SetScript("OnShow",frameOnShow)
 		frame:SetScript("OnHide",frameOnClose)
-		frame:SetMinResize(240,240)
+		if frame.SetResizeBounds then -- WoW 10.0
+			frame:SetResizeBounds(240,240)
+		else
+			frame:SetMinResize(240,240)
+		end
 		frame:SetToplevel(true)

 		local titlebg = frame:CreateTexture(nil, "BACKGROUND")
@@ -300,7 +300,7 @@ do
 		line2:SetHeight(8)
 		line2:SetPoint("BOTTOMRIGHT", -8, 8)
 		line2:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border
-		local x = 0.1 * 8/17
+		x = 0.1 * 8/17
 		line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5)

 		local sizer_s = CreateFrame("Frame",nil,frame)
@@ -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")
-				desc:ClearAllPoints()
-				desc:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21)
-				desc:SetWidth(self.frame.width - 30)
-				desc:SetPoint("RIGHT", self.frame, "RIGHT", -30, 0)
-				desc:SetJustifyH("LEFT")
-				desc:SetJustifyV("TOP")
-				self.desc = desc
+				local f = self.frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
+				f:ClearAllPoints()
+				f:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21)
+				f:SetWidth(self.frame.width - 30)
+				f:SetPoint("RIGHT", self.frame, "RIGHT", -30, 0)
+				f:SetJustifyH("LEFT")
+				f:SetJustifyV("TOP")
+				self.desc = f
 			end
 			self.desc:Show()
 			--self.text:SetFontObject(GameFontNormal)
@@ -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
-- List them here for Mikk's FindGlobals script
-- GLOBALS: ColorPickerFrame, OpacitySliderFrame
+-- Unfortunately we have no way to realistically detect if a client uses inverted alpha
+-- as no API will tell you. Wrath uses the old colorpicker, era uses the new one, both are inverted
+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,30 +61,63 @@ local function ColorSwatch_OnClick(frame)
 		ColorPickerFrame:SetFrameLevel(frame:GetFrameLevel() + 10)
 		ColorPickerFrame:SetClampedToScreen(true)

-		ColorPickerFrame.func = function()
-			local r, g, b = ColorPickerFrame:GetColorRGB()
-			local a = 1 - OpacitySliderFrame:GetValue()
-			ColorCallback(self, r, g, b, a)
-		end
+		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

-		ColorPickerFrame.hasOpacity = self.HasAlpha
-		ColorPickerFrame.opacityFunc = function()
-			local r, g, b = ColorPickerFrame:GetColorRGB()
-			local a = 1 - OpacitySliderFrame:GetValue()
-			ColorCallback(self, r, g, b, a, true)
-		end
+			local info = {
+				swatchFunc = function()
+					local r, g, b = ColorPickerFrame:GetColorRGB()
+					local a = ColorPickerFrame:GetColorAlpha()
+					ColorCallback(self, r, g, b, a)
+				end,

-		local r, g, b, a = self.r, self.g, self.b, self.a
-		if self.HasAlpha then
-			ColorPickerFrame.opacity = 1 - (a or 0)
-		end
-		ColorPickerFrame:SetColorRGB(r, g, b)
+				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,

-		ColorPickerFrame.cancelFunc = function()
-			ColorCallback(self, r, g, b, a, true)
-		end
+				cancelFunc = function()
+					ColorCallback(self, r2, g2, b2, a2, true)
+				end,

-		ColorPickerFrame:Show()
+				r = r2,
+				g = g2,
+				b = b2,
+			}
+
+			ColorPickerFrame:SetupColorPickerAndShow(info)
+		else
+			ColorPickerFrame.func = function()
+				local r, g, b = ColorPickerFrame:GetColorRGB()
+				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 = OpacitySliderFrame:GetValue()
+				ColorCallback(self, r, g, b, a, true)
+			end
+
+			local r, g, b, a = self.r, self.g, self.b, 1 - (self.a or 1)
+			if self.HasAlpha then
+				ColorPickerFrame.opacity = a
+			end
+			ColorPickerFrame:SetColorRGB(r, g, b)
+
+			ColorPickerFrame.cancelFunc = function()
+				ColorCallback(self, r, g, b, a, true)
+			end
+
+			ColorPickerFrame:Show()
+		end
 	end
 	AceGUI:ClearFocus()
 end
@@ -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)
@@ -1,4 +1,4 @@
--[[ $Id: AceGUIWidget-DropDown.lua 1239 2020-09-20 10:22:02Z 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, ...)
@@ -253,7 +249,7 @@ do

 	local function Constructor()
 		local count = AceGUI:GetNextWidgetNum(widgetType)
-		local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil)
+		local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent, "BackdropTemplate")
 		local self = {}
 		self.count = count
 		self.type = widgetType
@@ -304,7 +300,7 @@ do
 		scrollFrame.obj = self
 		itemFrame.obj = self

-		local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame, BackdropTemplateMixin and "BackdropTemplate" or nil)
+		local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame, "BackdropTemplate")
 		slider:SetOrientation("VERTICAL")
 		slider:SetHitRectInsets(0, 0, -10, 0)
 		slider:SetBackdrop(sliderBackdrop)
@@ -351,7 +347,7 @@ end

 do
 	local widgetType = "Dropdown"
-	local widgetVersion = 35
+	local widgetVersion = 36

 	--[[ Static data ]]--

@@ -376,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()
@@ -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
-	hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIEditBoxInsertLink(...) end)
+	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
-		name = GetSpellInfo(id, info)
+		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
@@ -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
@@ -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)
@@ -2,7 +2,7 @@
 Keybinding Widget
 Set Keybindings in the Config UI.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Keybinding", 26
+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, BackdropTemplateMixin and "BackdropTemplate" or nil)
+	local msgframe = CreateFrame("Frame", nil, UIParent, "BackdropTemplate")
 	msgframe:SetHeight(30)
 	msgframe:SetBackdrop(ControlBackdrop)
 	msgframe:SetBackdropColor(0,0,0)
@@ -2,7 +2,7 @@
 Label Widget
 Displays text and optionally an icon.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Label", 27
+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,13 +124,24 @@ local methods = {
 		UpdateImageAnchor(self)
 	end,

-	["SetFont"] = function(self, font, height, flags)
-		self.label:SetFont(font, height, flags)
+	["SetImageByAtlas"] = function(self, atlasString)
+		self.imageshown = true
+		local image = self.image
+		image:SetAtlas(atlasString)
 		UpdateImageAnchor(self)
 	end,

+	["SetFont"] = function(self, 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)
@@ -1,4 +1,4 @@
-local Type, Version = "MultiLineEditBox", 29
+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
-	hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIMultiLineEditBoxInsertLink(...) end)
+	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
-		info = GetSpellInfo(id, info)
+		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, BackdropTemplateMixin and "BackdropTemplate" or nil)
+	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()
@@ -2,7 +2,7 @@
 Slider Widget
 Graphical Slider, like, for Range values.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Slider", 23
+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.hightext:SetFormattedText("%s%%", (max * 100))
+		self.lowtext:SetFormattedText("%s%%", (min_value * 100))
+		self.hightext:SetFormattedText("%s%%", (max_value * 100))
 	else
-		self.lowtext:SetText(min)
-		self.hightext:SetText(max)
+		self.lowtext:SetText(min_value)
+		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.max = max
+		self.min = min_value
+		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, BackdropTemplateMixin and "BackdropTemplate" or nil)
+	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, BackdropTemplateMixin and "BackdropTemplate" or nil)
+	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
@@ -9,7 +9,7 @@
 -- make into AceHook.
 -- @class file
 -- @name AceHook-3.0
-- @release $Id: AceHook-3.0.lua 1243 2020-10-18 00:00:19Z nevcairiel $
+-- @release $Id$
 local ACEHOOK_MAJOR, ACEHOOK_MINOR = "AceHook-3.0", 9
 local AceHook, oldminor = LibStub:NewLibrary(ACEHOOK_MAJOR, ACEHOOK_MINOR)

@@ -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
@@ -1,4 +1,4 @@
 <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="AceHook-3.0.lua"/>
-</Ui>
+</Ui>
@@ -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

@@ -1,4 +1,4 @@
 <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="AceLocale-3.0.lua"/>
-</Ui>
+</Ui>
@@ -1,5 +1,5 @@
--[[ $Id: CallbackHandler-1.0.lua 1186 2018-07-21 14:19:18Z nevcairiel $ ]]
-local MAJOR, MINOR = "CallbackHandler-1.0", 7
+--[[ $Id: CallbackHandler-1.0.lua 25 2022-12-12 15:02:36Z nevcairiel $ ]]
+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 assert, error, loadstring = assert, error, loadstring
-local setmetatable, rawset, rawget = setmetatable, rawset, rawget
+local securecallfunction, error = securecallfunction, error
+local setmetatable, rawget = setmetatable, 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
-				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.
-				for self,func in pairs(callbacks) do
-					events[eventname][self] = func
+			for event,callbacks in pairs(registry.insertQueue) do
+				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 object,func in pairs(callbacks) do
+					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
@@ -1,4 +1,4 @@
 <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="CallbackHandler-1.0.lua"/>
-</Ui>
+</Ui>
@@ -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 = 44 -- 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,9 +16,8 @@ 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 = next, Minimap, CreateFrame
+local next, Minimap, CreateFrame, AddonCompartmentFrame = next, Minimap, CreateFrame, AddonCompartmentFrame
 lib.tooltip = lib.tooltip or CreateFrame("GameTooltip", "LibDBIconTooltip", UIParent, "GameTooltipTemplate")
 local isDraggingButton = false

@@ -26,6 +25,15 @@ 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,43 +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")
-	if button.SetFixedFrameStrata then -- Classic support
-		button:SetFixedFrameStrata(true)
-	end
+	button:SetFixedFrameStrata(true)
 	button:SetFrameLevel(8)
-	if button.SetFixedFrameLevel then -- Classic support
-		button:SetFixedFrameLevel(true)
-	end
-	button:SetSize(31, 31)
+	button:SetFixedFrameLevel(true)
 	button:RegisterForClicks("anyUp")
 	button:RegisterForDrag("LeftButton")
-	button:SetHighlightTexture(136477) --"Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight"
-	local overlay = button:CreateTexture(nil, "OVERLAY")
-	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
+	lib:ResetButtonHighlightTexture(name)
+	lib:ResetButtonSize(name)

+	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)
@@ -269,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
@@ -279,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
-- the icons when checking things like :IsRegistered, which is not necessary.
-local function check(name)
-	if lib.notCreated[name] then
-		createButton(name, lib.notCreated[name][1], lib.notCreated[name][2])
-		lib.notCreated[name] = nil
+	if db and db.showInCompartment then
+		lib:AddButtonToCompartment(name, customCompartmentIcon)
 	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")
-	f:SetScript("OnEvent", function(f)
+	local frame = CreateFrame("Frame")
+	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
@@ -305,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")
-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]
+	frame:RegisterEvent("PLAYER_LOGIN")
 end

 do
@@ -411,23 +354,100 @@ do
 	end
 	Minimap:HookScript("OnEnter", OnMinimapEnter)
 	Minimap:HookScript("OnLeave", OnMinimapLeave)
+end

-	function lib:ShowOnEnter(name, value)
-		local button = lib.objects[name]
-		if button then
-			if value then
-				button.showOnMouseover = true
-				button.fadeOut:Stop()
-				button:SetAlpha(0)
-			else
-				button.showOnMouseover = false
-				button.fadeOut:Stop()
-				button:SetAlpha(1)
-			end
+--------------------------------------------------------------------------------
+-- 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
+			button.fadeOut:Stop()
+			button:SetAlpha(0)
+		else
+			button.showOnMouseover = false
+			button.fadeOut:Stop()
+			button:SetAlpha(1)
+		end
+	end
+end
+
+function lib:GetMinimapButton(name)
+	return lib.objects[name]
+end
+
 function lib:GetButtonList()
 	local t = {}
 	for name in next, lib.objects do
@@ -449,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)
@@ -474,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
@@ -1,51 +1,30 @@
-- $Id: LibStub.lua 76 2007-09-03 01:50:17Z mikk $
 -- LibStub is a simple versioning stub meant for use in Libraries.  http://www.wowace.com/wiki/LibStub for more info
-- LibStub is hereby placed in the Public Domain
-- Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke
+-- LibStub is hereby placed in the Public Domain Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke
 local LIBSTUB_MAJOR, LIBSTUB_MINOR = "LibStub", 2  -- NEVER MAKE THIS AN SVN REVISION! IT NEEDS TO BE USABLE IN ALL REPOS!
 local LibStub = _G[LIBSTUB_MAJOR]

-- Check to see is this version of the stub is obsolete
 if not LibStub or LibStub.minor < LIBSTUB_MINOR then
 	LibStub = LibStub or {libs = {}, minors = {} }
 	_G[LIBSTUB_MAJOR] = LibStub
 	LibStub.minor = LIBSTUB_MINOR
-	
-	-- LibStub:NewLibrary(major, minor)
-	-- major (string) - the major version of the library
-	-- minor (string or number ) - the minor version of the library
-	-- 
-	-- returns nil if a newer or same version of the lib is already present
-	-- returns empty library object or old library object if upgrade is needed
+
 	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
 		self.minors[major], self.libs[major] = minor, self.libs[major] or {}
 		return self.libs[major], oldminor
 	end
-	
-	-- LibStub:GetLibrary(major, [silent])
-	-- major (string) - the major version of the library
-	-- silent (boolean) - if true, library is optional, silently return nil if its not found
-	--
-	-- throws an error if the library can not be found (except silent is set)
-	-- returns the library object if found
+
 	function LibStub:GetLibrary(major, silent)
 		if not self.libs[major] and not silent then
 			error(("Cannot find a library instance of %q."):format(tostring(major)), 2)
 		end
 		return self.libs[major], self.minors[major]
 	end
-	
-	-- LibStub:IterateLibraries()
-	-- 
-	-- Returns an iterator for the currently registered libraries
-	function LibStub:IterateLibraries() 
-		return pairs(self.libs) 
-	end
-	
+
+	function LibStub:IterateLibraries() return pairs(self.libs) end
 	setmetatable(LibStub, { __call = LibStub.GetLibrary })
 end
@@ -1,6 +1,6 @@
 # Grichelde - Text replacer

-Grichelde is a WoW Classic Addon that replaces any characters or words you typed in a chat input line according to your replacement rules.
+Grichelde is a WoW Addon for Classic, Wrath of the Lich King Classic and Retail (Shadowlands) that replaces any characters or words you typed in a chat input line according to your replacement rules.
 The replacement is done **before** the text is send to other players/in the target channel. It does **not** change text other players have written in the chat, but the text they will see **from you**.

 Its purpose is to simulate a speaking disability of your toon and hereby strengthen immersion in roleplay. 
@@ -39,7 +39,7 @@ Only slash commands, item links, textures, placeholders and ooc-markers are excl

 After entering a search or replacement text, you see a button "Okay" next to your input. This is **not** a validation message, 
 but the save button for text. This is a restriction from the UI library and can be seen in other addons as well. 
-Please click on "Okay" to save the input permanently, otherwise it will not be stored..
+Please click on "Okay" to save the input permanently, otherwise it will not be stored.

 ![click "Okay" on text changes](https://media.forgecdn.net/attachments/305/887/text-okay.jpg "change confirmation")

@@ -33,6 +33,8 @@ 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:"
@@ -33,6 +33,8 @@ 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:"
Author	SHA1	Message	Date
Lothar Buchholz	8feea49c36	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	2026-11-01 16:06:37 +01:00
Lothar Buchholz	a706241a90	- fixes german umlauts	2026-11-01 16:05:54 +01:00
Lothar Buchholz	2e476648dd	- adapted to new Chat API - fixed broken size calucation - fixed Import message	2026-11-01 15:37:09 +01:00
Lothar Buchholz	37e3dbe63d	- consolidated changelog and updated gitignore	2026-11-01 01:03:16 +01:00
Lothar Buchholz	01931510eb	- switching to new C_AddOns API changes - cascaded message hooking for Retail v12 engine - messages during encounters are sent unchanged, with a one-time notice - ignore numbered chats that do not exist - /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	2026-11-01 00:57:12 +01:00
Lothar Buchholz	79873b0523	- updated all libraries	2026-11-01 00:07:10 +01:00
Lothar Buchholz	e077eca0bd	- TOC update	2026-10-31 23:54:14 +01:00
Lothar Buchholz	ba160aface	- restored previous changes; cleanup workspace	2026-10-31 23:53:44 +01:00
Lothar Buchholz	396e140102	Version 1.1.6 - bumped version for latest WotLK Classic patch - updated Ace3.0 libraries for latest WotLK Classic patch	2023-01-18 19:47:41 +01:00
Lothar Buchholz	c387501df7	Version 1.1.5 - updated Ace3 libraries for Dragonflight - bumped version for all versions of WoW (Classic Era, WotLK, Retail)	2022-12-04 18:23:35 +01:00
Lothar Buchholz	97ee953b19	Version 1.1.4 - typos in descriptions - ambiguous variable definitions - bumped version for all versions of WoW (Classic Era, WotLK, Retail) - added TOCs for all versions of WoW, removed release script	2022-09-28 20:47:04 +02:00
Lothar Buchholz	a75d631423	fixed typos	2021-10-17 16:28:03 +02:00