Version 0.7.1-beta

- user reporting capabilities
- ignore Battle.net contacts
- screenshots

- graphical move arrows

.gitignore

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

.pkgmeta

@@ -6,7 +6,10 @@ externals:
   libs/LibStub: https://repos.wowace.com/wow/libstub/tags/1.0
   libs/CallbackHandler-1.0: https://repos.wowace.com/wow/callbackhandler/trunk/CallbackHandler-1.0
   libs/AceAddon-3.0: https://repos.wowace.com/wow/ace3/trunk/AceAddon-3.0
+  libs/AceConfig-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConfig-3.0
   libs/AceConsole-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConsole-3.0
+  libs/AceDB-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDB-3.0
+  libs/AceDBOptions-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDBOptions-3.0
   libs/AceEvent-3.0: https://repos.wowace.com/wow/ace3/trunk/AceEvent-3.0
   libs/AceGUI-3.0: https://repos.wowace.com/wow/ace3/trunk/AceGUI-3.0
   libs/AceHook-3.0: https://repos.wowace.com/wow/ace3/trunk/AceHook-3.0

CHANGELOG.md

@@ -3,17 +3,44 @@ 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).
 
-## [Unreleased] Version 1.0 - 2020-06-02
+## [Upcoming] Version 0.8.0-beta - 2020-06-08
 ### Added
-- case sensitivity 
+- handle replacement via slash command
+
+## Version 0.7.1-beta - 2020-06-07
+### Added
+- user reporting capabilities
+- ignore Battle.net contacts
+### Changed
+- graphical move arrows
+
+## Version 0.7.0-beta - 2020-06-07
+### Added
+- order buttons
+### Changed
+- use numeric LogLevel over booleans
+- exact case option reversed (again)
+- smart case handling if replacement is longer than match
+### Fixed
+- Deletion of all mappings
+
+## Version 0.6.0 (unreleased) - 2020-06-05
+### Added
+- honour capital/mixed cases for ignore case
 - consolidate consecutive matches
+- database upgrade capability
+### Changed
+- case sensitivity option reversed
+- removed obsolete WIM handling
+### Fixed
+- skip empty mapping
+- Deletion of mapping
 
 ## Version 0.5.0 - 2020-06-01
 ### Added
 - add replacements via options UI
-- handle replacement via slash command
 
-## Version 0.4.0 - 2020-05-30
+## Version 0.4.0 (unreleased) - 2020-05-30
 ### Added
 - restructured files
 - extract functions and color codes
@@ -23,13 +50,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - fixed DB storange and debug printing
 
-## Version 0.2.2 - 2020-05-26
+## Version 0.2.2 (unreleased) - 2020-05-26
 ### Added
 - added Options UI under Interface Options
 - store settings in profiles
 - added more translations
 
-## Version 0.2.1 - 2020-05-25
+## Version 0.2.1 (unreleased) - 2020-05-25
 ### Added
 - support automatic packaging for curseforge via .pkgmeta
 - include project logo
@@ -42,6 +69,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - handle SendChatMessage ordering if addon Misspelled is also installed
 - break long texts in chunks of 255 length
 
-## Version 0.1 - 2020-05-24
+## Version 0.1 (unreleased) - 2020-05-24
 ### Added
 - bootstrap addon with Ace3 based on [Misspelled](https://www.curseforge.com/wow/addons/misspelled)

Grichelde.lua

@@ -1,17 +1,15 @@
 --[[---------------------------------------------------------------------------
-  Grichelde
+
+  Grichelde - Text Replacer
   Copyright 2020 Teilzeit-Jedi <tj@teilzeit-jedi.de>
 
-  based on Misspelled developed by Nathan Pieper - nrpieper (@) gmail (dot) com
+  This addon is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-  This code freely distributed for your use in any GPL compliant project.
-  See conditions in the LICENSE file attached.
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  You should have received a copy of the GNU General Public License
+  along with the addon. If not, see <http://www.gnu.org/licenses/gpl-3.0.txt>.
 
 -----------------------------------------------------------------------------]]
 
@@ -24,9 +22,8 @@ local Grichelde = LibStub("AceAddon-3.0"):NewAddon(AddonTable, AddonName, "AceCo
 Grichelde.L = LibStub("AceLocale-3.0"):GetLocale("Grichelde", true)
 Grichelde.version = GetAddOnMetadata(AddonName, "Version")
 Grichelde.build = GetAddOnMetadata(AddonName, "X-Build") or "Experimental"
-Grichelde.hooks = {}
 Grichelde.classic = _G.WOW_PROJECT_ID == _G.WOW_PROJECT_CLASSIC
-Grichelde.debug = false
+Grichelde.logLevel = 0      -- cannot reference Grichelde.LOG_LEVELs here as they are loaded afterwards
 
 -- publish to global env
 _G.Grichelde = Grichelde
@@ -35,25 +32,20 @@ _G.Grichelde = Grichelde
 function Grichelde:OnInitialize()
     -- Build Interface Options window
     self.db = self:LoadDatabase()
+    self:UpgradeDatabase()
+
     self.options, self.dialog = self:SetupOptions()
 
+    -- populate UI from database
     self:RefreshOptions("OnProfileChanged")
-    self:DebugPrint(self.db.profile)
 
     self:SetupSlashCommands()
-
-    -- Watch for WIM and Prat to Load, then integrate
-    self:RegisterEvent("ADDON_LOADED", "HookIntoForOtherChatAddons")
 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)
 
-    if (_G.Misspelled) then
-        self:PrefixedPrint(self.L.Addon_Detected_Misspelled)
-    end
-
     -- tell the world we are listening
     self:Print(self.L.AddonLoaded, self.COLOR_CODES.PREFIX .. self.L.AddonName .. " " .. self.L.VersionAbbr .. self.version .. self.COLOR_CODES.CLOSE)
 end
@@ -64,52 +56,22 @@ end
 
 --- Register  slash commands 'gri' and 'grichelde'
 function Grichelde:SetupSlashCommands()
-    local function HandleSlashCommand(input)
+    self:RegisterChatCommand("grichelde", "HandleSlashCommand")
+    self:RegisterChatCommand("gri", "HandleSlashCommand")
+end
+
+function Grichelde:HandleSlashCommand(input)
     -- Show the GUI if no input is supplied, otherwise handle the chat input.
     if self.functions.nilOrEmpty(input) then
         LibStub("AceConfigDialog-3.0"):Open(self.name)
     else
         -- handle slash ourselves
-            self:Print("Handle slash command: " .. input)
-        end
-    end
-
-    self:RegisterChatCommand("grichelde", HandleSlashCommand)
-    self:RegisterChatCommand("gri", HandleSlashCommand)
-end
-
---- Hook into WIM to catch whisper sending event.
--- @param event string
--- @param addonName string
-function Grichelde:HookIntoForOtherChatAddons(event, addonName)
-    if event == "ADDON_LOADED" then
-        if addonName == "WIM" then
-            _G.WIM.RegisterWidgetTrigger("msg_box", "whisper,chat,w2w", "OnEnterPressed", Grichelde.EditBox_OnEnterPressed)
-
-            -- If available use the WIM API
-            if (_G.WIM.RegisterPreSendFilterText) then -- avoid error if WIM not up to date.
-                _G.WIM.RegisterPreSendFilterText(function(text)
-                    return self:CheckAndReplace(text)
-                end)
-            else
-                -- WIM sends its chat messages via the API ChatThrottleLib, which itself hooks the default SendChatMessage api
-                -- many times before Grichelde will. ChatThrottleLib might potentially load before Grichelde, so we just hook
-                -- into ChatThrottleLib to be on the safe side.
-
-                if (_G.ChatThrottleLib) then
-                    self.hooks["ChatThrottleLib"] = _G.ChatThrottleLib.SendChatMessage
-
-                    function _G.ChatThrottleLib:SendChatMessage(prio, prefix, text, ...)
-                        Grichelde:DebugPrint("ChatThrottleLib:SendChatMessage : Hook called")
-                        local replacedText = Grichelde:CheckAndReplace(text)
-                        return Grichelde.hooks["ChatThrottleLib"](_G.ChatThrottleLib, prio, prefix, replacedText, ...)
-                    end
-                end
-            end
-
-            if (_G.WIM) then
-                self:PrefixedPrint(self.L.Addon_Detected_WIM)
+        self:DebugPrint("Handle slash command: " .. input)
+        if input == "mappings" then
+            self:ShowMappings()
         end
+        if input == "options" then
+            self:PrintOptions()
         end
     end
 end

Grichelde.toc

@@ -1,14 +1,15 @@
 ## Interface: 11304
 
 ## Title: Grichelde
-## Notes: Replaces characters you type in the chat box
+## Notes: Replaces characters from the chat box
 ## Notes-de: Ersetzt eingegebene Zeichen in der Chat-Zeile
-## Version: 0.5.0
+## Version: 0.7.1-beta
 ## Author: Teilzeit-Jedi
 ## eMail: tj@teilzeit-jedi.de
 
 ## X-Build: Classic
 ## X-Curse-Project-ID: 385480
+## X-License: GPLv3
 ## X-Category: Chat/Communication
 ## X-Credits: Teilzeit-Jedi, Nathan Pieper
 ## X-Embeds: Ace3
@@ -23,5 +24,6 @@ Grichelde.lua
 GricheldeConstants.lua
 GricheldeUtils.lua
 GricheldeDatabase.lua
+GricheldeUpgrade.lua
 GricheldeOptions.lua
 GricheldeChat.lua

GricheldeChat.lua

@@ -2,8 +2,9 @@
 local _G = _G
 local Grichelde = _G.Grichelde
 
-local nilOrEmpty, ipairs, tContains, tFilter, tInsert, tConcat, find, sub, gsub, toLower, trim, length
-    = Grichelde.functions.nilOrEmpty, Grichelde.functions.ipairs, Grichelde.functions.tContains, Grichelde.functions.tFilter, Grichelde.functions.tInsert, Grichelde.functions.tConcat, Grichelde.functions.find, Grichelde.functions.sub, Grichelde.functions.gsub, Grichelde.functions.toLower, Grichelde.functions.trim, Grichelde.functions.length
+local nilOrEmpty, ipairs, spairs, tContains, tFilter, tInsert, tConcat, find, sub, isUpper, isLower, toUpper, toLower, trim, length
+    = Grichelde.functions.nilOrEmpty, Grichelde.functions.ipairs, Grichelde.functions.spairs, Grichelde.functions.tContains, Grichelde.functions.tFilter, Grichelde.functions.tInsert, Grichelde.functions.tConcat,
+      Grichelde.functions.find, Grichelde.functions.sub, Grichelde.functions.isUpper, Grichelde.functions.isLower, Grichelde.functions.toUpper, Grichelde.functions.toLower, Grichelde.functions.trim, Grichelde.functions.length
 
 --- Before a chat message is sent, check if replacement is required and replace the text accordingly.
 -- @param message string
@@ -13,7 +14,6 @@ local nilOrEmpty, ipairs, tContains, tFilter, tInsert, tConcat, find, sub, gsub,
 function Grichelde:SendChatMessage(message, type, language, channel, ...)
     local replacedText = self:CheckAndReplace(message, type)
 
-    self:DebugPrint("SendChatMessage : replacedText:", replacedText)
 
     -- Send text in chunks if length exceeds 255 bytes after replacement
     local chunks = self:SplitText(replacedText)
@@ -55,7 +55,7 @@ function Grichelde:CheckReplacement(text, channel)
     )
     self:DebugPrint("CheckReplacement : allowed channels:", tConcat(allowedChannels, ", "))
     local type = self:ConvertBlizChannelToType(channel)
-    if (type ~= nil and not tContains(allowedChannels, type)) then
+    if (type == nil or not tContains(allowedChannels, type)) then
         self:DebugPrint("CheckReplacement : skip channel type:", type)
         return false
     end
@@ -103,7 +103,7 @@ function Grichelde:ReplaceText(text)
 
     while current <= length(newText) do
         local currentChar = sub(newText, current, current)
-        self:DebugPrint("current/char : %s,%s", current, currentChar)
+        self:TracePrint("current/char : %s,%s", current, currentChar)
 
         if ( not tContains(lookAheads, currentChar)) then
             current = current + 1
@@ -153,6 +153,7 @@ function Grichelde:CheckForPreversableText(text)
         "|[Cc]%x%x%x%x%x%x%x%x.-|r", -- colored items (or links)
         "|H.-|h", -- item links (http://www.wowwiki.com/ItemLink)
         "|T.-|t", -- textures
+        "|K.-|k", -- Battle.net
         "|n", -- newline
 
         "{rt[1-8]}",  -- rumbered raid target icons
@@ -194,17 +195,188 @@ end
 -- @param text string
 -- @return string
 function Grichelde:ReplaceCharacters(text)
-    -- todo: read from options
-    -- todo: case (in)sensitivity
-    -- todo: consolidate consecutive
-    -- todo: prevent infinite loops - is that even possible?
-    local replacement = text
-    replacement = gsub(replacement, "s", "ch")
-    replacement = gsub(replacement, "S", "Ch")
-    replacement = gsub(replacement, "t", "k")
-    replacement = gsub(replacement, "T", "K")
-    self:DebugPrint("ReplaceCharacters : replaced \"%s\" with \"%s\"", text, replacement)
-    return replacement
+    local replacements = self.db.profile.replacements or {}
+    self:DebugPrint("ReplaceCharacters : replacements")
+    self:DebugPrint(replacements)
+
+    local result = text
+    local consolidate = {}
+
+    -- replacements are done first
+    for replName, replTable in spairs(replacements) do
+        local before = result
+        local search = replTable.searchText
+
+        if not nilOrEmpty(search) then
+            local replace = replTable.replaceText
+            consolidate[replName] = {}
+
+            if replTable.exactCase then
+                -- exact case
+                self:DebugPrint("ReplaceCharacters : \"%s => %s\" (exact case)", search, replace)
+                local pos, offset = 1, 0
+                local oldResult = result
+
+                local pos1, pos2 = find(oldResult, search, pos)
+                while (pos1 and pos2) do
+                    self:TracePrint("pos1: %d, pos2: %d", pos1, pos2)
+                    local pre = sub(result, 1, pos1 - 1 + offset)
+                    local post = sub(result, pos2 + 1 + offset)
+                    self:TracePrint("pre: %s, post: %s", pre, post)
+
+                    -- actual replacement
+                    result = pre .. replace .. post
+                    self:DebugPrint("result: %s", result)
+
+                    -- remember positions for consolidate
+                    if replTable.consolidate then
+                        tInsert(consolidate[replName], pos1 + offset)
+                    end
+
+                    -- replacement text can lengthen or shorten the resulting text
+                    -- after replacement result and lowerResult can have different sizes
+                    offset = offset + length(replace) - length(search)
+                    -- update values for next iteration
+                    pos = pos2 + 1
+                    pos1, pos2 = find(oldResult, search, pos)
+                end
+            else
+                self:DebugPrint("ReplaceCharacters : \"%s => %s\" (ignoreCase)", search, replace)
+                local pos, offset = 1, 0
+                local lowerResult = toLower(result)
+                local lowerSearch = toLower(search)
+
+                local pos1, pos2 = find(lowerResult, lowerSearch, pos)
+                while (pos1 and pos2) do
+                    self:TracePrint("pos1: %d, pos2: %d", pos1, pos2)
+                    local pre = sub(result, 1, pos1 - 1 + offset)
+                    local match = sub(result, pos1 + offset, pos2 + offset)
+                    local post = sub(result, pos2 + 1 + offset)
+                    self:TracePrint("pre: %s, match: %s, post: %s", pre, match, post)
+
+                    -- keep cases
+                    local repl = ""
+                    local lastCase = nil
+                    for p = pos1, pos2 do
+                        self:TracePrint("p: %d", p)
+                        local c = sub(match, p - pos1 + 1, p - pos1 + 1)
+                        local r = sub(replace, p - pos1 + 1, p - pos1 + 1) or ""
+
+                        if (isUpper(c)) then            -- all UPPER-CASE letter
+                            lastCase = true
+                            repl = repl .. toUpper(r)
+                        elseif (isLower(match)) then    -- all lower_case letter
+                            lastCase = false
+                            repl = repl .. toLower(r)
+                        else                            -- no letter
+                            lastCase = nil
+                            repl = repl .. r
+                        end
+                        self:TracePrint("character: %s, %s", c, r)
+                    end
+
+                    self:TracePrint("length %d > %d", length(replace), pos2 - pos1 + 1)
+                    if (length(replace) > pos2 - pos1 + 1) then
+                        local remainingReplace = sub(replace, pos2 - pos1 + 2)
+                        local nextLetter = sub(post, 1, 1)
+
+                        self:TracePrint("rest: %s, n: %s, lastCase: %s", remainingReplace, nextLetter, lastCase)
+
+                        if (isUpper(nextLetter)) then
+                            if lastCase == nil or lastCase == false then
+                                repl = repl .. remainingReplace
+                            else
+                                repl = repl .. toUpper(remainingReplace)
+                            end
+                        elseif (isLower(nextLetter)) then
+                            if lastCase == nil or lastCase == true then
+                                repl = repl .. remainingReplace
+                            else
+                                repl = repl .. toLower(remainingReplace)
+                            end
+                        else
+                            -- no letter
+                            if lastCase == nil then
+                                repl = repl .. remainingReplace
+                            elseif lastCase == false then
+                                repl = repl .. toLower(remainingReplace)
+                            else
+                                repl = repl .. toUpper(remainingReplace)
+                            end
+                        end
+                    end
+
+                    -- actual replacement
+                    result = pre .. repl .. post
+                    self:DebugPrint("result: %s", result)
+
+                    -- remember positions for consolidate
+                    if replTable.consolidate then
+                        tInsert(consolidate[replName], pos1 + offset)
+                    end
+
+                    -- replacement text can be longer or shorter the resulting text
+                    -- after replacement result and lowerResult can have different sizes
+                    offset = offset + length(repl) - length(lowerSearch)
+                    -- update values for next iteration
+                    pos = pos2 + 1
+                    pos1, pos2 = find(lowerResult, lowerSearch, pos)
+                end
+            end
+
+            if before ~= result then
+                self:DebugPrint("ReplaceCharacters : replaced \"%s\" with \"%s\"", before, result)
+            end
+        else
+            self:DebugPrint("ReplaceCharacters : Skip replacement for empty mapping")
+        end
+    end
+
+    -- consolidation is done last
+    for replName, replTable in spairs(replacements) do
+        local before = result
+        --local search = replTable.searchText
+        local search = replTable.searchText
+
+        if not nilOrEmpty(search) then
+            local replace = replTable.replaceText
+            local lowerResult = toLower(result)
+            local offset = 0
+
+            if replTable.consolidate then
+                self:DebugPrint("ReplaceCharacters : consolidating \"%s => %s\"", search, replace)
+                self:DebugPrint("consolidate[" .. replName .. "] is:")
+                self:DebugPrint(consolidate[replName])
+
+                for _, pos1 in spairs(consolidate[replName]) do
+                    local pos2 = pos1 + length(replace) - 1
+                    self:TracePrint("pos1: %d, pos2: %d", pos1, pos2)
+                    local match = sub(lowerResult, pos1, pos2)
+                    local next = sub(lowerResult, pos2 + 1, pos2 + 1 + pos2 - pos1)
+                    self:TracePrint("match: %s, next: %s", match, next)
+
+                    local _, p2 = find(next, "^" .. match)
+                    self:TracePrint("p2: %d", p2)
+                    if (p2) then
+                        result = sub(result, 1, pos2 + offset) .. sub(result, pos2 + 1 + p2 + offset)
+
+                        -- consolidation will shorten the resulting text
+                        offset = offset + length(result) - length(lowerResult)
+                    end
+                    self:DebugPrint("result: %s", result)
+                end
+            end
+
+            if before ~= result then
+                self:DebugPrint("ReplaceCharacters : consolidate \"%s\" with \"%s\"", before, result)
+            end
+        else
+            self:DebugPrint("ReplaceCharacters : Skip consolidation for empty mapping")
+        end
+    end
+
+    self:DebugPrint("ReplaceCharacters : final text:", result)
+    return result
 end
 
 --- Splits a long text in longest possible chunks of <= 255 length, split at last available space

GricheldeConstants.lua

@@ -2,21 +2,28 @@
 local _G = _G
 local Grichelde = _G.Grichelde
 
--- upvalues and constants
+-- constants and upvalues
+Grichelde.LOG_LEVEL = {}
+Grichelde.LOG_LEVEL.DEBUG = 1
+Grichelde.LOG_LEVEL.TRACE = 2
+
+Grichelde.MAPPING_OFFSET = 10
 
 -- colors:
 Grichelde.COLOR_CODES = {}
 Grichelde.COLOR_CODES.PREFIX      = "|c00FFAA00"
 -- https://github.com/stoneharry/Misc-WoW-Stuff/blob/master/EoC%20Interface/FrameXML/Constants.lua
-Grichelde.COLOR_CODES.NORMAL      = _G.NORMAL_FONT_COLOR_CODE      or "|cffffd200";
-Grichelde.COLOR_CODES.HIGHLIGHT	  = _G.HIGHLIGHT_FONT_COLOR_CODE   or "|cffffffff";
-Grichelde.COLOR_CODES.RED         = _G.RED_FONT_COLOR_CODE         or "|cffff2020";
-Grichelde.COLOR_CODES.GREEN       = _G.GREEN_FONT_COLOR_CODE       or "|cff20ff20";
-Grichelde.COLOR_CODES.GRAY        = _G.GRAY_FONT_COLOR_CODE        or "|cff808080";
-Grichelde.COLOR_CODES.YELLOW      = _G.YELLOW_FONT_COLOR_CODE      or "|cffffff00";
-Grichelde.COLOR_CODES.LIGHTYELLOW = _G.LIGHTYELLOW_FONT_COLOR_CODE or "|cffffff9a";
-Grichelde.COLOR_CODES.ORANGE      = _G.ORANGE_FONT_COLOR_CODE      or "|cffff7f3f";
-Grichelde.COLOR_CODES.CLOSE       = _G.FONT_COLOR_CODE_CLOSE       or "|r";
+Grichelde.COLOR_CODES.NORMAL      = _G.NORMAL_FONT_COLOR_CODE      or "|cffffd200"
+Grichelde.COLOR_CODES.HIGHLIGHT	  = _G.HIGHLIGHT_FONT_COLOR_CODE   or "|cffffffff"
+Grichelde.COLOR_CODES.RED         = _G.RED_FONT_COLOR_CODE         or "|cffff2020"
+Grichelde.COLOR_CODES.GREEN       = _G.GREEN_FONT_COLOR_CODE       or "|cff20ff20"
+Grichelde.COLOR_CODES.LIGHTGRAY   = "|cffC0C0C0"
+Grichelde.COLOR_CODES.GRAY        = _G.GRAY_FONT_COLOR_CODE        or "|cff808080"
+Grichelde.COLOR_CODES.DARKGRAY    = "|cff404040"
+Grichelde.COLOR_CODES.YELLOW      = _G.YELLOW_FONT_COLOR_CODE      or "|cffffff00"
+Grichelde.COLOR_CODES.LIGHTYELLOW = _G.LIGHTYELLOW_FONT_COLOR_CODE or "|cffffff9a"
+Grichelde.COLOR_CODES.ORANGE      = _G.ORANGE_FONT_COLOR_CODE      or "|cffff7f3f"
+Grichelde.COLOR_CODES.CLOSE       = _G.FONT_COLOR_CODE_CLOSE       or "|r"
 
 Grichelde.slashCommands = { "/s", "/say", "/e", "/em", "/me", "/emote", "/y", "/yell", "/sh", "/shout", "/p", "/party", "/pl", "/partyleader", "/g", "/gc", "/guild", "/o", "/osay", "/officer", "/raid", "/rsay", "/rl", "/raidleader", "/rw", "/raidwarning", "/i", "/instance", "/bg", "/battleground", "/w", "/whisper", "/t", "/tell", "/send", "/r", "/reply" }
 
@@ -35,6 +42,7 @@ local function spairs(t , orderFunc)
     if orderFunc then
         Grichelde.functions.tSort(sortedKeys, function(a, b) return orderFunc(sortedKeys, a, b) end)
     else
+        -- lexicographical order
         Grichelde.functions.tSort(sortedKeys)
     end
 
@@ -44,6 +52,8 @@ local function spairs(t , orderFunc)
         it = it + 1
         if sortedKeys[it] then
             return sortedKeys[it], t[sortedKeys[it]]
+        else
+            return nil
         end
     end
 end
@@ -86,6 +96,28 @@ local function tClone(orig)
     return copy
 end
 
+local function isChar(word)
+    return Grichelde.functions.find(word, "%a+")
+end
+
+local function isNumber(digit)
+    return Grichelde.functions.find(digit, "%d+")
+end
+
+local function isUpper(word)
+    return Grichelde.functions.isChar(word) and word == Grichelde.functions.toUpper(word)
+end
+
+local function isLower(word)
+    return Grichelde.functions.isChar(word) and word == Grichelde.functions.toLower(word)
+end
+
+local function isCapital(word)
+    return Grichelde.functions.legnth(word) > 1
+        and Grichelde.functions.isUpper(Grichelde.functions.sub(word,1,1))
+        and Grichelde.functions.isLower(Grichelde.functions.sub(word,2))
+end
+
 -- faster function lookups by mapping to local refs
 Grichelde.functions = {}
 Grichelde.functions.type         = _G.type
@@ -112,8 +144,13 @@ Grichelde.functions.gsub         = _G.string.gsub
 Grichelde.functions.match        = _G.strmatch
 Grichelde.functions.join         = _G.strjoin
 Grichelde.functions.split        = _G.strsplit
-Grichelde.functions.toLower      = _G.strlower
 Grichelde.functions.toUpper      = _G.strupper
+Grichelde.functions.toLower      = _G.strlower
+Grichelde.functions.isChar       = isChar
+Grichelde.functions.isNumber     = isNumber
+Grichelde.functions.isUpper      = isUpper
+Grichelde.functions.isLower      = isLower
+Grichelde.functions.isCapital    = isCapital
 Grichelde.functions.format       = _G.string.format
 Grichelde.functions.rep          = _G.string.rep
 Grichelde.functions.trim         = _G.strtrim

GricheldeDatabase.lua

@@ -2,10 +2,11 @@
 local _G = _G
 local Grichelde = _G.Grichelde
 
-local pairs, ipairs, tInsert, tSort, unpack, join, toString
-    = Grichelde.functions.pairs, Grichelde.functions.ipairs, Grichelde.functions.tInsert, Grichelde.functions.tSort, Grichelde.functions.unpack, Grichelde.functions.join, Grichelde.functions.toString
+local pairs, tInsert, tClone, unpack, join, toString
+    = Grichelde.functions.pairs, Grichelde.functions.tInsert, Grichelde.functions.tClone, Grichelde.functions.unpack, Grichelde.functions.join, Grichelde.functions.toString
 
-local defaultConfig = {
+function Grichelde:GetDefaultConfig()
+    return {
         global = {},
         profile = {
             enabled = true,
@@ -23,29 +24,37 @@ local defaultConfig = {
                     order = 9999,
                     searchText = "",
                     replaceText = "",
-                caseSensitive = false,
+                    exactCase = false,
                     consolidate = true,
                 },
-            replacement_0 = {
-                order = 5,
+                replacement_10 = {
+                    order = 10,
                     searchText = "s",
                     replaceText = "ch",
-                caseSensitive = false,
+                    exactCase = false,
                     consolidate = true,
                 },
-            replacement_1 = {
-                order = 9,
+                replacement_11 = {
+                    order = 11,
                     searchText = "t",
                     replaceText = "ck",
-                caseSensitive = false,
+                    exactCase = false,
+                    consolidate = true,
+                },
+                replacement_12 = {
+                    order = 12,
+                    searchText = "Zark",
+                    replaceText = "toter Schamane",
+                    exactCase = false,
                     consolidate = true,
                 }
             }
         }
     }
+end
 
 function Grichelde:LoadDatabase()
-    local db = LibStub("AceDB-3.0"):New(self.name .."DB", defaultConfig, true)
+    local db = LibStub("AceDB-3.0"):New(self.name .."DB", self:GetDefaultConfig(), true)
 
     db.RegisterCallback(self, "OnNewProfile", "RefreshOptions")
     db.RegisterCallback(self, "OnProfileChanged", "RefreshOptions")
@@ -57,10 +66,17 @@ function Grichelde:LoadDatabase()
 end
 
 function Grichelde:SyncToDatabase(info, val)
+    self:TracePrint("SyncToDatabase : info")
+    for i = 0, #info do
+        self:TracePrint("%d = %s", i, info[i])
+    end
+
     local option = self.db.profile
     local path = 1
     while (path < #info) do
+        if info[path] ~= "mappings" then
             option = option[info[path]] -- or nil
+        end
         path = path + 1
     end
     local optionPath = join(".", unpack(info, 1, #info))
@@ -69,10 +85,17 @@ function Grichelde:SyncToDatabase(info, val)
 end
 
 function Grichelde:ReadFromDatabase(info)
+    self:TracePrint("ReadFromDatabase : info")
+    for i = 0, #info do
+        self:TracePrint("%d = %s", i, info[i])
+    end
+
     local option = self.db.profile
     local path = 1
     while (path <= #info) do
+        if info[path] ~= "mappings" then
             option = option[info[path]] -- or nil
+        end
         path = path + 1
     end
     local optionPath = join(".", unpack(info, 1, #info))
@@ -80,43 +103,54 @@ function Grichelde:ReadFromDatabase(info)
     return option
 end
 
---- Sorts a replacements table by order sub-field.
---- Usually called with with self.db.profile.replacements
--- @param replacementsTable table
--- @return table
-function Grichelde:ReorderReplacements(replacementsTable)
-    local replacements = replacementsTable or {}
-    local sortedByOrder = {}
-    for replName, _ in pairs(replacements) do
-        tInsert(sortedByOrder, replName)
+--- Sorts a replacements table by order sub-field and rename.
+--- Do NOT reassign self.db.profile.replacements here or with its output as it will break defaults
+function Grichelde:ReorderReplacements()
+    local replacements = self.db.profile.replacements or {}
+
+    self:TracePrint("ReorderReplacements : unsorted table")
+    self:TracePrint(replacements)
+
+    local orderToName = {}
+    local size = 0
+    for replName, replTable in pairs(replacements) do
+        size = size + 1
+        tInsert(orderToName, replTable.order, replName)
     end
 
-    tSort(sortedByOrder)    -- lexicographical order will do for non-nil values
-    --[[tSort(sortedByOrder, function(a, b)
-        self:DebugPrint("ReorderReplacements : sort ", a, b)
-        if a then
-            if b then
-                return a < b
-            else
-                return a
-            end
-        else
-            return b
-        end
-    end)]]
+    self:TracePrint("ReorderReplacements : size: %d, orderToName", size)
+    self:TracePrint(orderToName)
 
-    self:DebugPrint("ReorderReplacements : sortedByOrder")
-    self:DebugPrint(sortedByOrder)
+    local sorted = {}
+    local index, count = 0, 0
 
-    local sortedReplacements = {}
-    local index = 0
-    for _, replName in ipairs(sortedByOrder) do
-        sortedReplacements["replacement_"..index] = replacements[replName]
-        sortedReplacements["replacement_"..index].order = index
+    while count < size do
+        local replName = orderToName[index]
+        if replName and replacements[replName] then
+            self:TracePrint("ReorderReplacements : replName: %s, replTable", replName)
+            self:TracePrint(replacements[replName])
+            local order = Grichelde.MAPPING_OFFSET + count
+            sorted["replacement_" .. order] = tClone(replacements[replName])
+            sorted["replacement_" .. order].order = order
+            count = count + 1
+        end
         index = index + 1
+        if ( index > 10000) then break end
     end
 
-    --self:DebugPrint("ReorderReplacements : sorted table")
-    --self:DebugPrint(sortedReplacements)
-    return sortedReplacements
+--  self:TracePrint("ReorderReplacements : sorted")
+--  self:TracePrint(sorted)
+
+    -- do NOT set self.db.profile.replacements = {} it will break defaults
+    for replName, _ in pairs(replacements) do
+        replacements[replName] = nil
+    end
+
+    -- copy over sorted replacements
+    for replName, replTable in pairs(sorted) do
+        replacements[replName] = replTable
+    end
+
+    self:DebugPrint("ReorderReplacements : sorted table")
+    self:DebugPrint(self.db.profile.replacements)
 end

GricheldeOptions.lua

@@ -2,8 +2,8 @@
 local _G = _G
 local Grichelde = _G.Grichelde
 
-local nilOrEmpty, pairs, tSize, unpack, find, join, toString, toNumber
-    = Grichelde.functions.nilOrEmpty, Grichelde.functions.pairs, Grichelde.functions.tSize, Grichelde.functions.unpack, Grichelde.functions.find, Grichelde.functions.join, Grichelde.functions.toString, Grichelde.functions.toNumber
+local nilOrEmpty, pairs, find, match, toString, toNumber
+    = Grichelde.functions.nilOrEmpty, Grichelde.functions.pairs, Grichelde.functions.find, Grichelde.functions.match, Grichelde.functions.toString, Grichelde.functions.toNumber
 
 function Grichelde:CreateOptionsUI()
     return {
@@ -29,71 +29,81 @@ function Grichelde:CreateOptionsUI()
                 name = self.L.Options_Channels_Group_Name,
                 desc = self:Format(self.L.Options_Channels_Group_Desc, self.L.AddonName),
                 args = {
-                    say = {
-                        order = 0,
-                        type = "toggle",
-                        name = self.L.Options_Channels_ChannelSay_Name,
-                        desc = self:Format(self.L.Options_Channels_ChannelSay_Desc, self.L.AddonName),
-                    },
-                    emote = {
+                    header = {
                         order = 1,
-                        type = "toggle",
-                        name = self.L.Options_Channels_ChannelEmote_Name,
-                        desc = self:Format(self.L.Options_Channels_ChannelEmote_Desc, self.L.AddonName),
+                        type = "description",
+                        name = self.L.Options_Channels_Header
                     },
-                    yell = {
+                    spacer = {
                         order = 2,
-                        type = "toggle",
-                        name = self.L.Options_Channels_ChannelYell_Name,
-                        desc = self:Format(self.L.Options_Channels_ChannelYell_Desc, self.L.AddonName),
+                        type = "header",
+                        name = ""
                     },
-                    party = {
-                        order = 3,
-                        type = "toggle",
-                        name = self.L.Options_Channels_ChannelParty_Name,
-                        desc = self:Format(self.L.Options_Channels_ChannelParty_Desc, self.L.AddonName),
-                    },
-                    guild = {
-                        order = 4,
-                        type = "toggle",
-                        name = self.L.Options_Channels_ChannelGuild_Name,
-                        desc = self:Format(self.L.Options_Channels_ChannelGuild_Desc, self.L.AddonName),
-                    },
-                    officer = {
-                        order = 5,
-                        type = "toggle",
-                        name = self.L.Options_Channels_ChannelOfficer_Name,
-                        desc = self:Format(self.L.Options_Channels_ChannelOfficer_Desc, self.L.AddonName),
-                    },
-                    raid = {
-                        order = 6,
-                        type = "toggle",
-                        name = self.L.Options_Channels_ChannelRaid_Name,
-                        desc = self:Format(self.L.Options_Channels_ChannelRaid_Desc, self.L.AddonName),
-                    },
-                    raidWarning = {
-                        order = 7,
-                        type = "toggle",
-                        name = self.L.Options_Channels_ChannelRaidWarning_Name,
-                        desc = self:Format(self.L.Options_Channels_ChannelRaidWarning_Desc, self.L.AddonName),
-                    },
-                    instance = {
-                        order = 8,
-                        type = "toggle",
-                        name = self.L.Options_Channels_ChannelInstance_Name,
-                        desc = self:Format(self.L.Options_Channels_ChannelInstance_Desc, self.L.AddonName),
-                    },
-                    battleground = {
-                        order = 9,
-                        type = "toggle",
-                        name = self.L.Options_Channels_ChannelBattleground_Name,
-                        desc = self:Format(self.L.Options_Channels_ChannelBattleground_Desc, self.L.AddonName),
-                    },
-                    whisper = {
+                    say = {
                         order = 10,
                         type = "toggle",
-                        name = self.L.Options_Channels_ChannelWhisper_Name,
-                        desc = self:Format(self.L.Options_Channels_ChannelWhisper_Desc, self.L.AddonName),
+                        name = self.L.Options_Channel_Say_Name,
+                        desc = self:Format(self.L.Options_Channel_Say_Desc, self.L.AddonName),
+                    },
+                    emote = {
+                        order = 11,
+                        type = "toggle",
+                        name = self.L.Options_Channel_Emote_Name,
+                        desc = self:Format(self.L.Options_Channel_Emote_Desc, self.L.AddonName),
+                    },
+                    yell = {
+                        order = 12,
+                        type = "toggle",
+                        name = self.L.Options_Channel_Yell_Name,
+                        desc = self:Format(self.L.Options_Channel_Yell_Desc, self.L.AddonName),
+                    },
+                    party = {
+                        order = 13,
+                        type = "toggle",
+                        name = self.L.Options_Channel_Party_Name,
+                        desc = self:Format(self.L.Options_Channel_Party_Desc, self.L.AddonName),
+                    },
+                    guild = {
+                        order = 14,
+                        type = "toggle",
+                        name = self.L.Options_Channel_Guild_Name,
+                        desc = self:Format(self.L.Options_Channel_Guild_Desc, self.L.AddonName),
+                    },
+                    officer = {
+                        order = 15,
+                        type = "toggle",
+                        name = self.L.Options_Channel_Officer_Name,
+                        desc = self:Format(self.L.Options_Channel_Officer_Desc, self.L.AddonName),
+                    },
+                    raid = {
+                        order = 16,
+                        type = "toggle",
+                        name = self.L.Options_Channel_Raid_Name,
+                        desc = self:Format(self.L.Options_Channel_Raid_Desc, self.L.AddonName),
+                    },
+                    raidWarning = {
+                        order = 17,
+                        type = "toggle",
+                        name = self.L.Options_Channel_RaidWarning_Name,
+                        desc = self:Format(self.L.Options_Channel_RaidWarning_Desc, self.L.AddonName),
+                    },
+                    instance = {
+                        order = 18,
+                        type = "toggle",
+                        name = self.L.Options_Channel_Instance_Name,
+                        desc = self:Format(self.L.Options_Channel_Instance_Desc, self.L.AddonName),
+                    },
+                    battleground = {
+                        order = 19,
+                        type = "toggle",
+                        name = self.L.Options_Channel_Battleground_Name,
+                        desc = self:Format(self.L.Options_Channel_Battleground_Desc, self.L.AddonName),
+                    },
+                    whisper = {
+                        order = 20,
+                        type = "toggle",
+                        name = self.L.Options_Channel_Whisper_Name,
+                        desc = self:Format(self.L.Options_Channel_Whisper_Desc, self.L.AddonName),
                     },
                 }
             },
@@ -110,7 +120,7 @@ function Grichelde:CreateOptionsUI()
                         confirm = false,
                         name = self.L.Options_Replacements_Add_Name,
                         desc = self.L.Options_Replacements_Add_Desc,
-                        func = function(info) self:AddReplacement(info) end
+                        func = function(info) self:AddEmptyMapping(info) end
                     },
                     deleteAll = {
                         order = 1,
@@ -119,60 +129,106 @@ function Grichelde:CreateOptionsUI()
                         confirmText = self.L.Options_Replacements_DeleteAll_ConfirmText,
                         name = self.L.Options_Replacements_DeleteAll_Name,
                         desc = self.L.Options_Replacements_DeleteAll_Desc,
-                        func = function(info) self:DeleteAllReplacements(info) end
-                    }
+                        func = function(info) self:DeleteAllMappings(info) end
+                    },
+                    header = {
+                        order = 3,
+                        type = "description",
+                        name = self.L.Options_Replacements_Header
+                    },
+                    spacer = {
+                        order = 4,
+                        type = "header",
+                        name = ""
+                    },
                 }
             }
         }
     }
 end
 
-function Grichelde:CreateReplacement(offset)
+function Grichelde:CreateMapping(offset)
     return {
         order = offset or 9999,
         type = "group",
         name = function(info) return self:MappingName(info) end,
-        desc = self.L.Options_Replacement_Group_Desc,
+        desc = self.L.Options_Mapping_Group_Desc,
         childGroups = "tree",
         args = {
             searchText = {
                 order = 0,
                 type = "input",
-                name = self.L.Options_Replacement_SearchText_Name,
-                desc = self.L.Options_Replacement_SearchText_Desc,
+                name = self.L.Options_Mapping_SearchText_Name,
+                desc = self.L.Options_Mapping_SearchText_Desc,
             },
             replaceText = {
                 order = 1,
                 type = "input",
-                name = self.L.Options_Replacement_ReplaceText_Name,
-                desc = self.L.Options_Replacement_ReplaceText_Desc,
+                name = self.L.Options_Mapping_ReplaceText_Name,
+                desc = self.L.Options_Mapping_ReplaceText_Desc,
             },
-            caseSensitive = {
+            exactCase = {
                 order = 2,
                 type = "toggle",
-                name = self.L.Options_Replacement_CaseSensitive_Name,
-                desc = self.L.Options_Replacement_CaseSensitive_Desc,
+                name = self.L.Options_Mapping_ExactCase_Name,
+                desc = self.L.Options_Mapping_ExactCase_Desc,
+                width = "full",
             },
             consolidate = {
                 order = 3,
                 type = "toggle",
-                name = self.L.Options_Replacement_Consolidate_Name,
-                desc = self.L.Options_Replacement_Consolidate_Desc,
-                width = 2
+                name = self.L.Options_Mapping_Consolidate_Name,
+                desc = self.L.Options_Mapping_Consolidate_Desc,
+                width = "full"
+            },
+            moveUp = {
+                order = 10,
+                type = "execute",
+                --name = self.L.Options_Mapping_MoveUp_Name,
+                name = "",
+                desc = self.L.Options_Mapping_MoveUp_Desc,
+                image = "Interface\\ChatFrame\\UI-ChatIcon-ScrollUp-Up",
+                width = 0.25,
+                func = function(info) self:MoveUp(info) end
+            },
+            moveDown = {
+                order = 11,
+                type = "execute",
+                --name = self.L.Options_Mapping_MoveDown_Name,
+                name = "",
+                desc = self.L.Options_Mapping_MoveDown_Desc,
+                image = "Interface\\ChatFrame\\UI-ChatIcon-ScrollDown-Up",
+                width = 0.25,
+                func = function(info) self:MoveDown(info) end
+            },
+            spacer = {
+                order = 18,
+                type = "description",
+                name = "",
+                width = 1,
             },
             delete = {
-                order = 4,
+                order = 19,
                 type = "execute",
                 confirm = true,
-                confirmText = self.L.Options_Replacements_Delete_ConfirmText,
-                name = self.L.Options_Replacement_Delete_Name,
-                desc = self.L.Options_Replacement_Delete_Desc,
-                func = function(info) self:DeleteReplacement(info) end
+                confirmText = self.L.Options_Mapping_Delete_ConfirmText,
+                name = self.L.Options_Mapping_Delete_Name,
+                desc = self.L.Options_Mapping_Delete_Desc,
+                width = 0.5,
+                func = function(info) self:DeleteMapping(info) end
             },
         }
     }
 end
 
+--dropButton:SetWidth(24)
+--dropButton:SetHeight(24)
+--dropButton:SetPoint("TOPRIGHT", DRight, "TOPRIGHT", -16, -18)
+--dropButton:SetNormalTexture([[Interface\ChatFrame\UI-ChatIcon-ScrollDown-Up]])
+--dropButton:SetPushedTexture([[Interface\ChatFrame\UI-ChatIcon-ScrollDown-Down]])
+--dropButton:SetDisabledTexture([[Interface\ChatFrame\UI-ChatIcon-ScrollDown-Disabled]])
+--dropButton:SetHighlightTexture([[Interface\Buttons\UI-Common-MouseHilight]], "ADD")
+
 function Grichelde:SetupOptions()
     -- add DB-backed profiles to UI options
     local options = self:CreateOptionsUI()
@@ -195,17 +251,14 @@ function Grichelde:IsDisabled(info)
 end
 
 function Grichelde:MappingName(info)
-    local option = self.db.profile
-    local path = 1
-    while (path <= #info) do
-        option = option[info[path]]
-        path = path + 1
-    end
+--  self:TracePrint("MappingName : info")
+--  self:TracePrint(info)
+    local option = self.db.profile.replacements[info[2]]
 
     if nilOrEmpty(option.searchText) and nilOrEmpty(option.replaceText) then
-        return self.L.Options_Replacement_EmptyMapping
+        return self.L.Options_Mapping_EmptyMapping
     else
-        return self:Format(self.L.Options_Replacement_Group_Name, option.searchText or "", option.replaceText or "")
+        return self:Format(self.L.Options_Mapping_Group_Name, option.searchText or "", option.replaceText or "")
     end
 end
 
@@ -225,15 +278,16 @@ function Grichelde:RefreshOptions(event)
         self:DebugPrint("Refreshing Profile %s on options change: %s", self.db:GetCurrentProfile(), event)
     end
 
-    self:RefreshReplacements(self:ReorderReplacements(self.db.profile.replacements))
+    self:ReorderReplacements()
+    self:RefreshReplacements(self.db.profile.replacements)
 end
 
 --- Create UI options for rhe given replacement table (from DB).
 --- Usually called with with self.db.profile.replacements
 -- @param replacementsTable
 function Grichelde:RefreshReplacements(replacementsTable)
-    --self:DebugPrint("RefreshReplacements : DB table:")
-    --self:DebugPrint(replacementsTable)
+    self:TracePrint("RefreshReplacements : DB table:")
+    self:TracePrint(replacementsTable)
 
     -- remove all previous replacements from options (not DB), except header and buttons
     local replacements = self.options.args.replacements.args or {}
@@ -245,59 +299,144 @@ function Grichelde:RefreshReplacements(replacementsTable)
 
     for replName, _ in pairs(replacementsTable or {}) do
         local _, replNumber = self:SplitOnFirstMatch(replName, "_")
-        replacements[replName] = self:CreateReplacement(toNumber(replNumber))
+        replacements[replName] = self:CreateMapping(toNumber(replNumber))
     end
 
-    --self:DebugPrint("RefreshReplacements : UI options:")
-    --self:DebugPrint(replacements)
+--  self:TracePrint("RefreshReplacements : UI options:")
+--  self:TracePrint(replacements)
 
     self.dialog:ConfigTableChanged(nil, self.name)
 end
 
-function Grichelde:AddReplacement()
-    local replacements = self.db.profile.replacements
-    local maxRepl = tSize(replacements)
-    local newMapping = "replacement_" .. maxRepl
-    self:DebugPrint("AddReplacement : new replacement key:", newMapping)
+function Grichelde:AddEmptyMapping()
+    local replacements = self.db.profile.replacements or {}
 
-    -- setting replacements[newMapping] = {} will deactivate defaults
-    replacements[newMapping].order = maxRepl
-    --self:DebugPrint("AddReplacements : all DB entries:")
-    --self:DebugPrint(replacements)
+    self:DebugPrint("AddEmptyMapping : old DB entries:")
+    self:DebugPrint(replacements)
 
-    --self.db.profile.replacements = replacements
-    self:RefreshOptions("AddReplacement " .. newMapping)
+    local maxRepl = Grichelde.MAPPING_OFFSET
+    for replName, _ in pairs(replacements) do
+        local num = match(replName, "^replacement_(%d+)")
+        if num and maxRepl < toNumber(num) then
+            maxRepl = toNumber(num)
+        end
+    end
+
+    local newMapping = "replacement_" .. toString(maxRepl + 1)
+    self:DebugPrint("AddEmptyMapping : new mapping key:", newMapping)
+
+    -- do NOT set self.db.profile.replacements = {} it will break defaults
+    replacements[newMapping].order = toString(maxRepl + 1)    -- will be reordered anyway
+    self:DebugPrint("AddEmptyMapping : new DB entries:")
+    self:DebugPrint(replacements)
+
+    self:RefreshOptions("AddEmptyMapping " .. newMapping)
     self.dialog:SelectGroup(self.name, "replacements", newMapping)
 end
 
-function Grichelde:DeleteReplacement(info)
-    self:DebugPrint("DeleteReplacement")
-    local option = self.db.profile
-    local path = 1
-    while (path < #info - 1) do
-        option = option[info[path]]
-        --self:DebugPrint(option)
-        path = path + 1
+function Grichelde:MoveUp(info)
+    self:TracePrint("MoveUp : info")
+    for i = 0, #info do
+        self:TracePrint("%d = %s", i, info[i])
     end
-    local optionPath = join(".", unpack(info, 1, #info))
-    self:DebugPrint("delete option \"%s\": %s", optionPath, toString(option[info[path]]))
-    option[info[path]] = nil
 
-    self:RefreshOptions("DeleteReplacement " .. info[path])
+    local replacements = self.db.profile.replacements or {}
+    local currentName = info[2]
 
-    local _, replNumber = self:SplitOnFirstMatch(info[path], "_")
+    self:DebugPrint("MoveUp : \"%s\"", currentName)
+    self:DebugPrint(replacements[currentName])
+
+    local _, replNumber = self:SplitOnFirstMatch(currentName, "_")
+    local currentOrder = toNumber(replNumber)
+
+    -- if not on top
+    if currentOrder ~= Grichelde.MAPPING_OFFSET then
+        local swapName = "replacement_" .. toString(currentOrder - 1)
+
+        -- swap ordering
+        self:DebugPrint("swap with option %s", swapName)
+
+        replacements[swapName].order = currentOrder
+        replacements[currentName].order = currentOrder - 1
+
+        self:RefreshOptions("MoveUp " .. currentName)
+
+        self:DebugPrint("MoveUp : refresh focus on %s", swapName)
+        self.dialog:SelectGroup(self.name, "replacements", swapName)
+    else
+        self:DebugPrint("MoveUp : already on top")
+    end
+end
+
+function Grichelde:MoveDown(info)
+    self:TracePrint("MoveDown : info")
+    for i = 0, #info do
+        self:TracePrint("%d = %s", i, info[i])
+    end
+
+    local replacements = self.db.profile.replacements or {}
+    local currentName = info[2]
+
+    self:DebugPrint("MoveDown : \"%s\"", currentName)
+    self:DebugPrint(replacements[currentName])
+
+    local _, replNumber = self:SplitOnFirstMatch(currentName, "_")
+    local currentOrder = toNumber(replNumber)
+
+    local maxRepl = Grichelde.MAPPING_OFFSET
+    for replName, _ in pairs(replacements) do
+        local num = match(replName, "^replacement_(%d+)")
+        if num and maxRepl < toNumber(num) then
+            maxRepl = toNumber(num)
+        end
+    end
+
+    -- if not last element
+    self:DebugPrint("MoveDown : maxRepl: %d", maxRepl)
+    if currentOrder < maxRepl then
+        local swapName = "replacement_" .. toString(currentOrder + 1)
+
+        -- swap ordering
+        self:DebugPrint("swap with option %s", swapName)
+
+        replacements[swapName].order = currentOrder
+        replacements[currentName].order = currentOrder + 1
+
+        self:RefreshOptions("MoveDown " .. currentName)
+
+        self:DebugPrint("MoveDown : refresh focus on %s", swapName)
+        self.dialog:SelectGroup(self.name, "replacements", swapName)
+    else
+        self:DebugPrint("MoveDown : already at bottom")
+    end
+end
+
+function Grichelde:DeleteMapping(info)
+    self:TracePrint("DeleteMapping : info")
+    for i = 0, #info do
+        self:TracePrint("%d = %s", i, info[i])
+    end
+
+    local currentName = info[2]
+
+    self:DebugPrint("delete option: %s", currentName)
+    self.db.profile.replacements[currentName] = nil
+
+    self:RefreshOptions("DeleteMapping " .. currentName)
+
+    local _, replNumber = self:SplitOnFirstMatch(currentName, "_")
     local newMapping = "replacement_" .. toNumber(replNumber - 1)
     self.dialog:SelectGroup(self.name, "replacements", newMapping)
 end
 
-function Grichelde:DeleteAllReplacements()
-    self:DebugPrint("DeleteAllReplacements : ")
+function Grichelde:DeleteAllMappings()
+    self:DebugPrint("DeleteAllMappings")
 
-    --self.db.profile.replacements = {}
+    -- do NOT set self.db.profile.replacements = {} it will break defaults
     for replName, _ in pairs(self.db.profile.replacements or {}) do
         self.db.profile.replacements[replName] = nil
     end
-    self:AddReplacement()
+    self:AddEmptyMapping()
 
-    self:RefreshOptions("DeleteAllReplacements")
+    self:RefreshOptions("DeleteAllMappings")
 end

GricheldeUpgrade.lua

@@ -0,0 +1,84 @@
+-- read namespace from global env
+local _G = _G
+local Grichelde = _G.Grichelde
+
+local pairs, find, toNumber = Grichelde.functions.pairs, Grichelde.functions.find, Grichelde.functions.toNumber
+
+function Grichelde:Upgrade_To_v060()
+    self:PrefixedPrint(self.L.Upgrade_ToVersion, Grichelde.COLOR_CODES.ORANGE .. "0.6.0" .. Grichelde.COLOR_CODES.CLOSE)
+
+    local replacements = self.db.profile.replacements or {}
+    self:DebugPrint("Upgrade_To_060 : old database")
+    self:DebugPrint(replacements)
+
+    for _, replTable in pairs(replacements) do
+        replTable["ignoreCase"] = not replTable["caseSensitive"]
+        replTable["caseSensitive"] = nil
+    end
+
+    self:DebugPrint("Upgrade_To_060 : new database")
+    self:DebugPrint(replacements)
+    return 0, 6, 0
+end
+
+function Grichelde:Upgrade_To_v070()
+    self:PrefixedPrint(self.L.Upgrade_ToVersion, Grichelde.COLOR_CODES.ORANGE .. "0.7.0" .. Grichelde.COLOR_CODES.CLOSE)
+
+    local replacements = self.db.profile.replacements or {}
+    self:DebugPrint("Upgrade_To_070 : old database")
+    self:DebugPrint(replacements)
+
+    for _, replTable in pairs(replacements) do
+        replTable["exactCase"] = not replTable["ignoreCase"]
+        replTable["ignoreCase"] = nil
+    end
+
+    self:DebugPrint("Upgrade_To_070 : new database")
+    self:DebugPrint(replacements)
+    return 0, 7, 0
+end
+
+--[[
+function Grichelde:Upgrade_To_v071()
+    return 0, 7, 1
+end
+]]
+
+function Grichelde:UpgradeDatabase()
+    local dbVersion = self.db.global.version or "0.0.0"
+    self:DebugPrint("Database version:", dbVersion)
+
+    local _, _, maj, min, pat = find(dbVersion, "(%d+)%.(%d+)%.(%d+).*")
+    local major, minor, patch = toNumber(maj) or 0, toNumber(min) or 0, toNumber(pat) or 0
+
+    local upgrade = 0
+    local error = false
+
+    if major == 0 then
+        if minor < 6 then
+            upgrade = upgrade + 1
+            major, minor, patch = self:Upgrade_To_v060(dbVersion)
+        end
+        if minor < 7 then
+            upgrade = upgrade + 1
+            major, minor, patch = self:Upgrade_To_v070(dbVersion)
+        end
+--[[
+        if minor == 7 then
+            if patch < 1 then
+                upgrade = upgrade + 1
+                major, minor, patch = self:Upgrade_To_v71(dbVersion)
+            end
+        end
+]]
+    end
+
+    if upgrade == 0 then
+        self:DebugPrint("Database up-to-date")
+    else
+        if not error then
+            self.db.global.version = self.version
+            self:PrefixedPrint(Grichelde.COLOR_CODES.GREEN .. self.L.Upgrade_Successful .. Grichelde.COLOR_CODES.CLOSE)
+        end
+    end
+end

GricheldeUtils.lua

@@ -65,9 +65,9 @@ function Grichelde:SplitOnFirstMatch(text, delimPattern, start)
     if text == nil then return nil end
     local pattern = "^(.-)" .. (delimPattern or " " ) .."(.*)"
     local pos = start or 1
-    self:DebugPrint("SplitOnFirstMatch : text: %s, pattern: %s, start: %d", text, pattern, start)
+    self:TracePrint("SplitOnFirstMatch : text: %s, pattern: %s, start: %d", text, pattern, start)
     local _, _, left, right = find(text, pattern, pos)
-    self:DebugPrint("SplitOnFirstMatch : left: %s, right: %s", left, right)
+    self:TracePrint("SplitOnFirstMatch : left: %s, right: %s", left, right)
     return left or text, right
 end
 
@@ -75,9 +75,9 @@ end
 function Grichelde:SplitOnLastMatch(text, delimPattern, start)
     local pattern = "(.*)" .. (delimPattern or " ") .. "(.-)$"
     local pos = start or 1
-    self:DebugPrint("SplitOnLastMatch : text: %s, pattern: %s, start: %d", text, pattern, start)
+    self:TracePrint("SplitOnLastMatch : text: %s, pattern: %s, start: %d", text, pattern, start)
     local _, _, left, right = find(text, pattern, pos)
-    self:DebugPrint("SplitOnLastMatch : left: %s, right: %s", left, right)
+    self:TracePrint("SplitOnLastMatch : left: %s, right: %s", left, right)
     return left, right or text
 end
 
@@ -121,18 +121,27 @@ function Grichelde:PrefixedPrint(...)
 end
 
 function Grichelde:DebugPrint(obj, ...)
-    local function prefixedDebugPrint(...)
+    self:LogPrint(Grichelde.LOG_LEVEL.DEBUG, function(...)
         print(self.COLOR_CODES.GRAY .. self.L.AddonName .. self.COLOR_CODES.CLOSE .. ":", self:Format(...))
+    end, obj, ...)
 end
 
-    if (self.debug) then
+function Grichelde:TracePrint(obj, ...)
+    self:LogPrint(Grichelde.LOG_LEVEL.TRACE, function(...)
+        print(self.COLOR_CODES.DARKGRAY .. self.L.AddonName .. self.COLOR_CODES.CLOSE .. ":", self:Format(...))
+    end, obj, ...)
+end
+
+function Grichelde:LogPrint(logLevel, printFunc, obj, ...)
+    if (self.logLevel >= logLevel) then
+        local printF = printFunc or print
         if obj == nil then
-            prefixedDebugPrint("<nil>")
+            printF("<nil>")
         else
             if type(obj) == "string" then
                 local l = select("#", ...)
                 if ( l == 0 or not find(obj, "%%")) then
-                    prefixedDebugPrint(obj, ...)
+                    printF(obj, ...)
                 else
                     -- sanitize nil values in vararg
                     local packed = { ... }
@@ -144,13 +153,69 @@ function Grichelde:DebugPrint(obj, ...)
 --                  self:tPrint(packed)
                     -- cannot assign unpacked to a vararg variable and print it for debug
                     local fmtMsg = format(obj, unpack(packed, 1, l)) -- manually set count as unpack() stops on nil (bug with #table)
-                    prefixedDebugPrint(fmtMsg)
+                    printF(fmtMsg)
                 end
             elseif type(obj) == "table" then
-                tPrint(obj, 0, {}, prefixedDebugPrint)
+                tPrint(obj, 0, {}, printF)
             else
-                prefixedDebugPrint(plainValue(obj))
+                printF(plainValue(obj))
             end
         end
     end
 end
+
+--- Print UI options to chat frame
+function Grichelde:PrintOptions()
+    self:PrefixedPrint(self.COLOR_CODES.PREFIX .. self.L.Debug_Options .. self.COLOR_CODES.CLOSE)
+    self:LogPrint(-1, function(...)
+        print(self.COLOR_CODES.PREFIX .. self.L.AddonName .. self.COLOR_CODES.CLOSE .. ":", self:Format(...))
+    end, self.options.args.replacements.args)
+end
+
+--- Print DB replacements to chat frame
+function Grichelde:PrintMappings()
+    self:PrefixedPrint(self.COLOR_CODES.PREFIX .. self.L.Debug_Mappings .. self.COLOR_CODES.CLOSE)
+    self:LogPrint(-1, function(...)
+        print(self.COLOR_CODES.PREFIX .. self.L.AddonName .. self.COLOR_CODES.CLOSE .. ":", self:Format(...))
+    end, self.db.profile.replacements)
+end
+
+--- Open UI windows with replacements in it
+function Grichelde:ShowMappings()
+    if self.debugFrame and self.debugFrame:IsShown() then
+        self.debugFrame:Release(self.debugFrame)
+        self.debugFrame = nil
+    else
+        local replacements = self.db.profile.replacements or {}
+        local repls = 0
+        for k, _ in pairs(replacements) do
+            if k and find(k, "^replacement_") then
+                repls = repls + 1
+            end
+        end
+
+        local AceGUI = LibStub("AceGUI-3.0")
+        local frame = AceGUI:Create("Frame");
+        frame:SetTitle(self.L.Debug_Mappings);
+        frame:SetStatusText(self:Format(self.L.Debug_Mappings_Found, repls))
+        frame:SetWidth(400);
+        frame:SetHeight(600);
+        frame:SetLayout("Fill");
+
+        local function closeFrame() frame:Release(frame) end
+        frame:SetCallback("OnClose", closeFrame)
+
+        local configBox = AceGUI:Create("MultiLineEditBox");
+        local text = ""
+        tPrint(replacements, 0, {}, function(s) text = text .. s .. "|n" end)
+        configBox:SetLabel("")
+        configBox:SetText(text)
+        configBox:DisableButton(true)
+        --configBox:SetDisabled(true)
+        configBox:SetNumLines(30);
+        configBox:SetFocus()
+
+        frame:AddChild(configBox);
+        self.debugFrame = frame
+    end
+end

localisation/deDE.lua

@@ -5,8 +5,11 @@ if not L then return end
 L.AddonName = "Grichelde"
 L.VersionAbbr = "v"
 L.AddonLoaded = "%s hilft Euch jetzt bei euren Sprachschwierigkeiten."
-L.Addon_Detected_Misspelled = "Das Addon 'Misspelled' wurde erkannt und alle Nachrichten werden automatisch bereinigt."
-L.Addon_Detected_WIM = "Das Addon 'WIM' wurde erkannt und alle Flüsternnachrichten aus IM-Fenster werden behandelt."
+L.Upgrade_ToVersion = "Hebe Databank auf Version %s an."
+L.Upgrade_Successful = "Upgrade erfolgreich."
+L.Debug_Options = "Optionen"
+L.Debug_Mappings = "Ersetzungen"
+L.Debug_Mappings_Found = "%d Ersetzungen gefunden"
 
 -- profiles
 L.Profiles_Available = "Verf\195\188gbare Profile:"
@@ -26,32 +29,34 @@ L.Options_Enabled_Desc = "Aktiviert %s"
 
 L.Options_Channels_Group_Name = "Kan\195\164le"
 L.Options_Channels_Group_Desc = "%s ist in folgenden Kan\195\164len aktiv."
-L.Options_Channels_ChannelSay_Name = "Sagen"
-L.Options_Channels_ChannelSay_Desc = "Aktiviert %s im Kanal \"Sagen\"."
-L.Options_Channels_ChannelEmote_Name = "Emote"
-L.Options_Channels_ChannelEmote_Desc = "Aktiviert %s im Kanal \"Emote\"."
-L.Options_Channels_ChannelYell_Name = "Schreien"
-L.Options_Channels_ChannelYell_Desc = "Aktiviert %s im Kanal \"Schreien\"."
-L.Options_Channels_ChannelParty_Name = "Gruppe"
-L.Options_Channels_ChannelParty_Desc = "Aktiviert %s im Kanal \"Gruppe\"."
-L.Options_Channels_ChannelPartyLeader_Name = "Gruppenanf\195\188hrer"
-L.Options_Channels_ChannelPartyLeader_Desc = "Aktiviert %s im Kanal \"Gruppenanf\195\188hrer\"."
-L.Options_Channels_ChannelGuild_Name = "Gilde"
-L.Options_Channels_ChannelGuild_Desc = "Aktiviert %s im Kanal \"Gilde\"."
-L.Options_Channels_ChannelOfficer_Name = "Offiziere"
-L.Options_Channels_ChannelOfficer_Desc = "Aktiviert %s im Kanal \"Offiziere\"."
-L.Options_Channels_ChannelRaid_Name = "Schlachtzug"
-L.Options_Channels_ChannelRaid_Desc = "Aktiviert %s im Kanal \"Schlachtzug\"."
-L.Options_Channels_ChannelRaidLeader_Name = "Schlachtzugsanf\195\188hrer"
-L.Options_Channels_ChannelRaidLeader_Desc = "Aktiviert %s im Kanal \"Schlachtzugsanf\195\188hrer\"."
-L.Options_Channels_ChannelRaidWarning_Name = "Schlachtzugswarnung"
-L.Options_Channels_ChannelRaidWarning_Desc = "Aktiviert %s im Kanal \"Schlachtzugswarnung."
-L.Options_Channels_ChannelInstance_Name = "Instanz"
-L.Options_Channels_ChannelInstance_Desc = "Aktiviert %s im Kanal \"Instanz\"."
-L.Options_Channels_ChannelBattleground_Name = "Schlachtfeld"
-L.Options_Channels_ChannelBattleground_Desc = "Aktiviert %s im Kanal \"Schlachtfeld\"."
-L.Options_Channels_ChannelWhisper_Name = "Fl\195\188stern"
-L.Options_Channels_ChannelWhisper_Desc = "Aktiviert %s im Kanal \"Fl\195\188stern\"."
+L.Options_Channels_Header = "Eine Ersetzung wird nur in den unten markierten Kan\195\164len durchgef\195\188hrt:"
+
+L.Options_Channel_Say_Name = "Sagen"
+L.Options_Channel_Say_Desc = "Aktiviert %s im Kanal \"Sagen\"."
+L.Options_Channel_Emote_Name = "Emote"
+L.Options_Channel_Emote_Desc = "Aktiviert %s im Kanal \"Emote\"."
+L.Options_Channel_Yell_Name = "Schreien"
+L.Options_Channel_Yell_Desc = "Aktiviert %s im Kanal \"Schreien\"."
+L.Options_Channel_Party_Name = "Gruppe"
+L.Options_Channel_Party_Desc = "Aktiviert %s im Kanal \"Gruppe\"."
+L.Options_Channel_PartyLeader_Name = "Gruppenanf\195\188hrer"
+L.Options_Channel_PartyLeader_Desc = "Aktiviert %s im Kanal \"Gruppenanf\195\188hrer\"."
+L.Options_Channel_Guild_Name = "Gilde"
+L.Options_Channel_Guild_Desc = "Aktiviert %s im Kanal \"Gilde\"."
+L.Options_Channel_Officer_Name = "Offiziere"
+L.Options_Channel_Officer_Desc = "Aktiviert %s im Kanal \"Offiziere\"."
+L.Options_Channel_Raid_Name = "Schlachtzug"
+L.Options_Channel_Raid_Desc = "Aktiviert %s im Kanal \"Schlachtzug\"."
+L.Options_Channel_RaidLeader_Name = "Schlachtzugsanf\195\188hrer"
+L.Options_Channel_RaidLeader_Desc = "Aktiviert %s im Kanal \"Schlachtzugsanf\195\188hrer\"."
+L.Options_Channel_RaidWarning_Name = "Schlachtzugswarnung"
+L.Options_Channel_RaidWarning_Desc = "Aktiviert %s im Kanal \"Schlachtzugswarnung."
+L.Options_Channel_Instance_Name = "Instanz"
+L.Options_Channel_Instance_Desc = "Aktiviert %s im Kanal \"Instanz\"."
+L.Options_Channel_Battleground_Name = "Schlachtfeld"
+L.Options_Channel_Battleground_Desc = "Aktiviert %s im Kanal \"Schlachtfeld\"."
+L.Options_Channel_Whisper_Name = "Fl\195\188stern"
+L.Options_Channel_Whisper_Desc = "Aktiviert %s im Kanal \"Fl\195\188stern\"."
 
 L.Options_Replacements_Group_Name = "Ersetzungen"
 L.Options_Replacements_Group_Desc = "Diese Vorkommen werden in den aktivierten Kan\195\164len ersetzt."
@@ -60,18 +65,25 @@ L.Options_Replacements_Add_Desc = "F\195\188gt eine neue Zuordnung hinzu."
 L.Options_Replacements_DeleteAll_Name = "Alle L\195\182schen"
 L.Options_Replacements_DeleteAll_Desc = "L\195\182scht alle Zuweisungen."
 L.Options_Replacements_DeleteAll_ConfirmText="Wirklich ALLE Zuweisungen l\195\182schen?"
-
-L.Options_Replacement_Group_Name = "%s => %s"
-L.Options_Replacement_Group_Desc = "Dieses Vorkommen wird in den aktivierten Kan\195\164len ersetzt."
-L.Options_Replacement_EmptyMapping = "(keine)"
-L.Options_Replacement_SearchText_Name = "Suchtext:"
-L.Options_Replacement_SearchText_Desc = "Dieser Text wird in der Chateingabe gesucht."
-L.Options_Replacement_ReplaceText_Name = "Ersetzung:"
-L.Options_Replacement_ReplaceText_Desc = "Jeder Suchtreffer wird mit diesem Text ersetzt."
-L.Options_Replacement_CaseSensitive_Name = "Gro\195\159- und Kleinschreibung beachten"
-L.Options_Replacement_CaseSensitive_Desc = "Groß\195\159buchstaben werden mit Gro\195\159buchstaben ersetzt."
-L.Options_Replacement_Consolidate_Name = "Fa\195\159e aufeinanderfolgende Treffer zusammen"
-L.Options_Replacement_Consolidate_Desc = "Wenn durch die Ersetzung die Zeichenfolge mehrfach hintereinander steht,|nfasse sie zu einem Vorkommen zusammen."
-L.Options_Replacement_Delete_Name = "L\195\182schen"
-L.Options_Replacement_Delete_Desc = "L\195\182scht diese Zuweisung."
-L.Options_Replacements_Delete_ConfirmText="Diese Zuweisung l\195\182schen?"
+L.Options_Replacements_Header = "Die Vorkommen links vom Pfeil ( => ) werden in den aktivierten Kan\195\164len gesucht und durch den Text rechts vom Pfeil ersetzt."
+                                .."|nWird die Gro\195\159- und Kleinschreibung ignoriert, wird die Gro\195\159schreibung jedes Zeichens wird bei der Ersetzung \195\188bernommen."
+                                .."|nDas Zusammenfassen aufeinanderfolgender Treffer vermeidet unsch\195\182ne Wiederholungen, die durch die Ersetzung entstehen k\195\182nnen."
+                                .."|nMit den beiden Standard-Ersetzung wird so aus \"Tasse\" => \"Ckache\"."
+L.Options_Mapping_Group_Name = "%s => %s"
+L.Options_Mapping_Group_Desc = "Dieses Vorkommen wird in den aktivierten Kan\195\164len ersetzt."
+L.Options_Mapping_EmptyMapping = "(keine)"
+L.Options_Mapping_SearchText_Name = "Suchtext:"
+L.Options_Mapping_SearchText_Desc = "Dieser Text wird in der Chateingabe gesucht."
+L.Options_Mapping_ReplaceText_Name = "Ersetzung:"
+L.Options_Mapping_ReplaceText_Desc = "Jeder Suchtreffer wird mit diesem Text ersetzt."
+L.Options_Mapping_ExactCase_Name = "exakte Gro\195\159- und Kleinschreibung"
+L.Options_Mapping_ExactCase_Desc = "Wenn gesetzt, muss die Gro\195\159- und Kleinschreibung des Suchtextes exakt \195\188berein stimmen. Anderfalls wird die Gro\195\159schreibung jedes Zeichens bei der Ersetzung \195\188bernommen."
+L.Options_Mapping_Consolidate_Name = "Fa\195\159e aufeinanderfolgende Treffer zusammen"
+L.Options_Mapping_Consolidate_Desc = "Wenn durch die Ersetzung die Zeichenfolge mehrfach hintereinander steht,|nfasse sie zu einem Vorkommen zusammen."
+L.Options_Mapping_MoveUp_Name = "^"
+L.Options_Mapping_MoveUp_Desc = "nach oben verschieben"
+L.Options_Mapping_MoveDown_Name = "v"
+L.Options_Mapping_MoveDown_Desc = "nach unten verschieben"
+L.Options_Mapping_Delete_Name = "L\195\182schen"
+L.Options_Mapping_Delete_Desc = "L\195\182scht diese Zuweisung."
+L.Options_Mapping_Delete_ConfirmText="Diese Zuweisung l\195\182schen?"

localisation/enUS.lua

@@ -5,9 +5,11 @@ if not L then return end
 L.AddonName = "Grichelde"
 L.VersionAbbr = "v"
 L.AddonLoaded = "%s now helps you with your spelling disabilities."
-L.Addon_Detected_Misspelled = "The Addon 'Misspelled' has been detected and any messsage will be cleansed automatically."
-L.Addon_Detected_WIM = "The Addon 'WIM' has been detected and any whispers will be handled from IM windows."
-
+L.Upgrade_ToVersion = "Upgrade database to version %s."
+L.Upgrade_Successful = "Upgrade successful."
+L.Debug_Options = "Options"
+L.Debug_Mappings = "Mappings"
+L.Debug_Mappings_Found = "%d Mappings found"
 
 -- profiles
 L.Profiles_Available = "Available profiles:"
@@ -27,32 +29,34 @@ L.Options_Enabled_Desc = "Enables %s"
 
 L.Options_Channels_Group_Name = "Channels"
 L.Options_Channels_Group_Desc = "%s is active in the following channels."
-L.Options_Channels_ChannelSay_Name = "Say"
-L.Options_Channels_ChannelSay_Desc = "Activates %s in channel \"Say\"."
-L.Options_Channels_ChannelEmote_Name = "Emote"
-L.Options_Channels_ChannelEmote_Desc = "Activates %s in channel \"Emote\"."
-L.Options_Channels_ChannelYell_Name = "Yell"
-L.Options_Channels_ChannelYell_Desc = "Activates %s in channel \"Yell\"."
-L.Options_Channels_ChannelParty_Name = "Party"
-L.Options_Channels_ChannelParty_Desc = "Activates %s in channel \"Party\"."
-L.Options_Channels_ChannelPartyLeader_Name = "Party Leader"
-L.Options_Channels_ChannelPartyLeader_Desc = "Activates %s in channel \"Party Leader\"."
-L.Options_Channels_ChannelGuild_Name = "Guild"
-L.Options_Channels_ChannelGuild_Desc = "Activates %s in channel \"Guild\"."
-L.Options_Channels_ChannelOfficer_Name = "Officers"
-L.Options_Channels_ChannelOfficer_Desc = "Activates %s in channel \"Officers\"."
-L.Options_Channels_ChannelRaid_Name = "Raid"
-L.Options_Channels_ChannelRaid_Desc = "Activates %s in channel \"Raid\"."
-L.Options_Channels_ChannelRaidLeader_Name = "Raid Leader"
-L.Options_Channels_ChannelRaidLeader_Desc = "Activates %s in channel \"Raid Leader\"."
-L.Options_Channels_ChannelRaidWarning_Name = "Raid Warning"
-L.Options_Channels_ChannelRaidWarning_Desc = "Activates %s in channel \"Raid Warning\"."
-L.Options_Channels_ChannelInstance_Name = "Instance"
-L.Options_Channels_ChannelInstance_Desc = "Activates %s in channel \"Instance\"."
-L.Options_Channels_ChannelBattleground_Name = "Battleground"
-L.Options_Channels_ChannelBattleground_Desc = "Activates %s in channel \"Battleground\"."
-L.Options_Channels_ChannelWhisper_Name = "Whisper"
-L.Options_Channels_ChannelWhisper_Desc = "Activates %s in channel \"Whisper\"."
+L.Options_Channels_Header = "Text replacement will only be done for marked channels below:"
+
+L.Options_Channel_Say_Name = "Say"
+L.Options_Channel_Say_Desc = "Activates %s in channel \"Say\"."
+L.Options_Channel_Emote_Name = "Emote"
+L.Options_Channel_Emote_Desc = "Activates %s in channel \"Emote\"."
+L.Options_Channel_Yell_Name = "Yell"
+L.Options_Channel_Yell_Desc = "Activates %s in channel \"Yell\"."
+L.Options_Channel_Party_Name = "Party"
+L.Options_Channel_Party_Desc = "Activates %s in channel \"Party\"."
+L.Options_Channel_PartyLeader_Name = "Party Leader"
+L.Options_Channel_PartyLeader_Desc = "Activates %s in channel \"Party Leader\"."
+L.Options_Channel_Guild_Name = "Guild"
+L.Options_Channel_Guild_Desc = "Activates %s in channel \"Guild\"."
+L.Options_Channel_Officer_Name = "Officers"
+L.Options_Channel_Officer_Desc = "Activates %s in channel \"Officers\"."
+L.Options_Channel_Raid_Name = "Raid"
+L.Options_Channel_Raid_Desc = "Activates %s in channel \"Raid\"."
+L.Options_Channel_RaidLeader_Name = "Raid Leader"
+L.Options_Channel_RaidLeader_Desc = "Activates %s in channel \"Raid Leader\"."
+L.Options_Channel_RaidWarning_Name = "Raid Warning"
+L.Options_Channel_RaidWarning_Desc = "Activates %s in channel \"Raid Warning\"."
+L.Options_Channel_Instance_Name = "Instance"
+L.Options_Channel_Instance_Desc = "Activates %s in channel \"Instance\"."
+L.Options_Channel_Battleground_Name = "Battleground"
+L.Options_Channel_Battleground_Desc = "Activates %s in channel \"Battleground\"."
+L.Options_Channel_Whisper_Name = "Whisper"
+L.Options_Channel_Whisper_Desc = "Activates %s in channel \"Whisper\"."
 
 L.Options_Replacements_Group_Name = "Replacements"
 L.Options_Replacements_Group_Desc = "These lookups will be replaced in activated channels."
@@ -61,18 +65,25 @@ L.Options_Replacements_Add_Desc = "Adds a new replacement mapping."
 L.Options_Replacements_DeleteAll_Name = "Delete All"
 L.Options_Replacements_DeleteAll_Desc = "Deletes all replacement mappings."
 L.Options_Replacements_DeleteAll_ConfirmText = "Do you really want to delete ALL replacement mappings?"
-
-L.Options_Replacement_Group_Name = "%s => %s"
-L.Options_Replacement_Group_Desc = "This lookup will be replaced in activated channels."
-L.Options_Replacement_EmptyMapping = "(none)"
-L.Options_Replacement_SearchText_Name = "Search for:"
-L.Options_Replacement_SearchText_Desc = "This text is looked up in your chat input box."
-L.Options_Replacement_ReplaceText_Name = "Replacement:"
-L.Options_Replacement_ReplaceText_Desc = "Any match will be replaced with this text."
-L.Options_Replacement_CaseSensitive_Name = "case sensitive"
-L.Options_Replacement_CaseSensitive_Desc = "Will not replace occurrences if cases differ."
-L.Options_Replacement_Consolidate_Name = "consolidate consecutive matches"
-L.Options_Replacement_Consolidate_Desc = "If after the replacement a text sequence is repeated|ndirectly after another, treat them as one occurrence."
-L.Options_Replacement_Delete_Name = "Delete"
-L.Options_Replacement_Delete_Desc = "Deletes this replacement mapping."
-L.Options_Replacements_Delete_ConfirmText = "Delete this replacement mapping?"
+L.Options_Replacements_Header = "All matches on the lefthand side of the arrow ( => ) will be replaced in activated channels by the text on the righthand side."
+                                .. "|nIf case sensivity is ignored, the case for each letter of the matching text is taken over when replaced."
+                                .. "|nConsolidation of consecutive matches prevent unaesthetic repetitions of letters introduced by replacements."
+                                .. "|nWith both default mappings active, the mapping would be \"Tossing\" => \"Ckoching\"."
+L.Options_Mapping_Group_Name = "%s => %s"
+L.Options_Mapping_Group_Desc = "This lookup will be replaced in activated channels."
+L.Options_Mapping_EmptyMapping = "(none)"
+L.Options_Mapping_SearchText_Name = "Search for:"
+L.Options_Mapping_SearchText_Desc = "This text is looked up in your chat input box."
+L.Options_Mapping_ReplaceText_Name = "Replacement:"
+L.Options_Mapping_ReplaceText_Desc = "Any match will be replaced with this text."
+L.Options_Mapping_ExactCase_Name = "exact case"
+L.Options_Mapping_ExactCase_Desc = "When set, matches must be case-sensitive. Otherwise the case for each letter of the matching text is taken over when replaced."
+L.Options_Mapping_Consolidate_Name = "consolidate consecutive matches"
+L.Options_Mapping_Consolidate_Desc = "If after the replacement a text sequence is repeated|ndirectly after another, treat them as one occurrence."
+L.Options_Mapping_MoveUp_Name = "^"
+L.Options_Mapping_MoveUp_Desc = "move up"
+L.Options_Mapping_MoveDown_Name = "v"
+L.Options_Mapping_MoveDown_Desc = "move down"
+L.Options_Mapping_Delete_Name = "Delete"
+L.Options_Mapping_Delete_Desc = "Deletes this replacement mapping."
+L.Options_Mapping_Delete_ConfirmText = "Delete this replacement mapping?"