Module:Convert/sandbox - Revision history

Johnuniq: fix variable_name and add pername for i18n; handle units like "E6km" so can have "million km"

2024-10-23T03:31:06Z

fix variable_name and add pername for i18n; handle units like "E6km" so can have "million km"

Graham87: rm role=math per Wikipedia talk:Manual of Style/Accessibility#Role=math (mirror edit from main page)

2024-01-14T14:43:51Z

rm role=math per Wikipedia talk:Manual of Style/Accessibility#Role=math (mirror edit from main page)

← Previous revision		Revision as of 14:43, 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: liter/litre fix to show symbol 'L' rather than 'l' per MOS

2023-05-02T07:55:43Z

liter/litre fix to show symbol 'L' rather than 'l' per MOS

← Previous revision		Revision as of 07:55, 2 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: use new cvt_bad_altitude message and "INTEGER" for less confusion; clean regex

2022-02-12T06:57:04Z

use new cvt_bad_altitude message and "INTEGER" for less confusion; clean regex

← Previous revision		Revision as of 06:57, 12 February 2022
Line 1,803:		Line 1,803:
	if en_name then		if en_name then
	local en_value = text_code.en_option_value[en_name]		local en_value = text_code.en_option_value[en_name]
	if en_value == '~~NUMBER~~' then -- altitude_ft, altitude_m, frac, sigfig		if en_value == 'INTEGER' then -- altitude_ft, altitude_m, frac, sigfig
	en_value = nil		en_value = nil
	if loc_value == '' then		if loc_value == '' then
Line 1,830:		Line 1,830:
	m = 'cvt_bad_sigfig'		m = 'cvt_bad_sigfig'
	else		else
	m = '~~cvt_bad_num~~'		m = 'cvt_bad_altitude'
	end		end
	add_warning(parms, 1, m, loc_name .. '=' .. loc_value)		add_warning(parms, 1, m, loc_name .. '=' .. loc_value)
Line 2,650:		Line 2,650:
	end		end
	elseif in_current.builtin == 'mach' then		elseif in_current.builtin == 'mach' then
	local sigfig = info.clean:gsub('^[0%.]\+', ''):gsub('%.', ''):len() + 1		local sigfig = info.clean:gsub('^[0.]+', ''):gsub('%.', ''):len() + 1
	show, exponent = make_sigfig(outvalue, sigfig)		show, exponent = make_sigfig(outvalue, sigfig)
	else		else

Johnuniq: enhanced Mach unit handling

2022-01-24T08:40:27Z

enhanced Mach unit handling

Show changes

Johnuniq: use spaced en dash instead of en dash for ranges with unit Mach and composite units like ftin

2022-01-18T01:18:35Z

use spaced en dash instead of en dash for ranges with unit Mach and composite units like ftin

← Previous revision		Revision as of 01:18, 18 January 2022
Line 1,691:		Line 1,691:
	end		end

	local function range_text(range, want_name, parms, before, after, inout)		local function range_text(range, want_name, parms, before, after, inout, options)
	-- Return before .. rtext .. after		-- Return before .. rtext .. after
	-- where rtext is the text that separates two values in a range.		-- where rtext is the text that separates two values in a range.
	local rtext, adj_text, exception		local rtext, adj_text, exception
			options = options or {}
	if type(range) == 'table' then		if type(range) == 'table' then
	-- Table must specify range text for ('off' and 'on') or ('input' and 'output'),		-- Table must specify range text for ('off' and 'on') or ('input' and 'output'),
Line 1,711:		Line 1,712:
	end		end
	end		end
	if rtext == '–' and after:sub(1, #MINUS) == MINUS then		if rtext == '–' and (options.spaced or after:sub(1, #MINUS) == MINUS) then
	rtext = ' – '		rtext = ' – '
	end		end
Line 3,256:		Line 3,257:
	-- For simplicity and because more not needed, handle one range item only.		-- For simplicity and because more not needed, handle one range item only.
	local prefix2 = make_id(parms, 2, first_unit) .. ' '		local prefix2 = make_id(parms, 2, first_unit) .. ' '
	result = range_text(range[1], want_name, parms, result, prefix2 .. valinfo[2].show, 'in')		result = range_text(range[1], want_name, parms, result, prefix2 .. valinfo[2].show, 'in', {spaced=true})
	end		end
	return preunit .. result		return preunit .. result
Line 3,346:		Line 3,347:
	if range then		if range then
	-- For simplicity and because more not needed, handle one range item only.		-- For simplicity and because more not needed, handle one range item only.
	result = range_text(range[1], want_name, parms, result, prefix .. valinfo[2].show, inout)		result = range_text(range[1], want_name, parms, result, prefix .. valinfo[2].show, inout, {spaced=true})
	end		end
	return preunit .. result		return preunit .. result
Line 3,552:		Line 3,553:
	local success, result2 = make_result(valinfo[i+1])		local success, result2 = make_result(valinfo[i+1])
	if not success then return false, result2 end		if not success then return false, result2 end
	result = range_text(range[i], want_name, parms, result, result2, inout)		result = range_text(range[i], want_name, parms, result, result2, inout, {spaced=true})
	end		end
	end		end

Johnuniq: update altitude table for Mach speed of sound

2022-01-18T01:15:56Z

update altitude table for Mach speed of sound

← Previous revision		Revision as of 01:15, 18 January 2022
Line 411:		Line 411:
	-- If no altitude given, use default (zero altitude = sea level).		-- If no altitude given, use default (zero altitude = sea level).
	-- Table gives speed of sound in miles per hour at various altitudes:		-- Table gives speed of sound in miles per hour at various altitudes:
	-- altitude = -17,499 to ~~302~~,499 feet		-- altitude = -17,499 to 402,499 feet
	-- mach_table[a + 4] = s where		-- mach_table[a + 4] = s where
	-- a = (altitude / 5000) rounded to nearest integer (-3 to 60)		-- a = (altitude / 5000) rounded to nearest integer (-3 to 80)
	-- s = speed of sound (mph) at that altitude		-- s = speed of sound (mph) at that altitude
	-- LATER: Should calculate result from an interpolation between the next		-- LATER: Should calculate result from an interpolation between the next
Line 423:		Line 423:
	660.1, 660.1, 660.1, 662.0, 664.3, 666.5, 668.9, 671.1, 673.4, 675.6, -- 11 to 20		660.1, 660.1, 660.1, 662.0, 664.3, 666.5, 668.9, 671.1, 673.4, 675.6, -- 11 to 20
	677.9, 683.7, 689.9, 696.0, 702.1, 708.1, 714.0, 719.9, 725.8, 731.6, -- 21 to 30		677.9, 683.7, 689.9, 696.0, 702.1, 708.1, 714.0, 719.9, 725.8, 731.6, -- 21 to 30
	737.3, 737.7, 737.7, 736.2, 730.5, 724.6, 718.8, 712.9, 707.0, 701.1, -- 31 to 40		737.3, 737.7, 737.7, 736.2, 730.5, 724.6, 718.8, 712.9, 707.0, 701.0, -- 31 to 40
	695.0, 688.9, 682.8, 676.6, 670.4, 664.1, 657.8, 652.9, 648.3, 643.7, -- 41 to 50		695.0, 688.9, 682.8, 676.6, 670.4, 664.1, 657.8, 652.9, 648.3, 643.7, -- 41 to 50
	639.1, 634.4, 629.6, 624.8, 620.0, 615.2, 613.2, 613.2, 613.2, 613.5, -- 51 to 60		639.1, 634.4, 629.6, 624.8, 620.0, 615.2, 613.2, 613.2, 613.2, 613.5, -- 51 to 60
			614.4, 615.3, 616.7, 619.8, 623.4, 629.7, 635.0, 641.1, 650.6, 660.0, -- 61 to 70
			672.5, 674.3, 676.1, 677.9, 679.7, 681.5, 683.3, 685.1, 686.8, 688.6, -- 71 to 80
	}		}
	altitude = altitude or 0		altitude = altitude or 0
Line 435:		Line 437:
	if a < -3 then		if a < -3 then
	a = -3		a = -3
	elseif a > 60 then		elseif a > 80 then
	a = 60		a = 80
	end		end
	return mach_table[a + 4] * 0.44704 -- mph converted to m/s		return mach_table[a + 4] * 0.44704 -- mph converted to m/s

Johnuniq: when needed, select frac/sfrac templatestyles

2021-04-28T09:54:22Z

when needed, select frac/sfrac templatestyles

← Previous revision		Revision as of 09:54, 28 April 2021
Line 444:		Line 444:

	local function add_style(parms, class)		local function add_style(parms, class)
	------begin temporary code------------------------------------------------------
	-- TODO Remove this code for {{convert\|test=stylesandbox\|...}} to use
	-- Template:Fraction/sandbox/styles.css
	-- instead of
	-- Template:Fraction/styles.css
	local force
	if parms.test == 'stylesandbox' then
	force = 'Fraction/sandbox/styles.css'
	end
	------end temporary code--------------------------------------------------------
	-- Add selected template style to parms if not already present.		-- Add selected template style to parms if not already present.
	parms.templatestyles = parms.templatestyles or {}		parms.templatestyles = parms.templatestyles or {}
	if not parms.templatestyles[class] then		if not parms.templatestyles[class] then
	parms.templatestyles[class] = parms.frame:extensionTag({		parms.templatestyles[class] = parms.frame:extensionTag({
	name = 'templatestyles', args = { src = ~~force or~~ text_code.titles[class] }		name = 'templatestyles', args = { src = text_code.titles[class] }
	})		})
	end		end
Line 464:		Line 454:

	local function get_styles(parms)		local function get_styles(parms)
	-- Return string of required template ~~style strip markers~~, empty if none.		-- Return string of required template styles, empty if none.
	if parms.templatestyles then		if parms.templatestyles then
	local t = {}		local t = {}
Line 1,151:		Line 1,141:
	'<span class="frac" role="math">{SIGN}<span class="num">{NUM}</span>&frasl;<span class="den">{DEN}</span></span>', -- 1/2		'<span class="frac" role="math">{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" role="math">{SIGN}{WHOLE}<span class="sr-only">+</span><span class="num">{NUM}</span>&frasl;<span class="den">{DEN}</span></span>', -- 1+2/3
			style = 'frac',
	},		},
	{ -- Like {{sfrac}} (fraction 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" role="math">{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" 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
			style = 'sfrac',
	},		},
	}		}
Line 1,188:		Line 1,180:
	end		end
	end		end
	add_style(parms, ~~'frac'~~)		add_style(parms, fracfmt[style].style)
	return wikitext		return wikitext
	end		end

Izno: consistent class/role in frac/sfrac spot

2021-04-27T19:31:39Z

consistent class/role in frac/sfrac spot

← Previous revision		Revision as of 19:31, 27 April 2021
Line 1,153:		Line 1,153:
	},		},
	{ -- Like {{sfrac}} (fraction horizontal bar).		{ -- Like {{sfrac}} (fraction horizontal bar).
	'<span ~~role="math"~~ 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 tion" role="math">{SIGN}<span class="num">{NUM}</span><span class="sr-only">/</span><span class="den">{DEN}</span></span>', -- 1//2
	'<span ~~role~~="~~math~~" ~~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		'<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
	},		},
	}		}

Johnuniq: fix failed attempt to implement test=stylesandbox (text_code is read only)

2021-04-14T04:27:28Z

fix failed attempt to implement test=stylesandbox (text_code is read only)

← Previous revision		Revision as of 04:27, 14 April 2021
Line 449:		Line 449:
	-- instead of		-- instead of
	-- Template:Fraction/styles.css		-- Template:Fraction/styles.css
			local force
	if parms.test == 'stylesandbox' then		if parms.test == 'stylesandbox' then
	~~text_code.titles.frac~~ = 'Fraction/sandbox/styles.css'		force = 'Fraction/sandbox/styles.css'
	end		end
	------end temporary code--------------------------------------------------------		------end temporary code--------------------------------------------------------
Line 457:		Line 458:
	if not parms.templatestyles[class] then		if not parms.templatestyles[class] then
	parms.templatestyles[class] = parms.frame:extensionTag({		parms.templatestyles[class] = parms.frame:extensionTag({
	name = 'templatestyles', args = { src = text_code.titles[class] }		name = 'templatestyles', args = { src = force or text_code.titles[class] }
	})		})
	end		end