Module:ParseList: Difference between revisions

← Older edit

Module:ParseList (view source)

Revision as of 19:06, 15 April 2024

876 bytes added , 15 April

Improve output of htmlList style.

Taylan

Bureaucrats, Interface administrators, Maintainers, Suppressors, Administrators, Widget editors

9,982

edits

@@ Line 9: / Line 9: @@
 local makeElementsLowercase
 local useTemplateOnElements
-local finalJoiningWord
+local useTwoArgTemplateOnElements
+local textDelim
+local textLastDelim
 local function splitListString(listString)
-    local strings = {}
+	local strings = {}
-    for str in listString:gmatch("[^" .. listDelimiters .. "]+") do
+	for str in listString:gmatch("[^" .. listDelimiters .. "]+") do
-        table.insert(strings, str:match("^%s*(.-)%s*$"))
+		table.insert(strings, str:match("^%s*(.-)%s*$"))
-    end
+	end
-    return strings
+	return strings
 end
@@ Line 137: / Line 139: @@
 end
--- Applies the singular, plural, lowercase, and linkification transform
+-- Applies the various per-element transforms.  Frame is needed for template
-local function processElement(str)
+-- expansion; it may be nil if template transforms won't be applied.
+local function processElement(str, frame)
 	local original = str
 	if makeElementsPlural then
@@ Line 150: / Line 153: @@
 	if makeElementsLinks then
 		return "[[" .. original .. "|" .. str .. "]]"
-	end
+	elseif useTemplateOnElements then
-	if useTemplateOnElements then
+		return frame:expandTemplate{
-		return "{{" .. useTemplateOnElements .. "|" .. str .. "}}"
+			title = useTemplateOnElements,
+			args = { str }
+		}
+	elseif useTwoArgTemplateOnElements then
+		return frame:expandTemplate{
+			title = useTwoArgTemplateOnElements,
+			args = { original, str }
+		}
 	end
 	return str
 end
--- These functions implement the different output types.  The elements will have
+-- These functions implement different output styles.  The elements will have
 -- already gone through processElement() at this point, so they only need to be
--- glued together to produce the desired type of listing format.
+-- glued together to produce the desired style of listing format.
 local converters = {
-	sentence = function (elements)
+	text = function (elements)
-	    local count = #elements
+		local result = ""
-	    if count == 0 then
+		local count = #elements
-	    	return ""
-	    elseif count == 1 then
-	    	return elements[1]
-	    elseif count == 2 then
-			return elements[1] .. " " .. finalJoiningWord .. " " .. elements[2]
-	    end
-	    local result = ""
 		for i, str in ipairs(elements) do
-			if i < count then
+			if i == 1 then
-				result = result .. str .. ", "
+				result = str
+			elseif i < count then
+				result = result .. textDelim .. str
 			else
-				result = result .. finalJoiningWord .. " " .. str
+				result = result .. textLastDelim .. str
 			end
-	    end
+		end
-	    return result
+		return result
 	end,
 	htmlList = function (elements)
-		local result = ""
+		local result = "<ul>\n"
+		for i, str in ipairs(elements) do
+			result = result .. "<li>" .. str .. "</li>\n"
+		end
+		return result .. "</ul>"
+	end,
+	tableList = function (elements)
+		local result = "<div class=\"bg3wiki-tablelist\">"
+		for i, str in ipairs(elements) do
+			result = result .. str .. "\n"
+		end
+		return result .. "</div>"
+	end,
+	htmlListNoBullets = function (elements)
+		local result = "<ul style='list-style: none; margin: 0;'>\n"
 		for i, str in ipairs(elements) do
-			result = result .. "* " .. str .. "\n"
+			result = result .. "<li>" .. str .. "</li>\n"
 		end
-		return result
+		return result .. "</ul>"
 	end,
 	simpleList = function (elements)
@@ Line 204: / Line 223: @@
 function p.main(frame)
 	local args = getArgs(frame, { frameOnly = true })
-	return p._main(args)
+	return p._main(args, frame)
 end
-function p._main(args)
+-- Frame is needed for template expansion; may be nil if the useTemplate and
+-- useTemplate2 args are nil.
+function p._main(args, frame)
 	listDelimiters = args['delimiter'] or ","
 	makeElementsLinks = args['makeLinks']
@@ Line 214: / Line 235: @@
 	makeElementsLowercase = args['makeLowercase']
 	useTemplateOnElements = args['useTemplate']
-	finalJoiningWord = args['joinWord'] or "and"
+	useTwoArgTemplateOnElements = args['useTemplate2']
+	textDelim = args['textDelim']
+	if textDelim then
+		textLastDelim = args['textLastDelim'] or textDelim
+	else
+		textDelim = ', '
+		textLastDelim = args['textLastDelim'] or ', and '
+	end
-	local type = args['type'] or 'sentence'
+	local style = args['style'] or args['type'] or 'text'
-	local converter = converters[type]
+	local converter = converters[style]
 	local elements = {}
 	local listString = args[1]
 	local strings = splitListString(listString)
 	for i, str in ipairs(strings) do
-		table.insert(elements, processElement(str))
+		table.insert(elements, processElement(str, frame))
 	end
 	return converter(elements)