nature/commands/doc.lua

@@ -60,7 +60,7 @@ Available sections: ]] .. table.concat(modules, ', ')
 			return lunacolors.underline(lunacolors.blue(string.gsub(fname, '.md', '')))
 		end)
 		if #moddocs ~= 0 then
-			funcdocs = funcdocs .. '\nSubdocs: ' .. table.concat(subdocs, ', ')
+			funcdocs = funcdocs .. '\nSubdocs: ' .. table.concat(subdocs, ', ') .. '\nLMAO'
 		end
 
 		local valsStr = funcdocs:match '%-%-%-\n([^%-%-%-]+)\n'
@@ -89,7 +89,7 @@ Available sections: ]] .. table.concat(modules, ', ')
 
 	local gh = Greenhouse(sinks.out)
 	local backtickOccurence = 0
-	local page = Page(nil, lunacolors.format(doc:gsub('`', function()
+	local page = Page(lunacolors.format(doc:gsub('`', function()
 		backtickOccurence = backtickOccurence + 1
 		if backtickOccurence % 2 == 0 then
 			return '{reset}'

nature/greenhouse/init.lua

@@ -44,21 +44,6 @@ function Greenhouse:updateCurrentPage(text)
 	page:setText(text)
 end
 
-local function sub(str, limit)
-	local overhead = 0
-	local function addOverhead(s)
-		overhead = overhead + string.len(s)
-	end
-
-	local s = str:gsub('\x1b%[%d+;%d+;%d+;%d+;%d+%w', addOverhead)
-     :gsub('\x1b%[%d+;%d+;%d+;%d+%w', addOverhead)
-     :gsub('\x1b%[%d+;%d+;%d+%w',addOverhead)
-     :gsub('\x1b%[%d+;%d+%w', addOverhead)
-     :gsub('\x1b%[%d+%w', addOverhead)
-
-	return s:sub(0, limit + overhead)
-end
-
 function Greenhouse:draw()
 	local workingPage = self.pages[self.curPage]
 	local offset = self.offset
@@ -71,9 +56,10 @@ function Greenhouse:draw()
 	self.sink:write(ansikit.getCSI(self.start .. ';1', 'H'))
 	self.sink:write(ansikit.getCSI(2, 'J'))
 
-	for i = offset, offset + (self.region.height - 1) do
+	-- the -2 negate is for the command and status line
+	for i = offset, offset + (self.region.height - self.start) do
 		if i > #lines then break end
-		self.sink:writeln('\r' .. sub(lines[i]:gsub('\t', '        '), self.region.width - 2))
+		self.sink:writeln('\r' .. lines[i]:gsub('\t', '        '):sub(0, self.region.width - 2))
 	end
 	self.sink:write '\r'
 	self:render()
@@ -96,7 +82,7 @@ function Greenhouse:scroll(direction)
 
 	local oldOffset = self.offset
 	if direction == 'down' then
-		self.offset = math.min(self.offset + 1, math.max(1, #lines - self.region.height + 1))
+		self.offset = math.min(self.offset + 1, #lines)
 	elseif direction == 'up' then
 		self.offset = math.max(self.offset - 1, 1)
 	end