- ToC and libraries update.

Details.toc

@@ -1,4 +1,4 @@
-## Interface: 80000
+## Interface: 80100
 ## Title: Details
 ## Notes: Computes detailed infos about combats.
 ## SavedVariables: _detalhes_global

Libs/AceAddon-3.0/AceAddon-3.0.lua

@@ -28,7 +28,7 @@
 -- end
 -- @class file
 -- @name AceAddon-3.0.lua
--- @release $Id: AceAddon-3.0.lua 1084 2013-04-27 20:14:11Z nevcairiel $
+-- @release $Id: AceAddon-3.0.lua 1184 2018-07-21 14:13:14Z nevcairiel $
 
 local MAJOR, MINOR = "AceAddon-3.0", 12
 local AceAddon, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
@@ -62,43 +62,12 @@ local function errorhandler(err)
 	return geterrorhandler()(err)
 end
 
-local function CreateDispatcher(argCount)
-	local code = [[
-		local xpcall, eh = ...
-		local method, ARGS
-		local function call() return method(ARGS) end
-	
-		local function dispatch(func, ...)
-			 method = func
-			 if not method then return end
-			 ARGS = ...
-			 return xpcall(call, eh)
-		end
-	
-		return dispatch
-	]]
-	
-	local ARGS = {}
-	for i = 1, argCount do ARGS[i] = "arg"..i end
-	code = code:gsub("ARGS", tconcat(ARGS, ", "))
-	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler)
-end
-
-local Dispatchers = setmetatable({}, {__index=function(self, argCount)
-	local dispatcher = CreateDispatcher(argCount)
-	rawset(self, argCount, dispatcher)
-	return dispatcher
-end})
-Dispatchers[0] = function(func)
-	return xpcall(func, errorhandler)
-end
-
 local function safecall(func, ...)
 	-- we check to see if the func is passed is actually a function here and don't error when it isn't
 	-- this safecall is used for optional functions like OnInitialize OnEnable etc. When they are not
 	-- present execution should continue without hinderance
 	if type(func) == "function" then
-		return Dispatchers[select('#', ...)](func, ...)
+		return xpcall(func, errorhandler, ...)
 	end
 end
 

Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua

@@ -1,5 +1,5 @@
---[[ $Id: CallbackHandler-1.0.lua 1131 2015-06-04 07:29:24Z nevcairiel $ ]]
-local MAJOR, MINOR = "CallbackHandler-1.0", 6
+--[[ $Id: CallbackHandler-1.0.lua 1186 2018-07-21 14:19:18Z nevcairiel $ ]]
+local MAJOR, MINOR = "CallbackHandler-1.0", 7
 local CallbackHandler = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not CallbackHandler then return end -- No upgrade needed
@@ -22,41 +22,15 @@ local function errorhandler(err)
 	return geterrorhandler()(err)
 end
 
-local function CreateDispatcher(argCount)
-	local code = [[
-	local next, xpcall, eh = ...
-
-	local method, ARGS
-	local function call() method(ARGS) end
-
-	local function dispatch(handlers, ...)
-		local index
-		index, method = next(handlers)
+local function Dispatch(handlers, ...)
+	local index, method = next(handlers)
 	if not method then return end
-		local OLD_ARGS = ARGS
-		ARGS = ...
 	repeat
-			xpcall(call, eh)
+		xpcall(method, errorhandler, ...)
 		index, method = next(handlers, index)
 	until not method
-		ARGS = OLD_ARGS
-	end
-
-	return dispatch
-	]]
-
-	local ARGS, OLD_ARGS = {}, {}
-	for i = 1, argCount do ARGS[i], OLD_ARGS[i] = "arg"..i, "old_arg"..i end
-	code = code:gsub("OLD_ARGS", tconcat(OLD_ARGS, ", ")):gsub("ARGS", tconcat(ARGS, ", "))
-	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(next, xpcall, errorhandler)
 end
 
-local Dispatchers = setmetatable({}, {__index=function(self, argCount)
-	local dispatcher = CreateDispatcher(argCount)
-	rawset(self, argCount, dispatcher)
-	return dispatcher
-end})
-
 --------------------------------------------------------------------------
 -- CallbackHandler:New
 --
@@ -87,7 +61,7 @@ function CallbackHandler:New(target, RegisterName, UnregisterName, UnregisterAll
 		local oldrecurse = registry.recurse
 		registry.recurse = oldrecurse + 1
 
-		Dispatchers[select('#', ...) + 1](events[eventname], eventname, ...)
+		Dispatch(events[eventname], eventname, ...)
 
 		registry.recurse = oldrecurse
 

Libs/LibCompress/LibCompress.lua

@@ -5,12 +5,12 @@
 -- Authors: jjsheets and Galmok of European Stormrage (Horde)
 -- Email : sheets.jeff@gmail.com and galmok@gmail.com
 -- Licence: GPL version 2 (General Public License)
--- Revision: $Revision: 81 $
--- Date: $Date: 2018-02-25 06:31:34 +0000 (Sun, 25 Feb 2018) $
+-- Revision: $Revision: 83 $
+-- Date: $Date: 2018-07-03 14:33:48 +0000 (Tue, 03 Jul 2018) $
 ----------------------------------------------------------------------------------
 
 
-local LibCompress = LibStub:NewLibrary("LibCompress", 90000 + tonumber(("$Revision: 81 $"):match("%d+")))
+local LibCompress = LibStub:NewLibrary("LibCompress", 90000 + tonumber(("$Revision: 83 $"):match("%d+")))
 
 if not LibCompress then return end
 
@@ -938,13 +938,9 @@ function LibCompress:GetEncodeTable(reservedChars, escapeChars, mapChars)
 		c = string_sub(encodeBytes, i, i)
 		if not encode_translate[c] then
 			-- this loop will update escapeChar and r
-			while r < 256 and taken[string_char(r)] do
+			while r >= 256 or taken[string_char(r)] do
 				r = r + 1
 				if r > 255 then -- switch to next escapeChar
-					if escapeChar == "" then -- we are out of escape chars and we need more!
-						return nil, "Out of escape characters"
-					end
-
 					codecTable["decode_search"..tostring(escapeCharIndex)] = escape_for_gsub(escapeChar).."([".. escape_for_gsub(table_concat(decode_search)).."])"
 					codecTable["decode_translate"..tostring(escapeCharIndex)] = decode_translate
 					table_insert(decode_func_string, "str = str:gsub(self.decode_search"..tostring(escapeCharIndex)..", self.decode_translate"..tostring(escapeCharIndex)..");")
@@ -952,6 +948,10 @@ function LibCompress:GetEncodeTable(reservedChars, escapeChars, mapChars)
 					escapeCharIndex  = escapeCharIndex + 1
 					escapeChar = string_sub(escapeChars, escapeCharIndex, escapeCharIndex)
 
+					if escapeChar == "" then -- we are out of escape chars and we need more!
+						return nil, "Out of escape characters"
+					end
+
 					r = 0
 					decode_search = {}
 					decode_translate = {}
@@ -980,7 +980,6 @@ function LibCompress:GetEncodeTable(reservedChars, escapeChars, mapChars)
 
 	encode_func = assert(loadstring("return function(self, str) return str:gsub(self.encode_search, self.encode_translate); end"))()
 	decode_func = assert(loadstring(decode_func_string))()
-
 	codecTable.encode_search = encode_search
 	codecTable.encode_translate = encode_translate
 	codecTable.Encode = encode_func

Libs/LibCompress/LibCompress.toc

@@ -1,13 +1,13 @@
-## Interface: 70300
+## Interface: 70300
 
 ## Title: Lib: Compress
 ## Notes: Compression and Decompression library
 ## Author: Galmok at Stormrage-EU (Horde) and JJSheets
-## Version: r82-release
+## Version: r84-release
 ## X-Website: http://www.wowace.com/addons/libcompress/
 ## X-Category: Library
 ## X-eMail: galmok AT gmail DOT com, sheets DOT jeff AT gmail DOT com
-## X-License: LGPL v2.1
+## X-License: GPL v2
 ## LoadOnDemand: 1
 
 LibStub\LibStub.lua

Libs/LibDBIcon-1.0/LibDBIcon-1.0.lua

@@ -6,19 +6,21 @@
 --
 
 local DBICON10 = "LibDBIcon-1.0"
-local DBICON10_MINOR = 36 -- Bump on changes
+local DBICON10_MINOR = 43 -- 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
 local lib = LibStub:NewLibrary(DBICON10, DBICON10_MINOR)
 if not lib then return end
 
-lib.disabled = lib.disabled or nil
 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
 lib.tooltip = lib.tooltip or CreateFrame("GameTooltip", "LibDBIconTooltip", UIParent, "GameTooltipTemplate")
+local next, Minimap = next, Minimap
+local isDraggingButton = false
 
 function lib:IconCallback(event, name, key, value)
 	if lib.objects[name] then
@@ -56,7 +58,15 @@ local function getAnchors(frame)
 end
 
 local function onEnter(self)
-	if self.isMoving then return end
+	if isDraggingButton then return end
+
+	for _, button in next, lib.objects do
+		if button.showOnMouseover then
+			button.fadeOut:Stop()
+			button:SetAlpha(1)
+		end
+	end
+
 	local obj = self.dataObject
 	if obj.OnTooltipShow then
 		lib.tooltip:SetOwner(self, "ANCHOR_NONE")
@@ -69,14 +79,25 @@ local function onEnter(self)
 end
 
 local function onLeave(self)
-	local obj = self.dataObject
 	lib.tooltip:Hide()
-	if obj.OnLeave then obj.OnLeave(self) end
+
+	if not isDraggingButton then
+		for _, button in next, lib.objects do
+			if button.showOnMouseover then
+				button.fadeOut:Play()
+			end
+		end
+	end
+
+	local obj = self.dataObject
+	if obj.OnLeave then
+		obj.OnLeave(self)
+	end
 end
 
 --------------------------------------------------------------------------------
 
-local onClick, onMouseUp, onMouseDown, onDragStart, onDragStop, updatePosition
+local onDragStart, updatePosition
 
 do
 	local minimapShapes = {
@@ -96,40 +117,60 @@ do
 		["TRICORNER-BOTTOMRIGHT"] = {true, true, true, false},
 	}
 
-	function updatePosition(button)
-		local angle = math.rad(button.db and button.db.minimapPos or button.minimapPos or 225)
-		local x, y, q = math.cos(angle), math.sin(angle), 1
+	local rad, cos, sin, sqrt, max, min = math.rad, math.cos, math.sin, math.sqrt, math.max, math.min
+	function updatePosition(button, position)
+		local angle = rad(position or 225)
+		local x, y, q = cos(angle), sin(angle), 1
 		if x < 0 then q = q + 1 end
 		if y > 0 then q = q + 2 end
 		local minimapShape = GetMinimapShape and GetMinimapShape() or "ROUND"
 		local quadTable = minimapShapes[minimapShape]
+		local w = (Minimap:GetWidth() / 2) + lib.radius
+		local h = (Minimap:GetHeight() / 2) + lib.radius
 		if quadTable[q] then
-			x, y = x*80, y*80
+			x, y = x*w, y*h
 		else
-			local diagRadius = 103.13708498985 --math.sqrt(2*(80)^2)-10
-			x = math.max(-80, math.min(x*diagRadius, 80))
-			y = math.max(-80, math.min(y*diagRadius, 80))
+			local diagRadiusW = sqrt(2*(w)^2)-10
+			local diagRadiusH = sqrt(2*(h)^2)-10
+			x = max(-w, min(x*diagRadiusW, w))
+			y = max(-h, min(y*diagRadiusH, h))
 		end
 		button:SetPoint("CENTER", Minimap, "CENTER", x, y)
 	end
 end
 
-function onClick(self, b) if self.dataObject.OnClick then self.dataObject.OnClick(self, b) end end
-function onMouseDown(self) self.isMouseDown = true; self.icon:UpdateCoord() end
-function onMouseUp(self) self.isMouseDown = false; self.icon:UpdateCoord() end
+local function onClick(self, b)
+	if self.dataObject.OnClick then
+		self.dataObject.OnClick(self, b)
+	end
+end
+
+local function onMouseDown(self)
+	self.isMouseDown = true
+	self.icon:UpdateCoord()
+end
+
+local function onMouseUp(self)
+	self.isMouseDown = false
+	self.icon:UpdateCoord()
+end
 
 do
+	local deg, atan2 = math.deg, math.atan2
 	local function onUpdate(self)
 		local mx, my = Minimap:GetCenter()
 		local px, py = GetCursorPosition()
 		local scale = Minimap:GetEffectiveScale()
 		px, py = px / scale, py / scale
+		local pos = 225
 		if self.db then
-			self.db.minimapPos = math.deg(math.atan2(py - my, px - mx)) % 360
+			pos = deg(atan2(py - my, px - mx)) % 360
+			self.db.minimapPos = pos
 		else
-			self.minimapPos = math.deg(math.atan2(py - my, px - mx)) % 360
+			pos = deg(atan2(py - my, px - mx)) % 360
+			self.minimapPos = pos
 		end
-		updatePosition(self)
+		updatePosition(self, pos)
 	end
 
 	function onDragStart(self)
@@ -137,17 +178,28 @@ do
 		self.isMouseDown = true
 		self.icon:UpdateCoord()
 		self:SetScript("OnUpdate", onUpdate)
-		self.isMoving = true
+		isDraggingButton = true
 		lib.tooltip:Hide()
+		for _, button in next, lib.objects do
+			if button.showOnMouseover then
+				button.fadeOut:Stop()
+				button:SetAlpha(1)
+			end
+		end
 	end
 end
 
-function onDragStop(self)
+local function onDragStop(self)
 	self:SetScript("OnUpdate", nil)
 	self.isMouseDown = false
 	self.icon:UpdateCoord()
 	self:UnlockHighlight()
-	self.isMoving = nil
+	isDraggingButton = false
+	for _, button in next, lib.objects do
+		if button.showOnMouseover then
+			button.fadeOut:Play()
+		end
+	end
 end
 
 local defaultCoords = {0, 1, 0, 1}
@@ -202,12 +254,24 @@ local function createButton(name, object, db)
 	button:SetScript("OnMouseDown", onMouseDown)
 	button:SetScript("OnMouseUp", onMouseUp)
 
+	button.fadeOut = button:CreateAnimationGroup()
+	local animOut = button.fadeOut:CreateAnimation("Alpha")
+	animOut:SetOrder(1)
+	animOut:SetDuration(0.2)
+	animOut:SetFromAlpha(1)
+	animOut:SetToAlpha(0)
+	animOut:SetStartDelay(1)
+	button.fadeOut:SetToFinalAlpha(true)
+
 	lib.objects[name] = button
 
 	if lib.loggedIn then
-		updatePosition(button)
-		if not db or not db.hide then button:Show()
-		else button:Hide() end
+		updatePosition(button, db and db.minimapPos)
+		if not db or not db.hide then
+			button:Show()
+		else
+			button:Hide()
+		end
 	end
 	lib.callbacks:Fire("LibDBIcon_IconCreated", button, name) -- Fire 'Icon Created' callback
 end
@@ -221,20 +285,21 @@ local function check(name)
 	end
 end
 
-lib.loggedIn = lib.loggedIn or false
 -- 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()
-		for _, object in pairs(lib.objects) do
-			updatePosition(object)
-			if not lib.disabled and (not object.db or not object.db.hide) then object:Show()
-			else object:Hide() end
+	f:SetScript("OnEvent", function(f)
+		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
+				button:Show()
+			else
+				button:Hide()
+			end
 		end
 		lib.loggedIn = true
 		f:SetScript("OnEvent", nil)
-		f = nil
 	end)
 	f:RegisterEvent("PLAYER_LOGIN")
 end
@@ -245,8 +310,8 @@ 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("Already registered, nubcake.") end
-	if not lib.disabled and (not db or not db.hide) then
+	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}
@@ -260,7 +325,9 @@ function lib:Lock(name)
 		lib.objects[name]:SetScript("OnDragStop", nil)
 	end
 	local db = getDatabase(name)
-	if db then db.lock = true end
+	if db then
+		db.lock = true
+	end
 end
 
 function lib:Unlock(name)
@@ -270,28 +337,36 @@ function lib:Unlock(name)
 		lib.objects[name]:SetScript("OnDragStop", onDragStop)
 	end
 	local db = getDatabase(name)
-	if db then db.lock = nil end
+	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)
-	if lib.disabled then return end
 	check(name)
-	lib.objects[name]:Show()
-	updatePosition(lib.objects[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)
-	if lib.disabled then return end
 	check(name)
 	local button = lib.objects[name]
-	if db then button.db = db end
-	updatePosition(button)
+	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
@@ -305,30 +380,91 @@ function lib:Refresh(name, db)
 		button:SetScript("OnDragStop", nil)
 	end
 end
+
 function lib:GetMinimapButton(name)
 	return lib.objects[name]
 end
 
-function lib:EnableLibrary()
-	lib.disabled = nil
-	for name, object in pairs(lib.objects) do
-		if not object.db or not object.db.hide then
-			object:Show()
-			updatePosition(object)
+do
+	local function OnMinimapEnter()
+		if isDraggingButton then return end
+		for _, button in next, lib.objects do
+			if button.showOnMouseover then
+				button.fadeOut:Stop()
+				button:SetAlpha(1)
 			end
 		end
-	for name, data in pairs(lib.notCreated) do
-		if not data.db or not data.db.hide then
-			createButton(name, data[1], data[2])
-			lib.notCreated[name] = nil
+	end
+	local function OnMinimapLeave()
+		if isDraggingButton then return end
+		for _, button in next, lib.objects do
+			if button.showOnMouseover then
+				button.fadeOut:Play()
+			end
+		end
+	end
+	Minimap:HookScript("OnEnter", OnMinimapEnter)
+	Minimap:HookScript("OnLeave", OnMinimapLeave)
+
+	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
 		end
 	end
 end
 
-function lib:DisableLibrary()
-	lib.disabled = true
-	for name, object in pairs(lib.objects) do
-		object:Hide()
+function lib:GetButtonList()
+	local t = {}
+	for name in next, lib.objects do
+		t[#t+1] = name
+	end
+	return t
+end
+
+function lib:SetButtonRadius(radius)
+	if type(radius) == "number" then
+		lib.radius = radius
+		for _, button in next, lib.objects do
+			updatePosition(button, button.db and button.db.minimapPos or button.minimapPos)
+		end
 	end
 end
 
+function lib:SetButtonToPosition(button, position)
+	updatePosition(lib.objects[button] or button, position)
+end
+
+-- Upgrade!
+for name, button in next, lib.objects do
+	local db = getDatabase(name)
+	if not db or not db.lock then
+		button:SetScript("OnDragStart", onDragStart)
+		button:SetScript("OnDragStop", onDragStop)
+	end
+	button:SetScript("OnEnter", onEnter)
+	button:SetScript("OnLeave", onLeave)
+	button:SetScript("OnClick", onClick)
+	button:SetScript("OnMouseDown", onMouseDown)
+	button:SetScript("OnMouseUp", onMouseUp)
+
+	if not button.fadeOut then -- Upgrade to 39
+		button.fadeOut = button:CreateAnimationGroup()
+		local animOut = button.fadeOut:CreateAnimation("Alpha")
+		animOut:SetOrder(1)
+		animOut:SetDuration(0.2)
+		animOut:SetFromAlpha(1)
+		animOut:SetToAlpha(0)
+		animOut:SetStartDelay(1)
+		button.fadeOut:SetToFinalAlpha(true)
+	end
+end
+lib:SetButtonRadius(lib.radius) -- Upgrade to 40

Libs/LibSharedMedia-3.0/LibSharedMedia-3.0.lua

@@ -1,6 +1,6 @@
 --[[
 Name: LibSharedMedia-3.0
-Revision: $Revision: 91 $
+Revision: $Revision: 106 $
 Author: Elkano (elkano@gmx.de)
 Inspired By: SurfaceLib by Haste/Otravi (troeks@gmail.com)
 Website: http://www.wowace.com/projects/libsharedmedia-3-0/
@@ -20,8 +20,6 @@ local pairs		= _G.pairs
 local type		= _G.type
 
 local band			= _G.bit.band
-
-local table_insert	= _G.table.insert
 local table_sort	= _G.table.sort
 
 local locale = GetLocale()

indent.lua

@@ -1,5 +1,5 @@
 -- For All Indents And Purposes
-local revision = 17
+local revision = 21
 -- Maintainer: kristofer.karlsson@gmail.com
 
 -- For All Indents And Purposes -
@@ -22,6 +22,8 @@ local revision = 17
 -- Read through this code for further usage help.
 -- (The documentation IS the code)
 
+-- luacheck: globals IndentationLib
+
 if not IndentationLib then
     IndentationLib = {}
 end
@@ -39,6 +41,9 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
     local stringrep = string.rep
     local stringgsub = string.gsub
 
+    local defaultTabWidth = 2
+    local defaultColorTable
+
     local workingTable = {}
     local workingTable2 = {}
     local function tableclear(t)
@@ -60,7 +65,6 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
     -- token types
     local tokens = {}
     lib.tokens = tokens
-
     tokens.TOKEN_UNKNOWN = 0
     tokens.TOKEN_NUMBER = 1
     tokens.TOKEN_LINEBREAK = 2
@@ -97,12 +101,10 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
     tokens.TOKEN_SPECIAL = 34
     tokens.TOKEN_VERTICAL = 35
     tokens.TOKEN_TILDE = 36
-
     -- WoW specific tokens
     tokens.TOKEN_COLORCODE_START = 37
     tokens.TOKEN_COLORCODE_STOP = 38
-
--- new as of lua 5.1
+    -- new as of lua 5.1
     tokens.TOKEN_HASH = 39
     tokens.TOKEN_PERCENT = 40
 
@@ -144,8 +146,7 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
     bytes.BYTE_VERTICAL = stringbyte("|")
     bytes.BYTE_r = stringbyte("r")
     bytes.BYTE_c = stringbyte("c")
-
--- new as of lua 5.1
+    -- new as of lua 5.1
     bytes.BYTE_HASH = stringbyte("#")
     bytes.BYTE_PERCENT = stringbyte("%")
 
@@ -185,7 +186,7 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
     specialCharacters[bytes.BYTE_ASTERISK] = tokens.TOKEN_ASTERISK
     -- WoW specific
     specialCharacters[bytes.BYTE_VERTICAL] = -1
--- new as of lua 5.1
+    -- new as of lua 5.1
     specialCharacters[bytes.BYTE_HASH] = tokens.TOKEN_HASH
     specialCharacters[bytes.BYTE_PERCENT] = tokens.TOKEN_PERCENT
 
@@ -293,7 +294,6 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
         end
     end
 
-   
     -- Already parsed the [==[ part when get here
     local function nextBracketString(text, pos, equalsCount)
         local state = 0
@@ -375,7 +375,7 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
     -- OUTPUT
     -- 1: token type
     -- 2: position after the last character of the token
-   function nextToken(text, pos)
+    local function nextToken(text, pos)
         local byte = stringbyte(text, pos)
         if not byte then
             return nil
@@ -535,7 +535,7 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
 
     keywords["else"] = indentBoth
 
-   tokenIndentation = {}
+    local tokenIndentation = {}
     lib.tokenIndentation = tokenIndentation
     tokenIndentation[tokens.TOKEN_LEFTPAREN] = indentRight
     tokenIndentation[tokens.TOKEN_LEFTBRACKET] = indentRight
@@ -601,7 +601,6 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
 
             if tokenType == tokens.TOKEN_COLORCODE_START or tokenType == tokens.TOKEN_COLORCODE_STOP or tokenType == tokens.TOKEN_UNKNOWN then
                 -- ignore color codes
-	    
             elseif tokenType == tokens.TOKEN_LINEBREAK or tokenType == tokens.TOKEN_WHITESPACE then
                 if tokenType == tokens.TOKEN_LINEBREAK then
                     numLines = numLines + 1
@@ -679,7 +678,6 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
         local tsize2 = 0
         local totalLen2 = 0
 
-
         local stopColor = colorTable and colorTable[0]
         local stopColorLen = not stopColor or stringlen(stopColor)
 
@@ -732,7 +730,6 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
                     newCaretPositionFinalized = true
                 end
 
-
                 for k, v in next,workingTable2 do
                     tsize = tsize + 1
                     workingTable[tsize] = v
@@ -761,7 +758,6 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
             elseif tokenType == tokens.TOKEN_WHITESPACE then
                 if hitNonWhitespace then
                     prevTokenWidth = nextPos - pos
-	       
                     tsize2 = tsize2 + 1
                     local s = stringsub(code, pos, nextPos - 1)
                     workingTable2[tsize2] = s
@@ -771,9 +767,7 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
                 -- skip these, though they shouldn't be encountered here anyway
             else
                 hitNonWhitespace = true
-	    
                 local str = stringsub(code, pos, nextPos - 1)
-	    
                 prevTokenWidth = nextPos - pos
 
                 -- See if this is an indent-modifier
@@ -781,7 +775,7 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
                 if tokenType == tokens.TOKEN_IDENTIFIER then
                     indentTable = keywords[str]
                 else
-	       indentTable = tokenIndentation[tokenType]
+                    indentTable = lib.tokenIndentation[tokenType]
                 end
 
                 if indentTable then
@@ -844,8 +838,6 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
         return table.concat(workingTable), newCaretPosition
     end
 
-
-
     -- WoW specific code:
     local GetTime = GetTime
 
@@ -881,8 +873,8 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
         local script = critical_enter(editbox)
 
         local text = editboxGetText(editbox)
-      editbox:Insert("\1")
-      local pos = stringfind(editboxGetText(editbox), "\1", 1, 1)
+        editbox:Insert("")
+        local pos = stringfind(editboxGetText(editbox), "", 1, 1)
         editboxSetText(editbox, text)
 
         if pos then
@@ -894,7 +886,7 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
     end
 
     local function setCaretPos(editbox, pos)
-      local script = critical_enter(editbox)
+        local script, script2 = critical_enter(editbox)
         setCaretPos_main(editbox, pos)
         critical_leave(editbox, script, script2)
     end
@@ -994,9 +986,6 @@ if not IndentationLib.revision or revision > IndentationLib.revision then
 
     end
 
-   local defaultTabWidth = 2
-   local defaultColorTable
-
     -- Data tables
     -- No weak table magic, since editboxes can never be removed in WoW
     local enabled = {}