Exposed Markdown and XML settings.

'toml' and 'json' are now aliases for their .parse() functions.
Fixed xml.htmlScrambleEmailAddresses=false not being fully effective.

Author: ReFreezed

examples/testsite/scripts/tests/runTests.lua

@@ -129,7 +129,9 @@ return function()
 			[620] = '<p><a href="mailto:[email protected]">[email protected]</a></p>\n', -- [email protected]  ->  <p>[email protected]</p>
 		}
 
-		xml.htmlAllowNoAttributeValue = false
+		markdown.addIdsToHeadings      = false
+		xml.htmlAllowNoAttributeValue  = false
+		xml.htmlScrambleEmailAddresses = false
 
 		local docHtml = assert(readTextFile"../../local/gfm-spec.html")
 		local doc     = assert(xml.parseHtml(docHtml))
@@ -190,7 +192,7 @@ return function()
 			return false
 		end
 
-		-- markdownRunInternalTests()
+		-- markdown.runInternalTests()
 		timerStart("markdown")
 
 		for _, test in ipairs(tests) do
@@ -202,7 +204,7 @@ return function()
 			then
 				-- print("Test#"..test.n)
 
-				local html = (markdown(test.input)
+				local html = (markdown.parse(test.input)
 					-- This is just so we pass tests we really should have passed. Sigh...
 					:gsub("'", "&apos;")
 				)

src/app.lua2p

@@ -446,9 +446,16 @@ local function setup()
 		utf8 = utf8,
 		xml  = xmlLib,
 
-		toml = { -- @Cleanup: Don't use 3rd party TOML library.
-			parse = dataParsers.toml,
-		},
+		toml = setmetatable( -- @Cleanup: Don't use 3rd party TOML library.
+			{
+				parse = dataParsers.toml,
+			},
+			{
+				__call = function(_, ...)
+					return dataParsers.toml(...)
+				end,
+			}
+		),
 
 		-- Site objects. (Create at site generation.)
 		site = nil,
@@ -479,7 +486,7 @@ local function setup()
 		ipairsr          = ipairsr,
 		isAny            = isAny,
 		isValueHtml      = doesValueLookLikeHtml,
-		markdown         = markdownToHtml, !!(DEV and `markdownRunInternalTests=markdownLib.runInternalTests,` or ``)
+		markdown         = markdownLib,
 		markdownOld      = markdownOldLib, -- @Renamed @Deprecated
 		max              = math.max,
 		min              = math.min,

src/json.lua2p

@@ -253,6 +253,7 @@ local function parseValue(s, path, pos)
 end
 
 -- value = json.parse( jsonString [, filePathForErrors ] )
+-- value = json      ( jsonString [, filePathForErrors ] )
 -- Returns nil and a message on error.
 function json.parse(s, path)
 	path      = path or "<json>"
@@ -274,4 +275,8 @@ end
 
 
 
-return json
+return setmetatable(json, {
+	__call = function(_, ...)
+		return json.parse(...)
+	end,
+})

src/markdown.lua2p

@@ -15,7 +15,7 @@
 --============================================================]]
 
 local markdown = {
-	addIdsToHeadings = true, -- @Incomplete: API.  @Doc
+	addIdsToHeadings = true,
 }
 
 !(
@@ -1688,6 +1688,7 @@ end
 
 
 -- html = markdown.parse( markdownString )
+-- html = markdown      ( markdownString )
 function markdown.parse(s)
 	@@PRINT"==================="
 	@@PRINT(showWhitespace(s))
@@ -2637,4 +2638,8 @@ end
 
 
 
-return markdown
+return setmetatable(markdown, {
+	__call = function(_, ...)
+		return markdown.parse(...)
+	end,
+})

src/utf8.lua

@@ -20,7 +20,7 @@
 --============================================================]]
 
 local utf8 = {
-	CHARACTER_PATTERN = "[%z\1-\127\194-\244][\128-\191]*", -- @Doc
+	CHARACTER_PATTERN = "[%z\1-\127\194-\244][\128-\191]*",
 }
 
 local stringByte  = string.byte

src/xml.lua2p

@@ -91,8 +91,8 @@ local HTML_END_TAG_PATTERNS_FOR_TAGS_WITH_UNENCODED_CONTENTS = {
 
 
 local xml = {
-	htmlAllowNoAttributeValue  = true, -- @Doc (Maybe this should be an argument for toHtml()?)
-	htmlScrambleEmailAddresses = true, -- @Doc (Maybe this should be an argument for toHtml()?)
+	htmlAllowNoAttributeValue  = true, -- @Cleanup: Maybe this should actually be an argument for toHtml()?
+	htmlScrambleEmailAddresses = true, -- @Cleanup: Maybe this should actually be an argument for toHtml()?
 }
 xml.__index = xml
 
@@ -528,7 +528,7 @@ local function parseElementContents(s, pos, pathForError, el, isHtml, isTop)
 		elseif s:find("^&", pos) then
 			if isTop then  fileError(pathForError, s, posOffsetForError+pos, "Invalid data outside root element.")  end
 
-			pos = _decodeEntities(s, pos, s, 0, pathForError, isHtml, el, true)
+			pos = _decodeEntities(s, pos,s, 0,pathForError, isHtml, el, true)
 
 		-- Text.
 		else
@@ -1304,6 +1304,7 @@ local function nodeToHtml(buffer, node, encodeTextAsEmail)
 
 	local tagName          = el.tag -- (Don't call :lower() because that may make HTML_XML_ENTRY_TAGS[tagName] true and we end up in a weird situation. Only normalize when parsing!)
 	local allowNoAttrValue = xml.htmlAllowNoAttributeValue
+	local scrambleEmails   = xml.htmlScrambleEmailAddresses
 
 	table.insert(buffer, "<")
 	table.insert(buffer, tagName)
@@ -1314,9 +1315,9 @@ local function nodeToHtml(buffer, node, encodeTextAsEmail)
 
 		if not (attrValue == "" and allowNoAttrValue) then
 			table.insert(buffer, '="')
-			if attrName == "href" and el.tag == "a" and attrValue:find"^[Mm][Aa][Ii][Ll][Tt][Oo]:" then
+			if attrName == "href" and el.tag == "a" and scrambleEmails and attrValue:find"^[Mm][Aa][Ii][Ll][Tt][Oo]:" then
 				encodeEmailValue(buffer, attrValue)
-				encodeTextAsEmail = xml.htmlScrambleEmailAddresses
+				encodeTextAsEmail = true
 			else
 				table.insert(buffer, xml.encodeMoreEntities(attrValue))
 			end
@@ -1747,11 +1748,11 @@ function xml.encodeMoreEntities(s)
 	return s
 end
 
--- text = decodeEntities( htmlText [, strict=true ] ) -- @Doc
+-- text = decodeEntities( htmlText [, strict=true ] )
 -- Returns nil and a message on error.
 function xml.decodeEntities(s, strict)
 	-- Note: The pcall() is useless if 'strict' is false because we will never get an error.
-	local ok, textOrMessage = pcall(_decodeEntities, s, 1, stringForError, positionOffsetForError, pathForError, isHtml, nil, strict~=false)
+	local ok, textOrMessage = pcall(_decodeEntities, s,1, s,0, "<html>", true, nil, strict~=false)
 	if not ok then  return nil, textOrMessage  end
 
 	return textOrMessage