Awards rack: no TOC steal; full awards list under ribbons
Infobox: drop certificate/arrive/depart/years; expand other_class codes
 
(29 intermediate revisions by the same user not shown)
Line 185: Line 185:
'physically unfit', 'unfit for', 'relieved prior', 'relieved of',
'physically unfit', 'unfit for', 'relieved prior', 'relieved of',
'kicked', 'eliminated from', 'not graduated', 'did not graduate',
'kicked', 'eliminated from', 'not graduated', 'did not graduate',
'excess absence', 'illness', 'sick call', 'medical board',
'psychiatr', 'neurot', 'homosexual', 'suicid', 'alcohol', 'drunk',
'intoxicat', 'venereal', 'syphili', 'gonorrh', 'mental case',
'mental illness', 'nervous breakdown',
'non-graduate', 'non graduate', 'nongraduate', 'certificate listed as ng',
}
}


Line 451: Line 456:
EE = 'Estonia',
EE = 'Estonia',
LA = 'Latvia',
LA = 'Latvia',
LAT = 'Latvia',
LI = 'Lithuania',
LI = 'Lithuania',
LT = 'Lithuania',
LT = 'Lithuania',
LV = 'Latvia',
LV = 'Latvia',
AL = 'Albania',
AL = 'Albania',
ALB = 'Albania',
BU = 'Bulgaria',
BU = 'Bulgaria',
BUL = 'Bulgaria',
BG = 'Bulgaria',
BG = 'Bulgaria',
LUX = 'Luxembourg',
BRA = 'Brazil',
IR = 'Ireland',
IR = 'Ireland',
IE = 'Ireland',
IE = 'Ireland',
PA = 'Palestine',
PA = 'Palestine',
PAL = 'Palestine',
EG = 'Egypt',
EG = 'Egypt',
JA = 'Japan',
JA = 'Japan',
Line 466: Line 477:
BR = 'Brazil',
BR = 'Brazil',
AR = 'Argentina',
AR = 'Argentina',
ARG = 'Argentina',
PE = 'Peru',
PE = 'Peru',
CO = 'Colombia',
CO = 'Colombia',
COL = 'Colombia',
LU = 'Luxembourg',
LU = 'Luxembourg',
ME = 'Mexico',
CHN = 'China',
LITH = 'Lithuania',
PRTG = 'Portugal',
PT = 'Portugal',
DR = 'Dominican Republic',
DO = 'Dominican Republic',
OTH = 'Other',
OTH = 'Other',
OTHER = 'Other',
OTHER = 'Other',
Line 494: Line 514:
ISLAM = 'Muslim',
ISLAM = 'Muslim',
Q = 'Quaker',
Q = 'Quaker',
QU = 'Quaker',
QUA = 'Quaker',
QUAKER = 'Quaker',
FRIENDS = 'Quaker',
N = 'None',
N = 'None',
X = 'Not stated',
X = 'Not stated',
Line 663: Line 687:
key = mw.ustring.gsub(key, '%s+', ' ')
key = mw.ustring.gsub(key, '%s+', ' ')
key = trim(key)
key = trim(key)
if RELIGION_NAME[key] then
local mapped = RELIGION_NAME[key]
return RELIGION_NAME[key]
if mapped then
-- Hide non-informative roster placeholders from the infobox.
if mapped == 'Not stated' or mapped == 'None' or mapped == 'Unknown' then
return ''
end
return mapped
end
end
local lower = mw.ustring.lower(s)
local lower = mw.ustring.lower(s)
if lower == 'not stated' or lower == 'none' or lower == 'unknown'
or lower == 'n/a' or lower == 'na' then
return ''
end
if lower == 'hebrew' or lower == 'jewish' or lower == 'jew'
if lower == 'hebrew' or lower == 'jewish' or lower == 'jew'
or mw.ustring.find(lower, 'jewish', 1, true)
or mw.ustring.find(lower, 'jewish', 1, true)
or mw.ustring.find(lower, 'hebrew', 1, true) then
or mw.ustring.find(lower, 'hebrew', 1, true) then
return 'Jewish'
return 'Jewish'
end
if lower == 'quaker' or lower == 'friends' then
return 'Quaker'
end
end
return prettyProse(s)
return prettyProse(s)
end
end


local function prettyNamePart(s)
-- Roster "other_class" codes → readable course names (By The Numbers / MITC charts).
return prettyNamePhrase(s, false)
local function expandOtherClassToken(tok)
end
tok = tidyDisplay(tok)
if tok == '' then
return ''
end
local u = mw.ustring.upper(tok)
u = mw.ustring.gsub(u, '%s+', ' ')
u = trim(u)


local function isNegativeClause(s)
local n = mw.ustring.match(u, '^SC%s*B%s*(%d+)$')
local lower = mw.ustring.lower(s)
if n then
if lower == 'failed' or mw.ustring.find(lower, '^failed%s') or mw.ustring.find(lower, '%sfailed%s') or mw.ustring.find(lower, '%sfailed$') then
return 'Special Course B ' .. n
return true
end
n = mw.ustring.match(u, '^SC%s*(%d+)$')
if n then
-- SC# aligns with AGF Photo Interpretation / “Special Course” numbering
-- (e.g. SC8 = Special Course 8 in PI).
return 'Special Course ' .. n
end
n = mw.ustring.match(u, '^DC%s*(%d+)$')
if n then
return 'Division Class ' .. n
end
n = mw.ustring.match(u, '^MITU%s*(%d+)$')
if n then
return 'Mobile Intelligence Training Unit ' .. n
end
n = mw.ustring.match(u, '^RDC%s*(%d+)$')
if n then
return 'Redeployment Class ' .. n
end
n = mw.ustring.match(u, '^RCM%s*(%d+)$')
if n then
return 'Radio Countermeasures Class ' .. n
end
n = mw.ustring.match(u, '^OB%s*(%d+)$')
if n then
return 'Order of Battle Class ' .. n
end
end
for _, phrase in ipairs(NEGATIVE_PHRASES) do
if u == 'SIG' or u == 'SIG-SIG' or mw.ustring.match(u, '^SIG[%s%-]') then
if mw.ustring.find(lower, phrase, 1, true) then
return 'Special Intelligence Group–Signal'
return true
end
end
end
return false
end


local function normalizeNoteKey(s)
local unitNum, unitKind = mw.ustring.match(u, '^(%d+)(?:ST|ND|RD|TH)%s+(.+)$')
s = mw.ustring.lower(trim(tidyDisplay(s)))
if unitNum and unitKind then
s = mw.ustring.gsub(s, '^also%s+', '')
local kind = trim(unitKind)
s = mw.ustring.gsub(s, '[^%w%s%-/]', ' ')
if kind == 'INF' then
s = mw.ustring.gsub(s, '%s+', ' ')
kind = 'Infantry'
return trim(s)
elseif kind == 'ARMD' then
end
kind = 'Armored'
 
else
local function dateOnlyFragment(s)
kind = prettyProse(kind)
return mw.ustring.match(trim(s), '^(%d%d?/%d%d?/%d%d%d?%d?)%.?$')
end
end
local ord = unitNum
 
local last = mw.ustring.sub(unitNum, -1)
local function joinDateFollowons(items)
local last2 = mw.ustring.len(unitNum) >= 2 and mw.ustring.sub(unitNum, -2) or ''
local out = {}
if last2 ~= '11' and last2 ~= '12' and last2 ~= '13' then
for _, clause in ipairs(items) do
if last == '1' then
local date = dateOnlyFragment(clause)
ord = unitNum .. 'st'
if date and #out > 0 then
elseif last == '2' then
local prev = mw.ustring.gsub(out[#out], '[ ,;]+$', '')
ord = unitNum .. 'nd'
if mw.ustring.sub(prev, -mw.ustring.len(date)) ~= date then
elseif last == '3' then
out[#out] = prev .. ', ' .. date
ord = unitNum .. 'rd'
else
ord = unitNum .. 'th'
end
end
elseif clause ~= '' then
else
table.insert(out, clause)
ord = unitNum .. 'th'
end
end
return ord .. ' ' .. kind
end
end
return out
 
return prettyProse(tok)
end
end


local function sanitizeNote(s)
local function expandOtherClass(raw)
s = tidyDisplay(s)
raw = tidyDisplay(raw)
if s == '' then
if raw == '' then
return ''
return ''
end
end
local lower = mw.ustring.lower(s)
local parts = {}
if mw.ustring.find(lower, 'no notes were in the source', 1, true) then
for piece in mw.ustring.gmatch(raw, '[^;,]+') do
return ''
local expanded = expandOtherClassToken(piece)
end
if expanded ~= '' then
local kept = {}
table.insert(parts, expanded)
for clause in mw.text.gsplit(s, ';', true) do
clause = trim(clause)
if clause ~= '' then
for sent in mw.text.gsplit(clause, '. ', true) do
sent = trim(sent)
sent = mw.ustring.gsub(sent, '%.$', '')
if sent ~= '' and not isNegativeClause(sent) then
table.insert(kept, prettyProse(sent))
end
end
end
end
end
end
return table.concat(kept, '; ')
return table.concat(parts, '; ')
end
end


local function containsIgnoreCase(haystack, needle)
local function prettyNamePart(s)
return mw.ustring.find(mw.ustring.lower(haystack), mw.ustring.lower(needle), 1, true) ~= nil
return prettyNamePhrase(s, false)
end
end


local function displayName(frame)
local function isNegativeClause(s)
local first = prettyNamePart(parentArg(frame, 'first'))
local lower = mw.ustring.lower(s)
local middle = prettyNamePart(parentArg(frame, 'middle'))
if lower == 'failed' or mw.ustring.find(lower, '^failed%s') or mw.ustring.find(lower, '%sfailed%s') or mw.ustring.find(lower, '%sfailed$') then
local surname = prettyNamePart(parentArg(frame, 'surname'))
return true
local suffix = prettyNamePart(parentArg(frame, 'suffix'))
local parts = {}
if first ~= '' then
table.insert(parts, first)
end
end
if middle ~= '' then
-- Bare class-chart non-graduate marker (e.g. "NG Class 10 OB", trailing "NG")
table.insert(parts, middle)
if lower == 'ng' or mw.ustring.find(lower, '^ng%s') or mw.ustring.find(lower, '%sng%s') or mw.ustring.find(lower, '%sng$') or mw.ustring.find(lower, 'nongrad') then
return true
end
end
if surname ~= '' then
for _, phrase in ipairs(NEGATIVE_PHRASES) do
table.insert(parts, surname)
if mw.ustring.find(lower, phrase, 1, true) then
end
return true
local name = table.concat(parts, ' ')
if suffix ~= '' then
if name ~= '' then
name = name .. ', ' .. suffix
else
name = suffix
end
end
end
end
if name == '' then
return false
name = 'This soldier'
end
end
 
return name
local function normalizeNoteKey(s)
s = mw.ustring.lower(trim(tidyDisplay(s)))
s = mw.ustring.gsub(s, '^also%s+', '')
s = mw.ustring.gsub(s, '[^%w%s%-/]', ' ')
s = mw.ustring.gsub(s, '%s+', ' ')
return trim(s)
end
 
local function dateOnlyFragment(s)
return mw.ustring.match(trim(s), '^(%d%d?/%d%d?/%d%d%d?%d?)%.?$')
end
end


local function classLinkList(raw, withPrefix)
local function joinDateFollowons(items)
local out = {}
local out = {}
for part in mw.text.gsplit(raw, ';', true) do
for _, clause in ipairs(items) do
part = trim(part)
local date = dateOnlyFragment(clause)
if part ~= '' then
if date and #out > 0 then
if withPrefix then
local prev = mw.ustring.gsub(out[#out], '[ ,;]+$', '')
table.insert(out, string.format('[[Class %s]]', part))
if mw.ustring.sub(prev, -mw.ustring.len(date)) ~= date then
else
out[#out] = prev .. ', ' .. date
table.insert(out, string.format('[[Class %s|%s]]', part, part))
end
end
elseif clause ~= '' then
table.insert(out, clause)
end
end
end
end
Line 793: Line 851:
end
end


local function isJunkIpwItalianLabel(part)
local function sanitizeNote(s)
local lower = mw.ustring.lower(trim(part))
s = tidyDisplay(s)
local spaced = mw.ustring.gsub(lower, '%s+', ' ')
if s == '' then
local junk = {
return ''
['16063'] = true, ['16095'] = true, ['16302'] = true,
['16320'] = true, ['16695'] = true,
['1st army'] = true, ['2 day'] = true, ['2/23/44'] = true,
['468th cic'] = true, ['5/7/45'] = true, ['8/24/44'] = true, ['8/7/43'] = true,
['apid'] = true, ['i-32'] = true, ['mis-eto'] = true, ['mitc'] = true,
['pac'] = true, ['sc7'] = true, ['shaef'] = true, ['v-831'] = true,
}
return junk[spaced] == true
end
 
local function normalizeIpwItalianCode(part)
part = trim(part)
if part == '' or isJunkIpwItalianLabel(part) then
return nil
end
end
local spaced = mw.ustring.lower(mw.ustring.gsub(part, '%s+', ' '))
local lower = mw.ustring.lower(s)
if spaced == '5th class' or spaced == 'italian 5th class' then
if mw.ustring.find(lower, 'no notes were in the source', 1, true) then
return '5'
return ''
end
end
return part
local kept = {}
for clause in mw.text.gsplit(s, ';', true) do
clause = trim(clause)
if clause ~= '' then
for sent in mw.text.gsplit(clause, '. ', true) do
sent = trim(sent)
sent = mw.ustring.gsub(sent, '%.$', '')
if sent ~= '' and not isNegativeClause(sent) then
table.insert(kept, prettyProse(sent))
end
end
end
end
return table.concat(kept, '; ')
end
 
local function containsIgnoreCase(haystack, needle)
return mw.ustring.find(mw.ustring.lower(haystack), mw.ustring.lower(needle), 1, true) ~= nil
end
end


local function isJunkIpwLabel(part)
local function displayName(frame)
local lower = mw.ustring.lower(trim(part))
local first = prettyNamePart(parentArg(frame, 'first'))
lower = mw.ustring.gsub(lower, '%s+', ' ')
local middle = prettyNamePart(parentArg(frame, 'middle'))
lower = mw.ustring.gsub(lower, '%s*%?+%s*$', '')
local surname = prettyNamePart(parentArg(frame, 'surname'))
lower = trim(lower)
local suffix = prettyNamePart(parentArg(frame, 'suffix'))
if lower == 'csu' or lower == 'fh' or lower == 'fid' or lower == 'illness'
local parts = {}
or lower == 'mfiu-5' or lower == 'mfiu 5' or lower == 'mitu 5' or lower == 'mitu-5'
if first ~= '' then
or lower == 'mrbc4' or lower == 'mrbc 4' or lower == 't force' or lower == 'to cic' then
table.insert(parts, first)
return true
end
end
local compact = mw.ustring.gsub(lower, '[%s%-]+', '')
if middle ~= '' then
if compact == 'docteam' or compact == 'mfiu5' or compact == 'mitu5'
table.insert(parts, middle)
or compact == 'mrbc4' or compact == 'tforce' or compact == 'tocic' then
return true
end
end
return false
if surname ~= '' then
end
table.insert(parts, surname)
 
local function normalizeIpwTeamCode(part)
part = trim(part)
if part == '' then
return nil, nil
end
end
local original = part
local name = table.concat(parts, ' ')
part = mw.ustring.gsub(part, '%s*%?+%s*$', '')
if suffix ~= '' then
part = trim(part)
if name ~= '' then
if part == '' then
name = name .. ', ' .. suffix
return nil, original
else
end
name = suffix
local lower = mw.ustring.lower(part)
if mw.ustring.find(lower, 'armd', 1, true) or mw.ustring.find(lower, 'armored', 1, true) then
return nil, original, nil
end
local miiNum, miiLetter = mw.ustring.match(part, '^(%d+)%s*[%-–—]%s*([A-Za-z])$')
if miiNum then
miiLetter = mw.ustring.upper(miiLetter)
local mii = miiNum .. '-' .. miiLetter
if miiLetter == 'R' and (miiNum == '540' or miiNum == '545' or miiNum == '546') then
mii = miiNum
end
end
return nil, mii, mii
end
end
local num = mw.ustring.match(part, '^(%d+)[Tt]$')
if name == '' then
if num then
name = 'This soldier'
return num, num, nil
end
end
if mw.ustring.match(lower, '^%d+(st|nd|rd|th)$') then
return name
return nil, original, nil
end
end
 
if isJunkIpwLabel(part) then
local function classLinkList(raw, withPrefix)
return nil, original, nil
local ClassDates = require('Module:ClassDates')
end
return part, part, nil
end
 
local function teamLinkList(raw, pagePrefix, label)
local out = {}
local out = {}
local isIpw = mw.ustring.find(pagePrefix, 'IPW', 1, true) == 1
for part in mw.text.gsplit(raw, ';', true) do
for part in mw.text.gsplit(raw, ';', true) do
part = trim(part)
part = mw.ustring.gsub(part, '[#<>%[%]|{}]', '')
part = trim(part)
part = trim(part)
if part ~= '' then
if part ~= '' then
if pagePrefix == 'IPW Italian ' then
local info = ClassDates.lookup(part)
local code = normalizeIpwItalianCode(part)
local dates = info and info.dates or ''
if code then
if withPrefix then
table.insert(out, string.format('[[Team %s%s|%s %s]]', pagePrefix, code, label, code))
if dates ~= '' then
table.insert(out, string.format('[[:Category:Class %s|Class %s]] (%s)', part, part, dates))
else
else
table.insert(out, part)
table.insert(out, string.format('[[:Category:Class %s|Class %s]]', part, part))
end
elseif isIpw then
local code, shown, mii = normalizeIpwTeamCode(part)
if mii then
table.insert(out, string.format('[[Team MII %s|MII %s]]', mii, mii))
elseif code then
table.insert(out, string.format('[[Team %s%s|%s %s]]', pagePrefix, code, label, shown))
elseif shown then
table.insert(out, shown)
end
end
else
else
table.insert(out, string.format('[[Team %s%s|%s %s]]', pagePrefix, part, label, part))
if dates ~= '' then
table.insert(out, string.format('[[:Category:Class %s|%s]] (%s)', part, part, dates))
else
table.insert(out, string.format('[[:Category:Class %s|%s]]', part, part))
end
end
end
end
end
end
end
return table.concat(out, ', ')
return out
end
end


local function addHeader(tbl, text)
local function isJunkIpwItalianLabel(part)
tbl:tag('tr'):tag('th')
local lower = mw.ustring.lower(trim(part))
:attr('colspan', '2')
local spaced = mw.ustring.gsub(lower, '%s+', ' ')
:addClass('infobox-header')
local junk = {
:wikitext(text)
['16063'] = true, ['16095'] = true, ['16302'] = true,
['16320'] = true, ['16695'] = true,
['1st army'] = true, ['2 day'] = true, ['2/23/44'] = true,
['468th cic'] = true, ['5/7/45'] = true, ['8/24/44'] = true, ['8/7/43'] = true,
['apid'] = true, ['i-32'] = true, ['mis-eto'] = true, ['mitc'] = true,
['pac'] = true, ['sc7'] = true, ['shaef'] = true, ['v-831'] = true,
}
return junk[spaced] == true
end
end


local function realCertificate(s)
local function normalizeIpwItalianCode(part)
s = trim(s)
part = trim(part)
if s == '' then
if part == '' or isJunkIpwItalianLabel(part) then
return ''
return nil
end
end
-- Placeholders: *, A, 5, #, and any other single character.
local spaced = mw.ustring.lower(mw.ustring.gsub(part, '%s+', ' '))
if mw.ustring.len(s) == 1 then
if spaced == '5th class' or spaced == 'italian 5th class' then
return ''
return '5'
end
end
return s
return part
end
end


local function addRow(tbl, label, value, dataClass)
local function isJunkIpwLabel(part)
if trim(value) == '' then
local lower = mw.ustring.lower(trim(part))
return
lower = mw.ustring.gsub(lower, '%s+', ' ')
lower = mw.ustring.gsub(lower, '%s*%?+%s*$', '')
lower = trim(lower)
if lower == 'csu' or lower == 'fh' or lower == 'fid' or lower == 'illness'
or lower == 'mfiu-5' or lower == 'mfiu 5' or lower == 'mitu 5' or lower == 'mitu-5'
or lower == 'mrbc4' or lower == 'mrbc 4' or lower == 't force' or lower == 'to cic' then
return true
end
end
local tr = tbl:tag('tr')
local compact = mw.ustring.gsub(lower, '[%s%-]+', '')
tr:tag('th')
if compact == 'docteam' or compact == 'mfiu5' or compact == 'mitu5'
:addClass('infobox-label')
or compact == 'mrbc4' or compact == 'tforce' or compact == 'tocic' then
:css('display', 'table-cell')
return true
:css('width', '38%')
:css('font-weight', 'bold')
:css('text-align', 'left')
:css('vertical-align', 'top')
:wikitext(label)
local td = tr:tag('td')
:addClass('infobox-data')
:css('display', 'table-cell')
:css('vertical-align', 'top')
if dataClass and dataClass ~= '' then
td:addClass(dataClass)
end
end
td:wikitext(value)
return false
end
end


local function yearOnly(s)
local function normalizeIpwTeamCode(part)
s = trim(s)
part = trim(part)
if s == '' or s == '?' then
if part == '' then
return ''
return nil, nil
end
end
local year = mw.ustring.match(s, '(%d%d%d%d)')
local original = part
if year then
part = mw.ustring.gsub(part, '%s*%?+%s*$', '')
return year
part = trim(part)
if part == '' then
return nil, original
end
local lower = mw.ustring.lower(part)
if mw.ustring.find(lower, 'armd', 1, true) or mw.ustring.find(lower, 'armored', 1, true) then
return nil, original, nil
end
local miiNum, miiLetter = mw.ustring.match(part, '^(%d+)%s*[%-–—]%s*([A-Za-z])$')
if miiNum then
miiLetter = mw.ustring.upper(miiLetter)
local mii = miiNum .. '-' .. miiLetter
if miiLetter == 'R' and (miiNum == '540' or miiNum == '545' or miiNum == '546') then
mii = miiNum
end
return nil, mii, mii
end
local num = mw.ustring.match(part, '^(%d+)[Tt]$')
if num then
return num, num, nil
end
if mw.ustring.match(lower, '^%d+(st|nd|rd|th)$') then
return nil, original, nil
end
if isJunkIpwLabel(part) then
return nil, original, nil
end
end
return ''
return part, part, nil
end
end


local RANK_MAP = {
local function teamLinkList(raw, pagePrefix, label)
['PVT'] = 'Private',
local out = {}
['PVTE'] = 'Private',
local isIpw = mw.ustring.find(pagePrefix, 'IPW', 1, true) == 1
['PRIVATE'] = 'Private',
for part in mw.text.gsplit(raw, ';', true) do
['PFC'] = 'Private First Class',
part = trim(part)
['P F C'] = 'Private First Class',
part = mw.ustring.gsub(part, '[#<>%[%]|{}]', '')
['PRIVATE FIRST CLASS'] = 'Private First Class',
part = trim(part)
['CPL'] = 'Corporal',
if part ~= '' then
['CORPORAL'] = 'Corporal',
if pagePrefix == 'IPW Italian ' then
['T/5'] = 'Technician Fifth Grade',
local code = normalizeIpwItalianCode(part)
['TEC5'] = 'Technician Fifth Grade',
if code then
['TEC 5'] = 'Technician Fifth Grade',
table.insert(out, string.format('[[Team %s%s|%s %s]]', pagePrefix, code, label, code))
['T5'] = 'Technician Fifth Grade',
else
['TECH 5'] = 'Technician Fifth Grade',
table.insert(out, part)
['SGT'] = 'Sergeant',
end
['SERGEANT'] = 'Sergeant',
elseif isIpw then
['T/4'] = 'Technician Fourth Grade',
local code, shown, mii = normalizeIpwTeamCode(part)
['TEC4'] = 'Technician Fourth Grade',
if mii then
['TEC 4'] = 'Technician Fourth Grade',
table.insert(out, string.format('[[Team MII %s|MII %s]]', mii, mii))
['T4'] = 'Technician Fourth Grade',
elseif code then
['TECH 4'] = 'Technician Fourth Grade',
table.insert(out, string.format('[[Team %s%s|%s %s]]', pagePrefix, code, label, shown))
['S/SGT'] = 'Staff Sergeant',
elseif shown then
['SSGT'] = 'Staff Sergeant',
table.insert(out, shown)
['S SGT'] = 'Staff Sergeant',
end
['STAFF SERGEANT'] = 'Staff Sergeant',
else
['T/3'] = 'Technician Third Grade',
table.insert(out, string.format('[[Team %s%s|%s %s]]', pagePrefix, part, label, part))
['TEC3'] = 'Technician Third Grade',
end
['TEC 3'] = 'Technician Third Grade',
end
['T3'] = 'Technician Third Grade',
end
['TECH 3'] = 'Technician Third Grade',
return table.concat(out, ', ')
['T/SGT'] = 'Technical Sergeant',
end
['TSGT'] = 'Technical Sergeant',
 
['T SGT'] = 'Technical Sergeant',
local function addHeader(tbl, text)
['TECHNICAL SERGEANT'] = 'Technical Sergeant',
tbl:tag('tr'):tag('th')
['1ST SGT'] = 'First Sergeant',
:attr('colspan', '2')
['1SGT'] = 'First Sergeant',
:addClass('infobox-header')
['FIRST SERGEANT'] = 'First Sergeant',
:wikitext(text)
['M/SGT'] = 'Master Sergeant',
end
['MSGT'] = 'Master Sergeant',
 
['MASTER SERGEANT'] = 'Master Sergeant',
local function realCertificate(s)
['WO'] = 'Warrant Officer',
s = trim(s)
['WOJG'] = 'Warrant Officer',
if s == '' then
['WARRANT OFFICER'] = 'Warrant Officer',
return ''
['CWO'] = 'Chief Warrant Officer',
end
['2ND LT'] = 'Second Lieutenant',
-- Placeholders: *, A, 5, #, and any other single character.
['2D LT'] = 'Second Lieutenant',
if mw.ustring.len(s) == 1 then
['2LT'] = 'Second Lieutenant',
return ''
['SECOND LIEUTENANT'] = 'Second Lieutenant',
end
['1ST LT'] = 'First Lieutenant',
-- NG = non-graduate marker on class charts, not a certificate number.
['1LT'] = 'First Lieutenant',
local upper = mw.ustring.upper(s)
['FIRST LIEUTENANT'] = 'First Lieutenant',
if upper == 'NG' or upper == 'N/G' or upper == 'N.G.' then
['LT'] = 'Lieutenant',
return ''
['LIEUTENANT'] = 'Lieutenant',
end
['CAPT'] = 'Captain',
return s
['CPT'] = 'Captain',
end
['CAPTAIN'] = 'Captain',
 
['MAJ'] = 'Major',
local function addRow(tbl, label, value, dataClass)
['MAJOR'] = 'Major',
if trim(value) == '' then
['LT COL'] = 'Lieutenant Colonel',
return
['LTCOL'] = 'Lieutenant Colonel',
end
['LTC'] = 'Lieutenant Colonel',
local tr = tbl:tag('tr')
['LIEUTENANT COLONEL'] = 'Lieutenant Colonel',
tr:tag('th')
['COL'] = 'Colonel',
:addClass('infobox-label')
['COLONEL'] = 'Colonel',
:css('display', 'table-cell')
['BRIG GEN'] = 'Brigadier General',
:css('width', '38%')
['BG'] = 'Brigadier General',
:css('font-weight', 'bold')
['BRIGADIER GENERAL'] = 'Brigadier General',
:css('text-align', 'left')
['MAJ GEN'] = 'Major General',
:css('vertical-align', 'top')
['MG'] = 'Major General',
:wikitext(label)
['MAJOR GENERAL'] = 'Major General',
local td = tr:tag('td')
['LT GEN'] = 'Lieutenant General',
:addClass('infobox-data')
['LIEUTENANT GENERAL'] = 'Lieutenant General',
:css('display', 'table-cell')
['GEN'] = 'General',
:css('vertical-align', 'top')
['GENERAL'] = 'General',
if dataClass and dataClass ~= '' then
['TECH'] = 'Technician',
td:addClass(dataClass)
['TEC'] = 'Technician',
end
}
td:wikitext(value)
end


local function expandRank(raw)
local function yearOnly(s)
raw = trim(raw)
s = trim(s)
if raw == '' then
if s == '' or s == '?' then
return ''
return ''
end
end
local key = mw.ustring.upper(raw)
local year = mw.ustring.match(s, '(%d%d%d%d)')
key = mw.ustring.gsub(key, '%.', '')
if year then
key = mw.ustring.gsub(key, '%s+', ' ')
return year
key = trim(key)
end
return RANK_MAP[key] or raw
return ''
end
end


local BRANCH_MAP = {
local RANK_MAP = {
['INF'] = 'Infantry',
['PVT'] = 'Private',
['INFANTRY'] = 'Infantry',
['PVTE'] = 'Private',
['FA'] = 'Field Artillery',
['PRIVATE'] = 'Private',
['FIELD ARTILLERY'] = 'Field Artillery',
['PFC'] = 'Private First Class',
['CAC'] = 'Coast Artillery Corps',
['P F C'] = 'Private First Class',
['CA'] = 'Coast Artillery',
['PRIVATE FIRST CLASS'] = 'Private First Class',
['COAST ARTILLERY'] = 'Coast Artillery',
['CPL'] = 'Corporal',
['AC'] = 'Air Corps',
['CORPORAL'] = 'Corporal',
['AAF'] = 'Army Air Forces',
['T/5'] = 'Technician Fifth Grade',
['AIR CORPS'] = 'Air Corps',
['TEC5'] = 'Technician Fifth Grade',
['QMC'] = 'Quartermaster Corps',
['TEC 5'] = 'Technician Fifth Grade',
['QC'] = 'Quartermaster Corps',
['T5'] = 'Technician Fifth Grade',
['QUARTERMASTER'] = 'Quartermaster Corps',
['TECH 5'] = 'Technician Fifth Grade',
['CAV'] = 'Cavalry',
['SGT'] = 'Sergeant',
['CAVALRY'] = 'Cavalry',
['SERGEANT'] = 'Sergeant',
['CE'] = 'Corps of Engineers',
['T/4'] = 'Technician Fourth Grade',
['ENG'] = 'Corps of Engineers',
['TEC4'] = 'Technician Fourth Grade',
['ENGINEERS'] = 'Corps of Engineers',
['TEC 4'] = 'Technician Fourth Grade',
['CMP'] = 'Corps of Military Police',
['T4'] = 'Technician Fourth Grade',
['MP'] = 'Military Police',
['TECH 4'] = 'Technician Fourth Grade',
['CWS'] = 'Chemical Warfare Service',
['S/SGT'] = 'Staff Sergeant',
['AUS'] = 'Army of the United States',
['SSGT'] = 'Staff Sergeant',
['SC'] = 'Signal Corps',
['S SGT'] = 'Staff Sergeant',
['SIG'] = 'Signal Corps',
['STAFF SERGEANT'] = 'Staff Sergeant',
['SIG C'] = 'Signal Corps',
['T/3'] = 'Technician Third Grade',
['SIGC'] = 'Signal Corps',
['TEC3'] = 'Technician Third Grade',
['SIGNAL CORPS'] = 'Signal Corps',
['TEC 3'] = 'Technician Third Grade',
['ORD'] = 'Ordnance Department',
['T3'] = 'Technician Third Grade',
['ORDNANCE'] = 'Ordnance Department',
['TECH 3'] = 'Technician Third Grade',
['MAC'] = 'Medical Administrative Corps',
['T/SGT'] = 'Technical Sergeant',
['MC'] = 'Medical Corps',
['TSGT'] = 'Technical Sergeant',
['MD'] = 'Medical Department',
['T SGT'] = 'Technical Sergeant',
['TC'] = 'Transportation Corps',
['TECHNICAL SERGEANT'] = 'Technical Sergeant',
['MI'] = 'Military Intelligence',
['1ST SGT'] = 'First Sergeant',
['MIS'] = 'Military Intelligence Service',
['1SGT'] = 'First Sergeant',
['INT'] = 'Intelligence',
['FIRST SERGEANT'] = 'First Sergeant',
['CIC'] = 'Counter Intelligence Corps',
['M/SGT'] = 'Master Sergeant',
['AGD'] = "Adjutant General's Department",
['MSGT'] = 'Master Sergeant',
['USMC'] = 'United States Marine Corps',
['MASTER SERGEANT'] = 'Master Sergeant',
['USMCR'] = 'United States Marine Corps Reserve',
['WO'] = 'Warrant Officer',
['AA'] = 'Antiaircraft',
['WOJG'] = 'Warrant Officer',
['AAA'] = 'Antiaircraft Artillery',
['WARRANT OFFICER'] = 'Warrant Officer',
['TD'] = 'Tank Destroyer',
['CWO'] = 'Chief Warrant Officer',
['FD'] = 'Finance Department',
['2ND LT'] = 'Second Lieutenant',
['GSC'] = 'General Staff Corps',
['2D LT'] = 'Second Lieutenant',
['ARMD F'] = 'Armored Force',
['2LT'] = 'Second Lieutenant',
['ARMD'] = 'Armored',
['SECOND LIEUTENANT'] = 'Second Lieutenant',
['ARMOR'] = 'Armor',
['1ST LT'] = 'First Lieutenant',
['SSF'] = 'Special Service Force',
['1LT'] = 'First Lieutenant',
['PA'] = 'Philippine Army',
['FIRST LIEUTENANT'] = 'First Lieutenant',
['RCE'] = 'Royal Canadian Engineers',
['LT'] = 'Lieutenant',
['RCA'] = 'Royal Canadian Artillery',
['LIEUTENANT'] = 'Lieutenant',
['CHC'] = 'Chaplain Corps',
['CAPT'] = 'Captain',
['CHP'] = 'Chaplain Corps',
['CPT'] = 'Captain',
['CAO'] = 'Civil Affairs',
['CAPTAIN'] = 'Captain',
['CAU'] = 'Civil Affairs',
['MAJ'] = 'Major',
['MAJOR'] = 'Major',
['LT COL'] = 'Lieutenant Colonel',
['LTCOL'] = 'Lieutenant Colonel',
['LTC'] = 'Lieutenant Colonel',
['LIEUTENANT COLONEL'] = 'Lieutenant Colonel',
['COL'] = 'Colonel',
['COLONEL'] = 'Colonel',
['BRIG GEN'] = 'Brigadier General',
['BG'] = 'Brigadier General',
['BRIGADIER GENERAL'] = 'Brigadier General',
['MAJ GEN'] = 'Major General',
['MG'] = 'Major General',
['MAJOR GENERAL'] = 'Major General',
['LT GEN'] = 'Lieutenant General',
['LIEUTENANT GENERAL'] = 'Lieutenant General',
['GEN'] = 'General',
['GENERAL'] = 'General',
['TECH'] = 'Technician',
['TEC'] = 'Technician',
}
}


local function expandBranchToken(raw)
local function expandRank(raw)
raw = trim(raw)
raw = trim(raw)
if raw == '' then
if raw == '' then
Line 1,118: Line 1,194:
key = mw.ustring.gsub(key, '%s+', ' ')
key = mw.ustring.gsub(key, '%s+', ' ')
key = trim(key)
key = trim(key)
if BRANCH_MAP[key] then
return RANK_MAP[key] or raw
return BRANCH_MAP[key]
end
end
 
local left, right = mw.ustring.match(key, '^(.+) %((.+)%)$')
local BRANCH_MAP = {
if left and right then
['INF'] = 'Infantry',
left = trim(left)
['INFANTRY'] = 'Infantry',
right = trim(right)
['FA'] = 'Field Artillery',
local leftExp = BRANCH_MAP[left] or left
['FIELD ARTILLERY'] = 'Field Artillery',
local rightExp = BRANCH_MAP[right] or right
['CAC'] = 'Coast Artillery Corps',
if BRANCH_MAP[left] or BRANCH_MAP[right] then
['CA'] = 'Coast Artillery',
return leftExp .. ' (' .. rightExp .. ')'
['COAST ARTILLERY'] = 'Coast Artillery',
end
['AC'] = 'Air Corps',
end
['AAF'] = 'Army Air Forces',
return raw
['AIR CORPS'] = 'Air Corps',
end
['QMC'] = 'Quartermaster Corps',
 
['QC'] = 'Quartermaster Corps',
-- Small public-domain / Commons emblems uploaded as File:Branch emblem *.png
['QUARTERMASTER'] = 'Quartermaster Corps',
local BRANCH_EMBLEM = {
['CAV'] = 'Cavalry',
['United States Army'] = 'Branch emblem US Army.png',
['CAVALRY'] = 'Cavalry',
['United States Marine Corps'] = 'Branch emblem US Marine Corps.png',
['CALVALRY'] = 'Cavalry',
['United States Navy'] = 'Branch emblem US Navy.png',
['CE'] = 'Corps of Engineers',
['United States Army Air Forces'] = 'Branch emblem US Army Air Forces.png',
['ENG'] = 'Corps of Engineers',
['United States Air Force'] = 'Branch emblem US Air Force.png',
['ENGINEERS'] = 'Corps of Engineers',
['United States Coast Guard'] = 'Branch emblem US Coast Guard.png',
['CMP'] = 'Corps of Military Police',
}
['MP'] = 'Military Police',
 
['CWS'] = 'Chemical Warfare Service',
local function branchWithEmblem(name)
['AUS'] = 'Army of the United States',
name = trim(name)
['SC'] = 'Signal Corps',
if name == '' then
['SIG'] = 'Signal Corps',
return ''
['SIG C'] = 'Signal Corps',
end
['SIGC'] = 'Signal Corps',
local file = BRANCH_EMBLEM[name]
['SIGNAL CORPS'] = 'Signal Corps',
if file then
['ORD'] = 'Ordnance Department',
return '[[File:' .. file .. '|18px|link=|alt=]] ' .. name
['ORDNANCE'] = 'Ordnance Department',
end
['MAC'] = 'Medical Administrative Corps',
-- Fuzzy contains
['MC'] = 'Medical Corps',
local low = mw.ustring.lower(name)
['MD'] = 'Medical Department',
if mw.ustring.find(low, 'marine', 1, true) then
['TC'] = 'Transportation Corps',
return '[[File:Branch emblem US Marine Corps.png|18px|link=|alt=]] ' .. name
['MI'] = 'Military Intelligence',
end
['MIS'] = 'Military Intelligence Service',
if mw.ustring.find(low, 'navy', 1, true) then
['INT'] = 'Intelligence',
return '[[File:Branch emblem US Navy.png|18px|link=|alt=]] ' .. name
['CIC'] = 'Counter Intelligence Corps',
end
['AGD'] = "Adjutant General's Department",
if mw.ustring.find(low, 'air force', 1, true) or mw.ustring.find(low, 'air forces', 1, true) then
['USMC'] = 'United States Marine Corps',
return '[[File:Branch emblem US Army Air Forces.png|18px|link=|alt=]] ' .. name
['USMCR'] = 'United States Marine Corps Reserve',
end
['AA'] = 'Antiaircraft',
if mw.ustring.find(low, 'coast guard', 1, true) then
['AAA'] = 'Antiaircraft Artillery',
return '[[File:Branch emblem US Coast Guard.png|18px|link=|alt=]] ' .. name
['TD'] = 'Tank Destroyer',
end
['FD'] = 'Finance Department',
if mw.ustring.find(low, 'army', 1, true) then
['GSC'] = 'General Staff Corps',
return '[[File:Branch emblem US Army.png|18px|link=|alt=]] ' .. name
['ARMD F'] = 'Armored Force',
end
['ARMD'] = 'Armored',
return name
['ARMOR'] = 'Armor',
end
['SSF'] = 'Special Service Force',
['PA'] = 'Philippine Army',
['RCE'] = 'Royal Canadian Engineers',
['RCA'] = 'Royal Canadian Artillery',
['CHC'] = 'Chaplain Corps',
['CHP'] = 'Chaplain Corps',
['CAO'] = 'Civil Affairs',
['CAU'] = 'Civil Affairs',
}


local function expandBranch(raw)
local function expandBranchToken(raw)
raw = trim(raw)
raw = trim(raw)
if raw == '' then
if raw == '' then
return ''
return ''
end
end
local parts = {}
local key = mw.ustring.upper(raw)
for part in mw.text.gsplit(raw, ';', true) do
key = mw.ustring.gsub(key, '%.', '')
part = expandBranchToken(part)
key = mw.ustring.gsub(key, '%s+', ' ')
if part ~= '' then
key = trim(key)
table.insert(parts, branchWithEmblem(part))
if BRANCH_MAP[key] then
return BRANCH_MAP[key]
end
local left, right = mw.ustring.match(key, '^(.+) %((.+)%)$')
if left and right then
left = trim(left)
right = trim(right)
local leftExp = BRANCH_MAP[left] or left
local rightExp = BRANCH_MAP[right] or right
if BRANCH_MAP[left] or BRANCH_MAP[right] then
return leftExp .. ' (' .. rightExp .. ')'
end
end
end
end
return table.concat(parts, '; ')
return raw
end
 
local function keyEqualsAAF(part)
local key = mw.ustring.upper(trim(part))
key = mw.ustring.gsub(key, '%.', '')
key = mw.ustring.gsub(key, '%s+', ' ')
return key == 'AAF' or key == 'ARMY AIR FORCES'
end
end


local function formatBattles(raw)
-- True when a BRANCH_MAP / class_branch value is an Army arm/service, not Army/Marines/Navy.
raw = trim(raw)
local SERVICE_BRANCH_KEY = {
if raw == '' then
['AUS'] = true,
return ''
['USA'] = true,
['ARMY'] = true,
['UNITED STATES ARMY'] = true,
['US ARMY'] = true,
['USMC'] = true,
['USMCR'] = true,
['MARINES'] = true,
['MARINE CORPS'] = true,
['UNITED STATES MARINE CORPS'] = true,
['USN'] = true,
['NAVY'] = true,
['UNITED STATES NAVY'] = true,
['USCG'] = true,
['COAST GUARD'] = true,
['UNITED STATES COAST GUARD'] = true,
['AAF'] = true,
['ARMY AIR FORCES'] = true,
['UNITED STATES ARMY AIR FORCES'] = true,
['PA'] = true,
['PHILIPPINE ARMY'] = true,
['RCE'] = true,
['RCA'] = true,
}
 
local function isServiceBranchName(name)
name = trim(name)
if name == '' then
return false
end
local key = mw.ustring.upper(name)
key = mw.ustring.gsub(key, '%.', '')
key = mw.ustring.gsub(key, '%s+', ' ')
key = trim(key)
if SERVICE_BRANCH_KEY[key] then
return true
end
end
-- Allow HTML <br /> or semicolon / newline separated campaigns
local low = mw.ustring.lower(name)
raw = mw.ustring.gsub(raw, '\r', '')
if mw.ustring.find(low, 'marine', 1, true)
if mw.ustring.find(raw, '<br', 1, true) or mw.ustring.find(raw, '\n', 1, true) then
or mw.ustring.find(low, 'navy', 1, true)
return raw
or mw.ustring.find(low, 'coast guard', 1, true) then
return true
end
end
local parts = {}
if mw.ustring.find(low, 'air force', 1, true)
for part in mw.text.gsplit(raw, ';', true) do
or mw.ustring.find(low, 'air forces', 1, true) then
part = trim(part)
return true
if part ~= '' then
table.insert(parts, part)
end
end
end
if #parts <= 1 then
if mw.ustring.find(low, 'united states army', 1, true)
return raw
or low == 'army'
or low == 'u.s. army'
or low == 'us army' then
return true
end
end
return table.concat(parts, '<br />')
return false
end
end


local function formatAwardsRibbons(raw)
local function isArmOfServiceToken(raw)
raw = trim(raw)
raw = trim(raw)
if raw == '' then
if raw == '' then
return ''
return false
end
end
local files = {}
local key = mw.ustring.upper(raw)
for part in mw.text.gsplit(raw, ';', true) do
key = mw.ustring.gsub(key, '%.', '')
part = trim(part)
key = mw.ustring.gsub(key, '%s+', ' ')
part = mw.ustring.gsub(part, '^[Ff]ile:', '')
key = trim(key)
if part ~= '' then
if SERVICE_BRANCH_KEY[key] then
table.insert(files, part)
return false
end
end
end
if #files == 0 then
if BRANCH_MAP[key] then
return ''
return true
end
end
-- Wikipedia-style ribbon rack: centered table, ~4 across, full article width
local low = mw.ustring.lower(raw)
local perRow = 4
if mw.ustring.find(low, 'calvalry', 1, true) then
local out = {}
return true
table.insert(out, '{| class="wikitable soldier-ribbon-rack"')
for i, file in ipairs(files) do
if ((i - 1) % perRow) == 0 then
table.insert(out, '|-')
end
table.insert(out, '| [[File:' .. file .. '|106px|link=]]')
end
end
-- Pad last row so cells align
for _, needle in ipairs({
local rem = #files % perRow
'artillery', 'signal', 'cavalry', 'infantry', 'engineer',
if rem > 0 then
'ordnance', 'quartermaster', 'medical', 'police', 'intelligence',
for _ = rem + 1, perRow do
'armor', 'tank destroyer', 'chemical', 'chaplain', 'transportation',
table.insert(out, '|')
'adjutant',
}) do
if mw.ustring.find(low, needle, 1, true) then
return true
end
end
end
end
table.insert(out, '|}')
return false
return table.concat(out, '\n')
end
end


local function formatAwardsLegend(raw)
local function splitBranchAndArm(branchRaw, classBranchRaw, armRaw)
raw = prettyProse(trim(raw))
branchRaw = trim(branchRaw)
if raw == '' then
classBranchRaw = trim(classBranchRaw)
return ''
armRaw = trim(armRaw)
end
 
-- Split semicolon / <br> lists into bullets
local service = ''
local parts = {}
local arms = {}
raw = mw.ustring.gsub(raw, '<br%s*/?>', ';')
 
for part in mw.text.gsplit(raw, ';', true) do
local function consider(raw, preferArm)
part = trim(part)
raw = trim(raw)
part = mw.ustring.gsub(part, '^%*%s*', '')
if raw == '' then
if part ~= '' then
return
table.insert(parts, '* ' .. part)
end
for part in mw.text.gsplit(raw, ';', true) do
part = trim(part)
if part ~= '' then
local expanded = expandBranchToken(part)
if isServiceBranchName(expanded) or isServiceBranchName(part) then
if service == '' then
service = expandBranchToken(part)
if not isServiceBranchName(service) then
-- expandBranchToken may not rewrite "Army"
local low = mw.ustring.lower(part)
if mw.ustring.find(low, 'marine', 1, true) then
service = 'United States Marine Corps'
elseif mw.ustring.find(low, 'navy', 1, true) then
service = 'United States Navy'
elseif mw.ustring.find(low, 'air force', 1, true)
or mw.ustring.find(low, 'air forces', 1, true)
or keyEqualsAAF(part) then
service = 'United States Army Air Forces'
else
service = 'United States Army'
end
end
end
elseif preferArm or isArmOfServiceToken(part) or isArmOfServiceToken(expanded) then
local armName = expanded
if mw.ustring.find(mw.ustring.lower(part), 'calvalry', 1, true) then
armName = 'Cavalry'
end
local dup = false
for _, existing in ipairs(arms) do
if existing == armName then
dup = true
break
end
end
if not dup then
table.insert(arms, armName)
end
elseif preferArm then
table.insert(arms, expanded)
elseif service == '' and not preferArm then
service = expanded
end
end
end
end
end
end
if #parts == 0 then
 
return ''
-- Explicit arm_or_service first
end
consider(armRaw, true)
return table.concat(parts, '\n')
-- Roster class_branch is almost always arm/service within the Army
consider(classBranchRaw, true)
-- |branch= may be either
consider(branchRaw, false)
 
local armJoined = table.concat(arms, '; ')
return service, armJoined
end
end


local function lifespan(birth, death)
-- Small public-domain / Commons emblems uploaded as File:Branch emblem *.png
birth = yearOnly(birth)
local BRANCH_EMBLEM = {
death = yearOnly(death)
['United States Army'] = 'Branch emblem US Army.png',
if birth ~= '' and death ~= '' then
['United States Marine Corps'] = 'Branch emblem US Marine Corps.png',
return ' (' .. birth .. '&ndash;' .. death .. ')'
['United States Navy'] = 'Branch emblem US Navy.png',
['United States Army Air Forces'] = 'Branch emblem US Army Air Forces.png',
['United States Air Force'] = 'Branch emblem US Air Force.png',
['United States Coast Guard'] = 'Branch emblem US Coast Guard.png',
}
 
local function branchWithEmblem(name)
name = trim(name)
if name == '' then
return ''
end
end
if birth ~= '' then
local file = BRANCH_EMBLEM[name]
return ' (born ' .. birth .. ')'
if file then
return '[[File:' .. file .. '|18px|link=|alt=]] ' .. name
end
end
if death ~= '' then
-- Fuzzy contains
return ' (died ' .. death .. ')'
local low = mw.ustring.lower(name)
if mw.ustring.find(low, 'marine', 1, true) then
return '[[File:Branch emblem US Marine Corps.png|18px|link=|alt=]] ' .. name
end
end
return ''
if mw.ustring.find(low, 'navy', 1, true) then
return '[[File:Branch emblem US Navy.png|18px|link=|alt=]] ' .. name
end
if mw.ustring.find(low, 'air force', 1, true) or mw.ustring.find(low, 'air forces', 1, true) then
return '[[File:Branch emblem US Army Air Forces.png|18px|link=|alt=]] ' .. name
end
if mw.ustring.find(low, 'coast guard', 1, true) then
return '[[File:Branch emblem US Coast Guard.png|18px|link=|alt=]] ' .. name
end
if mw.ustring.find(low, 'army', 1, true) then
return '[[File:Branch emblem US Army.png|18px|link=|alt=]] ' .. name
end
return name
end
end


local function preferredRank(frame)
local function expandBranch(raw)
local rank = expandRank(parentArg(frame, 'rank_final'))
raw = trim(raw)
if rank == '' then
if raw == '' then
rank = expandRank(parentArg(frame, 'class_rank'))
return ''
end
end
return rank
local parts = {}
end
for part in mw.text.gsplit(raw, ';', true) do
 
part = expandBranchToken(part)
function p.displayName(frame)
if part ~= '' then
return displayName(frame)
table.insert(parts, branchWithEmblem(part))
end
end
end
return table.concat(parts, '; ')
end


local function displayNameFrom(getArg)
local function formatBattles(raw)
local first = prettyNamePart(getArg('first'))
raw = trim(raw)
local middle = prettyNamePart(getArg('middle'))
if raw == '' then
local surname = prettyNamePart(getArg('surname'))
return ''
local suffix = prettyNamePart(getArg('suffix'))
local parts = {}
if first ~= '' then
table.insert(parts, first)
end
end
if middle ~= '' then
-- Allow HTML <br /> or semicolon / newline separated campaigns
table.insert(parts, middle)
raw = mw.ustring.gsub(raw, '\r', '')
if mw.ustring.find(raw, '<br', 1, true) or mw.ustring.find(raw, '\n', 1, true) then
return raw
end
end
if surname ~= '' then
local parts = {}
table.insert(parts, surname)
for part in mw.text.gsplit(raw, ';', true) do
end
part = trim(part)
local name = table.concat(parts, ' ')
if part ~= '' then
if suffix ~= '' then
table.insert(parts, part)
if name ~= '' then
name = name .. ', ' .. suffix
else
name = suffix
end
end
end
end
if name == '' then
if #parts <= 1 then
name = 'This soldier'
return raw
end
end
return name
return table.concat(parts, '<br />')
end
end


local function preferredRankFrom(getArg)
local function splitAwardRows(raw)
local rank = expandRank(getArg('rank_final'))
raw = trim(raw)
if rank == '' then
if raw == '' then
rank = expandRank(getArg('class_rank'))
return {}
end
-- Prefer @@ row separator (safe inside {{Soldier}}); also accept legacy |||
local sep = '@@'
if not mw.ustring.find(raw, '@@', 1, true) and mw.ustring.find(raw, '|||', 1, true) then
sep = '|||'
end
end
return rank
local rows = {}
end
for row in mw.text.gsplit(raw, sep, true) do
row = trim(row)
if row ~= '' then
local cells = {}
for cell in mw.text.gsplit(row, ';;', true) do
cell = trim(cell)
-- Unescape {{!}} used if a label ever needed a pipe
cell = mw.ustring.gsub(cell, '{{!}}', '|')
if cell ~= '' then
table.insert(cells, cell)
end
end
if #cells > 0 then
table.insert(rows, cells)
end
end
end
return rows
end


local function buildLead(getArg)
local function awardRibbonRows(raw, rowRaw)
local name = displayNameFrom(getArg)
-- Prefer explicit Wikipedia row layout when present
local rank = preferredRankFrom(getArg)
local rows = splitAwardRows(rowRaw or '')
local role = 'United States Army soldier'
if #rows > 0 then
if rank ~= '' then
return rows
role = 'United States Army ' .. rank
end
end
 
raw = trim(raw)
local classLinks = classLinkList(getArg('class_number'), true)
if raw == '' then
local trained
return {}
if #classLinks == 1 then
trained = ' who trained at [[Camp Ritchie]], Maryland, in ' .. classLinks[1]
elseif #classLinks == 2 then
trained = ' who trained at [[Camp Ritchie]], Maryland, in ' .. classLinks[1] .. ' and ' .. classLinks[2]
elseif #classLinks > 2 then
trained = ' who trained at [[Camp Ritchie]], Maryland, in '
.. table.concat(classLinks, ', ', 1, #classLinks - 1)
.. ', and ' .. classLinks[#classLinks]
else
trained = ' associated with Camp Ritchie, Maryland'
end
end
 
local files = {}
local lead = string.format(
for part in mw.text.gsplit(raw, ';', true) do
"'''%s'''%s was a %s%s.",
part = trim(part)
name,
part = mw.ustring.gsub(part, '^[Ff]ile:', '')
lifespan(getArg('birth_year'), getArg('death_year')),
if part ~= '' then
role,
table.insert(files, part)
trained
end
)
end
local who = prettyNamePart(getArg('first'))
if #files == 0 then
if who == '' then
return {}
who = prettyNamePart(getArg('surname'))
end
end
if who == '' then
-- Fallback: pack ~4 across
who = 'He'
local perRow = 4
rows = {}
local cur = {}
for _, file in ipairs(files) do
table.insert(cur, file)
if #cur == perRow then
table.insert(rows, cur)
cur = {}
end
end
end
local enlist = prettyPlace(getArg('enlistment_place'))
if #cur > 0 then
if enlist ~= '' then
table.insert(rows, cur)
lead = lead .. ' ' .. who .. ' enlisted at ' .. enlist .. '.'
end
end
return lead
return rows
end
end


function p.classLinks(frame)
local function awardRowsMatch(ribbonRows, labelRows)
return table.concat(classLinkList(parentArg(frame, 'class_number'), false), ', ')
if #ribbonRows == 0 or #ribbonRows ~= #labelRows then
return false
end
for i, cells in ipairs(ribbonRows) do
if #cells ~= #(labelRows[i] or {}) then
return false
end
end
return true
end
end


local PHOTO_EXTENSIONS = { 'jpg', 'jpeg', 'png', 'webp', 'gif' }
local function formatAwardsRibbons(raw, rowRaw, labelRaw)
 
local rows = awardRibbonRows(raw, rowRaw)
local function photoFileExists(filename)
if #rows == 0 then
filename = trim(filename)
return '', false
if filename == '' then
end
return false
local labelRows = splitAwardRows(labelRaw or '')
local labeled = awardRowsMatch(rows, labelRows)
-- One table per row so short rows (e.g. 2 ribbons) center like full rows.
-- When labels match ribbon cells, put captions in the same table so each
-- name sits centered under its ribbon (equal column widths).
local out = {}
for i, cells in ipairs(rows) do
if labeled then
table.insert(out, '{| class="soldier-ribbon-rack soldier-awards-labeled"')
else
table.insert(out, '{| class="soldier-ribbon-rack"')
end
table.insert(out, '|-')
for _, file in ipairs(cells) do
file = mw.ustring.gsub(file, '^[Ff]ile:', '')
table.insert(out, '| [[File:' .. file .. '|106px|link=]]')
end
if labeled then
table.insert(out, '|-')
for _, label in ipairs(labelRows[i]) do
table.insert(out, '| class="soldier-award-caption" | ' .. label)
end
end
table.insert(out, '|}')
end
end
local title = mw.title.new('File:' .. filename)
return table.concat(out, '\n'), labeled
return title ~= nil and title.exists
end
end


local function pushPhotoCandidate(candidates, seen, value)
local function awardGridColspanUnits(rows)
value = trim(value)
-- LCM of row lengths so 2-cell and 3-cell rows share one table width
if value == '' or seen[value] then
local function gcd(a, b)
return
while b ~= 0 do
a, b = b, a % b
end
return a
end
local function lcm(a, b)
if a == 0 or b == 0 then
return a + b
end
return (a / gcd(a, b)) * b
end
end
seen[value] = true
local units = 0
table.insert(candidates, value)
for _, cells in ipairs(rows) do
local n = #cells
if n > 0 then
units = lcm(units, n)
end
end
return units > 0 and units or 1
end
end


local function resolvePhoto(frame)
local function formatAwardsGrid(raw)
local explicit = trim(parentArg(frame, 'photo'))
local rows = splitAwardRows(raw)
if explicit ~= '' then
if #rows == 0 then
return explicit
return ''
end
local units = awardGridColspanUnits(rows)
local out = { '{| class="wikitable soldier-awards-grid"' }
for _, cells in ipairs(rows) do
local n = #cells
if n == 0 then
-- skip
else
local span = units / n
table.insert(out, '|-')
for _, cell in ipairs(cells) do
-- Allow <br /> from Wikipedia-style multi-line labels
table.insert(out, '| colspan="' .. tostring(span) .. '" | ' .. cell)
end
end
end
end
table.insert(out, '|}')
return table.concat(out, '\n')
end


local first = trim(parentArg(frame, 'first'))
local function formatAwardsLegend(raw)
local surname = trim(parentArg(frame, 'surname'))
-- Do not run prettyProse/prettyPlace — commas in prose (e.g. statue note)
local asn = trim(parentArg(frame, 'asn'))
-- get misread as place names and Title-Cased / rewrapped.
if first == '' or surname == '' then
raw = trim(raw)
if raw == '' then
return ''
return ''
end
end
 
local parts = {}
local candidates = {}
raw = mw.ustring.gsub(raw, '<br%s*/?>', ';')
local seen = {}
for part in mw.text.gsplit(raw, ';', true) do
local lowerFirst = mw.ustring.lower(first)
part = trim(part)
local lowerSurname = mw.ustring.lower(surname)
part = mw.ustring.gsub(part, '^%*%s*', '')
local bases = {
if part ~= '' then
first .. ' ' .. surname,
if isAllCapsPhrase(part) then
first .. ' ' .. lowerSurname,
part = prettyTitle(part, true)
lowerFirst .. ' ' .. lowerSurname,
end
first .. '_' .. surname,
table.insert(parts, '* ' .. part)
first .. '_' .. lowerSurname,
end
lowerFirst .. '_' .. lowerSurname,
surname .. ', ' .. first,
surname .. '_' .. first,
}
if asn ~= '' then
table.insert(bases, surname .. ', ' .. first .. ' (' .. asn .. ')')
end
end
for _, base in ipairs(bases) do
if #parts == 0 then
pushPhotoCandidate(candidates, seen, base)
return ''
end
end
return table.concat(parts, '\n')
end


for _, base in ipairs(candidates) do
local function lifespan(birth, death)
for _, ext in ipairs(PHOTO_EXTENSIONS) do
birth = trim(birth or '')
local filename = base .. '.' .. ext
death = trim(death or '')
if photoFileExists(filename) then
if birth ~= '' and death ~= '' then
return filename
return ' (' .. birth .. ' &ndash; ' .. death .. ')'
end
end
local upperExt = mw.ustring.upper(ext)
if birth ~= '' then
if upperExt ~= ext then
return ' (born ' .. birth .. ')'
filename = base .. '.' .. upperExt
end
if photoFileExists(filename) then
if death ~= '' then
return filename
return ' (died ' .. death .. ')'
end
end
end
end
end
return ''
return ''
end
end


function p.infobox(frame)
--- Prefer full birth/death dates (Wikipedia style); fall back to years.
local name = displayName(frame)
local function lifespanFromArgs(getArg)
local tbl = mw.html.create('table')
local birth = prettyProse(getArg('birth_date'))
tbl:addClass('infobox'):addClass('vcard'):addClass('soldier-infobox')
local death = prettyProse(getArg('death_date'))
if birth == '' then
birth = yearOnly(getArg('birth_year'))
end
if death == '' then
death = yearOnly(getArg('death_year'))
end
return lifespan(birth, death)
end


tbl:tag('tr'):tag('th')
local function preferredRank(frame)
:attr('colspan', '2')
local rank = expandRank(parentArg(frame, 'rank_final'))
:addClass('infobox-above fn')
if rank == '' then
:wikitext(name)
rank = expandRank(parentArg(frame, 'class_rank'))
 
local photo = resolvePhoto(frame)
if photo ~= '' then
local size = parentArg(frame, 'image_size')
if size == '' then
size = '220px'
end
local alt = parentArg(frame, 'alt')
if alt == '' then
alt = name
end
local td = tbl:tag('tr'):tag('td')
:attr('colspan', '2')
:addClass('infobox-image')
td:wikitext(string.format('[[File:%s|%s|alt=%s]]', photo, size, alt))
local caption = parentArg(frame, 'caption')
if caption ~= '' then
td:tag('div'):addClass('infobox-caption'):wikitext(caption)
end
end
end
return rank
end


local alias = prettyNamePart(parentArg(frame, 'alias'))
function p.displayName(frame)
local birthYear = yearOnly(parentArg(frame, 'birth_year'))
return displayName(frame)
local deathYear = yearOnly(parentArg(frame, 'death_year'))
end
local birthDate = prettyProse(parentArg(frame, 'birth_date'))
local deathDate = prettyProse(parentArg(frame, 'death_date'))
local birthPlace = prettyProse(parentArg(frame, 'birth_place'))
local deathPlace = prettyProse(parentArg(frame, 'death_place'))
local nativity = expandNativity(parentArg(frame, 'nativity'))
local religion = expandReligion(parentArg(frame, 'religion'))
local marital = prettyProse(parentArg(frame, 'marital'))
local education = prettyProse(parentArg(frame, 'education'))
local occupation = prettyProse(parentArg(frame, 'occupation'))
local knownFor = prettyProse(parentArg(frame, 'known_for'))
local awards = prettyProse(parentArg(frame, 'awards'))
local ribbonsRaw = parentArg(frame, 'awards_ribbons')
-- Full medal list belongs under the body ribbon rack; keep infobox short
if ribbonsRaw ~= '' and mw.ustring.len(awards) > 90 then
local first = mw.ustring.match(awards, '^([^;]+)')
awards = trim(first or awards)
end
local state = prettyPlace(parentArg(frame, 'state'))


local function datePlaceCell(date, place, year)
local function displayNameFrom(getArg)
local bits = {}
local first = prettyNamePart(getArg('first'))
if date ~= '' then
local middle = prettyNamePart(getArg('middle'))
table.insert(bits, date)
local surname = prettyNamePart(getArg('surname'))
elseif year ~= '' then
local suffix = prettyNamePart(getArg('suffix'))
table.insert(bits, year)
local parts = {}
if first ~= '' then
table.insert(parts, first)
end
if middle ~= '' then
table.insert(parts, middle)
end
if surname ~= '' then
table.insert(parts, surname)
end
local name = table.concat(parts, ' ')
if suffix ~= '' then
if name ~= '' then
name = name .. ', ' .. suffix
else
name = suffix
end
end
if place ~= '' then
table.insert(bits, place)
end
return table.concat(bits, '<br />')
end
end
if name == '' then
name = 'This soldier'
end
return name
end


local birth = datePlaceCell(birthDate, birthPlace, birthYear)
local function preferredRankFrom(getArg)
local death = datePlaceCell(deathDate, deathPlace, deathYear)
local rank = expandRank(getArg('rank_final'))
 
if rank == '' then
if alias ~= '' or birth ~= '' or death ~= '' or nativity ~= ''
rank = expandRank(getArg('class_rank'))
or religion ~= '' or marital ~= '' or education ~= ''
or occupation ~= '' or knownFor ~= '' or awards ~= '' or state ~= '' then
addHeader(tbl, 'Personal details')
end
end
return rank
end


addRow(tbl, 'Birth name', alias, 'nickname')
local function buildLead(getArg)
addRow(tbl, 'Born', birth)
local name = displayNameFrom(getArg)
addRow(tbl, 'Died', death)
local rank = preferredRankFrom(getArg)
addRow(tbl, 'Nativity', nativity)
local role = 'United States Army soldier'
addRow(tbl, 'Religion', religion)
if rank ~= '' then
addRow(tbl, 'Spouse / marital', marital)
role = 'United States Army ' .. rank
addRow(tbl, 'Education', education)
addRow(tbl, 'Occupation', occupation)
addRow(tbl, 'Known for', knownFor)
addRow(tbl, 'Awards', awards)
if state ~= '' then
addRow(tbl, 'State', state)
end
end


addHeader(tbl, 'Military service')
local classLinks = classLinkList(getArg('class_number'), true)
addRow(tbl, 'Allegiance', '[[File:Flag of the United States.png|20px|link=|alt=]] United States')
local trained
local branchRaw = parentArg(frame, 'class_branch')
if #classLinks == 1 then
if branchRaw == '' then
trained = ' who trained at [[Camp Ritchie]], Maryland, in ' .. classLinks[1]
branchRaw = parentArg(frame, 'branch')
elseif #classLinks == 2 then
end
trained = ' who trained at [[Camp Ritchie]], Maryland, in ' .. classLinks[1] .. ' and ' .. classLinks[2]
local branch = expandBranch(branchRaw)
elseif #classLinks > 2 then
if branch == '' then
trained = ' who trained at [[Camp Ritchie]], Maryland, in '
branch = branchWithEmblem('United States Army')
.. table.concat(classLinks, ', ', 1, #classLinks - 1)
end
.. ', and ' .. classLinks[#classLinks]
addRow(tbl, 'Branch', branch)
addRow(tbl, 'Years of service', prettyProse(parentArg(frame, 'years_of_service')))
addRow(tbl, 'ASN', parentArg(frame, 'asn'), 'serial')
 
local rankFinal = expandRank(parentArg(frame, 'rank_final'))
local classRank = expandRank(parentArg(frame, 'class_rank'))
if rankFinal ~= '' and classRank ~= '' and classRank ~= rankFinal then
addRow(tbl, 'Rank', rankFinal)
addRow(tbl, 'Rank at Ritchie', classRank)
else
else
local rank = rankFinal
trained = ' associated with Camp Ritchie, Maryland'
if rank == '' then
rank = classRank
end
addRow(tbl, 'Rank', rank)
end
end


local classRaw = parentArg(frame, 'class_number')
local lead = string.format(
local classBits = classLinkList(classRaw, false)
"'''%s'''%s was a %s%s.",
if #classBits > 0 then
name,
addRow(tbl, 'Camp Ritchie', 'Class ' .. table.concat(classBits, ', '))
lifespanFromArgs(getArg),
role,
trained
)
local who = prettyNamePart(getArg('first'))
if who == '' then
who = prettyNamePart(getArg('surname'))
end
if who == '' then
who = 'He'
end
end
addRow(tbl, 'Section', parentArg(frame, 'class_section'))
local enlist = prettyPlace(getArg('enlistment_place'))
addRow(tbl, 'Other class', parentArg(frame, 'other_class'))
 
local enlist = prettyPlace(parentArg(frame, 'enlistment_place'))
if enlist ~= '' then
if enlist ~= '' then
addRow(tbl, 'Enlisted', enlist)
lead = lead .. ' ' .. who .. ' enlisted at ' .. enlist .. '.'
end
end
addRow(tbl, 'Specialty', prettyProse(parentArg(frame, 'specialty')))
return lead
addRow(tbl, 'Unit / division', prettyProse(parentArg(frame, 'division')))
end
addRow(tbl, 'Battles / wars', formatBattles(parentArg(frame, 'battles')))
addRow(tbl, 'IPW (German)', teamLinkList(parentArg(frame, 'ipw_ge'), 'IPW ', 'IPW'))
addRow(tbl, 'IPW (Italian)', teamLinkList(parentArg(frame, 'ipw_it'), 'IPW Italian ', 'IPW Italian'))
addRow(tbl, 'Arrived', parentArg(frame, 'date_arrive'))
addRow(tbl, 'Departed', parentArg(frame, 'date_depart'))
addRow(tbl, 'Certificate', realCertificate(parentArg(frame, 'certificate')))


-- Awards ribbons render in the article body (p.awardsSection), not this
function p.classLinks(frame)
-- narrow infobox — matching Wikipedia's main-column ribbon racks.
return table.concat(classLinkList(parentArg(frame, 'class_number'), false), ', ')
 
return tostring(tbl)
end
end


function p.awardsSection(frame)
local PHOTO_EXTENSIONS = { 'jpg', 'jpeg', 'png', 'webp', 'gif' }
local ribbons = formatAwardsRibbons(parentArg(frame, 'awards_ribbons'))
 
local awardsText = formatAwardsLegend(parentArg(frame, 'awards'))
local function photoFileExists(filename)
if ribbons == '' and awardsText == '' then
filename = trim(filename)
return ''
if filename == '' then
return false
end
end
-- Use a styled div heading (not == wiki heading) so MediaWiki does not place
local title = mw.title.new('File:' .. filename)
-- the Contents box inside this block — JS moves the block after Biography.
return title ~= nil and title.exists
local parts = {
'<div class="soldier-awards-section">',
'<div class="soldier-awards-heading">Awards and honors</div>',
}
if ribbons ~= '' then
table.insert(parts, ribbons)
end
if awardsText ~= '' then
table.insert(parts, '<div class="soldier-awards-list">')
table.insert(parts, awardsText)
table.insert(parts, '</div>')
end
table.insert(parts, '</div>')
return table.concat(parts, '\n')
end
end


function p.lead(frame)
local function pushPhotoCandidate(candidates, seen, value)
return buildLead(function(key)
value = trim(value)
return parentArg(frame, key)
if value == '' or seen[value] then
end)
return
end
seen[value] = true
table.insert(candidates, value)
end
end


function p.leadFrom(frame)
local function resolvePhoto(frame)
return buildLead(function(key)
local explicit = trim(parentArg(frame, 'photo'))
return trim(frame.args[key] or '')
if explicit ~= '' then
end)
return explicit
end
end


local function researchNotesSection(content)
local first = trim(parentArg(frame, 'first'))
if not content or content == '' then
local surname = trim(parentArg(frame, 'surname'))
local asn = trim(parentArg(frame, 'asn'))
if first == '' or surname == '' then
return ''
return ''
end
end
local startPos = mw.ustring.find(content, '== Research notes ==', 1, true)
 
if not startPos then
local candidates = {}
return ''
local seen = {}
local lowerFirst = mw.ustring.lower(first)
local lowerSurname = mw.ustring.lower(surname)
local bases = {
first .. ' ' .. surname,
first .. ' ' .. lowerSurname,
lowerFirst .. ' ' .. lowerSurname,
first .. '_' .. surname,
first .. '_' .. lowerSurname,
lowerFirst .. '_' .. lowerSurname,
surname .. ', ' .. first,
surname .. '_' .. first,
}
if asn ~= '' then
table.insert(bases, surname .. ', ' .. first .. ' (' .. asn .. ')')
end
end
local after = mw.ustring.sub(content, startPos + 20)
for _, base in ipairs(bases) do
local nextHead = mw.ustring.find(after, '\n== ', 1, true)
pushPhotoCandidate(candidates, seen, base)
if nextHead then
return mw.ustring.sub(after, 1, nextHead - 1)
end
end
return after
end


local function miiPreferredLetter(num)
for _, base in ipairs(candidates) do
local ok, canon = pcall(require, 'Module:TeamCanon')
for _, ext in ipairs(PHOTO_EXTENSIONS) do
if ok and type(canon) == 'table' and type(canon.letter) == 'table' then
local filename = base .. '.' .. ext
return canon.letter[tostring(num)]
if photoFileExists(filename) then
return filename
end
local upperExt = mw.ustring.upper(ext)
if upperExt ~= ext then
filename = base .. '.' .. upperExt
if photoFileExists(filename) then
return filename
end
end
end
end
end
return nil
return ''
end
end


local function noteTeamNames(text)
-- Filled after noteTeamNames (local forward declare; used by p.infobox).
text = mw.ustring.upper(tostring(text or ''))
local addTeamsInfoboxRow
text = mw.ustring.gsub(text, mw.ustring.char(0x2013), '-')
 
text = mw.ustring.gsub(text, mw.ustring.char(0x2014), '-')
function p.infobox(frame)
text = mw.ustring.gsub(text, mw.ustring.char(0x2212), '-')
local name = displayName(frame)
local seen = {}
local tbl = mw.html.create('table')
local names = {}
tbl:addClass('infobox'):addClass('vcard'):addClass('soldier-infobox')
local letteredNums = {}
 
local function add(name)
tbl:tag('tr'):tag('th')
if name ~= '' and not seen[name] then
:attr('colspan', '2')
seen[name] = true
:addClass('infobox-above fn')
table.insert(names, name)
:wikitext(name)
 
local photo = resolvePhoto(frame)
if photo ~= '' then
local size = parentArg(frame, 'image_size')
if size == '' then
size = '220px'
end
end
end
local alt = parentArg(frame, 'alt')
local work = text
if alt == '' then
for num, letter in string.gmatch(work, 'MII[%s%-]+(%d+)%s*%-%s*([A-Z])') do
alt = name
if letter == 'R' and (num == '540' or num == '545' or num == '546') then
add('MII ' .. num)
else
add('MII ' .. num .. '-' .. letter)
letteredNums[num] = true
end
end
end
local td = tbl:tag('tr'):tag('td')
work = string.gsub(work, 'MII[%s%-]+%d+%s*%-%s*[A-Z]', ' ')
:attr('colspan', '2')
for num, letter in string.gmatch(' ' .. text .. ' ', '[^%d]([45]%d%d)%s*%-%s*([A-Z])[^A-Z]') do
:addClass('infobox-image')
if letter == 'R' and (num == '540' or num == '545' or num == '546') then
td:wikitext(string.format('[[File:%s|%s|alt=%s]]', photo, size, alt))
add('MII ' .. num)
local caption = parentArg(frame, 'caption')
else
if caption ~= '' then
add('MII ' .. num .. '-' .. letter)
td:tag('div'):addClass('infobox-caption'):wikitext(caption)
letteredNums[num] = true
end
end
end
end
for num in string.gmatch(work, 'MII[%s%-]+(%d+)') do
 
if not letteredNums[num] then
local alias = prettyNamePart(parentArg(frame, 'alias'))
local preferred = miiPreferredLetter(num)
local birthYear = yearOnly(parentArg(frame, 'birth_year'))
if preferred then
local deathYear = yearOnly(parentArg(frame, 'death_year'))
add('MII ' .. num .. '-' .. preferred)
local birthDate = prettyProse(parentArg(frame, 'birth_date'))
else
local deathDate = prettyProse(parentArg(frame, 'death_date'))
add('MII ' .. num)
local birthPlace = prettyProse(parentArg(frame, 'birth_place'))
end
local deathPlace = prettyProse(parentArg(frame, 'death_place'))
local nativity = expandNativity(parentArg(frame, 'nativity'))
local religion = expandReligion(parentArg(frame, 'religion'))
-- education / marital / occupation stay in Technical record (NARA snapshot);
-- curated life facts belong in Biography / Timeline, not the infobox.
local knownFor = prettyProse(parentArg(frame, 'known_for'))
local awards = prettyProse(parentArg(frame, 'awards'))
local ribbonsRaw = parentArg(frame, 'awards_ribbons')
-- Full medal list belongs under the body ribbon rack; keep infobox short
if ribbonsRaw ~= '' and mw.ustring.len(awards) > 90 then
local first = mw.ustring.match(awards, '^([^;]+)')
awards = trim(first or awards)
end
 
local function datePlaceCell(date, place, year)
local bits = {}
if date ~= '' then
table.insert(bits, date)
elseif year ~= '' then
table.insert(bits, year)
end
end
end
if place ~= '' then
for num, letter in string.gmatch(text, 'IPW%s+(%d+)%s*%-%s*([A-Z])') do
table.insert(bits, place)
if letter == 'R' and (num == '540' or num == '545' or num == '546') then
add('MII ' .. num)
else
add('MII ' .. num .. '-' .. letter)
end
end
return table.concat(bits, '<br />')
end
end
for num in string.gmatch(text, 'IPW%s+(%d+)[Tt]?%s*%??%f[^%a%d%-]') do
 
add('IPW ' .. num)
local birth = datePlaceCell(birthDate, birthPlace, birthYear)
local death = datePlaceCell(deathDate, deathPlace, deathYear)
 
if alias ~= '' or birth ~= '' or death ~= '' or nativity ~= ''
or religion ~= '' or knownFor ~= '' or awards ~= '' then
addHeader(tbl, 'Personal details')
end
end
return names
end


function p.noteTeamCategories(frame)
addRow(tbl, 'Birth name', alias, 'nickname')
local title = mw.title.getCurrentTitle()
addRow(tbl, 'Born', birth)
if not title or not title.getContent then
addRow(tbl, 'Died', death)
return ''
addRow(tbl, 'Nativity', nativity)
addRow(tbl, 'Religion', religion)
addRow(tbl, 'Known for', knownFor)
addRow(tbl, 'Awards', awards)
 
addHeader(tbl, 'Military service')
addRow(tbl, 'Allegiance', '[[File:Flag of the United States.png|20px|link=|alt=]] United States')
local serviceName, armName = splitBranchAndArm(
parentArg(frame, 'branch'),
parentArg(frame, 'class_branch'),
parentArg(frame, 'arm_or_service')
)
if serviceName == '' then
serviceName = 'United States Army'
end
end
local ok, content = pcall(function()
addRow(tbl, 'Branch', branchWithEmblem(serviceName))
return title:getContent()
if armName ~= '' then
end)
-- Roster "branch" codes (FA, Signal Corps, Cavalry, …) are arm/service, not Army/Marines.
if not ok or not content then
addRow(tbl, 'Arm / service', prettyProse(armName))
return ''
end
end
local bits = {}
-- years_of_service / date_arrive / date_depart / certificate stay in Technical
for _, name in ipairs(noteTeamNames(researchNotesSection(content))) do
-- record only (rarely curated; certificate is a cryptic chart number).
table.insert(bits, '[[Category:Team ' .. name .. ']]')
addRow(tbl, 'ASN', parentArg(frame, 'asn'), 'serial')
 
local rankFinal = expandRank(parentArg(frame, 'rank_final'))
local classRank = expandRank(parentArg(frame, 'class_rank'))
if rankFinal ~= '' and classRank ~= '' and classRank ~= rankFinal then
addRow(tbl, 'Rank', rankFinal)
addRow(tbl, 'Rank at Ritchie', classRank)
else
local rank = rankFinal
if rank == '' then
rank = classRank
end
addRow(tbl, 'Rank', rank)
end
end
return table.concat(bits)
end


function p.researchNotes(frame)
local classRaw = parentArg(frame, 'class_number')
local title = mw.title.getCurrentTitle()
local classBits = classLinkList(classRaw, false)
if not title or not title.getContent then
if #classBits > 0 then
return ''
addRow(tbl, 'Camp Ritchie', 'Class ' .. table.concat(classBits, ', '))
end
end
local ok, content = pcall(function()
addRow(tbl, 'Section', mw.ustring.upper(parentArg(frame, 'class_section')))
return title:getContent()
addRow(tbl, 'Other class', expandOtherClass(parentArg(frame, 'other_class')))
end)
 
if not ok or not content or content == '' then
local enlist = prettyPlace(parentArg(frame, 'enlistment_place'))
return ''
if enlist ~= '' then
addRow(tbl, 'Enlisted', enlist)
end
addRow(tbl, 'Specialty', prettyProse(parentArg(frame, 'specialty')))
addRow(tbl, 'Unit / division', prettyProse(parentArg(frame, 'division')))
addRow(tbl, 'Battles / wars', formatBattles(parentArg(frame, 'battles')))
addTeamsInfoboxRow(tbl, frame)
 
-- Awards ribbons render in the article body (p.awardsSection), not this
-- narrow infobox — matching Wikipedia's main-column ribbon racks.
 
return tostring(tbl)
end
 
function p.awardsSection(frame)
local gridRaw = parentArg(frame, 'awards_grid')
local ribbons, labelsInRack = formatAwardsRibbons(
parentArg(frame, 'awards_ribbons'),
parentArg(frame, 'awards_ribbon_rows'),
gridRaw
)
-- Skip the separate label table when captions already sit under ribbons
local grid = ''
if not labelsInRack then
grid = formatAwardsGrid(gridRaw)
end
local extras = formatAwardsLegend(parentArg(frame, 'awards_extra'))
-- Fallback: flat awards list when no grid was extracted
if grid == '' and extras == '' and not labelsInRack then
extras = formatAwardsLegend(parentArg(frame, 'awards'))
end
end
local section = researchNotesSection(content)
if ribbons == '' and grid == '' and extras == '' then
if section == '' then
return ''
return ''
end
end
local items = {}
-- Use a styled div heading (not == wiki heading) so MediaWiki does not place
for line in mw.text.gsplit(section, '\n', true) do
-- the Contents box inside this block — JS moves the block after Biography.
line = trim(line)
local parts = {
if mw.ustring.sub(line, 1, 2) == '* ' then
'<div class="soldier-awards-section">',
'<div class="soldier-awards-heading">Awards and honors</div>',
}
if ribbons ~= '' then
table.insert(parts, ribbons)
end
if grid ~= '' then
table.insert(parts, grid)
end
if extras ~= '' then
table.insert(parts, '<div class="soldier-awards-list">')
table.insert(parts, extras)
table.insert(parts, '</div>')
end
table.insert(parts, '</div>')
return table.concat(parts, '\n')
end
 
function p.lead(frame)
return buildLead(function(key)
return parentArg(frame, key)
end)
end
 
function p.leadFrom(frame)
return buildLead(function(key)
return trim(frame.args[key] or '')
end)
end
 
local function researchNotesSection(content)
if not content or content == '' then
return ''
end
local startPos = mw.ustring.find(content, '== Research notes ==', 1, true)
if not startPos then
return ''
end
local after = mw.ustring.sub(content, startPos + 20)
local nextHead = mw.ustring.find(after, '\n== ', 1, true)
if nextHead then
return mw.ustring.sub(after, 1, nextHead - 1)
end
return after
end
 
local function miiPreferredLetter(num)
local ok, canon = pcall(require, 'Module:TeamCanon')
if ok and type(canon) == 'table' and type(canon.letter) == 'table' then
return canon.letter[tostring(num)]
end
return nil
end
 
local function noteTeamNames(text)
text = mw.ustring.upper(tostring(text or ''))
text = mw.ustring.gsub(text, mw.ustring.char(0x2013), '-')
text = mw.ustring.gsub(text, mw.ustring.char(0x2014), '-')
text = mw.ustring.gsub(text, mw.ustring.char(0x2212), '-')
local seen = {}
local names = {}
local letteredNums = {}
local function add(name)
if name ~= '' and not seen[name] then
seen[name] = true
table.insert(names, name)
end
end
local work = text
for num, letter in string.gmatch(work, 'MII[%s%-]+(%d+)%s*%-%s*([A-Z])') do
if letter == 'R' and (num == '540' or num == '545' or num == '546') then
add('MII ' .. num)
else
add('MII ' .. num .. '-' .. letter)
letteredNums[num] = true
end
end
work = string.gsub(work, 'MII[%s%-]+%d+%s*%-%s*[A-Z]', ' ')
for num, letter in string.gmatch(' ' .. text .. ' ', '[^%d]([45]%d%d)%s*%-%s*([A-Z])[^A-Z]') do
if letter == 'R' and (num == '540' or num == '545' or num == '546') then
add('MII ' .. num)
else
add('MII ' .. num .. '-' .. letter)
letteredNums[num] = true
end
end
for num in string.gmatch(work, 'MII[%s%-]+(%d+)') do
if not letteredNums[num] then
local preferred = miiPreferredLetter(num)
if preferred then
add('MII ' .. num .. '-' .. preferred)
else
add('MII ' .. num)
end
end
end
for num, letter in string.gmatch(text, 'IPW%s+(%d+)%s*%-%s*([A-Z])') do
if letter == 'R' and (num == '540' or num == '545' or num == '546') then
add('MII ' .. num)
else
add('MII ' .. num .. '-' .. letter)
end
end
for num in string.gmatch(text, 'IPW%s+(%d+)[Tt]?%s*%??%f[^%a%d%-]') do
add('IPW ' .. num)
end
return names
end
 
local function appendUniqueTeamName(names, seen, name)
name = trim(tostring(name or ''))
if name == '' or seen[name] then
return
end
seen[name] = true
table.insert(names, name)
end
 
local function namesFromIpwGerman(raw)
local names = {}
local seen = {}
for part in mw.text.gsplit(raw or '', ';', true) do
part = trim(part)
part = mw.ustring.gsub(part, '[#<>%[%]|{}]', '')
part = trim(part)
if part ~= '' then
local code, shown, mii = normalizeIpwTeamCode(part)
if mii then
appendUniqueTeamName(names, seen, 'MII ' .. mii)
elseif code then
appendUniqueTeamName(names, seen, 'IPW ' .. shown)
end
end
end
return names
end
 
local function namesFromIpwItalian(raw)
local names = {}
local seen = {}
for part in mw.text.gsplit(raw or '', ';', true) do
part = trim(part)
part = mw.ustring.gsub(part, '[#<>%[%]|{}]', '')
part = trim(part)
if part ~= '' then
local code = normalizeIpwItalianCode(part)
if code then
appendUniqueTeamName(names, seen, 'IPW Italian ' .. code)
end
end
end
return names
end
 
--- Explicit |teams= values: "MII 439-G; IPW 12" or shorthand "439-G".
local function namesFromTeamsParam(raw)
local names = {}
local seen = {}
for part in mw.text.gsplit(raw or '', ';', true) do
part = trim(part)
if part ~= '' then
local fromScan = noteTeamNames(part)
if #fromScan > 0 then
for _, name in ipairs(fromScan) do
appendUniqueTeamName(names, seen, name)
end
else
local upper = mw.ustring.upper(part)
local itRest = mw.ustring.match(upper, '^IPW%s+ITALIAN%s+(.+)$')
if itRest then
local code = normalizeIpwItalianCode(itRest)
if code then
appendUniqueTeamName(names, seen, 'IPW Italian ' .. code)
end
else
local ipwRest = mw.ustring.match(upper, '^IPW%s+(.+)$')
if ipwRest then
local code, shown, mii = normalizeIpwTeamCode(ipwRest)
if mii then
appendUniqueTeamName(names, seen, 'MII ' .. mii)
elseif code then
appendUniqueTeamName(names, seen, 'IPW ' .. shown)
end
else
local code, shown, mii = normalizeIpwTeamCode(part)
if mii then
appendUniqueTeamName(names, seen, 'MII ' .. mii)
elseif code and mw.ustring.match(tostring(shown or code), '^%d') then
appendUniqueTeamName(names, seen, 'IPW ' .. shown)
end
end
end
end
end
end
return names
end
 
local function teamNameLink(name)
return string.format('[[Team %s|%s]]', name, name)
end
 
local function pageResearchNotesText()
local title = mw.title.getCurrentTitle()
if not title or not title.getContent then
return ''
end
local ok, content = pcall(function()
return title:getContent()
end)
if not ok or not content then
return ''
end
return researchNotesSection(content)
end
 
--- Roster IPW fields + optional |teams= + research-note team codes, one linked row.
addTeamsInfoboxRow = function(tbl, frame)
local names = {}
local seen = {}
local function addAll(list)
for _, name in ipairs(list) do
appendUniqueTeamName(names, seen, name)
end
end
addAll(namesFromIpwGerman(parentArg(frame, 'ipw_ge')))
addAll(namesFromIpwItalian(parentArg(frame, 'ipw_it')))
addAll(namesFromTeamsParam(parentArg(frame, 'teams')))
addAll(noteTeamNames(pageResearchNotesText()))
if #names == 0 then
return
end
local links = {}
for _, name in ipairs(names) do
table.insert(links, teamNameLink(name))
end
local label = 'Team'
if #names > 1 then
label = 'Teams'
end
addRow(tbl, label, table.concat(links, ', '))
end
 
function p.noteTeamCategories(frame)
local title = mw.title.getCurrentTitle()
if not title or not title.getContent then
return ''
end
local ok, content = pcall(function()
return title:getContent()
end)
if not ok or not content then
return ''
end
local seen = {}
local bits = {}
local function addCat(name)
name = trim(tostring(name or ''))
if name == '' or seen[name] then
return
end
seen[name] = true
table.insert(bits, '[[Category:Team ' .. name .. ']]')
end
for _, name in ipairs(noteTeamNames(researchNotesSection(content))) do
addCat(name)
end
for _, name in ipairs(namesFromTeamsParam(parentArg(frame, 'teams'))) do
addCat(name)
end
return table.concat(bits)
end
 
function p.researchNotes(frame)
local title = mw.title.getCurrentTitle()
if not title or not title.getContent then
return ''
end
local ok, content = pcall(function()
return title:getContent()
end)
if not ok or not content or content == '' then
return ''
end
local section = researchNotesSection(content)
if section == '' then
return ''
end
local items = {}
for line in mw.text.gsplit(section, '\n', true) do
line = trim(line)
if mw.ustring.sub(line, 1, 2) == '* ' then
local note = sanitizeNote(mw.ustring.sub(line, 3))
local note = sanitizeNote(mw.ustring.sub(line, 3))
if note ~= '' then
if note ~= '' then
for clause in mw.text.gsplit(note, ';', true) do
for clause in mw.text.gsplit(note, ';', true) do
clause = trim(clause)
clause = trim(clause)
if clause ~= '' and not isNegativeClause(clause) then
if clause ~= '' and not isNegativeClause(clause) then
table.insert(items, prettyProse(clause))
table.insert(items, prettyProse(clause))
end
end
end
end
end
end
end
end
items = joinDateFollowons(items)
local unique = {}
local seen = {}
for _, clause in ipairs(items) do
local key = normalizeNoteKey(clause)
if key ~= '' and not seen[key] then
seen[key] = true
table.insert(unique, clause)
end
end
items = unique
if #items == 0 then
return ''
end
local wrap = mw.html.create('div')
wrap:addClass('soldier-research-notes')
wrap:tag('div'):addClass('soldier-research-notes-heading'):wikitext('Research notes')
local ul = wrap:tag('ul')
for _, note in ipairs(items) do
ul:tag('li'):wikitext(note)
end
return tostring(wrap)
end
 
local function cargoRows(tables, fields, where, limit, orderBy)
if not mw.ext or not mw.ext.cargo or not mw.ext.cargo.query then
return nil
end
local opts = {
where = where,
limit = limit or 8,
}
if orderBy and orderBy ~= '' then
opts.orderBy = orderBy
end
local ok, result = pcall(mw.ext.cargo.query, tables, fields, opts)
if not ok or type(result) ~= 'table' then
return nil
end
return result
end
 
local function rowField(row, ...)
for i = 1, select('#', ...) do
local key = select(i, ...)
local v = row[key]
if v ~= nil and trim(tostring(v)) ~= '' then
return trim(tostring(v))
end
end
return ''
end
 
local function titleToCaption(title)
title = trim(title)
local surname, given = mw.ustring.match(title, '^([^,]+),%s*(.-)%s*%(%d')
if surname and given then
return trim(given .. ' ' .. surname)
end
return title
end
 
local function displayFromCargoRow(row)
local page = rowField(row, 'pageName', '_pageName')
local surname = rowField(row, 'Surname')
local first = rowField(row, 'First_name', 'First name')
local middle = rowField(row, 'Middle_name', 'Middle name')
local given = trim(first .. (middle ~= '' and (' ' .. middle) or ''))
local caption
if given ~= '' and surname ~= '' then
caption = given .. ' ' .. surname
elseif page ~= '' then
caption = titleToCaption(page)
else
caption = surname
end
if page == '' and surname ~= '' then
local asn = rowField(row, 'ASN')
if asn ~= '' then
page = surname .. ', ' .. (given ~= '' and given or first) .. ' (' .. asn .. ')'
end
end
return page, caption
end
 
local function linkList(rows, skipAsn, skipPage, maxLinks)
local links = {}
local seen = {}
for _, row in ipairs(rows or {}) do
local asn = rowField(row, 'ASN')
local page, caption = displayFromCargoRow(row)
if caption == '' and page ~= '' then
caption = titleToCaption(page)
end
if page ~= '' and page ~= skipPage and asn ~= skipAsn and not seen[page] then
seen[page] = true
table.insert(links, string.format('[[%s|%s]]', page, caption))
if #links >= maxLinks then
break
end
end
end
return links
end
 
local function classFullWhere(classNum)
-- Prefer Class_number__full: the Class_number HOLDS index is corrupted on some hosts.
local n = tostring(classNum or '')
n = mw.ustring.gsub(n, '[^0-9A-Za-z%-]', '')
if n == '' then
return nil
end
return string.format(
'Class_number__full="%s" OR Class_number__full LIKE "%s;%%" OR Class_number__full LIKE "%%;%s" OR Class_number__full LIKE "%%;%s;%%"',
n,
n,
n,
n
)
end
 
function p.storyCue(frame)
local story = parentArg(frame, 'story')
if story == '' then
return ''
end
story = mw.ustring.gsub(story, '^%[%[', '')
story = mw.ustring.gsub(story, '%]%]$', '')
local storyTitle, storyLabel = mw.ustring.match(story, '^([^|]+)|(.+)$')
if not storyTitle then
storyTitle = story
storyLabel = nil
end
storyTitle = trim(storyTitle)
if storyLabel then
storyLabel = trim(storyLabel)
end
if not storyLabel or storyLabel == '' then
storyLabel = mw.ustring.match(storyTitle, '([^/]+)$') or storyTitle
end
local name = displayName(frame)
return string.format(
'<div class="soldier-story-cue">'
.. '<span class="soldier-story-cue-label">Full story</span> '
.. 'Read more about %s in [[%s|%s]] on \'\'[[The Stories]]\'\'.'
.. '</div>',
name,
storyTitle,
storyLabel
)
end
 
-- related-rail: live team rosters via category members (filled by Common.js)
function p.relatedSoldiers(frame)
local pageTitle = mw.title.getCurrentTitle().prefixedText
 
-- Same sources as the infobox Teams row: roster IPW, |teams=, research notes.
local teamNames = {}
local seenTeams = {}
local function addTeams(list)
for _, name in ipairs(list) do
appendUniqueTeamName(teamNames, seenTeams, name)
end
end
addTeams(namesFromIpwGerman(parentArg(frame, 'ipw_ge')))
addTeams(namesFromIpwItalian(parentArg(frame, 'ipw_it')))
addTeams(namesFromTeamsParam(parentArg(frame, 'teams')))
addTeams(noteTeamNames(pageResearchNotesText()))
 
if #teamNames == 0 then
return ''
end
 
local wrap = mw.html.create('div')
:addClass('soldier-related')
:attr('data-current-title', pageTitle)
wrap:tag('div'):addClass('soldier-related-heading'):wikitext('Teammates')
 
for _, teamName in ipairs(teamNames) do
local cat = 'Category:Team ' .. teamName
local block = wrap:tag('div')
:addClass('soldier-related-block')
:attr('data-team-cat', cat)
block:tag('div')
:addClass('soldier-related-label')
:wikitext('Team — ' .. teamNameLink(teamName))
-- Noscript / pre-JS fallback: category link. Common.js replaces with live names.
block:tag('div')
:addClass('soldier-related-links')
:addClass('soldier-related-links-live')
:wikitext('[[' .. cat .. '|Browse team roster]]')
end
 
wrap:tag('div')
:addClass('soldier-related-note')
:wikitext(
'These are other soldiers listed on the same team roster. '
.. 'People moved between teams; overlapping service dates are not always documented.'
)
return tostring(wrap)
end
 
local function seqCount(t)
-- mw.loadData tables do not always report # correctly.
local n = 0
if type(t) ~= 'table' then
return 0
end
for _ in ipairs(t) do
n = n + 1
end
return n
end
 
function p.mediaCue(frame)
local pageTitle = mw.title.getCurrentTitle().prefixedText
local ok, data = pcall(mw.loadData, 'Module:Interviews/data')
if not ok or type(data) ~= 'table' or type(data.by_title) ~= 'table' then
return ''
end
local rec = data.by_title[pageTitle]
if type(rec) ~= 'table' then
return ''
end
-- Prefer interviews; accept legacy `items` key from hand-edited cues.
local interviews = rec.interviews
if type(interviews) ~= 'table' then
interviews = rec.items
end
local films = rec.films
local nInterviews = seqCount(interviews)
local nFilms = seqCount(films)
if nInterviews == 0 and nFilms == 0 then
return ''
end
local name = displayName(frame)
local blocks = {}
if nInterviews > 0 then
local links = {}
local anyAudio = false
for _, item in ipairs(interviews) do
local heading = item.heading or 'Interview'
local short = item.short or heading
if item.kind == 'audio' then
anyAudio = true
end
table.insert(
links,
string.format('[[Ritchie Boy Interviews#%s|%s]]', heading, short)
)
end
local label = nInterviews == 1 and 'Interview' or 'Interviews'
local verb = 'Watch'
if nInterviews == 1 and interviews[1].kind == 'audio' then
verb = 'Listen to'
elseif anyAudio and nInterviews > 1 then
verb = 'Hear'
end
local body
if nInterviews == 1 then
body = string.format(
'%s %s on [[Ritchie Boy Interviews#%s|%s]].',
verb,
name,
interviews[1].heading,
interviews[1].short or interviews[1].heading
)
else
body = string.format(
'%s %s in %d recordings on [[Ritchie Boy Interviews]]: %s.',
verb,
name,
nInterviews,
table.concat(links, ' · ')
)
end
end
table.insert(
blocks,
'<div class="soldier-interview-cue">'
.. '<span class="soldier-interview-cue-label">'
.. label
.. '</span> '
.. body
.. '</div>'
)
end
end
items = joinDateFollowons(items)
if nFilms > 0 then
local unique = {}
local links = {}
local seen = {}
for _, item in ipairs(films) do
for _, clause in ipairs(items) do
local heading = item.heading or 'Documentaries/Movies'
local key = normalizeNoteKey(clause)
local filmLabel = item.label or heading
if key ~= '' and not seen[key] then
table.insert(
seen[key] = true
links,
table.insert(unique, clause)
string.format('[[Documentaries/Movies#%s|%s]]', heading, filmLabel)
)
end
end
local body = string.format(
'%s appears in %s.',
name,
table.concat(links, '; ')
)
table.insert(
blocks,
'<div class="soldier-film-cue">'
.. '<span class="soldier-film-cue-label">On film</span> '
.. body
.. '</div>'
)
end
end
items = unique
return '<div class="soldier-media-cue">' .. table.concat(blocks, '') .. '</div>'
if #items == 0 then
return ''
end
local wrap = mw.html.create('div')
wrap:addClass('soldier-research-notes')
wrap:tag('div'):addClass('soldier-research-notes-heading'):wikitext('Research notes')
local ul = wrap:tag('ul')
for _, note in ipairs(items) do
ul:tag('li'):wikitext(note)
end
return tostring(wrap)
end
end


return p
return p