Module:IPA/overview - Revision history

Nardog: simpler

2023-10-02T09:24:06Z

simpler

← Previous revision		Revision as of 09:24, 2 October 2023
Line 125:		Line 125:
	local key = lect.key or lect.parent and lect.parent.key		local key = lect.key or lect.parent and lect.parent.key
	if key then		if key then
	local asciiKey = ''		local asciiKey = mw.ustring.gsub(mw.ustring.toNFD(key), '[^ -~]', '')
	for s in mw.ustring.gmatch(mw.ustring.toNFD(key), '[ -~]+') do
	asciiKey = asciiKey .. s
	end
	if not byKey[asciiKey] then		if not byKey[asciiKey] then
	byKey[asciiKey] = { name = key }		byKey[asciiKey] = { name = key }

Nardog: sort Māori correctly

2023-10-02T09:19:36Z

sort Māori correctly

← Previous revision		Revision as of 09:19, 2 October 2023
Line 125:		Line 125:
	local key = lect.key or lect.parent and lect.parent.key		local key = lect.key or lect.parent and lect.parent.key
	if key then		if key then
			local asciiKey = ''
	if not byKey[key] then
			for s in mw.ustring.gmatch(mw.ustring.toNFD(key), '[ -~]+') do
⚫	byKey[~~key~~] = {}
			asciiKey = asciiKey .. s
⚫	table.insert(keys, ~~key~~)
	end		end
	~~table.insert(~~byKey[~~key~~], {		if not byKey[asciiKey] then
		⚫	byKey[asciiKey] = { name = key }
		⚫	table.insert(keys, asciiKey)
			end
			table.insert(byKey[asciiKey], {
	code = lect.code,		code = lect.code,
	name = lect.name or lect.extName,		name = lect.name or lect.extName,
Line 137:		Line 141:
	end		end
	table.sort(keys)		table.sort(keys)
	for _, ~~key~~ in ipairs(keys) do		for _, asciiKey in ipairs(keys) do
	local row = t:tag('tr')		local row = t:tag('tr')
	local ~~keyCell~~ = ~~row:tag('td'):wikitext('~~[~~[' .. key .. ']~~]')		local keyLects = byKey[asciiKey]
			local keyCell = row:tag('td'):wikitext('[[' .. keyLects.name .. ']]')
	local keyLects = byKey[key]
	local lang		local lang
	if #keyLects > 1 then		if #keyLects > 1 then
	keyCell:attr('rowspan', #keyLects)		keyCell:attr('rowspan', #keyLects)
	table.sort(keyLects, function (a, b) return a.name < b.name end)		table.sort(keyLects, function (a, b) return a.name < b.name end)
	local keyName = mw.ustring.gsub(~~key~~, '^[^/]*/', '')		local keyName = mw.ustring.gsub(keyLects.name, '^[^/]*/', '')
	for _, lect in ipairs(keyLects) do		for _, lect in ipairs(keyLects) do
	if lect.name == keyName then		if lect.name == keyName then

Nardog: rm diaCode

2023-09-23T22:07:30Z

rm diaCode

← Previous revision		Revision as of 22:07, 23 September 2023
Line 53:		Line 53:
	end		end
	end		end
	cells[1]:wikitext('<code>' .. (lect.~~diaCode~~ ~~or lect.code~~) .. '</code>')		cells[1]:wikitext('<code>' .. lect.code:gsub('^[^-]+%-', '') .. '</code>')
	if lect.aliases then		if lect.aliases then
	local aliases = {}		local aliases = {}

Nardog: refactor

2023-09-23T20:57:43Z

refactor

← Previous revision		Revision as of 20:57, 23 September 2023
Line 170:		Line 170:
	end		end
	lang = lang or keyLects[1]		lang = lang or keyLects[1]
	local ~~nameCell~~ = ~~row:tag('td'):wikitext(~~		local prev = {
	~~string.format('[[%s\|%s]]',~~ ~~lang.link,~~ lang.name)		name = lang.name,
			count = 1,
⚫	)
		⚫	cell = row:tag('td'):wikitext(
	local nameRowspan = 1
		⚫	string.format('[[%s\|%s]]', lang.link, lang.name)
		⚫	)
			}
	row:tag('td'):wikitext('<code>' .. lang.code .. '</code>')		row:tag('td'):wikitext('<code>' .. lang.code .. '</code>')
	for i, lect in ipairs(keyLects) do		for _, lect in ipairs(keyLects) do
	if lect ~= lang then		if lect ~= lang then
	local subRow = t:tag('tr')		local subRow = t:tag('tr')
	local prev = i == 1 and lang or keyLects[i - 1]
	if prev.name == lect.name then		if prev.name == lect.name then
	~~nameRowspan~~ = ~~nameRowspan~~ + 1		prev.count = prev.count + 1
	~~nameCell~~:attr('rowspan', ~~nameRowspan~~)		prev.cell:attr('rowspan', prev.count)
	else		else
	~~nameRowspan~~ = 1		prev = {
			name = lect.name,
⚫	~~nameCell~~ = ~~subRow~~:tag('td'):wikitext(
			count = 1,
⚫	string.format('[[%s\|%s]]', ~~lect~~.link, ~~lect~~.name)
			cell = subRow:tag('td'):wikitext(
⚫	)
			string.format('[[%s\|%s]]', lect.link, lect.name)
		⚫	)
			}
	end		end
	subRow:tag('td'):wikitext('<code>' .. lect.code .. '</code>')		subRow:tag('td'):wikitext('<code>' .. lect.code .. '</code>')
Line 194:		Line 199:
	return tostring(t)		return tostring(t)
	end		end


	return p		return p

Nardog at 20:40, 23 September 2023

2023-09-23T20:40:48Z

← Previous revision		Revision as of 20:40, 23 September 2023
Line 48:		Line 48:
	table.insert(cells, row:tag('td'))		table.insert(cells, row:tag('td'))
	end		end
	if not lect.parent and (not lects[i + 1] ~~or not~~ lects[i + 1].parent) then		if not lect.parent and not (lects[i + 1] and lects[i + 1].parent) then
	for _ = 1, 4 do		for _ = 1, 4 do
	row:tag('td'):css('background', '#ececec')		row:tag('td'):css('background', '#ececec')

Nardog at 20:40, 23 September 2023

2023-09-23T20:40:01Z

← Previous revision		Revision as of 20:40, 23 September 2023
Line 48:		Line 48:
	table.insert(cells, row:tag('td'))		table.insert(cells, row:tag('td'))
	end		end
	if not lect.parent and (not lects[i + 1] or not lects[i + 1].~~diaCode~~) then		if not lect.parent and (not lects[i + 1] or not lects[i + 1].parent) then
	for _ = 1, 4 do		for _ = 1, 4 do
	row:tag('td'):css('background', '#ececec')		row:tag('td'):css('background', '#ececec')

Nardog: notes

2023-09-23T20:24:35Z

notes

← Previous revision		Revision as of 20:24, 23 September 2023
Line 4:		Line 4:
	local lects = mw.loadData('Module:IPA/data/export')		local lects = mw.loadData('Module:IPA/data/export')

	local function ~~addNotes~~(cell, ~~notes~~)		local function addNote(cell, note)
		⚫	cell:wikitext(string.format(' <small>(%s)</small>', note))
	if #notes > 0 then
	cell:wikitext(
⚫	string.format(' <small>(%s)</small>', ~~table.concat(notes, '; '~~))
⚫	)
⚫	end
	end		end

Line 63:		Line 59:
	table.insert(aliases, alias)		table.insert(aliases, alias)
	end		end
	~~addNotes~~(cells[1], {		addNote(cells[1], string.format(
			'also <code>%s</code>',
	string.format(
	~~'also~~ <code>%s</code>',		table.concat(aliases, '</code>, <code>')
		⚫	))
	table.concat(aliases, '</code>, <code>')
⚫	)
	})
	end		end
	do		do
Line 83:		Line 77:
	end		end
	cells[2]:wikitext(lect.name or lect.extName)		cells[2]:wikitext(lect.name or lect.extName)
	~~addNotes(cells[2],~~ notes)		if #notes > 0 then
			addNote(cells[2], table.concat(notes, '; '))
		⚫	end
	end		end
	do		do
	local ~~notes = {}~~		local note
	local intLink = lect.link or lect.generatedLink		local intLink = lect.link or lect.generatedLink
	if intLink then		if intLink then
	if intLink == lect.extLink then		if intLink == lect.extLink then
	~~table.insert(notes,~~ 'redundant')		note = 'redundant'
	elseif lect.extLink then		elseif lect.extLink then
	~~local~~ note = string.format('overrides [[%s]]', lect.extLink)		note = string.format('overrides [[%s]]', lect.extLink)
	local intTitle = mw.title.new(intLink)		local intTitle = mw.title.new(intLink)
	intTitle = intTitle.redirectTarget or intTitle		intTitle = intTitle.redirectTarget or intTitle
Line 100:		Line 96:
	note = note .. ', a different article'		note = note .. ', a different article'
	end		end
	table.insert(notes, note)
	end		end
	end		end
Line 106:		Line 101:
	s = lect.generatedLink and '([[' .. s .. ']])' or '[[' .. s .. ']]'		s = lect.generatedLink and '([[' .. s .. ']])' or '[[' .. s .. ']]'
	cells[3]:wikitext(s)		cells[3]:wikitext(s)
			if note then
	~~addNotes~~(cells[3], ~~notes~~)		addNote(cells[3], note)
		⚫	end
	end		end
	cells[4]:wikitext(		cells[4]:wikitext(

Nardog: fix aliases

2023-09-23T19:09:08Z

fix aliases

← Previous revision		Revision as of 19:09, 23 September 2023
Line 59:		Line 59:
	cells[1]:wikitext('<code>' .. (lect.diaCode or lect.code) .. '</code>')		cells[1]:wikitext('<code>' .. (lect.diaCode or lect.code) .. '</code>')
	if lect.aliases then		if lect.aliases then
			local aliases = {}
			for _, alias in ipairs(lect.aliases) do
			table.insert(aliases, alias)
			end
	addNotes(cells[1], {		addNotes(cells[1], {
	string.format(		string.format(
	'also <code>%s</code>',		'also <code>%s</code>',
	table.concat(~~lect.~~aliases, '</code>, <code>')		table.concat(aliases, '</code>, <code>')
	)		)
	})		})

Nardog: simpler

2023-09-23T18:46:24Z

simpler

← Previous revision		Revision as of 18:46, 23 September 2023
Line 2:		Line 2:
	local p = {}		local p = {}

	local data = mw.title.getCurrentTitle().subpageText == 'sandbox'
	and mw.loadData('Module:IPA/data/sandbox')
	or mw.loadData('Module:IPA/data')
	local lects = mw.loadData('Module:IPA/data/export')		local lects = mw.loadData('Module:IPA/data/export')

Line 109:		Line 106:
	cells[4]:wikitext(		cells[4]:wikitext(
	lect.key and '[[' .. lect.key .. ']]' or		lect.key and '[[' .. lect.key .. ']]' or
	'([[' .. (lect.parent and lect.parent.key or ~~data.defaultKey~~) .. ']])'		'([[' .. (lect.parent and lect.parent.key or 'Help:IPA') .. ']])'
	)		)
	end		end

Nardog at 18:16, 23 September 2023

2023-09-23T18:16:27Z

← Previous revision		Revision as of 18:16, 23 September 2023
Line 146:		Line 146:
	if #keyLects > 1 then		if #keyLects > 1 then
	keyCell:attr('rowspan', #keyLects)		keyCell:attr('rowspan', #keyLects)
	table.sort(keyLects, function (a, b)		table.sort(keyLects, function (a, b) return a.name < b.name end)
	return a.name < b.name
	end)
	local keyName = mw.ustring.gsub(key, '^[^/]*/', '')		local keyName = mw.ustring.gsub(key, '^[^/]*/', '')
	for _, lect in ipairs(keyLects) do		for _, lect in ipairs(keyLects) do
Line 173:		Line 171:
	end		end
	end		end
	if ~~not~~ lang ~~then~~		lang = lang or keyLects[1]
	lang = keyLects[1]
	end
	local nameCell = row:tag('td'):wikitext(		local nameCell = row:tag('td'):wikitext(
	string.format('[[%s\|%s]]', lang.link, lang.name)		string.format('[[%s\|%s]]', lang.link, lang.name)