模块:Separated entries：修订间差异

←上一编辑下一编辑→

@@ 第1行： / 第1行： @@
-local getArgs = require('Module:Arguments').getArgs
+-- This module takes positional parameters as input and concatenates them with
+-- an optional separator. The final separator (the "conjunction") can be
+-- specified independently, enabling natural-language lists like
+-- "foo, bar, baz and qux".
 local compressSparseArray = require('Module:TableTools').compressSparseArray
 local p = {}
-function p.main(frame)
-	local args = getArgs(frame, {
-		trim = true,
-		removeBlanks = true
-	})
-	return p._main(args)
-end
 function p._main(args)
 	local separator = args.separator
@@ 第18行： / 第14行： @@
 	-- Discard named parameters.
 	local values = compressSparseArray(args)
 	return mw.text.listToText(values, separator, conjunction)
 end
+local function makeInvokeFunction(separator, conjunction)
+	return function (frame)
+		local args = require('Module:Arguments').getArgs(frame)
+		args.separator = separator or args.separator
+		args.conjunction = conjunction or args.conjunction
+		return p._main(args)
+	end
+end
+p.main = makeInvokeFunction()
+p.br = makeInvokeFunction('<br />')
+p.comma = makeInvokeFunction(mw.message.new('comma-separator'):plain())
 return p