Module:Val: Difference between revisions

From Zoophilia Wiki
Jump to navigationJump to search
meta>Johnuniq
minor refactor and fixes; accept and display ± before first argument; convert now provides sort key span element
meta>Johnuniq
handle scale for built-in units such as 'million'; fix sort key to handle scaled built-in units and per units; fix units when have up=x with no u=x
Line 33: Line 33:
local isnegative, propersign, prefix
local isnegative, propersign, prefix
prefix, arg = arg:match('^(.-)([%d.]+)$')
prefix, arg = arg:match('^(.-)([%d.]+)$')
if arg:sub(1, 1) == '.' then
arg = '0' .. arg
end
local value = tonumber(arg)
local value = tonumber(arg)
if not value then
if not value then
return false
return false
end
if arg:sub(1, 1) == '.' then
arg = '0' .. arg
end
end
if prefix == '' then
if prefix == '' then
Line 63: Line 63:
end
end


local function get_builtin_unit(unitcode, definitions)
local function get_scale(text, ucode)
-- Return the value of text as a number, or throw an error.
-- This supports extremely basic expressions of the form:
--  a / b
--  a ^ b
-- where a and b are numbers or 'pi'.
local n = tonumber(text)
if n then
return n
end
n = text:gsub('pi', math.pi)
for _, op in ipairs({ '/', '^' }) do
local a, b = n:match('^(.-)' .. op .. '(.*)$')
if a then
a = tonumber(a)
b = tonumber(b)
if a and b then
if op == '/' then
return a / b
elseif op == '^' then
return a ^ b
end
end
break
end
end
error('Unit "' .. ucode .. '" has invalid scale "' .. text .. '"')
end
 
local function get_builtin_unit(ucode, definitions)
-- Return table of information for the specified built-in unit, or nil if not known.
-- Return table of information for the specified built-in unit, or nil if not known.
-- Each defined unit code must be followed by two spaces (not tab characters).
-- Each defined unit code must be followed by two spaces (not tab characters).
local _, pos = definitions:find('\n' .. unitcode .. '  ', 1, true)
local _, pos = definitions:find('\n' .. ucode .. '  ', 1, true)
if pos then
if pos then
local endline = definitions:find('\n', pos, true)
local endline = definitions:find('\n', pos, true)
Line 72: Line 101:
local result = {}
local result = {}
local n = 0
local n = 0
local text = definitions:sub(pos, endline - 1)
local text = definitions:sub(pos, endline - 1):gsub('%s%s+', '\t')
for item in (text .. ' '):gmatch('(%S[^\n]-)%s%s') do
for item in (text .. '\t'):gmatch('(%S.-)\t') do
if item == 'NOSPACE' then
if item == 'NOSPACE' then
result.nospace = true
result.nospace = true
Line 85: Line 114:
elseif n == 2 then
elseif n == 2 then
result.link = item
result.link = item
elseif n == 3 then
result.scale = get_scale(item, ucode)
else
else
break
break
Line 90: Line 121:
end
end
end
end
if n == 2 then
if n >= 2 then
return result
return result
end
end
Line 98: Line 129:
end
end


local function convert_lookup(ucode, options)
local function convert_lookup(ucode, value, scaled_top, want_link, options)
local lookup = require('Module:Convert/sandbox')._unit
local lookup = require('Module:Convert/sandbox')._unit
return lookup(ucode, { value = options.value, link = options.want_link })
return lookup(ucode, {
value = value,
scaled_top = scaled_top,
link = want_link,
sort = options.want_sort
})
end
end


local function get_unit(ucode, value, want_link, want_longscale)
local function get_unit(ucode, value, scaled_top, options)
local want_link = options.want_link
if scaled_top then
want_link = options.want_per_link
end
local data = mw.loadData('Module:Val/units')
local data = mw.loadData('Module:Val/units')
local result = want_longscale and
local result = options.want_longscale and
get_builtin_unit(ucode, data.builtin_units_long_scale) or
get_builtin_unit(ucode, data.builtin_units_long_scale) or
get_builtin_unit(ucode, data.builtin_units)
get_builtin_unit(ucode, data.builtin_units)
local convert_unit = convert_lookup(ucode, { value = value, link = want_link })
if result and result.scale then
value = value * result.scale
end
local convert_unit = convert_lookup(ucode, value, scaled_top, want_link, options)
if result then
if result then
-- Have: result.symbol + result.link + result.isangle + result.nospace
if want_link then
if want_link then
result.text = '[[' .. result.link .. '|' .. result.symbol .. ']]'
result.text = '[[' .. result.link .. '|' .. result.symbol .. ']]'
Line 117: Line 159:
end
end
result.sortkey = convert_unit.sortspan
result.sortkey = convert_unit.sortspan
result.scaled_top = value
else
else
result = {
result = {
text = convert_unit.text,
text = convert_unit.text,
sortkey = convert_unit.sortspan,
sortkey = convert_unit.sortspan,
scaled_top = convert_unit.scaled_value,
}
}
end
end
Line 126: Line 170:
end
end


local function makeunit(ucode, options)
local function makeunit(value, options)
-- Return wikitext, sortkey for the requested unit and options.
-- Return table of information for the requested unit and options, or
-- TODO The sortkey does not account for any per unit.
-- return nil if no unit.
local function bracketed(ucode, text)
return ucode:find('[*./]') and '(' .. text .. ')' or text
end
options = options or {}
options = options or {}
local unit = get_unit(ucode, options.value, options.link, options.longscale)
local unit
local text = unit.text
local ucode = options.u
local percode = options.per
local percode = options.per
if ucode then
unit = get_unit(ucode, value, nil, options)
elseif percode then
unit = { nospace = true, scaled_top = value }
else
return nil
end
local text = unit.text or ''
local sortkey = unit.sortkey
if percode then
if percode then
local perunit = get_unit(percode, 0, options.per_link, options.longscale)
local function bracketed(code, text)
text = bracketed(ucode, text) .. '/' .. bracketed(percode, perunit.text)
return code:find('[*./]') and '(' .. text .. ')' or text
end
local perunit = get_unit(percode, 1, unit.scaled_top, options)
text = (ucode and bracketed(ucode, text) or '') ..
'/' .. bracketed(percode, perunit.text)
sortkey = perunit.sortkey
end
end
if not unit.nospace then
if not unit.nospace then
text = ' ' .. text
text = ' ' .. text
end
end
return { text = text, isangle = unit.isangle, sortkey = unit.sortkey }
return { text = text, isangle = unit.isangle, sortkey = sortkey }
end
end


local function delimit(numstr, fmt)
local function delimit(sign, numstr, fmt)
-- Return numstr (unsigned digits or '.' only) after formatting.
-- Return sign and numstr (unsigned digits or '.' only) after formatting.
local result
local result
fmt = (fmt or ''):lower()
fmt = (fmt or ''):lower()
Line 154: Line 209:
local ipart, dpart = delimit_groups(numstr)
local ipart, dpart = delimit_groups(numstr)
if fmt == 'commas' then
if fmt == 'commas' then
result = table.concat(ipart, ',')
result = sign .. table.concat(ipart, ',')
if dpart then
if dpart then
result = result .. '.' .. table.concat(dpart)
result = result .. '.' .. table.concat(dpart)
end
end
elseif fmt == 'none' then
elseif fmt == 'none' then
result = numstr
result = sign .. numstr
else
else
-- Delimit with a small gap by default.
-- Delimit with a small gap by default.
Line 176: Line 231:
-- LATER Is the following needed?
-- LATER Is the following needed?
--      It is for compatibility with {{val}} which uses {{val/delimitnum}}.
--      It is for compatibility with {{val}} which uses {{val/delimitnum}}.
result = '<span style="white-space:nowrap">' .. result .. '</span>'
result = '<span style="white-space:nowrap">' .. sign .. result .. '</span>'
end
end
return result
return result
Line 185: Line 240:
local fmt = misc_tbl.fmt
local fmt = misc_tbl.fmt
-- Unit.
-- Unit.
local sortkey
local want_sort = not (misc_tbl.sortable == 'off')
local want_sort = not (misc_tbl.sortable == 'off')
local unit_table, sortkey
local sort_value = want_sort and ((number.value or 1) * (e_10.value and 10^e_10.value or 1)) or 1
local sort_value = want_sort and ((number.value or 1) * (e_10.value and 10^e_10.value or 1)) or 1
if unit_spec.u then
local unit_table = makeunit(sort_value, {
unit_table = makeunit(unit_spec.u, {
u = unit_spec.u,
link = unit_spec.link,
want_link = unit_spec.want_link,
per = unit_spec.per,
per = unit_spec.per,
per_link = unit_spec.per_link,
want_per_link = unit_spec.want_per_link,
longscale = unit_spec.longscale,
want_longscale = unit_spec.want_longscale,
value = sort_value,
want_sort = want_sort,
})
})
if unit_table then
if want_sort then
if want_sort then
sortkey = unit_table.sortkey
sortkey = unit_table.sortkey
end
end
elseif want_sort then
else
sortkey = convert_lookup('dummy', { value = sort_value }).sortspan
unit_table = { text = '' }
if want_sort then
sortkey = convert_lookup('dummy', sort_value, nil, nil, { want_sort = true }).sortspan
end
end
end
-- Uncertainty.
-- Uncertainty.
Line 206: Line 265:
local paren_left, paren_right = '', ''
local paren_left, paren_right = '', ''
local uncU = uncertainty.upper.clean
local uncU = uncertainty.upper.clean
if uncU and number.clean then  
if uncU and number.clean then
-- Cannot enter an uncertainty without a preceding number, however, if it were
-- Cannot enter an uncertainty without a preceding number, however, if it were
-- possible, the uncertainty should be ignored to avoid displaying junk.
-- possible, the uncertainty should be ignored to avoid displaying junk.
Line 212: Line 271:
if uncL then
if uncL then
local mSu = require('Module:Su')._main  -- sup/sub format
local mSu = require('Module:Su')._main  -- sup/sub format
uncU = '+' .. delimit(uncU, fmt) .. (uncertainty.upper.errend or '')
uncU = delimit('+', uncU, fmt) .. (uncertainty.upper.errend or '')
uncL = '−' .. delimit(uncL, fmt) .. (uncertainty.lower.errend or '')
uncL = delimit('−', uncL, fmt) .. (uncertainty.lower.errend or '')
if unit_table and unit_table.isangle then
if unit_table.isangle then
uncU = uncU .. unit_table.text
uncU = uncU .. unit_table.text
uncL = uncL .. unit_table.text
uncL = uncL .. unit_table.text
Line 223: Line 282:
unc_text = '(' .. uncU .. ')'  -- template does not delimit
unc_text = '(' .. uncU .. ')'  -- template does not delimit
else
else
unc_text = '<span style="margin-left:0.3em;margin-right:0.15em">±</span>' .. delimit(uncU, fmt)
unc_text = '<span style="margin-left:0.3em;margin-right:0.15em">±</span>' .. delimit('', uncU, fmt)
if e_10.clean then
if e_10.clean then
paren_left = '('
paren_left = '('
Line 232: Line 291:
unc_text = unc_text .. uncertainty.errend
unc_text = unc_text .. uncertainty.errend
end
end
if unit_table and unit_table.isangle then
if unit_table.isangle then
unc_text = unc_text .. unit_table.text
unc_text = unc_text .. unit_table.text
end
end
Line 239: Line 298:
local e_text, n_text
local e_text, n_text
if number.clean then
if number.clean then
n_text = number.sign .. delimit(number.clean, fmt) .. (number.nend  or '')
n_text = delimit(number.sign, number.clean, fmt) .. (number.nend  or '')
if not uncertainty.upper.parens and unit_table and unit_table.isangle then
if not uncertainty.upper.parens and unit_table.isangle then
n_text = n_text .. unit_table.text
n_text = n_text .. unit_table.text
end
end
Line 251: Line 310:
end
end
if e_10.clean then
if e_10.clean then
e_text = '10<sup>' .. e_10.sign .. delimit(e_10.clean, fmt) .. '</sup>'
e_text = '10<sup>' .. delimit(e_10.sign, e_10.clean, fmt) .. '</sup>'
if number.clean then
if number.clean then
e_text = '<span style="margin-left:0.25em;margin-right:0.15em">×</span>' .. e_text
e_text = '<span style="margin-left:0.25em;margin-right:0.15em">×</span>' .. e_text
Line 267: Line 326:
paren_right,
paren_right,
e_text,
e_text,
(unit_table and not unit_table.isangle) and unit_table.text or '',
unit_table.isangle and '' or unit_table.text,
misc_tbl.suffix or '',
misc_tbl.suffix or '',
'</span>'
'</span>'
Line 304: Line 363:
local unit_spec = {
local unit_spec = {
u = args.ul or args.u,
u = args.ul or args.u,
link = args.ul ~= nil,
want_link = args.ul ~= nil,
per = args.upl or args.up,
per = args.upl or args.up,
per_link = args.upl ~= nil,
want_per_link = args.upl ~= nil,
longscale = (args.longscale or args.long_scale or args['long scale']) == 'on',
want_longscale = (args.longscale or args.long_scale or args['long scale']) == 'on',
}
}
local misc_tbl = {
local misc_tbl = {

Revision as of 11:27, 18 July 2015

Documentation for this module may be created at Module:Val/doc

local delimit_groups = require('Module:Gapnum').groups

-- Specific message for {{Val}} errors
local function valerror(msg, nocat)
	if is_test_run then  -- LATER remove
		return 'Error: "' .. msg .. '"'
	end
	local ret = mw.html.create('strong')
							:addClass('error')
							:wikitext('Error in &#123;&#123;Val&#125;&#125;: ' .. msg)
	-- Not in talk, user, user_talk, or wikipedia_talk
	if not nocat and not mw.title.getCurrentTitle():inNamespaces(1,2,3,5) then
		ret:wikitext('[[Category:Pages with incorrect formatting templates use]]')
	end
	return tostring(ret)
end

local function extract_number(index, numbers, args)
	-- Extract number from args[index] and store result in numbers[index]
	-- and return true if no argument or if argument is valid.
	-- The result is a table which is empty if there was no specified number.
	-- Input like 1e3 is regarded as invalid; should use e=3 parameter.
	-- Input commas are removed so 1,234 is the same as 1234.
	local result = {}
	local arg = args[index]  -- has been trimmed
	if arg and arg ~= '' then
		arg = arg:gsub(',', '')
		if arg:sub(1, 1) == '(' and arg:sub(-1) == ')' then
			result.parens = true
			arg = arg:sub(2, -2)
		end
		local minus = '−'
		local isnegative, propersign, prefix
		prefix, arg = arg:match('^(.-)([%d.]+)$')
		local value = tonumber(arg)
		if not value then
			return false
		end
		if arg:sub(1, 1) == '.' then
			arg = '0' .. arg
		end
		if prefix == '' then
			-- Ignore.
		elseif prefix == '±' then
			-- Display for first number, ignore for others.
			if index == 1 then
				propersign = '±'
			end
		elseif prefix == '+' then
			propersign = '+'
		elseif prefix == '-' or prefix == minus then
			propersign = minus
			isnegative = true
		else
			return false
		end
		result.clean = arg
		result.sign = propersign or ''
		result.value = isnegative and -value or value
	end
	numbers[index] = result
	return true
end

local function get_scale(text, ucode)
	-- Return the value of text as a number, or throw an error.
	-- This supports extremely basic expressions of the form:
	--   a / b
	--   a ^ b
	-- where a and b are numbers or 'pi'.
	local n = tonumber(text)
	if n then
		return n
	end
	n = text:gsub('pi', math.pi)
	for _, op in ipairs({ '/', '^' }) do
		local a, b = n:match('^(.-)' .. op .. '(.*)$')
		if a then
			a = tonumber(a)
			b = tonumber(b)
			if a and b then
				if op == '/' then
					return a / b
				elseif op == '^' then
					return a ^ b
				end
			end
			break
		end
	end
	error('Unit "' .. ucode .. '" has invalid scale "' .. text .. '"')
end

local function get_builtin_unit(ucode, definitions)
	-- Return table of information for the specified built-in unit, or nil if not known.
	-- Each defined unit code must be followed by two spaces (not tab characters).
	local _, pos = definitions:find('\n' .. ucode .. '  ', 1, true)
	if pos then
		local endline = definitions:find('\n', pos, true)
		if endline then
			local result = {}
			local n = 0
			local text = definitions:sub(pos, endline - 1):gsub('%s%s+', '\t')
			for item in (text .. '\t'):gmatch('(%S.-)\t') do
				if item == 'NOSPACE' then
					result.nospace = true
				elseif item == 'ANGLE' then
					result.isangle = true
					result.nospace = true
				else
					n = n + 1
					if n == 1 then
						result.symbol = item
					elseif n == 2 then
						result.link = item
					elseif n == 3 then
						result.scale = get_scale(item, ucode)
					else
						break
					end
				end
			end
			if n >= 2 then
				return result
			end
			-- Ignore invalid definition, treating it as a comment.
		end
	end
end

local function convert_lookup(ucode, value, scaled_top, want_link, options)
	local lookup = require('Module:Convert/sandbox')._unit
	return lookup(ucode, {
			value = value,
			scaled_top = scaled_top,
			link = want_link,
			sort = options.want_sort
		})
end

local function get_unit(ucode, value, scaled_top, options)
	local want_link = options.want_link
	if scaled_top then
		want_link = options.want_per_link
	end
	local data = mw.loadData('Module:Val/units')
	local result = options.want_longscale and
		get_builtin_unit(ucode, data.builtin_units_long_scale) or
		get_builtin_unit(ucode, data.builtin_units)
	if result and result.scale then
		value = value * result.scale
	end
	local convert_unit = convert_lookup(ucode, value, scaled_top, want_link, options)
	if result then
		if want_link then
			result.text = '[[' .. result.link .. '|' .. result.symbol .. ']]'
		else
			result.text = result.symbol
		end
		result.sortkey = convert_unit.sortspan
		result.scaled_top = value
	else
		result = {
			text = convert_unit.text,
			sortkey = convert_unit.sortspan,
			scaled_top = convert_unit.scaled_value,
		}
	end
	return result
end

local function makeunit(value, options)
	-- Return table of information for the requested unit and options, or
	-- return nil if no unit.
	options = options or {}
	local unit
	local ucode = options.u
	local percode = options.per
	if ucode then
		unit = get_unit(ucode, value, nil, options)
	elseif percode then
		unit = { nospace = true, scaled_top = value }
	else
		return nil
	end
	local text = unit.text or ''
	local sortkey = unit.sortkey
	if percode then
		local function bracketed(code, text)
			return code:find('[*./]') and '(' .. text .. ')' or text
		end
		local perunit = get_unit(percode, 1, unit.scaled_top, options)
		text = (ucode and bracketed(ucode, text) or '') ..
				'/' .. bracketed(percode, perunit.text)
		sortkey = perunit.sortkey
	end
	if not unit.nospace then
		text = '&nbsp;' .. text
	end
	return { text = text, isangle = unit.isangle, sortkey = sortkey }
end

local function delimit(sign, numstr, fmt)
	-- Return sign and numstr (unsigned digits or '.' only) after formatting.
	local result
	fmt = (fmt or ''):lower()
	-- Group number by integer and decimal parts.
	-- If there is no decimal part, delimit_groups returns only one table.
	local ipart, dpart = delimit_groups(numstr)
	if fmt == 'commas' then
		result = sign .. table.concat(ipart, ',')
		if dpart then
			result = result .. '.' .. table.concat(dpart)
		end
	elseif fmt == 'none' then
		result = sign .. numstr
	else
		-- Delimit with a small gap by default.
		local groups = {}
		groups[1] = table.remove(ipart, 1)
		for _, v in ipairs(ipart) do
			table.insert(groups, '<span style="margin-left:.25em">' .. v .. '</span>')
		end
		if dpart then
			table.insert(groups, '.' .. table.remove(dpart, 1))
			for _, v in ipairs(dpart) do
				table.insert(groups, '<span style="margin-left:.25em">' .. v .. '</span>')
			end
		end
		result = table.concat(groups)
		-- LATER Is the following needed?
		--       It is for compatibility with {{val}} which uses {{val/delimitnum}}.
		result = '<span style="white-space:nowrap">' .. sign .. result .. '</span>'
	end
	return result
end

local function _main(number, uncertainty, unit_spec, misc_tbl)
	local e_10 = misc_tbl.e
	local fmt = misc_tbl.fmt
	-- Unit.
	local sortkey
	local want_sort = not (misc_tbl.sortable == 'off')
	local sort_value = want_sort and ((number.value or 1) * (e_10.value and 10^e_10.value or 1)) or 1
	local unit_table = makeunit(sort_value, {
						u = unit_spec.u,
						want_link = unit_spec.want_link,
						per = unit_spec.per,
						want_per_link = unit_spec.want_per_link,
						want_longscale = unit_spec.want_longscale,
						want_sort = want_sort,
					})
	if unit_table then
		if want_sort then
			sortkey = unit_table.sortkey
		end
	else
		unit_table = { text = '' }
		if want_sort then
			sortkey = convert_lookup('dummy', sort_value, nil, nil, { want_sort = true }).sortspan
		end
	end
	-- Uncertainty.
	local unc_text
	local paren_left, paren_right = '', ''
	local uncU = uncertainty.upper.clean
	if uncU and number.clean then
		-- Cannot enter an uncertainty without a preceding number, however, if it were
		-- possible, the uncertainty should be ignored to avoid displaying junk.
		local uncL = uncertainty.lower.clean
		if uncL then
			local mSu = require('Module:Su')._main  -- sup/sub format
			uncU =  delimit('+', uncU, fmt) .. (uncertainty.upper.errend or '')
			uncL =  delimit('−', uncL, fmt) .. (uncertainty.lower.errend or '')
			if unit_table.isangle then
				uncU = uncU .. unit_table.text
				uncL = uncL .. unit_table.text
			end
			unc_text = '<span style="margin-left:0.3em;">' .. mSu(uncU, uncL) .. '</span>'
		else
			if uncertainty.upper.parens then
				unc_text = '(' .. uncU .. ')'  -- template does not delimit
			else
				unc_text = '<span style="margin-left:0.3em;margin-right:0.15em">±</span>' .. delimit('', uncU, fmt)
				if e_10.clean then
					paren_left = '('
					paren_right = ')'
				end
			end
			if uncertainty.errend then
				unc_text = unc_text .. uncertainty.errend
			end
			if unit_table.isangle then
				unc_text = unc_text .. unit_table.text
			end
		end
	end
	local e_text, n_text
	if number.clean then
		n_text = delimit(number.sign, number.clean, fmt) .. (number.nend  or '')
		if not uncertainty.upper.parens and unit_table.isangle then
			n_text = n_text .. unit_table.text
		end
	else
		n_text = ''
		if not e_10.clean then
			e_10.clean = '0'
			e_10.sign = ''
		end
	end
	if e_10.clean then
		e_text = '10<sup>' .. delimit(e_10.sign, e_10.clean, fmt) .. '</sup>'
		if number.clean then
			e_text = '<span style="margin-left:0.25em;margin-right:0.15em">×</span>' .. e_text
		end
	else
		e_text = ''
	end
	return table.concat({
			'<span class="nowrap">',
			sortkey or '',
			misc_tbl.prefix or '',
			paren_left,
			n_text,
			unc_text or '',
			paren_right,
			e_text,
			unit_table.isangle and '' or unit_table.text,
			misc_tbl.suffix or '',
			'</span>'
		})
end

local function main(frame)
	local getArgs = require('Module:Arguments').getArgs
	local args = getArgs(frame, {wrappers = { 'Template:Val', 'Template:Val/sandboxlua' }})
	local nocat = args.nocategory
	local numbers = {}
	local checks = {
		-- index, description
		{ 1, 'first parameter' },
		{ 2, 'second parameter' },
		{ 3, 'third parameter' },
		{ 'e', 'exponent parameter (<b>e</b>)' },
	}
	for _, item in ipairs(checks) do
		if not extract_number(item[1], numbers, args) then
			return valerror(item[2] .. ' is not a valid number.', nocat)
		end
	end
	if args.u and args.ul then
		return valerror('unit (<b>u</b>) and unit with link (<b>ul</b>) are both specified, only one is allowed.', nocat)
	end
	if args.up and args.upl then
		return valerror('unit per (<b>up</b>) and unit per with link (<b>upl</b>) are both specified, only one is allowed.', nocat)
	end
	local number = numbers[1]
	local uncertainty = {
			upper = numbers[2],
			lower = numbers[3],
			errend = args.errend,
		}
	local unit_spec = {
			u = args.ul or args.u,
			want_link = args.ul ~= nil,
			per = args.upl or args.up,
			want_per_link = args.upl ~= nil,
			want_longscale = (args.longscale or args.long_scale or args['long scale']) == 'on',
		}
	local misc_tbl = {
			e = numbers.e,
			prefix = args.p,
			suffix = args.s,
			fmt = args.fmt or '',
			nocat = args.nocategory,
			sortable = args.sortable,
		}
	number.nend = args['end']
	uncertainty.upper.errend = args['+errend']
	uncertainty.lower.errend = args['-errend']
	return _main(number, uncertainty, unit_spec, misc_tbl)
end

return { main = main, _main = _main }