Module:Gapnum - Revision history

Ookami: 73 revisions imported

2020-09-03T13:41:45Z

73 revisions imported

← Older revision	Revision as of 13:41, 3 September 2020
(No difference)

meta>MusikAnimal: Changed protection level for "Module:Gapnum": High-risk Lua module: 7,000+ transclusions ([Edit=Require extended confirmed access] (indefinite))

2017-10-10T17:39:00Z

Changed protection level for "Module:Gapnum": High-risk Lua module: 7,000+ transclusions ([Edit=Require extended confirmed access] (indefinite))

← Older revision	Revision as of 17:39, 10 October 2017
(No difference)

meta>MusikAnimal: Protected "Module:Gapnum": High-risk module ([Edit=Require template editor access] (indefinite))

2017-10-10T17:19:53Z

Protected "Module:Gapnum": High-risk module ([Edit=Require template editor access] (indefinite))

← Older revision	Revision as of 17:19, 10 October 2017
(No difference)

92.39.197.32: default tonumber() handling has a special case for fractional parts

2015-06-07T01:40:19Z

default tonumber() handling has a special case for fractional parts

← Older revision		Revision as of 01:40, 7 June 2015
Line 13:		Line 13:
	if not n then		if not n then
	error('Parameter 1 is required')		error('Parameter 1 is required')
	elseif not tonumber(n, 36) then -- Validates any number with base ≤ 36		elseif not tonumber(n) and not tonumber(n, 36) then -- Validates any number with base ≤ 36
	error('Unable to convert "' .. args[1] .. '" to a number')		error('Unable to convert "' .. args[1] .. '" to a number')
	end		end

92.39.197.32: Allow numbers with any base ≤ 36

2015-06-07T01:35:39Z

Allow numbers with any base ≤ 36

← Older revision		Revision as of 01:35, 7 June 2015
Line 13:		Line 13:
	if not n then		if not n then
	error('Parameter 1 is required')		error('Parameter 1 is required')
	elseif not tonumber(n) then		elseif not tonumber(n, 36) then -- Validates any number with base ≤ 36
	error('Unable to convert "' .. args[1] .. '" to a number')		error('Unable to convert "' .. args[1] .. '" to a number')
	end		end

meta>The Mol Man at 18:31, 10 January 2015

2015-01-10T18:31:29Z

← Older revision		Revision as of 18:31, 10 January 2015
Line 7:		Line 7:
	getArgs = require('Module:Arguments').getArgs		getArgs = require('Module:Arguments').getArgs
	end		end

	local args = getArgs(frame, {wrappers = 'Template:Gapnum'})		local args = getArgs(frame, {wrappers = 'Template:Gapnum'})
	local n = args[1]		local n = args[1]
Line 34:		Line 35:
	local ret = mw.html.create('span')		local ret = mw.html.create('span')
	:css('white-space','nowrap')		:css('white-space','nowrap')
	-- No ~~margin~~ on first ~~part~~		-- No gap necessary on first group
	~~ret~~:wikitext(table.remove(int_part,1))		:wikitext(table.remove(int_part,1))

	-- Build ~~intstring~~		-- Build int part
	for _, v in ipairs(int_part) do		for _, v in ipairs(int_part) do
	ret:tag('span')		ret:tag('span')
Line 45:		Line 46:

	if frac_part then		if frac_part then
	~~ret:wikitext('.')~~		-- The first group after the decimal shouldn't have a gap
	-- The first group after the decimal shouldn't have a gap ~~between the decimal~~		ret:wikitext('.' .. table.remove(frac_part,1))
	ret:wikitext(table.remove(frac_part,1))		-- Build frac part
	-- ~~Allow groups of 3 or 2 (3 first)~~		for _, v in ipairs(frac_part) do
	for _,v in ipairs(frac_part) do
	ret:tag('span')		ret:tag('span')
	:css('margin-left',gap)		:css('margin-left',gap)
Line 74:		Line 74:
	frac_part = nstr:sub(decimalloc + 1)		frac_part = nstr:sub(decimalloc + 1)
	end		end
			-- only define ret_i as an empty table, let ret_d stay nil
	local ret_i,ret_d = {}		local ret_i,ret_d = {}
	-- Loop to handle most of the groupings; from right to left, so that if a group has less than 3 members, it will be the first group		-- Loop to handle most of the groupings; from right to left, so that if a group has less than 3 members, it will be the first group

meta>The Mol Man at 18:27, 10 January 2015

2015-01-10T18:27:15Z

← Older revision		Revision as of 18:27, 10 January 2015
Line 42:		Line 42:
	:css('margin-left',gap)		:css('margin-left',gap)
	:wikitext(v)		:wikitext(v)
	~~:done()~~
	end		end

Line 50:		Line 49:
	ret:wikitext(table.remove(frac_part,1))		ret:wikitext(table.remove(frac_part,1))
	-- Allow groups of 3 or 2 (3 first)		-- Allow groups of 3 or 2 (3 first)
	for v in ipairs(frac_part) do		for _,v in ipairs(frac_part) do
	ret:tag('span')		ret:tag('span')
	:css('margin-left',gap)		:css('margin-left',gap)
Line 120:		Line 119:
	return ret_i,ret_d		return ret_i,ret_d
	end		end

	return p		return p

meta>The Mol Man: simplify p.gaps by letting it use tables created by p.groups

2015-01-10T18:21:38Z

simplify p.gaps by letting it use tables created by p.groups

← Older revision		Revision as of 18:21, 10 January 2015
Line 29:		Line 29:
	end		end
	local gap = tbl.gap or '.25em'		local gap = tbl.gap or '.25em'
	~~local precision = tbl.prec or -1~~

	~~local decimalloc = nstr:find('.', 1, true)~~		local int_part, frac_part = p.groups(n,tbl.prec)
	local int_part, frac_part
	~~if decimalloc~~ =~~= nil then~~
	~~int_part = nstr~~
	~~else~~
	~~int_part = nstr:sub~~(1, ~~decimalloc-1)~~
	~~frac_part = nstr:sub(decimalloc + 1~~)
	~~end~~
	local ret = mw.html.create('span')		local ret = mw.html.create('span')
	:css('white-space','nowrap')		:css('white-space','nowrap')
	~~local int_string = {}~~		-- No margin on first part
	-- ~~Loop to handle most of the groupings; from right to left, so that if a group has less than 3 members, it will be the~~ first ~~group~~		ret:wikitext(table.remove(int_part,1))
	~~-- ???~~: ~~Would string.reverse with string.gmatch be better??~~
	~~while int_part:len~~(~~) > 3 do~~
	~~-- Insert in first spot, since we're moving backwards~~
	table.~~insert~~(~~int_string~~,1~~,int_part:sub(-3)~~)
	~~int_part = int_part:sub(1,-4~~)
	~~end~~
	~~-- handle any left over numbers; add directly~~
	~~ret:wikitext(int_part)~~
	-- Build intstring		-- Build intstring
	for _, v in ipairs(~~int_string~~) do		for _, v in ipairs(int_part) do
	ret:tag('span')		ret:tag('span')
	:css('margin-left',gap)		:css('margin-left',gap)
Line 59:		Line 45:
	end		end

	if ~~precision ~= 0 and~~ frac_part then		if frac_part then
	ret:wikitext('.')		ret:wikitext('.')
	~~if precision == -1 then~~
	~~precision = frac_part:len()~~
	~~end~~
	~~-- Reduce the length of the string if required precision is less than actual precision~~
	~~-- OR~~
	~~-- Increase it (by adding 0s) if the required precision is more than actual~~
	~~local offset = precision - frac_part:len()~~
	~~if offset < 0 then~~
	~~frac_part = frac_part:sub(1,precision)~~
	~~elseif offset > 0 then~~
	~~frac_part = frac_part .. string.rep('0', offset)~~
	~~end~~
	-- The first group after the decimal shouldn't have a gap between the decimal		-- The first group after the decimal shouldn't have a gap between the decimal
	ret:wikitext(frac_part~~:sub(~~1~~,3)~~)		ret:wikitext(table.remove(frac_part,1))
	~~frac_part = frac_part:sub(4~~)
	~~local last_span~~
	-- Allow groups of 3 or 2 (3 first)		-- Allow groups of 3 or 2 (3 first)
	for v in ~~string.gmatch~~(frac_part~~,'%d%d%d?'~~) do		for v in ipairs(frac_part) do
	~~last_span =~~ ret:tag('span')		ret:tag('span')
	:css('margin-left',gap)		:css('margin-left',gap)
	:wikitext(v)		:wikitext(v)
	~~end~~
	~~-- Preference for groups of 4 instead of groups of 1 at the end~~
	~~if #frac_part % 3 == 1 then~~
	~~if last_span then~~
	~~last_span:wikitext(frac_part:sub(-1))~~
	~~else~~
	~~ret:wikitext(frac_part)~~
	~~end~~
	end		end
	end		end
Line 153:		Line 117:
	end		end
	end		end
	~~if ret_d then~~
	return ret_i,ret_d		return ret_i,ret_d
	~~else~~
	~~return ret_i~~
	~~end~~
	end		end
	return p		return p

meta>The Mol Man: oops, that was my test

2015-01-08T02:13:20Z

oops, that was my test

← Older revision		Revision as of 02:13, 8 January 2015
Line 156:		Line 156:
	return ret_i,ret_d		return ret_i,ret_d
	else		else
	return ~~{1,1}~~		return ret_i
	end		end
	end		end
	return p		return p

meta>The Mol Man at 02:11, 8 January 2015

2015-01-08T02:11:44Z

← Older revision		Revision as of 02:11, 8 January 2015
Line 145:		Line 145:
	if #frac_part % 3 == 1 then		if #frac_part % 3 == 1 then
	if frac_part:len() == 1 then		if frac_part:len() == 1 then
	ret_d~~[1]~~ = {frac_part}		ret_d = {frac_part}
	else		else
	local last_g = ret_d[#ret_d] or ''		local last_g = ret_d[#ret_d] or ''
Line 156:		Line 156:
	return ret_i,ret_d		return ret_i,ret_d
	else		else
	return ~~ret_i~~		return {1,1}
	end		end
	end		end
	return p		return p