No edit summary |
(merge serialDelimiter) |
||
Line 25: | Line 25: | ||
['to'] = ' to ', |
['to'] = ' to ', |
||
['br'] = '<br/>', |
['br'] = '<br/>', |
||
− | ['newline'] = '<br |
+ | ['newline'] = '<br>', |
− | ['list'] = ' |
+ | ['list'] = '\n' .. listLevel, |
− | ['bullet'] = ' |
+ | ['bullet'] = '\n' .. listLevel, |
− | ['*'] = ' |
+ | ['*'] = '\n' .. listLevel, |
− | ['and-list'] = ' and |
+ | ['and-list'] = ', and\n' .. listLevel, |
− | ['or-list'] = ' or |
+ | ['or-list'] = ', or\n' .. listLevel, |
− | ['&-list'] = ' & |
+ | ['&-list'] = ' &\n' .. listLevel, |
− | ['amp-list'] = ' & |
+ | ['amp-list'] = ' &\n' .. listLevel, |
− | ['comma-list'] = ', |
+ | ['comma-list'] = ',\n' .. listLevel, |
− | [',-list'] = ', |
+ | [',-list'] = ',\n' .. listLevel, |
} |
} |
||
Line 43: | Line 43: | ||
['and-list'] = ',<br>\n' .. listLevel, |
['and-list'] = ',<br>\n' .. listLevel, |
||
['&-list'] = ',<br>\n' .. listLevel, |
['&-list'] = ',<br>\n' .. listLevel, |
||
− | } |
||
− | |||
− | local delimitersWithSerial = { |
||
− | ['and'] = true, |
||
− | ['or'] = true, |
||
− | ['and-list'] = true, |
||
− | ['&-list'] = true, |
||
− | ['or-list'] = true |
||
} |
} |
||
local delimiter = args['delimiter'] or args['delim'] or args['d'] or ' ' |
local delimiter = args['delimiter'] or args['delim'] or args['d'] or ' ' |
||
− | + | local finalDelimiter = finalDelimiterValues[delimiter] or delimiter |
|
local midDelimiter = midDelimiterValues[delimiter] or delimiter |
local midDelimiter = midDelimiterValues[delimiter] or delimiter |
||
− | local serialDelimiter = delimitersWithSerial[delimiter] and ',' or '' |
||
− | for i, |
+ | for i,val in ipairs(args) do |
if (i > 1) then |
if (i > 1) then |
||
− | local currentDelimiter = args[i |
+ | local currentDelimiter = args[i+1] and midDelimiter or finalDelimiter |
− | output = output .. currentDelimiter .. tag( |
+ | output = output .. currentDelimiter .. tag(val) |
end |
end |
||
end |
end |
Revision as of 03:48, 5 December 2020
local p = {}
function p.output(f)
local args = f
if f == mw.getCurrentFrame() then
args = require('Module:ProcessArgs').merge(true)
end
local tag = function(txt)
return '<' .. args['tag'] .. '>' .. txt .. '</' .. args['tag'] .. '>'
end
local listLevel = args['list-level'] or '**'
local output = tag(args[1])
local finalDelimiterValues = {
['none'] = '<nowiki/>',
['comma'] = ', ',
[','] = ', ',
['and'] = ' and ',
['&'] = ' & ',
['amp'] = ' & ',
['or'] = ' or ',
['to'] = ' to ',
['br'] = '<br/>',
['newline'] = '<br>',
['list'] = '\n' .. listLevel,
['bullet'] = '\n' .. listLevel,
['*'] = '\n' .. listLevel,
['and-list'] = ', and\n' .. listLevel,
['or-list'] = ', or\n' .. listLevel,
['&-list'] = ' &\n' .. listLevel,
['amp-list'] = ' &\n' .. listLevel,
['comma-list'] = ',\n' .. listLevel,
[',-list'] = ',\n' .. listLevel,
}
local midDelimiterValues = {
['and'] = ', ',
['&'] = ', ',
['amp'] = ', ',
['and-list'] = ',<br>\n' .. listLevel,
['&-list'] = ',<br>\n' .. listLevel,
}
local delimiter = args['delimiter'] or args['delim'] or args['d'] or ' '
local finalDelimiter = finalDelimiterValues[delimiter] or delimiter
local midDelimiter = midDelimiterValues[delimiter] or delimiter
for i,val in ipairs(args) do
if (i > 1) then
local currentDelimiter = args[i+1] and midDelimiter or finalDelimiter
output = output .. currentDelimiter .. tag(val)
end
end
return output
end
return p