Changes

local origArgs= {}

local function notemptyhas_list_class( s args_to_check) return s and s:match for _, list in pairs( lists) do if not list.found then for _, arg in pairs(args_to_check) do for _, pattern in ipairs(list.patterns) do if mw.ustring.find(arg or '%S' , pattern) then list.found = true break end end if list.found then break end end end endend

s = mw.ustring.gsub(s, marker .. '(%s*</[Tt][Aa][Bb][Ll][Ee]%s*>)', '%1') s = mw.ustring.gsub(s, marker .. '(%s*\n|%})', '%1')

s = s .. '<tr' .. rowstyle ..'><' .. tt .. ' colspan=2>\n' .. subcells[k]

s = s .. '<tr><' .. tt .. ' colspan=2>\n' .. subcells[k] .. '</' .. tt .. '></tr>'

-- https[[Special:Diff//en.wikipedia.org/w/index.php?title=Template_talk849054481]] -- remove when [[:phab:Infobox_musical_artist&oldid=849054481T191516]] is fixed or OBE

-- Returns the union of the values of two tables, as a sequence. local vals = {} for k, v in pairs(t1) do vals[v] = true end for k, v in pairs(t2) do vals[v] = true end local ret = {} for k, v in pairs(vals) do table.insert(ret, k) end return ret

-- Returns a table containing the numbers of the arguments that exist -- for the specified prefix. For example, if the prefix was 'data', and -- 'data1', 'data2', and 'data5' exist, it would return {1, 2, 5}. local nums = {} for k, v in pairs(args) do local num = tostring(k):match('^' .. prefix .. '([1-9]%d*)$') if num then table.insert(nums, tonumber(num)) end end table.sort(nums) return nums

-- Adds a row to the infobox, with either a header cell -- or a label/data cell combination if rowArgs. if header and rowArgs.header ~= '_BLANK_' then has_rows = true has_list_class({ rowArgs.rowclass, rowArgs.class, args.headerclass }) root :tag('tr') :addClass(rowArgs.rowclass) :cssText(rowArgs.rowstyle) :attr('id', rowArgs.rowid) :tag('th') :attr('colspan', '2') :attraddClass('idinfobox-header', rowArgs.headerid) :addClass(rowArgs.class) :addClass(args.headerclass) :css('text -- @deprecated next; target .infobox-<name> .infobox-align', 'center')header :cssText(args.headerstyle) :cssText(rowArgs.rowcellstyle) :wikitext(fixChildBoxes(rowArgs.header, 'th')) if rowArgs.data then root:wikitext( '[[Category:Pages using infobox templates with ignored data cells]]' ) end elseif rowArgs.data and rowArgs.data:gsub(category_in_empty_row_pattern, ''):match('^%S') then has_rows = true has_list_class({ rowArgs.rowclass, rowArgs.class }) local row = root:tag('tr') row:addClass(rowArgs.rowclass) row:cssText(rowArgs.rowstyle) row:attr('id', rowArgs.rowid) if rowArgs.label then row :tag('th') :attr('scope', 'row') :attraddClass('idinfobox-label', rowArgs) -- @deprecated next; target .infobox-<name> .labelid)infobox-label :cssText(args.labelstyle) :cssText(rowArgs.rowcellstyle) :wikitext(rowArgs.label) :done() end local dataCell = row:tag('td') if not rowArgs.label then dataCell :attr('colspan', not rowArgs.label and '2' or nil) :cssaddClass(not rowArgs.label and 'textinfobox-full-aligndata', or 'centerinfobox-data') end dataCell :attraddClass('id', rowArgs.dataidclass) :addClass -- @deprecated next; target .infobox-<name> .infobox(rowArgs.class-full)-data :cssText(rowArgs.datastyle) :cssText(rowArgs.rowcellstyle) :newline() :wikitext(fixChildBoxes(rowArgs.data, 'td')) else table.insert(empty_row_categories, rowArgs.data or '') end

if not args.title then return end

has_rows = true has_list_class({args.titleclass}) root :tag('caption') :addClass('infobox-title') :addClass(args.titleclass) -- @deprecated next; target .infobox-<name> .infobox-title :cssText(args.titlestyle) :wikitext(args.title)

if not args.above then return end has_rows = true has_list_class({ args.aboveclass }) root :tag('tr') :tag('th') :attr('colspan', '2') :addClass(args.aboveclass) :css('textinfobox-align', 'centerabove') :cssaddClass('font-size', '125%'args.aboveclass) :css('font -- @deprecated next; target .infobox-<name> .infobox-weight', 'bold')above :cssText(args.abovestyle) :wikitext(fixChildBoxes(args.above,'th'))

if not args.below then return end has_rows = true has_list_class({ args.belowclass }) root :tag('tr') :tag('td') :attr('colspan', '2') :addClass('infobox-below') :addClass(args.belowclass) -- @deprecated next; target .infobox-<name> .infobox-below :cssText(args.belowstyle) :wikitext(fixChildBoxes(args.below,'td'))end local function addSubheaderRow(subheaderArgs) if subheaderArgs.data and subheaderArgs.data:cssgsub(category_in_empty_row_pattern, ''text-align):match('^%S') then has_rows = true has_list_class({ subheaderArgs.rowclass, subheaderArgs.class }) local row = root:tag('tr') row:addClass(subheaderArgs.rowclass)  local dataCell = row:tag('td') dataCell :attr('colspan', 'center2') :addClass('infobox-subheader') :addClass(subheaderArgs.class) :cssText(argssubheaderArgs.belowstyledatastyle) :newlinecssText(subheaderArgs.rowcellstyle) :wikitext(fixChildBoxes(argssubheaderArgs.belowdata,'td')) else table.insert(empty_row_categories, subheaderArgs.data or '') end

if args.subheader then args.subheader1 = args.subheader end if args.subheaderrowclass then args.subheaderrowclass1 = args.subheaderrowclass end local subheadernums = getArgNums('subheader') for k, num in ipairs(subheadernums) do addRow addSubheaderRow({ data = args['subheader' .. tostring(num)], -- @deprecated next; target .infobox-<name> .infobox-subheader datastyle = args.subheaderstyle or , rowcellstyle = args['subheaderstyle' .. tostring(num)], class = args.subheaderclass, rowclass = args['subheaderrowclass' .. tostring(num)] }) endend local function addImageRow(imageArgs)  if imageArgs.data and imageArgs.data:gsub(category_in_empty_row_pattern, ''):match('^%S') then  has_rows = true has_list_class({ imageArgs.rowclass, imageArgs.class }) local row = root:tag('tr') row:addClass(imageArgs.rowclass)  local dataCell = row:tag('td') dataCell :attr('colspan', '2') :addClass('infobox-image') :addClass(imageArgs.class) :cssText(imageArgs.datastyle) :wikitext(fixChildBoxes(imageArgs.data, 'td')) else table.insert(empty_row_categories, imageArgs.data or '') end

if args.image then args.image1 = args.image end if args.caption then args.caption1 = args.caption end local imagenums = getArgNums('image') for k, num in ipairs(imagenums) do local caption = args['caption' .. tostring(num)] local data = mw.html.create():wikitext(args['image' .. tostring(num)]) if caption then data :tag('div') :addClass('infobox-caption') -- @deprecated next; target .infobox-<name> .infobox-caption :cssText(args.captionstyle) :wikitext(caption) end addRow addImageRow({ data = tostring(data), -- @deprecated next; target .infobox-<name> .infobox-image datastyle = args.imagestyle, class = args.imageclass, rowclass = args['imagerowclass' .. tostring(num)] }) endend -- When autoheaders are turned on, preprocesses the rowslocal function preprocessRows() if not args.autoheaders then return end local rownums = union(getArgNums('header'), getArgNums('data')) table.sort(rownums) local lastheader for k, num in ipairs(rownums) do if args['header' .. tostring(num)] then if lastheader then args['header' .. tostring(lastheader)] = nil end lastheader = num elseif args['data' .. tostring(num)] and args['data' .. tostring(num)]:gsub( category_in_empty_row_pattern, '' ):match('^%S') then local data = args['data' .. tostring(num)] if data:gsub(category_in_empty_row_pattern, ''):match('%S') then lastheader = nil end end end if lastheader then args['header' .. tostring(lastheader)] = nil end

-- Gets the union of the header and data argument numbers, -- and renders them all in order using addRow. local rownums = union(getArgNums('header'), getArgNums('data')) table.sort(rownums) for k, num in ipairs(rownums) do addRow({ header = args['header' .. tostring(num)], label = args['label' .. tostring(num)], data = args['data' .. tostring(num)], datastyle = args.datastyle, class = args['class' .. tostring(num)], rowclass = args['rowclass' .. tostring(num)], -- @deprecated next; target .infobox-<name> rowclass rowstyle = args['rowstyle' .. tostring(num)], rowcellstyle = args['rowcellstyle' .. tostring(num)], dataid = args['dataid' .. tostring(num)], labelid = args['labelid' .. tostring(num)], headerid = args['headerid' .. tostring(num)], rowid = args['rowid' .. tostring(num)] }) end

if not args.name then return end has_rows = true root :tag('tr') :tag('td') :attr('colspan', '2') :cssaddClass('textinfobox-align', 'rightnavbar') :wikitext(navbarrequire('Module:Navbar')._navbar{ args.name, mini = 1, })

local italicTitle = args['italic title'] and mw.ustring.lower(args['italic title']) if italicTitle == '' or italicTitle == 'force' or italicTitle == 'yes' then root:wikitext(mw.getCurrentFramerequire('Module:Italic title'):expandTemplate._main({title = 'italic title'})) end

if args.decat ~== 'yes' thenreturn end if #(getArgNums(args.child == 'datayes')) == 0 and mwthen if args.title.getCurrentTitle().namespace == 0 then root:wikitext( '[[Category:Articles which use Pages using embedded infobox templates with no data rowsthe title parameter]]' ) end if args.child elseif #(getArgNums('data')) == 'yes' 0 and argsmw.title .getCurrentTitle().namespace == 0 then root:wikitext('[[Category:Pages which use embedded Articles using infobox templates with the title parameterno data rows]]') end end

-- Specify the overall layout of the infobox, with special settings -- if the infobox is used as a 'child' inside another infobox. if args.child ~= 'yes' then root = mw.html.create('table') root :addClass((args.subbox ~== 'yes') and 'infobox-subbox' or nil'infobox') :addClass(args.bodyclass) if args.subbox == 'yes' then root :css('padding', '0') :css('border', 'none') :css('margin', ' -3px') :css('width', 'auto') :css('min-width', '100%') :css('font@deprecated next; target .infobox-size', '100%') :css('clear', 'none') :css('float', 'none') :css('background-color', 'transparent') else<name> root :css('width', '22em') end root :cssText(args.bodystyle) renderTitle() renderAboveRow() else root = mw.html.create() root :wikitext has_list_class({ args.titlebodyclass }) end

renderSubheaders renderTitle() renderImages renderAboveRow() renderRows else root = mw.html.create() renderBelowRow() renderNavBar root :wikitext(args.title) renderItalicTitle() end renderTrackingCategories structure_infobox_common() return tostringloadTemplateStyles() .. root)

-- If the argument exists and isn't blank, add it to the argument table. -- Blank arguments are treated as nil to match the behaviour of ParserFunctions. if origArgs[argName] and origArgs[argName] ~= '' then args[argName] = origArgs[argName] end

-- Assign the parameters with the given prefixes to the args table, in order, in batches -- of the step size specified. This is to prevent references etc. from appearing in the -- wrong order. The prefixTable should be an array containing tables, each of which has -- two possible fields, a "prefix" string and a "depend" table. The function always parses -- parameters containing the "prefix" string, but only parses parameters in the "depend" -- table if the prefix parameter is present and non-blank. if type(prefixTable) ~= 'table' then error("Non-table value detected for the prefix table", 2) end if type(step) ~= 'number' then error("Invalid step value detected", 2) end -- Get arguments without a number suffix, and check for bad input. for i,v in ipairs(prefixTable) do if type(v) ~= 'table' or type(v.prefix) ~= "string" or (v.depend and type(v.depend) ~= 'table') then error('Invalid input detected to preprocessArgs prefix table', 2) end preprocessSingleArg(v.prefix) -- Only parse the depend parameter if the prefix parameter is present -- and not blank. if args[v.prefix] and v.depend then for j, dependValue in ipairs(v.depend) do if type(dependValue) ~= 'string' then error('Invalid "depend" parameter value detected in preprocessArgs') end preprocessSingleArg(dependValue) end end end -- Get arguments with number suffixes. local a = 1 -- Counter variable. local moreArgumentsExist = true while moreArgumentsExist == true do moreArgumentsExist = false for i = a, a + step - 1 do for j,v in ipairs(prefixTable) do local prefixArgName = v.prefix .. tostring(i) if origArgs[prefixArgName] then -- Do another loop if any arguments are found, even blank ones. moreArgumentsExist = true preprocessSingleArg(prefixArgName) end -- Process the depend table if the prefix argument is present -- and not blank, or we are processing "prefix1" and "prefix" is -- present and not blank, and if the depend table is present. if v.depend and (args[prefixArgName] or (i == 1 and args[v.prefix])) then for j,dependValue in ipairs(v.depend) do local dependArgName = dependValue.. tostring(i) preprocessSingleArg(dependArgName) end end end end a = a + step end end -- Parse the data parameters in the same order that the old {{infobox}} did, so-- that references etc. will display in the expected places. Parameters that-- depend on another parameter are only processed if that parameter is present,-- to avoid phantom references appearing in article reference lists.local function parseDataParameters()

-- Get arguments with number suffixes. preprocessSingleArg('autoheaders') preprocessSingleArg('child') preprocessSingleArg('bodyclass') preprocessSingleArg('subbox') preprocessSingleArg('bodystyle') preprocessSingleArg('title') preprocessSingleArg('titleclass') preprocessSingleArg('titlestyle') preprocessSingleArg('above') local a = 1 -- Counter variable. preprocessSingleArg('aboveclass') local moreArgumentsExist = true preprocessSingleArg('abovestyle') while moreArgumentsExist == true do preprocessArgs({ moreArgumentsExist {prefix = false for i 'subheader', depend = a{'subheaderstyle', a + step - 1 do'subheaderrowclass'}} for j },v in ipairs10) preprocessSingleArg(prefixTable'subheaderstyle') do local prefixArgName = v.prefix .. tostring preprocessSingleArg(i'subheaderclass') if origArgs[prefixArgName] then preprocessArgs({ moreArgumentsExist {prefix = 'image', depend = true -- Do another loop if any arguments are found{'caption', 'imagerowclass'}} }, even blank ones.10) preprocessSingleArg('captionstyle') preprocessSingleArg('imagestyle') preprocessSingleArg(prefixArgName'imageclass') end preprocessArgs({ -- Process the depend table if the {prefix argument is present and not blank= 'header'}, or -- we are processing "prefix1" and " {prefix" is present and not blank= 'data', depend = {'label'}}, and -- if the depend table is present. {prefix = 'rowclass'}, if v.depend and (args[prefixArgName] or (i {prefix ='rowstyle'}, {prefix = 1 and args[v.'rowcellstyle'}, {prefix]= 'class'} }, 50) preprocessSingleArg('headerclass') then for j,dependValue in ipairs preprocessSingleArg('headerstyle') preprocessSingleArg(v.depend'labelstyle') do local dependArgName = dependValue .. tostring preprocessSingleArg(i'datastyle') preprocessSingleArg(dependArgName'below') end preprocessSingleArg('belowclass') end preprocessSingleArg('belowstyle') end preprocessSingleArg('name') end -- different behaviour for italics if blank or absent a args['italic title'] = a + steporigArgs['italic title'] preprocessSingleArg('decat') preprocessSingleArg('templatestyles') end preprocessSingleArg('child templatestyles') preprocessSingleArg('grandchild templatestyles')

-- If called via #invoke, use the args passed into the invoking template. -- Otherwise, for testing purposes, assume args are being passed directly in. if frame == mw.getCurrentFrame() then origArgs = frame:getParent().args else origArgs = frame end -- Parse the data parameters in the same order that the old {{infobox}} did, so that -- references etc. will display in the expected places. Parameters that depend on -- another parameter are only processed if that parameter is present, to avoid -- phantom references appearing in article reference lists. preprocessSingleArg parseDataParameters('child') preprocessSingleArg('bodyclass') preprocessSingleArg return _infobox('subbox') preprocessSingleArg('bodystyle')end preprocessSingleArg('title') preprocessSingleArg('titleclass')-- For calling via #invoke within a template preprocessSingleArgfunction p.infoboxTemplate('titlestyle'frame) preprocessSingleArg('above') preprocessSingleArg('aboveclass') preprocessSingleArg('abovestyle') preprocessArgs({ {prefix = 'subheader', depend origArgs = {'subheaderstyle', 'subheaderrowclass'}} } for k, 10) preprocessSingleArgv in pairs('subheaderstyle'frame.args) preprocessSingleArg('subheaderclass') preprocessArgs({ {prefix do origArgs[k] = 'image', depend = {'caption', 'imagerowclass'}} }, 10) preprocessSingleArgmw.text.trim('captionstyle'v)end preprocessSingleArg('imagestyle') preprocessSingleArg('imageclass') preprocessArgs({ {prefix = 'header'}, {prefix = 'data', depend = {'label'}}, {prefix = 'rowclass'}, {prefix = 'rowstyle'}, {prefix = 'rowcellstyle'}, {prefix = 'class'}, {prefix = 'dataid'}, {prefix = 'labelid'}, {prefix = 'headerid'}, {prefix = 'rowid'} }, 50) preprocessSingleArg('headerclass') preprocessSingleArg('headerstyle') preprocessSingleArg('labelstyle') preprocessSingleArg('datastyle') preprocessSingleArg('below') preprocessSingleArg('belowclass') preprocessSingleArg('belowstyle') preprocessSingleArg('name') args['italic title'] = origArgs['italic title'] -- different behaviour if blank or absent preprocessSingleArg parseDataParameters('decat') return _infobox()