Trying to access page.content too early will now raise an error.

utf8.getLength() now returns the first error position.
XML: Fixed contentsToXml/Html() encoding the node itself if it was a text node.

Author: ReFreezed

src/app.lua2p

@@ -441,7 +441,7 @@ local function setup()
 		-- Lua libraries.
 		json = jsonLib,
 		lfs  = lfs,
-		utf8 = utf8, -- @Doc
+		utf8 = utf8,
 		xml  = xmlLib,
 
 		toml = { -- @Cleanup: Don't use 3rd party TOML library.
@@ -472,11 +472,11 @@ local function setup()
 		generatorMeta    = generatorMeta,
 		getFilename      = getFilename,
 		getKeys          = getKeys,
-		gmatchAndBetween = gmatchAndBetween, -- @Doc
+		gmatchAndBetween = gmatchAndBetween,
 		indexOf          = indexOf,
 		ipairsr          = ipairsr,
 		isAny            = isAny,
-		isValueHtml      = doesValueLookLikeHtml, -- @Doc
+		isValueHtml      = doesValueLookLikeHtml,
 		markdown         = markdownToHtml,
 		max              = math.max,
 		min              = math.min,
@@ -535,22 +535,22 @@ local function setup()
 			return (getBasename_internal(getFilename(genericPath)))
 		end,
 
-		X = function(node, tagName) -- @Doc
+		X = function(node, tagName) -- @Cleanup: Remove this!
 			if type(node) ~= "table" then  error("Invalid XML argument.", 2)  end
 			return (itemWith(node, "tag", tagName))
 		end,
 
-		Xs = function(node, tagName) -- @Doc
+		Xs = function(node, tagName) -- @Cleanup: Remove this!
 			if type(node) ~= "table" then  error("Invalid XML argument.", 2)  end
 			return (itemWithAll(node, "tag", tagName))
 		end,
 
-		forXml = function(node, tagName) -- @Doc
+		forXml = function(node, tagName) -- @Cleanup: Remove this!
 			if type(node) ~= "table" then  error("Invalid XML argument.", 2)  end
 			return ipairs(itemWithAll(node, "tag", tagName))
 		end,
 
-		printXmlTree = function(node) -- @Doc
+		printXmlTree = function(node) -- @Cleanup: Remove this!
 			if type(node) ~= "table" then  error("Invalid XML argument.", 2)  end
 
 			local function printNode(node, indent)
@@ -781,7 +781,7 @@ local function setup()
 			return fileInfos
 		end,
 
-		getGeneratedPages = function() -- @Doc
+		getGeneratedPages = function()
 			-- Just like getOutputtedFiles(), there's no reason to restrict context for this function, I don't think. 2021-05-18
 			local generatedPages = {}
 
@@ -818,7 +818,6 @@ local function setup()
 			return _dataParsers
 		end,
 
-		-- array = clampArray( array, length ) -- @Doc
 		clampArray = function(t, len)
 			for i = #t, len+1, -1 do
 				t[i] = nil
@@ -827,7 +826,7 @@ local function setup()
 		end,
 
 		--
-		-- html = summarize( html, maxCharacters [, keepSomeElements=false ] ) -- @Doc
+		-- html = summarize( html, maxCharacters [, keepSomeElements=false ] )
 		--
 		-- Limit the amount of text and restrict allowed tags in an HTML string
 		-- to be used e.g. as the description for an item in an RSS feed.
@@ -1041,7 +1040,7 @@ local function setup()
 			table.insert(getContext"template".out, tostringForTemplates(s))
 		end,
 
-		echoSmart = function(v) -- @Doc
+		echoSmart = function(v)
 			assertContext("template", "echoSmart")
 			if v == nil then
 				-- void  Echo nothing.
@@ -1543,8 +1542,9 @@ local function buildWebsite()
 		-- Template.
 		elseif site._fileTypes[extLower] then
 			-- Generate these later so e.g. urlExists() works better.
-			local pagesArray = ((site._fileTypes[extLower] == "markdown" or site._fileTypes[extLower] == "html") and site._pages or nonPagePages)
-			table.insert(pagesArray, newPage(pathRel, false))
+			local page       = newPage(pathRel, false)
+			local pagesArray = (page.isPage and site._pages or nonPagePages)
+			table.insert(pagesArray, page)
 
 		-- Special.
 		elseif pathRel == ".htaccess" and handleHtaccess then
@@ -1572,7 +1572,7 @@ local function buildWebsite()
 	end)
 
 	for _, page in ipairs(nonPagePages) do
-		generateFromTemplateFile(page)
+		generateFromTemplateFile(page) -- Note that this template may trigger generation of actual pages (e.g. by calling subpages()).
 	end
 
 	for _, page in ipairs(site._pages) do

src/functions.lua2p

@@ -1663,7 +1663,7 @@ function _G.getProtectionWrapper(obj, objName)
 				errorf(2, "[internal] No getter for %s.%s", objName, k)
 			end
 
-			return field:g()
+			return (field:g())
 		end,
 
 		__newindex = function(wrapper, k, vNew)
@@ -1770,16 +1770,14 @@ function _G.generateFromTemplateString(page, template, modTime, onPageInit)
 			return
 		end
 
+		page.content.v           = pageContent
+		page._contentIsAvailable = true
+
 		if page.layout.v == "" then
 			result = pageContent
-
 		else
-			page.content.v = pageContent
-
 			local layoutTemplate, layoutPath = getLayoutTemplate(page)
 			result                           = parseAndRunTemplate(page, layoutPath, layoutTemplate, "html", true, nil)
-
-			-- page.content.v = "" -- We don't need this anymore. (Actually, things like RSS feeds do!)
 		end
 
 	else
@@ -2204,7 +2202,7 @@ function _G.newSite()
 		_ignoreFolders              = {--[[ filenamePattern1, ... ]]},
 		_ignorePaths                = {--[[ pathPattern1, ... ]]},
 
-		_fileTypes                  = {["md"]="markdown", ["html"]="html", ["xml"]="xml", ["css"]="othertemplate"},
+		_fileTypes                  = {["md"]="markdown", ["markdown"]="markdown", ["html"]="html", ["htm"]="html", ["xml"]="xml", ["css"]="othertemplate"},
 		_fileProcessors             = {--[[ [extension1]=function(data, sitePath), ... ]]},
 
 		_htaErrors                  = {--[[ [httpStatusCode1]=document1, ... ]]},
@@ -2244,7 +2242,7 @@ function _G.newSite()
 			v = "",
 			g = function(field)  return field.v  end,
 		},
-		description = { -- @Doc
+		description = {
 			v = "",
 			g = function(field)  return field.v  end,
 		},
@@ -2315,15 +2313,16 @@ do
 		local page; page = {
 			_readonly = false,
 
-			_category     = category,
-			_isGenerating = false,
-			_isGenerated  = false,
-			_isSkipped    = false,
-			_isLocked     = false, -- @Cleanup: Is this always synced with _readonly? If so, just remove _isLocked.
-			_path         = pathRel,
-			_pathOut      = pathRelOut,
-			_pathForError = F("%s/%s", DIR_CONTENT, pathRel),
-			_extension    = extLower,
+			_category           = category,
+			_isGenerating       = false,
+			_isGenerated        = false,
+			_isSkipped          = false,
+			_isLocked           = false, -- @Cleanup: Is this always synced with _readonly? If so, just remove _isLocked.
+			_contentIsAvailable = false,
+			_path               = pathRel,
+			_pathOut            = pathRelOut,
+			_pathForError       = F("%s/%s", DIR_CONTENT, pathRel),
+			_extension          = extLower,
 
 			isPage = {
 				v = isPage,
@@ -2348,14 +2347,22 @@ do
 				g = function(field)  return field.v  end,
 				s = function(field, title)  field.v = title  end,
 			},
-			description = { -- @Doc
+			description = {
 				v = "",
 				g = function(field)  return field.v  end,
 				s = function(field, description)  field.v = description  end,
 			},
 			content = {
 				v = "",
-				g = function(field)  return field.v  end,
+				g = function(field)
+					if page._contentIsAvailable then
+						return field.v
+					elseif not page.isPage.v then
+						errorf(3, "page.content isn't available for non-page templates. (%s)", page._pathForError)
+					else
+						errorf(3, "page.content isn't available (probably because the page hasn't finished generating). (%s)", page._pathForError)
+					end
+				end,
 			},
 
 			date = {
@@ -2830,8 +2837,8 @@ end
 
 
 do
-	-- for isMatch, position, match1, ... in gmatchAndBetween( string, pattern )
-	-- If isMatch is false then match1 is the string between the last match and the next. (This string will never be empty.)
+	-- for position, isMatch, capture1, ... in gmatchAndBetween( string, pattern )
+	-- If isMatch is false then capture1 is the string between the last match and the next. (This string will never be empty.)
 	function _G.gmatchAndBetween(s, pat)
 		local nextPos = 1
 		local i1, i2  = nil

src/utf8.lua2p

@@ -25,8 +25,8 @@ local tableInsert  = table.insert
 
 
 
--- string = codepointToString( cp )
--- codepointToString( cp, outputBuffer )
+-- string = codepointToString( codepoint )
+-- codepointToString( codepoint, outputBuffer )
 function utf8.codepointToString(cp, buffer)
 	if cp < 0 or cp > 0x10ffff then
 		errorf("Codepoint %d is outside the valid range (0..10FFFF).", cp)
@@ -86,7 +86,7 @@ end
 
 
 
--- length|nil = getCharacterLength( string [, position=1 ] )
+-- length = getCharacterLength( string [, position=1 ] )
 -- Returns nil if the string is invalid at the position.
 function utf8.getCharacterLength(s, pos)
 	pos                  = pos or 1
@@ -137,15 +137,15 @@ end
 
 
 
--- length|nil = getLength( string [, startPosition=1 ] )
--- Returns nil if the string is invalid.
+-- length = getLength( string [, startPosition=1 ] )
+-- Returns nil and the first error position if the string is invalid.
 function utf8.getLength(s, pos)
 	pos       = pos or 1
 	local len = 0
 
 	while pos <= #s do
 		local charLen = utf8.getCharacterLength(s, pos)
-		if not charLen then  return nil  end
+		if not charLen then  return nil, pos  end
 
 		len = len + 1
 		pos = pos + charLen
@@ -156,13 +156,14 @@ end
 
 
 
--- position|nil = getStartOfCharacter( string, position )
+-- position = getStartOfCharacter( string, position )
 -- Returns nil if the string is invalid at the position.
 function utf8.getStartOfCharacter(s, pos)
 	for pos = pos, math.max(pos-3, 1), -1 do
 		local b = getByte(s, pos)
 
 		if b <= 127 or (b >= 194 and b <= 244) then
+			-- @Robustness: Verify that the following bytes are valid.
 			return pos
 		end
 	end

src/xml.lua2p

@@ -725,7 +725,7 @@ do
 		end
 	end
 
-	-- text = Element:getHtmlText( ) -- @Doc
+	-- text = Element:getHtmlText( )
 	function Element.getHtmlText(el)
 		local buffer = {}
 		_getHtmlText(buffer, el)
@@ -1131,18 +1131,14 @@ function xml.toXml(node, preface)
 end
 Element.toXml = xml.toXml -- :Alias
 
--- xmlString = xml.contentsToXml( node ) -- @Doc
+-- xmlString = xml.contentsToXml( node )
 function xml.contentsToXml(node)
-	local buffer = {}
+	if !!(IS_TEXT`node`) then  return ""  end
 
-	if !!(IS_TEXT`node`) then
-		nodeToXml(buffer, node)
-	else
-		for _, childNode in ipairs(node) do
-			nodeToXml(buffer, childNode)
-		end
+	local buffer = {}
+	for _, childNode in ipairs(node) do
+		nodeToXml(buffer, childNode)
 	end
-
 	return table.concat(buffer, "")
 end
 Element.contentsToXml = xml.contentsToXml -- :Alias
@@ -1312,18 +1308,14 @@ function xml.toHtml(node, preface)
 end
 Element.toHtml = xml.toHtml -- :Alias
 
--- htmlString = xml.contentsToHtml( node ) -- @Doc
+-- htmlString = xml.contentsToHtml( node )
 function xml.contentsToHtml(node)
-	local buffer = {}
+	if !!(IS_TEXT`node`) then  return ""  end
 
-	if !!(IS_TEXT`node`) then
-		nodeToHtml(buffer, node)
-	else
-		for _, childNode in ipairs(node) do
-			nodeToHtml(buffer, childNode)
-		end
+	local buffer = {}
+	for _, childNode in ipairs(node) do
+		nodeToHtml(buffer, childNode)
 	end
-
 	return table.concat(buffer, "")
 end
 Element.contentsToHtml = xml.contentsToHtml -- :Alias
@@ -1684,12 +1676,12 @@ local CHAR_TO_ENTITY = {
 }
 
 -- Encode special characters.
-function xml.encodeRequiredEntities(s) -- @Doc
+function xml.encodeRequiredEntities(s)
 	return (s:gsub("[&<>\"']", CHAR_TO_ENTITY))
 end
 
 -- Encode special characters and some additional characters (like non-breaking space).
-function xml.encodeMoreEntities(s) -- @Doc
+function xml.encodeMoreEntities(s)
 	s = xml.encodeRequiredEntities(s)
 
 	-- Note: We encode HTML entities in XML documents too. It's probably fine, but who knows!

testsite/content/all-lists-all/a.md

@@ -5,6 +5,6 @@ lock()
 
 ## Page List
 
-{{fori page in subpages(true)}}
-- {{page.title}}
+{{fori subpage in subpages(true)}}
+- {{subpage.title}}
 {{end}}

testsite/content/all-lists-all/b.md

@@ -5,6 +5,6 @@ lock()
 
 ## Page List
 
-{{fori page in subpages(true)}}
-- {{page.title}}
+{{fori subpage in subpages(true)}}
+- {{subpage.title}}
 {{end}}

testsite/content/all-lists-all/c.md

@@ -5,6 +5,6 @@ lock()
 
 ## Page List
 
-{{fori page in subpages(true)}}
-- {{page.title}}
+{{fori subpage in subpages(true)}}
+- {{subpage.title}}
 {{end}}