Module:Convert - Revision history

Quantumhusky: 1 revision imported

2021-06-06T22:22:41Z

1 revision imported

← Older revision	Revision as of 22:22, 6 June 2021
(No difference)

en>Johnuniq: update from sandbox per Template talk:Convert#Module version 25

2021-05-06T05:08:31Z

update from sandbox per Template talk:Convert#Module version 25

← Older revision		Revision as of 05:08, 6 May 2021
Line 442:		Line 442:
	-- END: Code required only for built-in units.		-- END: Code required only for built-in units.
	------------------------------------------------------------------------		------------------------------------------------------------------------

			local function add_style(parms, class)
			-- Add selected template style to parms if not already present.
			parms.templatestyles = parms.templatestyles or {}
			if not parms.templatestyles[class] then
			parms.templatestyles[class] = parms.frame:extensionTag({
			name = 'templatestyles', args = { src = text_code.titles[class] }
			})
			end
			end

			local function get_styles(parms)
			-- Return string of required template styles, empty if none.
			if parms.templatestyles then
			local t = {}
			for _, v in pairs(parms.templatestyles) do
			table.insert(t, v)
			end
			return table.concat(t)
			end
			return ''
			end

	local function get_range(word)		local function get_range(word)
Line 1,117:		Line 1,139:
	local fracfmt = {		local fracfmt = {
	{ -- Like {{frac}} (fraction slash).		{ -- Like {{frac}} (fraction slash).
	~~-- 1/2 : sign, numerator, denominator~~		'<span class="frac" role="math">{SIGN}<span class="num">{NUM}</span>&frasl;<span class="den">{DEN}</span></span>', -- 1/2
	~~-- 1+2/3 : signed_wholenumber, numerator, denominator~~		'<span class="frac" role="math">{SIGN}{WHOLE}<span class="sr-only">+</span><span class="num">{NUM}</span>&frasl;<span class="den">{DEN}</span></span>', -- 1+2/3
	'<span class="frac ~~nowrap~~">%s<~~sup~~>%s</~~sup~~>&frasl;<~~sub~~>%s</~~sub~~></span>',		style = 'frac',
	'<span class="frac ~~nowrap~~">%s<span class="~~visualhide~~">~~ ~~</span><~~sup~~>%s</~~sup~~>&frasl;<~~sub~~>%s</~~sub~~></span>',
	},		},
	{ -- Like {{sfrac}} (fraction horizontal bar).		{ -- Like {{sfrac}} (stacked fraction, that is, horizontal bar).
	~~-- 1//2 : sign, numerator, denominator (sign should probably be before the fraction, but then it can wrap, and html is already too long)~~		'<span class="sfrac tion" role="math">{SIGN}<span class="num">{NUM}</span><span class="sr-only">/</span><span class="den">{DEN}</span></span>', -- 1//2
	~~-- 1+2//3 : signed_wholenumber, numerator, denominator~~		'<span class="sfrac" role="math">{SIGN}{WHOLE}<span class="sr-only">+</span><span class="tion"><span class="num">{NUM}</span><span class="sr-only">/</span><span class="den">{DEN}</span></span></span>', -- 1+2//3
	'<span class="sfrac ~~nowrap~~" ~~style~~="~~display:inline-block; vertical-align:-0.5em; font-size:85%%; text-align:center;~~"><span ~~style~~="~~display:block; line-height:1em; padding:0 0.1em;~~">~~%s%s~~</span><span class="~~visualhide~~">/</span><span ~~style~~="~~display:block; line-height:1em; padding:0 0.1em; border-top:1px solid;~~">%s</span></span>',		style = 'sfrac',
	'<span class="sfrac ~~nowrap~~">%s<span class="~~visualhide~~">~~ ~~</span><span ~~style~~="~~display:inline-block; vertical-align:-0.5em; font-size:85%%; text-align:center;~~"><span ~~style~~="~~display:block; line-height:1em; padding:0 0.1em;~~">%s</span><span class="~~visualhide~~">/</span><span ~~style~~="~~display:block; line-height:1em; padding:0 0.1em; border-top:1px solid;~~">%s</span></span></span>',
	},		},
	}		}
Line 1,140:		Line 1,160:
	wholestr = nil		wholestr = nil
	end		end
	~~if wholestr then~~		local substitute = {
	~~local decorated~~ = with_separator(parms, wholestr)		SIGN = negative and MINUS or '',
	~~if negative then~~		WHOLE = wholestr and with_separator(parms, wholestr),
	~~decorated = MINUS .. decorated~~		NUM = from_en(numstr),
	~~end~~		DEN = from_en(denstr),
	~~local fmt~~ = ~~fracfmt[style][2]~~		}
	~~wikitext = format(fmt, decorated,~~ from_en(numstr), from_en(denstr))		wikitext = fracfmt[style][wholestr and 2 or 1]:gsub('{(%u+)}', substitute)
	~~else~~
	~~local sign = negative and MINUS or ''~~
	wikitext = ~~format(~~fracfmt[style][1]~~, sign, from_en~~(~~numstr~~), ~~from_en(denstr)~~)
	~~end~~
	if do_spell then		if do_spell then
	if negative then		if negative then
Line 1,159:		Line 1,175:
	end		end
	end		end
	~~wikitext~~ = spell_number(parms, inout, wholestr, numstr, denstr) ~~or wikitext~~		local s = spell_number(parms, inout, wholestr, numstr, denstr)
			if s then
			return s
			end
	end		end
			add_style(parms, fracfmt[style].style)
	return wikitext		return wikitext
	end		end
Line 3,660:		Line 3,680:
	wikitext = wikitext .. parms.warnings		wikitext = wikitext .. parms.warnings
	end		end
	return true, wikitext, out_unit_table		return true, get_styles(parms) .. wikitext, out_unit_table
	end		end

Ookami: 185 revisions imported

2020-09-03T14:08:45Z

185 revisions imported

← Older revision	Revision as of 14:08, 3 September 2020
(No difference)

meta>Johnuniq: update from sandbox per Template talk:Convert#Module version 24

2019-05-04T03:48:20Z

update from sandbox per Template talk:Convert#Module version 24

← Older revision		Revision as of 03:48, 4 May 2019
Line 759:		Line 759:
	result.scale = t.scale * 10 ^ (si.exponent * t.prefixes)		result.scale = t.scale * 10 ^ (si.exponent * t.prefixes)
	return true, setmetatable(result, unit_prefixed_mt)		return true, setmetatable(result, unit_prefixed_mt)
	~~end~~
	~~end~~
	~~end~~
	~~-- Accept any unit with an engineering notation prefix like "e6cuft"~~
	~~-- (million cubic feet), but not chained prefixes like "e3e6cuft",~~
	~~-- and not if the unit is a combination or multiple,~~
	~~-- and not if the unit has an offset or is a built-in.~~
	~~-- Only en digits are accepted.~~
	~~local has_plus = unitcode:find('+', 1, true)~~
	~~if not has_plus then~~
	~~local exponent, baseunit = unitcode:match('^e(%d+)(.*)')~~
	~~if exponent then~~
	~~local engscale = text_code.eng_scales[exponent]~~
	~~if engscale then~~
	~~local success, result = lookup(parms, baseunit, 'no_combination', utable, fails, depth)~~
	~~if success and not (result.offset or result.builtin or result.engscale) then~~
	~~result.unitcode = unitcode -- 'e6cuft' not 'cuft'~~
	~~result.defkey = unitcode -- key to lookup default exception~~
	~~result.engscale = engscale~~
	~~result.scale = result.scale * 10 ^ tonumber(exponent)~~
	~~return true, result~~
	~~end~~
	end		end
	end		end
Line 790:		Line 768:
	local err_is_fatal		local err_is_fatal
	local combo = collection()		local combo = collection()
	if ~~has_plus~~ then		if unitcode:find('+', 1, true) then
	err_is_fatal = true		err_is_fatal = true
	for item in (unitcode .. '+'):gmatch('%s(.-)%s%+') do		for item in (unitcode .. '+'):gmatch('%s(.-)%s%+') do
Line 827:		Line 805:
	if success or err_is_fatal then		if success or err_is_fatal then
	return success, result		return success, result
			end
			end
			-- Accept any unit with an engineering notation prefix like "e6cuft"
			-- (million cubic feet), but not chained prefixes like "e3e6cuft",
			-- and not if the unit is a combination or multiple,
			-- and not if the unit has an offset or is a built-in.
			-- Only en digits are accepted.
			local exponent, baseunit = unitcode:match('^e(%d+)(.*)')
			if exponent then
			local engscale = text_code.eng_scales[exponent]
			if engscale then
			local success, result = lookup(parms, baseunit, 'no_combination', utable, fails, depth)
			if success and not (result.offset or result.builtin or result.engscale) then
			result.unitcode = unitcode -- 'e6cuft' not 'cuft'
			result.defkey = unitcode -- key to lookup default exception
			result.engscale = engscale
			result.scale = result.scale * 10 ^ tonumber(exponent)
			return true, result
			end
	end		end
	end		end
Line 1,382:		Line 1,379:
	-- Before processing, the input text is cleaned:		-- Before processing, the input text is cleaned:
	-- * Any thousand separators (valid or not) are removed.		-- * Any thousand separators (valid or not) are removed.
	-- * Any sign ~~(and optional following whitespace)~~ is replaced with		-- * Any sign is replaced with '-' (if negative) or '' (otherwise).
	-- '-' (if negative) or '' (otherwise).
	-- That replaces Unicode minus with '-'.		-- That replaces Unicode minus with '-'.
	-- If successful, the returned info table contains named fields:		-- If successful, the returned info table contains named fields:
Line 1,443:		Line 1,439:
	local valstr		local valstr
	for _, prefix in ipairs({ '-', MINUS, '−' }) do		for _, prefix in ipairs({ '-', MINUS, '−' }) do
	-- Including '-' ~~means inputs like '- 2' (with space) are accepted as -2.~~		-- Including '-' sets isnegative in case input is a fraction like '-2-3/4'.
	~~-- It also~~ sets isnegative in case input is a fraction like '-2-3/4'.
	local plen = #prefix		local plen = #prefix
	if clean:sub(1, plen) == prefix then		if clean:sub(1, plen) == prefix then
	valstr = clean:sub(plen + 1)		valstr = clean:sub(plen + 1)
			if valstr:match('^%s') then -- "- 1" is invalid but "-1 - 1/2" is ok
			return false, { 'cvt_bad_num', text }
			end
	break		break
	end		end
Line 1,785:		Line 1,783:
	kv_pairs.sing = nil		kv_pairs.sing = nil
	end		end
			kv_pairs.comma = kv_pairs.comma or config.comma -- for plwiki who want default comma=5
	for loc_name, loc_value in pairs(kv_pairs) do		for loc_name, loc_value in pairs(kv_pairs) do
	local en_name = text_code.en_option_name[loc_name]		local en_name = text_code.en_option_name[loc_name]
Line 2,053:		Line 2,052:
	-- Testing shows this function is successful for 96% of converts in articles,		-- Testing shows this function is successful for 96% of converts in articles,
	-- and that on average it speeds up converts by 8%.		-- and that on average it speeds up converts by 8%.
	~~if parms.opt_ri or parms.opt_spell_in then return end~~
	local clean = to_en(strip(parms[1] or ''), parms)		local clean = to_en(strip(parms[1] or ''), parms)
	if #clean > 10 or not clean:match('^[0-9.]+$') then		if parms.opt_ri or parms.opt_spell_in or #clean > 10 or not clean:match('^[0-9.]+$') then
	return false, clean		return false, clean
	end		end
Line 2,532:		Line 2,530:
	end		end
	local sortspan		local sortspan
	if sortkey and ~~(parms.opt_sortable_debug or~~ not parms.table_align) then		if sortkey and not parms.table_align then
	sortspan = parms.opt_sortable_debug and		sortspan = parms.opt_sortable_debug and
	'<span style="border:1px solid~~;display:inline;" class="sortkey~~">' .. sortkey .. '♠</span>' or		'<span data-sort-value="' .. sortkey .. '♠"><span style="border:1px solid">' .. sortkey .. '♠</span></span>' or
	'<span ~~style="display:none" class~~="~~sortkey">~~' .. sortkey .. '♠</span>'		'<span data-sort-value="' .. sortkey .. '♠"></span>'
	parms.join_before = sortspan		parms.join_before = sortspan
	end		end
	if parms.table_align then		if parms.table_align then
			local sort
			if sortkey then
			sort = ' data-sort-value="' .. sortkey .. '"'
			if parms.opt_sortable_debug then
			parms.join_before = '<span style="border:1px solid">' .. sortkey .. '</span>'
			end
			else
			sort = ''
			end
	local style = 'style="text-align:' .. parms.table_align .. ';'		local style = 'style="text-align:' .. parms.table_align .. ';'
	~~local sort = sortkey and ' data-sort-value="' .. sortkey .. '"' or ''~~
	local joins = {}		local joins = {}
	for i = 1, 2 do		for i = 1, 2 do
Line 3,154:		Line 3,160:
	if (abbr == 'on' or abbr == inout) and not parms.number_word then		if (abbr == 'on' or abbr == inout) and not parms.number_word then
	info.show = info.show ..		info.show = info.show ..
	'<span style="margin-left:0.2em">×<span style="margin-left:0.1em">' ..		'<span style="margin-left:0.2em">×<span style="margin-left:0.1em">' ..
	from_en('10') ..		from_en('10') ..
	'</span></span><s style="display:none">^</s><sup>' ..		'</span></span><s style="display:none">^</s><sup>' ..
	from_en(tostring(engscale.exponent)) .. '</sup>'		from_en(tostring(engscale.exponent)) .. '</sup>'
	elseif number_word then		elseif number_word then
	local number_id		local number_id

meta>Johnuniq: update from sandbox per Template talk:Convert#Module version 23

2018-06-15T10:08:32Z

update from sandbox per Template talk:Convert#Module version 23

← Older revision		Revision as of 10:08, 15 June 2018
Line 1,613:		Line 1,613:
	-- p2 is text to insert before the output unit		-- p2 is text to insert before the output unit
	-- p1 or p2 may be nil to mean "no preunit"		-- p1 or p2 may be nil to mean "no preunit"
	-- Using '+ ' gives output like "5+ feet" (no ~~preceding~~ space).		-- Using '+' gives output like "5+ feet" (no space before, but space after).
	local function withspace(text, i)		local function withspace(text, wantboth)
	-- ~~Insert~~ space ~~at beginning~~ if ~~i == 1~~, ~~or at end if i == -1~~.		-- Return text with space before and, if wantboth, after.
	-- However, no space is ~~inserted~~ if there is a space or ' '		-- However, no space is added if there is a space or ' ' or '-'
	-- ~~or '-'~~ at that position ('-' is for adjectival text).		-- at that position ('-' is for adjectival text).
	local ~~current~~ = text:sub(i, i)		-- There is also no space if text starts with '&'
	if ~~current~~ == ' ~~' or current == '-~~' then		-- (e.g. '°' would display a degree symbol with no preceding space).
	return text		local char = text:sub(1, 1)
			if char == '&' then
			return text -- an html entity can be used to specify the exact display
	end		end
	if i == 1 then		if not (char == ' ' or char == '-' or char == '+') then
	~~current =~~ text~~:sub(1, 6)~~		text = ' ' .. text
	~~else~~
	~~current~~ = text~~:sub(-6, -1)~~
	end		end
	if ~~current~~ == ' ' then		if wantboth then
	~~return~~ text		char = text:sub(-1, -1)
	~~end~~		if not (char == ' ' or char == '-' or text:sub(-6, -1) == ' ') then
	~~if i~~ =~~= 1 then~~		text = text .. ' '
	~~return ' ' .. text~~		end
	end		end
	return text ~~.. ' '~~		return text
	end		end
			local PLUS = '+ '
	preunit1 = preunit1 or ''		preunit1 = preunit1 or ''
	local trim1 = strip(preunit1)		local trim1 = strip(preunit1)
Line 1,641:		Line 1,642:
	return nil		return nil
	end		end
	return ~~withspace(~~withspace(preunit1, ~~1), -1~~)		if trim1 == '+' then
			return PLUS
			end
			return withspace(preunit1, true)
	end		end
			preunit1 = withspace(preunit1)
	preunit2 = preunit2 or ''		preunit2 = preunit2 or ''
	local trim2 = strip(preunit2)		local trim2 = strip(preunit2)
	if trim1 == '' ~~and~~ trim2 == '' then		if trim1 == '+' then
	return ~~nil~~, ~~nil~~		if trim2 == '' or trim2 == '+' then
			return PLUS, PLUS
			end
			preunit1 = PLUS
	end		end
	if trim1 ~= '+' then		if trim2 == '' then
	~~preunit1~~ = ~~withspace(~~preunit1~~, 1)~~		if trim1 == '' then
	~~end~~		return nil, nil
	if trim2 == ' ' then -- trick to make preunit2 empty		end
			preunit2 = preunit1
			elseif trim2 == '+' then
			preunit2 = PLUS
			elseif trim2 == ' ' then -- trick to make preunit2 empty
	preunit2 = nil		preunit2 = nil
	~~elseif trim2 == '' then~~		else
	~~preunit2 = preunit1~~		preunit2 = withspace(preunit2)
	~~elseif trim2 ~= '+' then~~
	preunit2 = withspace(preunit2~~, 1~~)
	end		end
	return preunit1, preunit2		return preunit1, preunit2
Line 2,241:		Line 2,251:
	else		else
	parms.precision = precision		parms.precision = precision
			end
			for j = i, i + 3 do
			local parm = parms[j] -- warn if find a non-empty extraneous parameter
			if parm and parm:match('%S') then
			add_warning(parms, 1, 'cvt_unknown_option', parm)
			break
			end
	end		end
	return true, in_unit_table		return true, in_unit_table
Line 3,197:		Line 3,214:
	return preunit .. id1		return preunit .. id1
	end		end
	if parms.opt_also_symbol and not composite then		if parms.opt_also_symbol and not composite and not parms.opt_flip then
	local join1 = parms.joins[1]		local join1 = parms.joins[1]
	if join1 == ' (' or join1 == ' [' then		if join1 == ' (' or join1 == ' [' then

meta>Johnuniq: update from sandbox per Template talk:Convert#Module version 20

2017-12-09T22:33:14Z

update from sandbox per Template talk:Convert#Module version 20

← Older revision		Revision as of 22:33, 9 December 2017
Line 590:		Line 590:
	-- This is never called to determine a unit name or link because per units		-- This is never called to determine a unit name or link because per units
	-- are handled as a special case.		-- are handled as a special case.
	-- Similarly, the default output is handled elsewhere.		-- Similarly, the default output is handled elsewhere, and for a symbol
			-- this is only called from get_default() for default_exceptions.
	__index = function (self, key)		__index = function (self, key)
	local value		local value
Line 2,915:		Line 2,916:
	local per = unit_table.per		local per = unit_table.per
	if per then		if per then
			local paren1, paren2 = '', '' -- possible parentheses around bottom unit
	local unit1 = per[1] -- top unit_table, or nil		local unit1 = per[1] -- top unit_table, or nil
	local unit2 = per[2] -- bottom unit_table		local unit2 = per[2] -- bottom unit_table
Line 2,926:		Line 2,928:
	return symbol -- for exceptions that have the symbol built-in		return symbol -- for exceptions that have the symbol built-in
	end		end
			end
			if (unit2.symbol):find('⋅', 1, true) then
			paren1, paren2 = '(', ')'
	end		end
	end		end
Line 2,965:		Line 2,970:
	unit_table.sep = ''		unit_table.sep = ''
	end		end
	return result .. linked_id(parms, unit2, key_id2, want_link, '1')		return result .. paren1 .. linked_id(parms, unit2, key_id2, want_link, '1') .. paren2
	end		end
	if multiplier then		if multiplier then

meta>Johnuniq: update from sandbox per Template talk:Convert#Module version 19

2017-08-17T01:39:24Z

update from sandbox per Template talk:Convert#Module version 19

← Older revision		Revision as of 01:39, 17 August 2017
Line 1,758:		Line 1,758:
	-- Return true if successful or return false, t where t is an error message table.		-- Return true if successful or return false, t where t is an error message table.
	currency_text = nil -- local testing can hold module in memory; must clear globals		currency_text = nil -- local testing can hold module in memory; must clear globals
			local accept_any_text = {
			input = true,
			qid = true,
			qual = true,
			stylein = true,
			styleout = true,
			tracking = true,
			}
	if kv_pairs.adj and kv_pairs.sing then		if kv_pairs.adj and kv_pairs.sing then
	-- For enwiki (before translation), warn if attempt to use adj and sing		-- For enwiki (before translation), warn if attempt to use adj and sing
Line 1,794:		Line 1,802:
	end		end
	end		end
	elseif en_name ~~== 'stylein' or en_name == 'styleout' or en_name == 'qual' or en_name == 'qid' or en_name == 'input'~~ then		elseif accept_any_text[en_name] then
	en_value = loc_value ~= '' and loc_value or nil -- accept non-empty user text with no validation		en_value = loc_value ~= '' and loc_value or nil -- accept non-empty user text with no validation
	if en_name == 'input' then		if en_name == 'input' then
Line 3,651:		Line 3,659:
	-- An unknown input unit would display the input and an error message		-- An unknown input unit would display the input and an error message
	-- with success == true at this point.		-- with success == true at this point.
	-- Also, can have success == false with a message ~~to output~~ an empty string.		-- Also, can have success == false with a message that outputs an empty string.
	if ~~success~~ then		if parms.input_text then
	if parms.have_problem ~~and~~ parms.~~input_text~~ then		if success and not parms.have_problem then
	~~return~~ parms.~~input_text~~		return result
			end
			local cat
			if parms.tracking then
			-- Add a tracking category using the given text as the category sort key.
			-- There is currently only one type of tracking, but in principle multiple
			-- items could be tracked, using different sort keys for convenience.
			cat = wanted_category('tracking', parms.tracking)
	end		end
	return ~~result~~		return parms.input_text .. (cat or '')
	end		end
	return ~~parms.input_text~~ and ~~parms.input_text~~ or message(parms, result)		return success and result or message(parms, result)
	end		end

meta>Johnuniq: update from sandbox per Template talk:Convert#Module version 18

2017-07-01T03:11:49Z

update from sandbox per Template talk:Convert#Module version 18

← Older revision		Revision as of 03:11, 1 July 2017
Line 259:		Line 259:
	end		end

	local function wanted_category(~~cat~~)		local function wanted_category(catkey, catsort, want_warning)
	-- Return ~~cat~~ if it is wanted in current namespace, otherwise return ~~nil~~.		-- Return message category if it is wanted in current namespace,
	~~-- This is so tracking categories only include pages that need correction.~~		-- otherwise return ''.
			local cat
	local title = mw.title.getCurrentTitle()		local title = mw.title.getCurrentTitle()
	if title then		if title then
Line 268:		Line 269:
	for _, v in ipairs(split(config.nscat or nsdefault, ',')) do		for _, v in ipairs(split(config.nscat or nsdefault, ',')) do
	if namespace == tonumber(v) then		if namespace == tonumber(v) then
	~~return~~ cat		cat = text_code.all_categories[want_warning and 'warning' or catkey]
			if catsort and catsort ~= '' and cat:sub(-2) == ']]' then
			cat = cat:sub(1, -3) .. '\|' .. mw.text.nowiki(usub(catsort, 1, 20)) .. ']]'
			end
			break
	end		end
	end		end
	end		end
			return cat or ''
	end		end

	local function message(parms, mcode)		local function message(parms, mcode, is_warning)
	-- Return wikitext for an error message, including category if specified		-- Return wikitext for an error message, including category if specified
	-- for the message type.		-- for the message type.
Line 341:		Line 347:
	return success and (revid == '')		return success and (revid == '')
	end		end
			local want_warning = is_warning and
			not config.warnings and -- show unobtrusive warnings if config.warnings not configured
			not msg.nowarn -- but use msg settings, not standard warning, if specified
	local title = string.gsub(msg[1] or 'Missing message', '$%d+', parts)		local title = string.gsub(msg[1] or 'Missing message', '$%d+', parts)
	local text = msg[2] or 'Missing message'		local text = want_warning and '*' or msg[2] or 'Missing message'
	local cat = wanted_category(~~text_code.all_categories[~~msg[3]]) ~~or ''~~		local cat = wanted_category(msg[3], mcode[2], want_warning)
	local anchor = msg[4] or ''		local anchor = msg[4] or ''
	local fmtkey = ispreview() and 'cvt_format_preview' or (msg.format or 'cvt_format')		local fmtkey = ispreview() and 'cvt_format_preview' or
			(want_warning and 'cvt_format2' or msg.format or 'cvt_format')
	local fmt = text_code.all_messages[fmtkey] or 'convert: bug'		local fmt = text_code.all_messages[fmtkey] or 'convert: bug'
	return subparm(fmt, title:gsub('"', '"'), text, cat, anchor)		return subparm(fmt, title:gsub('"', '"'), text, cat, anchor)
Line 354:		Line 364:
	function add_warning(parms, level, key, text1, text2) -- for forward declaration above		function add_warning(parms, level, key, text1, text2) -- for forward declaration above
	-- If enabled, add a warning that will be displayed after the convert result.		-- If enabled, add a warning that will be displayed after the convert result.
			-- A higher level is more verbose: more kinds of warnings are displayed.
	-- To reduce output noise, only the first warning is displayed.		-- To reduce output noise, only the first warning is displayed.
	~~if config.warnings or level < 0 then~~		if level <= (tonumber(config.warnings) or 1) then
	if level <= (tonumber(config.warnings) or 1) then		if parms.warnings == nil then
	if parms.warnings == nil then		parms.warnings = message(parms, { key, text1, text2 }, true)
	parms.warnings = message(parms, { key, text1, text2 })
	~~end~~
	end		end
	end		end
Line 380:		Line 389:
	success, speller = pcall(get_speller, spell_module)		success, speller = pcall(get_speller, spell_module)
	if not success or type(speller) ~= 'function' then		if not success or type(speller) ~= 'function' then
	add_warning(parms, 1, 'cvt_no_spell')		add_warning(parms, 1, 'cvt_no_spell', 'spell')
	return nil		return nil
	end		end
Line 1,782:		Line 1,791:
	en_value = number		en_value = number
	else		else
	add_warning(parms, 1, (en_name == 'frac' and 'cvt_bad_frac' or 'cvt_bad_sigfig'), loc_value)		add_warning(parms, 1, (en_name == 'frac' and 'cvt_bad_frac' or 'cvt_bad_sigfig'), loc_name .. '=' .. loc_value)
	end		end
	end		end

meta>Johnuniq: extra Wikidata fix I meant to do: when using "frequency" or "wavelength", any output unit also specified in the convert is ignored

2017-05-06T07:50:00Z

extra Wikidata fix I meant to do: when using "frequency" or "wavelength", any output unit also specified in the convert is ignored

← Older revision		Revision as of 07:50, 6 May 2017
Line 2,172:		Line 2,172:
	end		end
	if word and not set_precision(word) then		if word and not set_precision(word) then
	parms.out_unit = word		parms.out_unit = parms.out_unit or word
	if set_precision(strip(parms[i])) then		if set_precision(strip(parms[i])) then
	i = i + 1		i = i + 1

meta>Johnuniq: update from sandbox per Template talk:Convert#Module version 17

2017-05-06T07:15:40Z

update from sandbox per Template talk:Convert#Module version 17

← Older revision		Revision as of 07:15, 6 May 2017
Line 1,785:		Line 1,785:
	end		end
	end		end
	elseif en_name == 'stylein' or en_name == 'styleout' or en_name == 'qid' or en_name == 'input' then		elseif en_name == 'stylein' or en_name == 'styleout' or en_name == 'qual' or en_name == 'qid' or en_name == 'input' then
	en_value = loc_value ~= '' and loc_value or nil -- accept non-empty user text with no validation		en_value = loc_value ~= '' and loc_value or nil -- accept non-empty user text with no validation
	if en_name == 'input' then		if en_name == 'input' then
Line 2,046:		Line 2,046:
	end		end

	local function wikidata_call(operation, ...)		local function wikidata_call(parms, operation, ...)
	-- Return true, s where s is the result of a Wikidata operation,		-- Return true, s where s is the result of a Wikidata operation,
	-- or return false, t where t is an error message table.		-- or return false, t where t is an error message table.
Line 2,057:		Line 2,057:
	if success then		if success then
	return status, result		return status, result
			end
			if parms.opt_sortable_debug then
			-- Use debug=yes to crash if an error while accessing Wikidata.
			error('Error accessing Wikidata: ' .. status, 0)
	end		end
	return false, { 'cvt_wd_fail' }		return false, { 'cvt_wd_fail' }
Line 2,088:		Line 2,092:
	return lookup({}, ucode, 'no_combination')		return lookup({}, ucode, 'no_combination')
	end		end
	return wikidata_call('_listunits', ulookup)		return wikidata_call(parms, '_listunits', ulookup)
	end		end
	local success, msg = translate_parms(parms, kv_pairs)		local success, msg = translate_parms(parms, kv_pairs)
	if not success then return false, msg end		if not success then return false, msg end
	if parms.input then		if parms.input then
	success, msg = wikidata_call('_adjustparameters', parms, 1)		success, msg = wikidata_call(parms, '_adjustparameters', parms, 1)
	if not success then return false, msg end		if not success then return false, msg end
	end		end
Line 2,167:		Line 2,171:
	end		end
	end		end
	if not set_precision(word) then		if word and not set_precision(word) then
	parms.out_unit = word		parms.out_unit = word
	if set_precision(strip(parms[i])) then		if set_precision(strip(parms[i])) then
Line 2,861:		Line 2,865:
	else		else
	i = 3		i = 3
			end
			if i > 1 and varname == 'pl' then
			i = i - 1
	end		end
	vname = split(unit_table.varname, '!')[i]		vname = split(unit_table.varname, '!')[i]
Line 3,491:		Line 3,498:
	local bad_input_mcode = in_unit_table.bad_mcode -- nil if input unit is a valid convert unit		local bad_input_mcode = in_unit_table.bad_mcode -- nil if input unit is a valid convert unit
	local out_unit = parms.out_unit		local out_unit = parms.out_unit
	if out_unit == nil or out_unit == '' then		if out_unit == nil or out_unit == '' or type(out_unit) == 'function' then
	if bad_input_mcode or parms.opt_input_unit_only then		if bad_input_mcode or parms.opt_input_unit_only then
	bad_output = ''		bad_output = ''
	else		else
	success, out_unit = ~~get_default~~(in_unit_table.valinfo[1].value, in_unit_table)		local getdef = type(out_unit) == 'function' and out_unit or get_default
			success, out_unit = getdef(in_unit_table.valinfo[1].value, in_unit_table)
	parms.out_unit = out_unit		parms.out_unit = out_unit
	if not success then		if not success then