Module:Convert - Revision history

Johnuniq: update from sandbox per Template talk:Convert#Module version 30

2024-10-26T23:10:14Z

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

Graham87: rm role=math per Wikipedia talk:Manual of Style/Accessibility#Role=math

2024-01-14T08:10:12Z

rm role=math per Wikipedia talk:Manual of Style/Accessibility#Role=math

← Previous revision		Revision as of 08:10, 14 January 2024
Line 1,142:		Line 1,142:
	local fracfmt = {		local fracfmt = {
	{ -- Like {{frac}} (fraction slash).		{ -- Like {{frac}} (fraction slash).
	'<span class="frac~~" role="math~~">{SIGN}<span class="num">{NUM}</span>&frasl;<span class="den">{DEN}</span></span>', -- 1/2		'<span class="frac">{SIGN}<span class="num">{NUM}</span>&frasl;<span class="den">{DEN}</span></span>', -- 1/2
	'<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">{SIGN}{WHOLE}<span class="sr-only">+</span><span class="num">{NUM}</span>&frasl;<span class="den">{DEN}</span></span>', -- 1+2/3
	style = 'frac',		style = 'frac',
	},		},
	{ -- Like {{sfrac}} (stacked fraction, that is, horizontal bar).		{ -- Like {{sfrac}} (stacked fraction, that is, horizontal bar).
	'<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		'<span class="sfrac tion">{SIGN}<span class="num">{NUM}</span><span class="sr-only">/</span><span class="den">{DEN}</span></span>', -- 1//2
	'<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">{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
	style = 'sfrac',		style = 'sfrac',
	},		},

Johnuniq: update from sandbox per Template talk:Convert#Module version 29

2023-05-10T03:20:21Z

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

← Previous revision		Revision as of 03:20, 10 May 2023
Line 568:		Line 568:
	if key == 'symbol' then		if key == 'symbol' then
	value = self.si_prefix .. self._symbol		value = self.si_prefix .. self._symbol
			if value == 'l' then value = 'L' end
	elseif key == 'sym_us' then		elseif key == 'sym_us' then
	value = rawget(self, '_sym_us')		value = rawget(self, '_sym_us')

Johnuniq: update from sandbox per Template talk:Convert#Module version 27

2022-02-13T04:01:13Z

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

Show changes

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

@@ Line 442: / Line 442: @@
 -- END: Code required only for built-in units.
 ------------------------------------------------------------------------
 local function get_range(word)
@@ Line 1,117: / Line 1,139: @@
 local fracfmt = {
 	{ -- Like {{frac}} (fraction slash).
 	},
-	{ -- Like {{sfrac}} (fraction horizontal bar).
+	{ -- Like {{sfrac}} (stacked fraction, that is, horizontal bar).
 	},
+}
@@ Line 1,140: / Line 1,160: @@
 		wholestr = nil
 	end
-		local decorated = with_separator(parms, wholestr)
+		WHOLE = wholestr and with_separator(parms, wholestr),
-		wikitext = format(fmt, decorated, from_en(numstr), from_en(denstr))
+	wikitext = fracfmt[style][wholestr and 2 or 1]:gsub('{(%u+)}', substitute)
 	if do_spell then
 		if negative then
@@ Line 1,159: / Line 1,175: @@
 			end
 		end
-		wikitext = spell_number(parms, inout, wholestr, numstr, denstr) or wikitext
+		local s = spell_number(parms, inout, wholestr, numstr, denstr)
 	end
 	return wikitext
 end
@@ Line 3,660: / Line 3,680: @@
 		wikitext = wikitext .. parms.warnings
 	end
-	return true, wikitext, out_unit_table
+	return true, get_styles(parms) .. wikitext, out_unit_table
 end

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

Show changes

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

← Previous 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).
			-- There is also no space if text starts with '&'
	local current = text:sub(i, i)
			-- (e.g. '°' would display a degree symbol with no preceding space).
⚫	if ~~current~~ == ' ' or ~~current~~ == '-' then
	~~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)
			if not (char == ' ' or char == '-' or text:sub(-6, -1) == ' ') then
		⚫	text = text .. ' '
		⚫	end
	end		end
		⚫	return text
⚫	if i == 1 then
⚫	return ~~' ' ..~~ text
⚫	end
⚫	~~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
		⚫	if trim1 == '+' then
⚫	return ~~withspace(~~withspace(preunit1, ~~1), -1~~)
		⚫	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
		⚫	if trim2 == '' or trim2 == '+' then
⚫	return ~~nil, nil~~
			return PLUS, PLUS
⚫	end
			end
⚫	if trim1 ~= '+' then
	preunit1 = ~~withspace(preunit1, 1)~~		preunit1 = PLUS
	end		end
	if trim2 == '~~ ~~' then ~~-- trick to make preunit2 empty~~		if trim2 == '' then
	~~preunit2~~ = ~~nil~~		if trim1 == '' then
			return nil, nil
	elseif trim2 == '' then
			end
	preunit2 = preunit1		preunit2 = preunit1
	elseif trim2 ~= '+' then		elseif trim2 == '+' then
	preunit2 = ~~withspace(preunit2, 1)~~		preunit2 = PLUS
			elseif trim2 == ' ' then -- trick to make preunit2 empty
			preunit2 = nil
		⚫	else
			preunit2 = withspace(preunit2)
	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

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

← Previous 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

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

← Previous 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 accept_any_text[en_name] 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 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		end
			local cat
	return result
			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
			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

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

← Previous 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,
			-- otherwise return ''.
			local cat
	-- This is so tracking categories only include pages that need correction.
	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
			cat = text_code.all_categories[want_warning and 'warning' or catkey]
⚫	return cat
			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