Module:Person height - Revision history

Frietjes: fix for leading zero

2023-07-03T19:22:01Z

fix for leading zero

← Previous revision		Revision as of 19:22, 3 July 2023
Line 89:		Line 89:
	s = mw.ustring.gsub(s, '^(%s*%d+)([★%s]+)%[%[[Mm]et[re][re]\|m%]%]', '%100%2[[centimetre\|cm]]')		s = mw.ustring.gsub(s, '^(%s*%d+)([★%s]+)%[%[[Mm]et[re][re]\|m%]%]', '%100%2[[centimetre\|cm]]')
	s = mw.ustring.gsub(s, '([%(★%s]%d+)([★%s]+)%[%[[Mm]et[re][re]\|m%]%]', '%100%2[[centimetre\|cm]]')		s = mw.ustring.gsub(s, '([%(★%s]%d+)([★%s]+)%[%[[Mm]et[re][re]\|m%]%]', '%100%2[[centimetre\|cm]]')
	s = mw.ustring.gsub(s, '0(%d+[★%s]+cm)', '%1')		s = mw.ustring.gsub(s, '0(%d+%.?%d*[★%s]+cm)', '%1')
	s = mw.ustring.gsub(s, '0(%d+[★%s]+%[%[[Cc]entimet[re][re]\|cm%]%])', '%1')		s = mw.ustring.gsub(s, '0(%d+%.?%d*[★%s]+%[%[[Cc]entimet[re][re]\|cm%]%])', '%1')
	else		else
	s = mw.ustring.gsub(s, '(%d)(%d%d)%.(%d*[★%s]+)cm', '%1.%2%3m')		s = mw.ustring.gsub(s, '(%d)(%d%d)%.(%d*[★%s]+)cm', '%1.%2%3m')

Frietjes: extend enforce=m and enforce=cm to include converted units per talk page (tested in the sandbox/testcases, but please revert if there is a problem)

2023-07-03T19:12:03Z

extend enforce=m and enforce=cm to include converted units per talk page (tested in the sandbox/testcases, but please revert if there is a problem)

@@ Line 71: / Line 71: @@
 		s = mw.ustring.gsub(s, '^%s*(.-)%s*$', '%1')
 	end
 	return s
 end
@@ Line 83: / Line 114: @@
 	unconverted = clean(s or '') -- basic unit cleaning
 	s = mw.ustring.gsub(unconverted, '&[Nn][Bb][Ss][Pp];', ' ')
@@ Line 169: / Line 200: @@
 		end
 		return '', unconverted
 	end

Frietjes at 16:50, 16 June 2023

2023-06-16T16:50:18Z

← Previous revision		Revision as of 16:50, 16 June 2023
Line 175:		Line 175:

	function convert(frame, args)		function convert(frame, args)
	local str, suffix = splitsuffix(args[1])		local str, suffix = splitsuffix(args[1] or '')
	local targs, str = get_convert_args(str, args['prefer'] or '', args['enforce'] or '', args['ri'] or '')		local targs, str = get_convert_args(str, args['prefer'] or '', args['enforce'] or '', args['ri'] or '')

Frietjes: more clean up for cases in the test cases

2023-06-12T21:37:04Z

more clean up for cases in the test cases

← Previous revision		Revision as of 21:37, 12 June 2023
Line 43:		Line 43:
	s = mw.ustring.gsub(s, '%[%[[Ii]n\|in%]%]', '[[inch\|in]]')		s = mw.ustring.gsub(s, '%[%[[Ii]n\|in%]%]', '[[inch\|in]]')

	s = mw.ustring.gsub(s, '(%d)%s+~~(c?m)~~', '%1 %2')		s = mw.ustring.gsub(s, '(%d)%s+[Cc][Mm]', '%1 cm')
	s = mw.ustring.gsub(s, '(%d)%s+~~(ft)~~', '%1 %2')		s = mw.ustring.gsub(s, '(%d)%s+[Mm]', '%1 m')
	s = mw.ustring.gsub(s, '(%d)%s+~~(in)~~', '%1 %2')		s = mw.ustring.gsub(s, '(%d)%s+[Ff][Tt]', '%1 ft')
			s = mw.ustring.gsub(s, '(%d)%s+[Ii][Nn]', '%1 in')

			s = mw.ustring.gsub(s, '(%d&[Nn][Bb][Ss][Pp];)[Cc][Mm]', '%1cm')
			s = mw.ustring.gsub(s, '(%d&[Nn][Bb][Ss][Pp];)[Mm]', '%1m')
			s = mw.ustring.gsub(s, '(%d&[Nn][Bb][Ss][Pp];)[Ff][Tt]', '%1ft')
			s = mw.ustring.gsub(s, '(%d&[Nn][Bb][Ss][Pp];)[Ii][Nn]', '%1in')

			s = mw.ustring.gsub(s, '(%d)%s[′\']%s([%d]%d)%s[\"″]', '%1 ft %2 in')

	return s		return s

Frietjes: updates per talk page

2023-06-12T21:27:25Z

updates per talk page

← Previous revision		Revision as of 21:27, 12 June 2023
Line 3:		Line 3:
	local p = {}		local p = {}

	local function ~~clean~~(s)		local function splitsuffix(s)
			local suffix = ''
			if mw.ustring.match(s,'^(.-)(<sup.*)$') then
			local a = mw.ustring.gsub(s, '^(.-)(<sup.*)$', '%1')
			local b = mw.ustring.gsub(s, '^(.-)(<sup.*)$', '%2')
			s = a
			suffix = b .. suffix
			end
			if mw.ustring.match(s,'^(.-)(%[%[[Cc]ategory:.*)$') then
			local a = mw.ustring.gsub(s, '^(.-)(%[%[[Cc]ategory:.*)$', '%1')
			local b = mw.ustring.gsub(s, '^(.-)(%[%[[Cc]ategory:.*)$', '%2')
			s = a
			suffix = b .. suffix
			end
			return s, suffix
			end

			local function clean(s)
	s = mw.ustring.gsub(s, '[Mm]etre', 'm')		s = mw.ustring.gsub(s, '[Mm]etre', 'm')
	s = mw.ustring.gsub(s, '([^a])meter', '%1m') -- prevents "parameter" from being changed to "param"		s = mw.ustring.gsub(s, '([^a])meter', '%1m') -- prevents "parameter" from being changed to "param"
Line 151:		Line 167:

	function convert(frame, args)		function convert(frame, args)
			local str, suffix = splitsuffix(args[1])
	local targs, str = get_convert_args(~~args[1]~~, args['prefer'] or '', args['enforce'] or '', args['ri'] or '')		local targs, str = get_convert_args(str, args['prefer'] or '', args['enforce'] or '', args['ri'] or '')

			str = str .. suffix

	if type(targs) == 'table' then		if type(targs) == 'table' then

Frietjes: fix two unit links

2023-06-12T21:08:59Z

fix two unit links

← Previous revision		Revision as of 21:08, 12 June 2023
Line 21:		Line 21:

	s = mw.ustring.gsub(s, '%[%[[Mm]%]%]s', '[[Metre\|m]]')		s = mw.ustring.gsub(s, '%[%[[Mm]%]%]s', '[[Metre\|m]]')
			s = mw.ustring.gsub(s, '%[%[[Mm]\|[Mm]%]%]', '[[Metre\|m]]')
	s = mw.ustring.gsub(s, '%[%[[Cc]m%]%]s', '[[Centimetre\|cm]]')		s = mw.ustring.gsub(s, '%[%[[Cc]m%]%]s', '[[Centimetre\|cm]]')
			s = mw.ustring.gsub(s, '%[%[[Cc]m\|[Cc]m%]%]', '[[Centimetre\|cm]]')
	s = mw.ustring.gsub(s, '%[%[[Cc]entim\|cm%]%]', '[[Centimetre\|cm]]')		s = mw.ustring.gsub(s, '%[%[[Cc]entim\|cm%]%]', '[[Centimetre\|cm]]')
	s = mw.ustring.gsub(s, '%[%[[Ii]n\|in%]%]', '[[inch\|in]]')		s = mw.ustring.gsub(s, '%[%[[Ii]n\|in%]%]', '[[inch\|in]]')

Frietjes: fix spacing problem identified on the talk page

2023-06-12T15:34:31Z

fix spacing problem identified on the talk page

← Previous revision		Revision as of 15:34, 12 June 2023
Line 24:		Line 24:
	s = mw.ustring.gsub(s, '%[%[[Cc]entim\|cm%]%]', '[[Centimetre\|cm]]')		s = mw.ustring.gsub(s, '%[%[[Cc]entim\|cm%]%]', '[[Centimetre\|cm]]')
	s = mw.ustring.gsub(s, '%[%[[Ii]n\|in%]%]', '[[inch\|in]]')		s = mw.ustring.gsub(s, '%[%[[Ii]n\|in%]%]', '[[inch\|in]]')

			s = mw.ustring.gsub(s, '(%d)%s+(c?m)', '%1 %2')
			s = mw.ustring.gsub(s, '(%d)%s+(ft)', '%1 %2')
			s = mw.ustring.gsub(s, '(%d)%s+(in)', '%1 %2')

	return s		return s

Frietjes: support for 1/2

2023-05-19T20:05:20Z

support for 1/2

← Previous revision		Revision as of 20:05, 19 May 2023
Line 5:		Line 5:
	local function clean(s)		local function clean(s)

	s = mw.ustring.gsub(s, '~~metre~~', 'm')		s = mw.ustring.gsub(s, '[Mm]etre', 'm')
	s = mw.ustring.gsub(s, '([^a])meter', '%1m') -- prevents "parameter" from being changed to "param"		s = mw.ustring.gsub(s, '([^a])meter', '%1m') -- prevents "parameter" from being changed to "param"
	s = mw.ustring.gsub(s, '[Cc]enti', 'c') -- changes "centim" to "cm"		s = mw.ustring.gsub(s, '[Cc]enti', 'c') -- changes "centim" to "cm"
Line 31:		Line 31:
	if s then		if s then
	s = mw.ustring.gsub(s, '%+%s%d+%s/%s%d+%s$', '')		s = mw.ustring.gsub(s, '%+%s%d+%s/%s%d+%s$', '')
			s = mw.ustring.gsub(s, '%s1%s/%s2%s$', '0.5')
	return tonumber(s)		return tonumber(s)
	end		end

Frietjes: optional caps

2023-05-19T19:11:09Z

optional caps

← Previous revision		Revision as of 19:11, 19 May 2023
Line 7:		Line 7:
	s = mw.ustring.gsub(s, 'metre', 'm')		s = mw.ustring.gsub(s, 'metre', 'm')
	s = mw.ustring.gsub(s, '([^a])meter', '%1m') -- prevents "parameter" from being changed to "param"		s = mw.ustring.gsub(s, '([^a])meter', '%1m') -- prevents "parameter" from being changed to "param"
	s = mw.ustring.gsub(s, '~~centi~~', 'c') -- changes "centim" to "cm"		s = mw.ustring.gsub(s, '[Cc]enti', 'c') -- changes "centim" to "cm"
	s = mw.ustring.gsub(s, 'ms', 'm')		s = mw.ustring.gsub(s, 'ms', 'm')
	s = mw.ustring.gsub(s, 'm[%.,]', 'm')		s = mw.ustring.gsub(s, 'm[%.,]', 'm')

	s = mw.ustring.gsub(s, '~~feet~~', 'ft')		s = mw.ustring.gsub(s, '[Ff]eet', 'ft')
	s = mw.ustring.gsub(s, 'foot', 'ft')		s = mw.ustring.gsub(s, 'foot', 'ft')
	s = mw.ustring.gsub(s, 'ft[%.,]', 'ft')		s = mw.ustring.gsub(s, 'ft[%.,]', 'ft')

	s = mw.ustring.gsub(s, '~~inches~~', 'in')		s = mw.ustring.gsub(s, '[Ii]nches', 'in')
	s = mw.ustring.gsub(s, '~~inch~~', 'in')		s = mw.ustring.gsub(s, '[Ii]nch', 'in')
	s = mw.ustring.gsub(s, 'ins', 'in')		s = mw.ustring.gsub(s, 'ins', 'in')
	s = mw.ustring.gsub(s, 'in[%.,]', 'in')		s = mw.ustring.gsub(s, 'in[%.,]', 'in')

Frietjes: (1) fix precision issue identified on the talk page, and (2) add optional |ri=cmin to round inputs to nearest cm or in per talk page

2023-05-19T19:08:59Z

(1) fix precision issue identified on the talk page, and (2) add optional |ri=cmin to round inputs to nearest cm or in per talk page

← Previous revision		Revision as of 19:08, 19 May 2023
Line 36:		Line 36:
	end		end

	local function ~~get_convert_args~~(s~~, prefer, enforce~~)		local function trimspace(s)
			if s then
			s = mw.ustring.gsub(s, '^%s(.-)%s$', '%1')
			end
			return s
			end

			local function get_convert_args(s, prefer, enforce, ri)
	local prefer_m = (prefer or '') == 'm'		local prefer_m = (prefer or '') == 'm'
	local force_m = (enforce or '') == 'm'		local force_m = (enforce or '') == 'm'
	local prefer_cm = (prefer or '') == 'cm'		local prefer_cm = (prefer or '') == 'cm'
	local force_cm = (enforce or '') == 'cm'		local force_cm = (enforce or '') == 'cm'

			ri = (ri or '') == 'cmin' and 'cmin' or ''

	unconverted = clean(s or '') -- basic unit cleaning		unconverted = clean(s or '') -- basic unit cleaning
Line 54:		Line 63:
	return '', unconverted		return '', unconverted
	end		end

			local adj = nil

	if c ~= nil and f == nil and i == nil then		if c ~= nil and f == nil and i == nil then
	local n = mw.ustring.sub(s, 1, c - 1)		local n = mw.ustring.sub(s, 1, c - 1)
	if isnumber(n) then		if isnumber(n) then
			if force_m then
			local prec = require("Module:Math")._precision(trimspace(n))
			adj = (prec == 1) and 'ri3' or 'ri2'
			end
			if ri ~= '' then
			adj = force_m and 'ri2' or 'ri0'
			end
	return force_m		return force_m
	and {n/100,'m','ftin',0,['abbr']='on'}		and {n/100,'m','ftin',0,['abbr']='on', ['adj']=adj}
	or {n,'cm','ftin',0,['abbr']='on'}, mw.ustring.sub(s, c+2)		or {n,'cm','ftin',0,['abbr']='on', ['adj']=adj}, mw.ustring.sub(s, c+2)
	end		end
	return '', unconverted		return '', unconverted
Line 67:		Line 85:
	if m ~= nil and c == nil and f == nil and i == nil then		if m ~= nil and c == nil and f == nil and i == nil then
	local n = mw.ustring.sub(s, 1, m - 1)		local n = mw.ustring.sub(s, 1, m - 1)
			if ri ~= '' then
			adj = force_cm and 'ri0' or 'ri2'
			end
	if isnumber(n) then		if isnumber(n) then
	return force_cm		return force_cm
	and {n*100,'cm','ftin',0,['abbr']='on'}		and {n*100,'cm','ftin',0,['abbr']='on',['adj']=adj}
	or {n,'m','ftin',0,['abbr']='on'}, mw.ustring.sub(s, m+1)		or {n,'m','ftin',0,['abbr']='on',['adj']=adj}, mw.ustring.sub(s, m+1)
	end		end
	return '', unconverted		return '', unconverted
Line 79:		Line 100:
	local n2 = mw.ustring.sub(s, f+2, i - 1)		local n2 = mw.ustring.sub(s, f+2, i - 1)
	if isnumber(n1) and isnumber(n2) then		if isnumber(n1) and isnumber(n2) then
			if ri ~= '' then
			adj = 'ri0'
			end
	return (force_m or prefer_m)		return (force_m or prefer_m)
	and {n1,'ft',n2,'in', 'm',2,['abbr']='on'}		and {n1,'ft',n2,'in', 'm',2,['abbr']='on',['adj']=adj}
	or {n1,'ft',n2,'in', 'cm',0,['abbr']='on'}, mw.ustring.sub(s, i+2)		or {n1,'ft',n2,'in', 'cm',0,['abbr']='on',['adj']=adj}, mw.ustring.sub(s, i+2)
	end		end
	return '', unconverted		return '', unconverted
Line 89:		Line 113:
	local n = mw.ustring.sub(s, 1, f - 1)		local n = mw.ustring.sub(s, 1, f - 1)
	if isnumber(n) then		if isnumber(n) then
			if ri ~= '' then
			local n2 = 12*(n - math.floor(n))
			adj = 'ri0'
			return (force_m or prefer_m)
			and {math.floor(n),'ft',n2, 'in','m',2,['abbr']='on',['adj']=adj}
			or {math.floor(n),'ft',n2,'in','cm',0,['abbr']='on',['adj']=adj}, mw.ustring.sub(s, f+2)
			end
	return (force_m or prefer_m)		return (force_m or prefer_m)
	and {n,'ft','m',2,['abbr']='on'}		and {n,'ft','m',2,['abbr']='on'}
Line 99:		Line 130:
	local n = mw.ustring.sub(s, 1, i - 1)		local n = mw.ustring.sub(s, 1, i - 1)
	if isnumber(n) then		if isnumber(n) then
			if ri ~= '' then
			adj = 'ri0'
			end
	return (force_m or prefer_m)		return (force_m or prefer_m)
	and {n,'in','m',2,['abbr']='on'}		and {n,'in','m',2,['abbr']='on'}
Line 110:		Line 144:

	function convert(frame, args)		function convert(frame, args)
	local targs, str = get_convert_args(args[1], args['prefer'] or '', args['enforce'] or '')		local targs, str = get_convert_args(args[1], args['prefer'] or '', args['enforce'] or '', args['ri'] or '')

	if type(targs) == 'table' then		if type(targs) == 'table' then

← Previous revision		Revision as of 21:08, 12 June 2023
Line 21:		Line 21:

	s = mw.ustring.gsub(s, '%[%[[Mm]%]%]s', '[[Metre\|m]]')		s = mw.ustring.gsub(s, '%[%[[Mm]%]%]s', '[[Metre\|m]]')
			s = mw.ustring.gsub(s, '%[%[[Mm]\|[Mm]%]%]', '[[Metre\|m]]')
	s = mw.ustring.gsub(s, '%[%[[Cc]m%]%]s', '[[Centimetre\|cm]]')		s = mw.ustring.gsub(s, '%[%[[Cc]m%]%]s', '[[Centimetre\|cm]]')
			s = mw.ustring.gsub(s, '%[%[[Cc]m\|[Cc]m%]%]', '[[Centimetre\|cm]]')
	s = mw.ustring.gsub(s, '%[%[[Cc]entim\|cm%]%]', '[[Centimetre\|cm]]')		s = mw.ustring.gsub(s, '%[%[[Cc]entim\|cm%]%]', '[[Centimetre\|cm]]')
	s = mw.ustring.gsub(s, '%[%[[Ii]n\|in%]%]', '[[inch\|in]]')		s = mw.ustring.gsub(s, '%[%[[Ii]n\|in%]%]', '[[inch\|in]]')