Make DEBUG a require()d local

frontend/document/credocument.lua

@@ -4,6 +4,7 @@ local Document = require("document/document")
 local Configurable = require("ui/reader/configurable")
 local Font = require("ui/font")
 local Screen = require("ui/screen")
+local DEBUG = require("dbg")
 -- TBD: DrawContext
 
 local CreDocument = Document:new{

frontend/document/document.lua

@@ -2,6 +2,8 @@ local Cache = require("cache")
 local CacheItem = require("cacheitem")
 local TileCacheItem = require("document/tilecacheitem")
 local Geom = require("ui/geometry")
+local Configurable = require("ui/reader/configurable")
+local DEBUG = require("dbg")
 
 --[[
 This is an abstract interface to a document

frontend/document/tilecacheitem.lua

@@ -1,4 +1,5 @@
 local CacheItem = require("cacheitem")
+local DEBUG = require("dbg")
 
 local TileCacheItem = CacheItem:new{}
 

frontend/ui/device/screen.lua

@@ -1,4 +1,5 @@
 local Geom = require("ui/geometry")
+local DEBUG = require("dbg")
 
 -- Blitbuffer
 -- einkfb

frontend/ui/font.lua

@@ -1,5 +1,5 @@
-require "dbg" -- for DEBUG()
 local Screen = require("ui/screen")
+local DEBUG = require("dbg")
 
 local Font = {
 	fontmap = {

frontend/ui/geometry.lua

@@ -1,3 +1,5 @@
+local DEBUG = require("dbg")
+
 --[[
 2D Geometry utilities
 

frontend/ui/gesturedetector.lua

@@ -1,6 +1,7 @@
 local Geom = require("ui/geometry")
 local TimeVal = require("ui/timeval")
 local Screen = require("ui/screen")
+local DEBUG = require("dbg")
 
 --[[
 Current detectable gestures:

frontend/ui/input.lua

@@ -4,6 +4,7 @@ local Event = require("ui/event")
 local TimeVal = require("ui/timeval")
 local Screen = require("ui/screen")
 local Dbg = require("dbg")
+local DEBUG = require("dbg")
 
 -- constants from <linux/input.h>
 local EV_SYN = 0

frontend/ui/reader/readercropping.lua

@@ -11,6 +11,7 @@ local HorizontalGroup = require("ui/widget/horizontalgroup")
 local BBoxWidget = require("ui/widget/bboxwidget")
 local HorizontalSpan = require("ui/widget/horizontalspan")
 local Button = require("ui/widget/button")
+local DEBUG = require("dbg")
 
 local PageCropDialog = VerticalGroup:new{
 	ok_text = "OK",

frontend/ui/reader/readerdictionary.lua

@@ -3,6 +3,7 @@ local UIManager = require("ui/uimanager")
 local DictQuickLookup = require("ui/widget/dictquicklookup")
 local Screen = require("ui/screen")
 local JSON = require("JSON")
+local DEBUG = require("dbg")
 
 local ReaderDictionary = EventListener:new{}
 

frontend/ui/reader/readergoto.lua

@@ -3,6 +3,7 @@ local InputDialog = require("ui/widget/inputdialog")
 local UIManager = require("ui/uimanager")
 local Screen = require("ui/screen")
 local Event = require("ui/event")
+local DEBUG = require("dbg")
 local _ = require("gettext")
 
 local ReaderGoto = InputContainer:new{

frontend/ui/reader/readerhighlight.lua

@@ -9,6 +9,7 @@ local Event = require("ui/event")
 local UIManager = require("ui/uimanager")
 local ButtonTable = require("ui/widget/buttontable")
 local Input = require("ui/input")
+local DEBUG = require("dbg")
 local _ = require("gettext")
 
 local ReaderHighlight = InputContainer:new{}

frontend/ui/reader/readerpaging.lua

@@ -7,6 +7,7 @@ local Device = require("ui/device")
 local Event = require("ui/event")
 local UIManager = require("ui/uimanager")
 local Math = require("optmath")
+local DEBUG = require("dbg")
 
 local ReaderPaging = InputContainer:new{
 	current_page = 0,

frontend/ui/reader/readerpanning.lua

@@ -1,5 +1,6 @@
 local InputContainer = require("ui/widget/container/inputcontainer")
 local Device = require("ui/device")
+local DEBUG = require("dbg")
 local _ = require("gettext")
 
 local ReaderPanning = InputContainer:new{

frontend/ui/reader/readerrolling.lua

@@ -6,6 +6,7 @@ local Input = require("ui/input")
 local Event = require("ui/event")
 local GestureRange = require("ui/gesturerange")
 local ReaderPanning = require("ui/reader/readerpanning")
+local DEBUG = require("dbg")
 local _ = require("gettext")
 
 local ReaderRolling = InputContainer:new{

frontend/ui/reader/readertypeset.lua

@@ -1,5 +1,6 @@
 local InputContainer = require("ui/widget/container/inputcontainer")
 local Event = require("ui/event")
+local DEBUG = require("dbg")
 local _ = require("gettext")
 -- lfs
 

frontend/ui/reader/readerview.lua

@@ -6,6 +6,7 @@ local ReaderDogear = require("ui/reader/readerdogear")
 local Geom = require("ui/geometry")
 local Event = require("ui/event")
 local UIManager = require("ui/uimanager")
+local DEBUG = require("dbg")
 
 local ReaderView = OverlapGroup:new{
 	document = nil,

frontend/ui/reader/readerzooming.lua

@@ -5,6 +5,7 @@ local Screen = require("ui/screen")
 local Geom = require("ui/geometry")
 local GestureRange = require("ui/gesturerange")
 local Event = require("ui/event")
+local DEBUG = require("dbg")
 local _ = require("gettext")
 
 local ReaderZooming = InputContainer:new{

frontend/ui/readerui.lua

@@ -4,6 +4,7 @@ local Device = require("ui/device")
 local DocSettings = require("docsettings")
 local Event = require("ui/event")
 local UIManager = require("ui/uimanager")
+local DEBUG = require("dbg")
 local _ = require("gettext")
 
 local ReaderView = require("ui/reader/readerview")

frontend/ui/rendertext.lua

@@ -1,5 +1,6 @@
 local Cache = require("cache")
 local CacheItem = require("cacheitem")
+local DEBUG = require("dbg")
 
 --[[
 TODO: all these functions should probably be methods on Face objects

frontend/ui/uimanager.lua

@@ -2,6 +2,7 @@ local Device = require("ui/device")
 local Screen = require("ui/screen")
 local Input = require("ui/input")
 local Event = require("ui/event")
+local DEBUG = require("dbg")
 
 -- initialize output module, this must be initialized before Input
 Screen:init()

frontend/ui/widget/bboxwidget.lua

@@ -4,6 +4,7 @@ local Event = require("ui/event")
 local UIManager = require("ui/uimanager")
 local Device = require("ui/device")
 local GestureRange = require("ui/gesturerange")
+local DEBUG = require("dbg")
 
 --[[
 BBoxWidget shows a bbox for page cropping

frontend/ui/widget/confirmbox.lua

@@ -11,6 +11,7 @@ local Screen = require("ui/screen")
 local HorizontalGroup = require("ui/widget/horizontalgroup")
 local VerticalSpan = require("ui/widget/verticalspan")
 local HorizontalSpan = require("ui/widget/horizontalspan")
+local DEBUG = require("dbg")
 local _ = require("gettext")
 
 -- screen

frontend/ui/widget/container/inputcontainer.lua

@@ -1,6 +1,7 @@
 local WidgetContainer = require("ui/widget/container/widgetcontainer")
 local Event = require("ui/event")
 local Geom = require("ui/geometry")
+local DEBUG = require("dbg")
 
 --[[
 an InputContainer is an WidgetContainer that handles input events

frontend/ui/widget/dictquicklookup.lua

@@ -14,6 +14,7 @@ local UIManager = require("ui/uimanager")
 local ButtonTable = require("ui/widget/buttontable")
 local Device = require("ui/device")
 local VerticalGroup = require("ui/widget/verticalgroup")
+local DEBUG = require("dbg")
 local _ = require("gettext")
 
 --[[

frontend/ui/widget/toggleswitch.lua

@@ -10,6 +10,7 @@ local UIManager = require("ui/uimanager")
 local Screen = require("ui/screen")
 local Device = require("ui/device")
 local GestureRange = require("ui/gesturerange")
+local DEBUG = require("dbg")
 local _ = require("gettext")
 
 local ToggleLabel = TextWidget:new{

frontend/ui/widget/virtualkeyboard.lua

@@ -14,6 +14,7 @@ local Screen = require("ui/screen")
 local Device = require("ui/device")
 local GestureRange = require("ui/gesturerange")
 local UIManager = require("ui/uimanager")
+local DEBUG = require("dbg")
 
 local VirtualKey = InputContainer:new{
 	key = nil,