Module:Unicode chart - Revision history

Cobaltcigs: several changes to range handling to allow, among other things, referring to predefined subsets

2019-09-20T13:16:34Z

several changes to range handling to allow, among other things, referring to predefined subsets

Cobaltcigs: fix off-by-one

2019-09-19T21:41:55Z

fix off-by-one

← Previous revision		Revision as of 21:41, 19 September 2019
Line 92:		Line 92:
	function getUtf16(n)		function getUtf16(n)
	if(n < 0 or n > 0x10FFFF) then return nil end		if(n < 0 or n > 0x10FFFF) then return nil end
	if~~(n < 0xD7FF) or~~ (n > ~~0xDFFF~~ and n < ~~0x10000~~) then return ~~{ n }~~ end		if(n >= 0xD800 and n <= 0xDFFF) then return nil end
			if(n < 0x10000) then return { n } end
	local u = (n - 0x10000)		local u = (n - 0x10000)
	local low = u % 0x400		local low = (u % 0x400)
	local high = (u - low) / 0x400		local high = (u - low) / 0x400
	return { 0xD800 + high, 0xDC00 + low }		return { 0xD800 + high, 0xDC00 + low }

Drmccreedy: slight change because we aren't linking to the specific version

2019-09-19T20:33:52Z

slight change because we aren't linking to the specific version

← Previous revision		Revision as of 20:33, 19 September 2019
Line 217:		Line 217:
	function makeVersionRef()		function makeVersionRef()
	if(not config.showRefs or mVersion == nil or mVersion == '') then return ''		if(not config.showRefs or mVersion == nil or mVersion == '') then return ''
	else return string.format('<ref name="version">As of [[Unicode#Versions\|Unicode version %s]].</ref>', mw.text.nowiki(mVersion)) end		else return string.format('<ref name="version">As of [[Unicode#Versions\|Unicode version]] %s.</ref>', mw.text.nowiki(mVersion)) end
	end		end

Cobaltcigs: display/box params are now whacked. link param will be next.

2019-09-19T06:34:43Z

display/box params are now whacked. link param will be next.

← Previous revision		Revision as of 06:34, 19 September 2019
Line 217:		Line 217:
	function makeVersionRef()		function makeVersionRef()
	if(not config.showRefs or mVersion == nil or mVersion == '') then return ''		if(not config.showRefs or mVersion == nil or mVersion == '') then return ''
	else return string.format('<ref name="version">As of Unicode version %s.</ref>', mw.text.nowiki(mVersion)) end		else return string.format('<ref name="version">As of [[Unicode#Versions\|Unicode version %s]].</ref>', mw.text.nowiki(mVersion)) end
	end		end

Line 270:		Line 270:
	return table.concat(t)		return table.concat(t)
	end		end
			function makeDivUl(t, class) return makeDiv(makeUl(t), class) end

			function makeUl(t, class)
			if not t then return '' end
			if class then class = string.format(' class="%s"', class) else class = '' end
			return string.format('<ul%s><li>%s</li></ul>', class, table.concat(t, '</li><li>'))
			end
			function makeDiv(s, class)
			if not s or string.len(s) == 0 then return '' end
			if class then class = string.format(' class="%s"', class) else class = '' end
			return string.format('<div%s>%s</div>', class, s)
			end
	function makeInfoRow(info)		function makeInfoRow(info)
	local alii = makeAliasList(info.n)		local alii = makeAliasList(info.n)
	local html = ~~'<div class="html"><ul><li>'..table.concat~~(getEntities(info.n), '~~</li><li>~~')~~..'</li></ul></div>'~~		local html = makeDivUl(getEntities(info.n), 'html')
	local utf8 = ~~'<div class="utf8"><ul><li>'..table.concat~~(getUtf8toStr(info.n), '~~</li><li>~~')~~..'</li></ul></div>'~~		local utf8 = makeDivUl(getUtf8toStr(info.n), 'utf8')
	local utf16 = ~~'<div class="utf16"><ul><li>'..table.concat~~(getUtf16toStr(info.n), '~~</li><li>~~')~~..'</li></ul></div>'~~		local utf16 = makeDivUl(getUtf16toStr(info.n), 'utf16')
	local age = getAge(info.n)		local age = getAge(info.n)
	if(age) then age = string.format('<div class="age">Introduced in Unicode version %s.</div>', age) else age = '' end		if(age) then age = string.format('<div class="age">Introduced in Unicode version %s.</div>', age) else age = '' end
			if(info.category == 'control') then info.name = mw.text.nowiki('<control>') end
	local cat = info.category
	if(~~cat~~ == '~~control~~') then info.~~name~~ = ~~mw.text.nowiki(~~'~~<control>~~') end		if(info.category == 'space separator') then info.cBox = ' box' end
	local doBox = cat=='control' or cat=='format' or cat=='space separator' or
	mw.ustring.match(info.display, '<span%s+class="small')
	local class = ''		local class = ''
	if config.useFontCss then class = class..'script-'..info.sCode end		if config.useFontCss then class = class..'script-'..info.sCode end
	if(doBox) then class = class.." box" end
	local charInfo = '<div class="char">'..table.concat({utf8, utf16, html, age})..'</div>'		local charInfo = '<div class="char">'..table.concat({utf8, utf16, html, age})..'</div>'
	local titleBarFmt = '<div><div class="title">%s %s</div><div class="category">%s</div></div>'		local titleBarFmt = '<div><div class="title">%s %s</div><div class="category">%s</div></div>'
	local titleBar = string.format(titleBarFmt, info.uPlus, info.name, info.category)		local titleBar = string.format(titleBarFmt, info.uPlus, info.name, info.category)
	local fmt = '<tr class="info-row" id="%s"><th class="thumb %s">%s</th><td colspan="16" class="info">%s%s%s</td></tr>'		local fmt = '<tr class="info-row" id="%s"><th class="thumb %s%s">%s</th><td colspan="16" class="info">%s%s%s</td></tr>'
	return string.format(fmt, getAnchorId(info.n), class, info.display, titleBar, alii, charInfo)		return string.format(fmt, getAnchorId(info.n), class, info.cBox, info.display, titleBar, alii, charInfo)
	end		end

Line 305:		Line 312:
	local uPlus = string.format("U+%04X", n)		local uPlus = string.format("U+%04X", n)
	local char = mw.ustring.char(n)		local char = mw.ustring.char(n)
	local cfFmt = '<td title="%s" class="char%s%s"><div>\n%s\n</div></td>'		local cfFmt = '<td title="%s" class="char%s"><div>\n%s\n</div></td>'
	local isControlN, isFormatN = isControl(n), isFormat(n)		local isControlN, isFormatN = isControl(n), isFormat(n)
	local ~~aliases~~ = getControlAliases(n)		local charName = table.last(getControlAliases(n)) or mUnicode.lookup_name(n)
	local charName = table.last(aliases) or mUnicode.lookup_name(n)
	if isControlN then charName = charName or "<control>" end		if isControlN then charName = charName or "<control>" end
	local ~~box~~ = ~~getParamNx("box", n, true)~~		local cBox = ''

	local masterListDisplay = mDisplay[n]		local masterListDisplay = mDisplay[n]
	~~local~~ cBox = ' box'		if masterListDisplay then cBox = ' box' end
	~~if(box~~ == ~~"no" and not~~ masterListDisplay~~) then cBox =~~ '' ~~end~~		local display = masterListDisplay or char
	local display = masterListDisplay or getParamNx("display", n, false) or table.last(getControlAbbrs(n)) or char
	local title = uPlus..' '..charName		local title = uPlus..' '..charName
	if isControlN or isFormatN then display = makeSpan(display, title, true) end		if isControlN or isFormatN then display = makeSpan(display, title, true) end
Line 348:		Line 352:
	elseif isControlN then		elseif isControlN then
	refGrammar.control.count = refGrammar.control.count + 1		refGrammar.control.count = refGrammar.control.count + 1
	cell = string.format(cfFmt, title, " control", ~~cBox~~, makeLink(linkThis, display))		cell = string.format(cfFmt, title, " control box", makeLink(linkThis, display))
	elseif isFormatN then		elseif isFormatN then
	refGrammar.format.count = refGrammar.format.count + 1		refGrammar.format.count = refGrammar.format.count + 1
	cell = string.format(cfFmt, title, " format", ~~cBox~~, makeLink(linkThis, display))		cell = string.format(cfFmt, title, " format box", makeLink(linkThis, display))
	else		else
	if sCode then sClass = sClass..string.format(' script-%s', sCode) end		if sCode then sClass = sClass..string.format(' script-%s', sCode) end
	~~if(masterListDisplay or box == "yes") then~~ sClass = sClass..~~' box' end~~		sClass = sClass..cBox
	isCombining = mUnicode.is_combining(n)		isCombining = mUnicode.is_combining(n)
	if isCombining then		if isCombining then
Line 377:		Line 381:
	printable = printable,		printable = printable,
	category = category,		category = category,
	~~aliases~~ = ~~aliases~~		cBox = cBox,
	}		}
	table.insert(infoTable, makeInfoRow(info))		table.insert(infoTable, makeInfoRow(info))

Cobaltcigs: make "master list" value also force dashed box; delete special case no longer needed

2019-09-19T04:32:48Z

make "master list" value also force dashed box; delete special case no longer needed

← Previous revision		Revision as of 04:32, 19 September 2019
Line 311:		Line 311:
	if isControlN then charName = charName or "<control>" end		if isControlN then charName = charName or "<control>" end
	local box = getParamNx("box", n, true)		local box = getParamNx("box", n, true)

			local masterListDisplay = mDisplay[n]
	local cBox = ' box'		local cBox = ' box'
	if box == "no" then cBox = '' end		if(box == "no" and not masterListDisplay) then cBox = '' end
		⚫	local display = masterListDisplay or getParamNx("display", n, false) or table.last(getControlAbbrs(n)) or char
	local title = uPlus..' '..charName		local title = uPlus..' '..charName
⚫	local display = ~~mDisplay[n]~~ or getParamNx("display", n, false) or table.last(getControlAbbrs(n)) or char
	if isControlN or isFormatN then display = makeSpan(display, title, true) end		if isControlN or isFormatN then display = makeSpan(display, title, true) end
	local sCode = nil		local sCode = nil
Line 350:		Line 352:
	refGrammar.format.count = refGrammar.format.count + 1		refGrammar.format.count = refGrammar.format.count + 1
	cell = string.format(cfFmt, title, " format", cBox, makeLink(linkThis, display))		cell = string.format(cfFmt, title, " format", cBox, makeLink(linkThis, display))
	elseif string.match(charName, "VARIATION SELECTOR") then
	if string.match(charName, "MONGOLIAN") then
	display = table.last(getControlAbbrs(n))
	else
	display = mw.ustring.gsub(charName, "VARIATION SELECTOR%-", "VS ")
	end
	local cellFmt = '<td title="%s" class="char box vs"><div>\n%s\n</div></td>'
	display = makeSpan(display, title, true)
	cell = string.format(cellFmt, title, makeLink(linkThis, display))
	else		else
	if sCode then sClass = sClass..string.format(' script-%s', sCode) end		if sCode then sClass = sClass..string.format(' script-%s', sCode) end
	if box == "yes" then sClass = sClass..' box' end		if(masterListDisplay or box == "yes") then sClass = sClass..' box' end
	isCombining = mUnicode.is_combining(n)		isCombining = mUnicode.is_combining(n)
	if isCombining then		if isCombining then

Cobaltcigs: m

2019-09-19T00:12:00Z

← Previous revision		Revision as of 00:12, 19 September 2019
Line 364:		Line 364:
	isCombining = mUnicode.is_combining(n)		isCombining = mUnicode.is_combining(n)
	if isCombining then		if isCombining then
	~~count~~.combining = ~~count~~.combining + 1		refGrammar.combining.count = refGrammar.combining.count + 1
	sClass = sClass.." combining"		sClass = sClass.." combining"
	display = "◌"..char		display = "◌"..char

Cobaltcigs: heavily refactored

2019-09-19T00:09:10Z

heavily refactored

Show changes

Cobaltcigs: read age module

2019-09-18T22:25:20Z

read age module

← Previous revision		Revision as of 22:25, 18 September 2019
Line 2:		Line 2:
	local mTableTools = require('Module:TableTools')		local mTableTools = require('Module:TableTools')
	local mUnicode = require('Module:Unicode data')		local mUnicode = require('Module:Unicode data')
			local mAge = require('Module:Unicode data/age')
	local mAliases = require('Module:Unicode data/aliases')		local mAliases = require('Module:Unicode data/aliases')
	local mBlocks = require('Module:Unicode data/blocks')		local mBlocks = require('Module:Unicode data/blocks')
Line 108:		Line 109:
	end		end

			function getAge(n)
			local a = mAge.singles[n]
			if(a) then return a end
			for k,v in pairs(mAge.ranges) do
			if n >= v[1] and n <= v[2] then return v[3] end
			end
			return nil
			end
	function getCategory(n)		function getCategory(n)
	local cc = mUnicode.lookup_category(n)		local cc = mUnicode.lookup_category(n)
Line 226:		Line 235:

	function makeInfoRow(info)		function makeInfoRow(info)

⚫	local html = '<ul><li>'..table.concat(getEntities(info.n), '</li><li>')..'</li></ul>'
⚫	local utf8 = '<ul><li>'..table.concat(getUtf8toStr(info.n), '</li><li>')..'</li></ul>'
⚫	local utf16 = '<ul><li>'..table.concat(getUtf16toStr(info.n), '</li><li>')..'</li></ul>'
	local alii = makeAliasList(info.n)		local alii = makeAliasList(info.n)
		⚫	local html = '<div class="html"><ul><li>'..table.concat(getEntities(info.n), '</li><li>')..'</li></ul></div>'
		⚫	local utf8 = '<div class="utf8"><ul><li>'..table.concat(getUtf8toStr(info.n), '</li><li>')..'</li></ul></div>'
		⚫	local utf16 = '<div class="utf16"><ul><li>'..table.concat(getUtf16toStr(info.n), '</li><li>')..'</li></ul></div>'
			local age = getAge(info.n)
			if(age) then age = string.format('<div class="age">Introduced in Unicode %s.</div>', age) else age = '' end

	local cat = info.category		local cat = info.category
	if(cat == 'control') then info.name = mw.text.nowiki('<control>') end		if(cat == 'control') then info.name = mw.text.nowiki('<control>') end


	local doBox = cat=='control' or cat=='format' or cat=='space separator' or		local doBox = cat=='control' or cat=='format' or cat=='space separator' or
Line 240:		Line 251:
	if config.useFontCss then class = class..'script-'..info.sCode end		if config.useFontCss then class = class..'script-'..info.sCode end
	if(doBox) then class = class.." box" end		if(doBox) then class = class.." box" end
	local ~~cfmt~~ = '<div class="char">~~<div class="~~utf8~~">%s</div><div~~ ~~class="~~utf16~~">%s</div><div~~ ~~class="~~html~~">%s</div>~~</div>'		local charInfo = '<div class="char">'..table.concat({utf8, utf16, html, age})..'</div>'
	local charInfo = string.format(cfmt, utf8, utf16, html)
	local titleBarFmt = '<div><div class="title">%s %s</div><div class="category">%s</div></div>'		local titleBarFmt = '<div><div class="title">%s %s</div><div class="category">%s</div></div>'
	local titleBar = string.format(titleBarFmt, info.uPlus, info.name, info.category)		local titleBar = string.format(titleBarFmt, info.uPlus, info.name, info.category)

Cobaltcigs: load display string from master list as first choice

2019-09-18T19:43:30Z

load display string from master list as first choice

← Previous revision		Revision as of 19:43, 18 September 2019
Line 9:		Line 9:
	local mVersion = require('Module:Unicode data/version')		local mVersion = require('Module:Unicode data/version')
	local mEntities = require('Module:Unicode chart/entities')		local mEntities = require('Module:Unicode chart/entities')
			local mDisplay = require('Module:Unicode chart/display')

	local p = {}		local p = {}
Line 297:		Line 298:
	if box == "no" then cBox = '' end		if box == "no" then cBox = '' end
	local title = uPlus..' '..charName		local title = uPlus..' '..charName
	local display = getParamNx("display", n, false) or table.last(getControlAbbrs(n)) or char		local display = mDisplay[n] or getParamNx("display", n, false) or table.last(getControlAbbrs(n)) or char

	if isControlN or isFormatN then		if isControlN or isFormatN then

Cobaltcigs: added utf16, put utf8/utf16/entities info in a div that moves to the right of aliases list, if any, rather than below

2019-09-18T18:39:19Z

added utf16, put utf8/utf16/entities info in a div that moves to the right of aliases list, if any, rather than below

@@ Line 35: / Line 35: @@
 table.concat2 = function(t1,t2) for i=1,#t2 do t1[#t1+1] = t2[i] end return t1 end
 table.last = function(t) if t then return t[#t] else return nil end end
 function makeRange(a,b) return {first=math.min(a,b),last=math.max(a,b)} end
@@ Line 108: / Line 135: @@
 end
-function getEntity(n)
+function getNamedEntity(n)
 	local e = mEntities[n]
 	if e then return string.gsub(e, "&", "&amp;") else return nil end
 end
@@ Line 187: / Line 225: @@
 function makeInfoRow(info)
-	local html, htmlX = string.format('&amp;#%d;', info.n), string.format('&amp;#x%X;', info.n)
+	local html = '<ul><li>'..table.concat(getEntities(info.n), '</li><li>')..'</li></ul>'
-	local e = getEntity(info.n)
+	local utf8 = '<ul><li>'..table.concat(getUtf8toStr(info.n), '</li><li>')..'</li></ul>'
 	local cat = info.category
 	if(cat == 'control') then info.name = mw.text.nowiki('<control>') end
 	local doBox = cat=='control' or cat=='format' or cat=='space separator' or
 		mw.ustring.match(info.display, '<span%s+class="small')
 	if(doBox) then class = class.." box" end
-	local fmt = '<tr class="info-row" id="%s"><th class="thumb %s">%s</th><td colspan="16" class="info"><div class="title">%s %s</div><div class="category">%s</div>%s<div class="utf8">%s</div><div class="html">%s</div></td></tr>'
+	local cfmt = '<div class="char"><div class="utf8">%s</div><div class="utf16">%s</div><div class="html">%s</div></div>'
 end