Изменения

Перейти к навигации Перейти к поиску
+ newline
Строка 2: Строка 2:  
-- an optional separator. The final separator (the "conjunction") can be
 
-- an optional separator. The final separator (the "conjunction") can be
 
-- specified independently, enabling natural-language lists like
 
-- specified independently, enabling natural-language lists like
-- "foo, bar, baz and qux". The starting parameter can also be specified.
+
-- "foo, bar, baz and qux".
    
local compressSparseArray = require('Module:TableTools').compressSparseArray
 
local compressSparseArray = require('Module:TableTools').compressSparseArray
Строка 12: Строка 12:  
and mw.text.decode(args.separator) or ''
 
and mw.text.decode(args.separator) or ''
 
local conjunction = args.conjunction and mw.text.decode(args.conjunction) or separator
 
local conjunction = args.conjunction and mw.text.decode(args.conjunction) or separator
-- Discard values before the starting parameter.
  −
local start = tonumber(args.start)
  −
if start then
  −
for i = 1, start - 1 do args[i] = nil end
  −
end
   
-- Discard named parameters.
 
-- Discard named parameters.
 
local values = compressSparseArray(args)
 
local values = compressSparseArray(args)
Строка 22: Строка 17:  
end
 
end
   −
local function makeInvokeFunction(separator, conjunction, first)
+
local function makeInvokeFunction(separator, conjunction)
 
return function (frame)
 
return function (frame)
 
local args = require('Module:Arguments').getArgs(frame)
 
local args = require('Module:Arguments').getArgs(frame)
 
args.separator = separator or args.separator
 
args.separator = separator or args.separator
 
args.conjunction = conjunction or args.conjunction
 
args.conjunction = conjunction or args.conjunction
args.first = first or args.first
   
return p._main(args)
 
return p._main(args)
 
end
 
end
Строка 34: Строка 28:  
p.main = makeInvokeFunction()
 
p.main = makeInvokeFunction()
 
p.br = makeInvokeFunction('<br />')
 
p.br = makeInvokeFunction('<br />')
 +
p.newline = makeInvokeFunction('\n')
 
p.comma = makeInvokeFunction(mw.message.new('comma-separator'):plain())
 
p.comma = makeInvokeFunction(mw.message.new('comma-separator'):plain())
    
return p
 
return p
Анонимный участник

Реклама:

Навигация