Module:Detect singular - Revision history

Hike395: when flag is set, parse number and determine plurality from that

2025-03-05T07:06:22Z

when flag is set, parse number and determine plurality from that

← Previous revision		Revision as of 07:06, 5 March 2025
Line 31:		Line 31:
	local args = {}		local args = {}
	-- canonicalize boolean arguments		-- canonicalize boolean arguments
	for key, default in pairs({no_comma=false,parse_links=false,any_comma=false,~~no_and=false}) do~~		for key, default in pairs({no_comma=false,parse_links=false,any_comma=false,
			no_and=false,parse_number=false}) do
	if origArgs[key] == nil then		if origArgs[key] == nil then
	args[key] = default		args[key] = default
Line 42:		Line 43:
	local rewriteLinks = not args.parse_links		local rewriteLinks = not args.parse_links
	local anyComma = args.any_comma		local anyComma = args.any_comma
			local parseNumber = args.parse_number
	local s = origArgs[1] -- the input string		local s = origArgs[1] -- the input string
	if not s then		if not s then
Line 67:		Line 69:
	return plural		return plural
	end		end
			if parseNumber then
			local m = tonumber(mw.ustring.match(s,"^%s*(%d+)"))
			if m then
			return m > 1 and plural or singular
			end
			end
	-- fix for trailing br tags passed through [[template:marriage]]		-- fix for trailing br tags passed through [[template:marriage]]
	s = mw.ustring.gsub(s, '<%sbr[^>]>%s*(</div>)', '%1')		s = mw.ustring.gsub(s, '<%sbr[^>]>%s*(</div>)', '%1')

Hike395: decode HTML entities

2023-01-02T22:05:13Z

decode HTML entities

← Previous revision		Revision as of 22:05, 2 January 2023
Line 47:		Line 47:
	end		end
	s = tostring(s)		s = tostring(s)
			s = mw.text.decode(s,true) --- replace HTML entities (to avoid spurious semicolons)
	if plainFind(s,'data-plural="0"') then -- magic data string to return true		if plainFind(s,'data-plural="0"') then -- magic data string to return true
	return singular		return singular

Hike395: ignore br elements immediately before (per Frietjes)

2022-09-08T04:24:04Z

ignore br elements immediately before </div> (per Frietjes)

← Previous revision		Revision as of 04:24, 8 September 2022
Line 67:		Line 67:
	end		end
	-- fix for trailing br tags passed through [[template:marriage]]		-- fix for trailing br tags passed through [[template:marriage]]
		⚫	s = mw.ustring.gsub(s, '<%sbr[^>]>%s*(</div>)', '%1')
	-- Frietjes fix: should we use it? comment out for now
⚫	-- s = mw.ustring.gsub(s, '<%sbr[^>]>%s*(</div>)', '%1')
	-- replace all wikilinks with fixed string		-- replace all wikilinks with fixed string
	if rewriteLinks then		if rewriteLinks then

Hike395: update force singular/plural detection strings

2022-09-07T05:03:32Z

update force singular/plural detection strings

← Previous revision		Revision as of 05:03, 7 September 2022
Line 47:		Line 47:
	end		end
	s = tostring(s)		s = tostring(s)
	if plainFind(s,'~~forcedetectsingular~~') then -- magic data string to return true		if plainFind(s,'data-plural="0"') then -- magic data string to return true
	return singular		return singular
	end		end
	if plainFind(s,'~~forcedetectplural~~') then -- magic data string to return false		if plainFind(s,'data-plural="1"') then -- magic data string to return false
	return plural		return plural
	end		end

Hike395: mistake in argument handling

2022-09-07T02:18:43Z

mistake in argument handling

← Previous revision		Revision as of 02:18, 7 September 2022
Line 94:		Line 94:
	args = type(args) == 'table' and args or {}		args = type(args) == 'table' and args or {}
	local singularForm = args[3] or args.singular or ""		local singularForm = args[3] or args.singular or ""
	local pluralForm = args[4] or args.plural ~~or args.likely~~ or ""		local pluralForm = args[4] or args.plural or ""
	local likelyForm = args.likely or pluralForm		local likelyForm = args.likely or pluralForm
	local link = args[5] or args.link		local link = args[5] or args.link

Hike395: modify pluralize to accept "likely" parameter (for situations where plurality is likely, but not certain)

2022-09-07T02:17:35Z

modify pluralize to accept "likely" parameter (for situations where plurality is likely, but not certain)

← Previous revision		Revision as of 02:17, 7 September 2022
Line 14:		Line 14:
	return count		return count
	end		end

			local singular = 1
			local likelyPlural = 2
			local plural = 3

	-- Determine whether a string is singular or plural (i.e., it represents one		-- Determine whether a string is singular or plural (i.e., it represents one
Line 21:		Line 25:
	-- origArgs.no_comma: if false, use commas to detect plural (default false)		-- origArgs.no_comma: if false, use commas to detect plural (default false)
	-- origArgs.parse_links: if false, treat wikilinks as opaque singular objects (default false)		-- origArgs.parse_links: if false, treat wikilinks as opaque singular objects (default false)
			-- Returns:
			-- singular, likelyPlural, or plural (see constants above), or nil for completely unknown
	function p._main(origArgs)		function p._main(origArgs)
	origArgs = type(origArgs) == 'table' and origArgs or {}		origArgs = type(origArgs) == 'table' and origArgs or {}
Line 42:		Line 48:
	s = tostring(s)		s = tostring(s)
	if plainFind(s,'forcedetectsingular') then -- magic data string to return true		if plainFind(s,'forcedetectsingular') then -- magic data string to return true
	return ~~true~~		return singular
	end		end
	if plainFind(s,'forcedetectplural') then -- magic data string to return false		if plainFind(s,'forcedetectplural') then -- magic data string to return false
	return ~~false~~		return plural
	end		end
	-- count number of list items		-- count number of list items
Line 51:		Line 57:
	-- if exactly one, then singular, if more than one, then plural		-- if exactly one, then singular, if more than one, then plural
	if numListItems == 1 then		if numListItems == 1 then
	return ~~true~~		return singular
	end		end
	if numListItems > 1 then		if numListItems > 1 then
	return ~~false~~		return plural
	end		end
	-- if "list of" occurs inside of wlink, then it's plural		-- if "list of" occurs inside of wlink, then it's plural
	if mw.ustring.find(s:lower(), '%[%[[^%]]*list of[^%]]+%]%]') then		if mw.ustring.find(s:lower(), '%[%[[^%]]*list of[^%]]+%]%]') then
	return ~~false~~		return plural
	end		end
			-- fix for trailing br tags passed through [[template:marriage]]
			-- Frietjes fix: should we use it? comment out for now
			-- s = mw.ustring.gsub(s, '<%sbr[^>]>%s*(</div>)', '%1')
	-- replace all wikilinks with fixed string		-- replace all wikilinks with fixed string
	if rewriteLinks then		if rewriteLinks then
	s = mw.ustring.gsub(s,'%b[]','WIKILINK')		s = mw.ustring.gsub(s,'%b[]','WIKILINK')
	end		end
	-- Five conditions: any one of them can make the string a plural		-- Five conditions: any one of them can make the string a likely plural or plural
	local hasBreak = mw.ustring.find(s,'<%s*br')		local hasBreak = mw.ustring.find(s,'<%s*br')
	-- For the last 4, evaluate on string stripped of wikimarkup		-- For the last 4, evaluate on string stripped of wikimarkup
	s = getPlain(s)		s = getPlain(s)
		⚫	local hasBullets = countMatches(s,'%*+') > 1
		⚫	local multipleQids = mw.ustring.find(s,'Q%d+[%p%s]+Q%d+') -- has multiple QIDs in a row
			if hasBullets or multipleQids then
			return plural
			end
	local commaPattern = anyComma and '[,;]' or '%D[,;]%D' -- semi-colon similar to comma		local commaPattern = anyComma and '[,;]' or '%D[,;]%D' -- semi-colon similar to comma
	local hasComma = checkComma and mw.ustring.find(s, commaPattern)		local hasComma = checkComma and mw.ustring.find(s, commaPattern)
	local hasAnd = checkAnd and mw.ustring.find(s,'[,%s]and%s')		local hasAnd = checkAnd and mw.ustring.find(s,'[,%s]and%s')
			if hasBreak or hasComma or hasAnd then
⚫	local hasBullets = countMatches(s,'%*+') > 1
			return likelyPlural
⚫	local multipleQids = mw.ustring.find(s,'Q%d+[%p%s]+Q%d+') -- has multiple QIDs in a row
			end
	-- return ~~bool: is it~~ singular?		return singular
	return not (hasComma or hasAnd or hasBreak or hasBullets or multipleQids)
	end		end

Line 80:		Line 94:
	args = type(args) == 'table' and args or {}		args = type(args) == 'table' and args or {}
	local singularForm = args[3] or args.singular or ""		local singularForm = args[3] or args.singular or ""
	local pluralForm = args[4] or args.plural or ""		local pluralForm = args[4] or args.plural or args.likely or ""
			local likelyForm = args.likely or pluralForm
	local link = args[5] or args.link		local link = args[5] or args.link
	if link then		if link then
Line 86:		Line 101:
	singularForm = '[['..link..'\|'..singularForm..']]'		singularForm = '[['..link..'\|'..singularForm..']]'
	pluralForm = '[['..link..'\|'..pluralForm..']]'		pluralForm = '[['..link..'\|'..pluralForm..']]'
			likelyForm = '[['..link..'\|'..likelyForm..']]'
	end		end
	if args[2] then		if args[2] then
Line 94:		Line 110:
	return "" -- return blank on complete failure		return "" -- return blank on complete failure
	end		end
	~~return~~ detect ~~and~~ ~~singularForm~~ ~~or pluralForm~~		if detect == singular then
			return singularForm
			elseif detect == likelyPlural then
			return likelyForm
			else
			return pluralForm
			end
	end		end

Line 104:		Line 126:
	return 1		return 1
	end		end
	return result and 1 or ""		return result == singular and 1 or ""
	end		end

Hike395: implement named arguments: singular, plural, link

2022-01-28T07:30:24Z

implement named arguments: singular, plural, link

← Previous revision		Revision as of 07:30, 28 January 2022
Line 79:		Line 79:
	function p._pluralize(args)		function p._pluralize(args)
	args = type(args) == 'table' and args or {}		args = type(args) == 'table' and args or {}
	local singularForm = args[3] or ""		local singularForm = args[3] or args.singular or ""
	local pluralForm = args[4] or ""		local pluralForm = args[4] or args.plural or ""
	if args[5] ~~then~~		local link = args[5] or args.link
			if link then
	link = tostring(~~args[5]~~)		link = tostring(link)
	singularForm = '[['..link..'\|'..singularForm..']]'		singularForm = '[['..link..'\|'..singularForm..']]'
	pluralForm = '[['..link..'\|'..pluralForm..']]'		pluralForm = '[['..link..'\|'..pluralForm..']]'

Hike395: add any_comma and no_and flags

2022-01-15T06:25:32Z

add any_comma and no_and flags

← Previous revision		Revision as of 06:25, 15 January 2022
Line 25:		Line 25:
	local args = {}		local args = {}
	-- canonicalize boolean arguments		-- canonicalize boolean arguments
	for key, default in pairs({no_comma=false,parse_links=false}) do		for key, default in pairs({no_comma=false,parse_links=false,any_comma=false,no_and=false}) do
	if origArgs[key] == nil then		if origArgs[key] == nil then
	args[key] = default		args[key] = default
Line 33:		Line 33:
	end		end
	local checkComma = not args.no_comma		local checkComma = not args.no_comma
			local checkAnd = not args.no_and
	local rewriteLinks = not args.parse_links		local rewriteLinks = not args.parse_links
			local anyComma = args.any_comma
	local s = origArgs[1] -- the input string		local s = origArgs[1] -- the input string
	if not s then		if not s then
Line 66:		Line 68:
	-- For the last 4, evaluate on string stripped of wikimarkup		-- For the last 4, evaluate on string stripped of wikimarkup
	s = getPlain(s)		s = getPlain(s)
	local ~~hasComma~~ = ~~checkComma~~ and ~~mw.ustring.find(s~~, '%D[,;]%D') -- semi-colon similar to comma		local commaPattern = anyComma and '[,;]' or '%D[,;]%D' -- semi-colon similar to comma
	local ~~hasAnd~~ = mw.ustring.find(s,~~'[,%s]and%s'~~)		local hasComma = checkComma and mw.ustring.find(s, commaPattern)
			local hasAnd = checkAnd and mw.ustring.find(s,'[,%s]and%s')
	local hasBullets = countMatches(s,'%*+') > 1		local hasBullets = countMatches(s,'%*+') > 1
	local multipleQids = mw.ustring.find(s,'Q%d+[%p%s]+Q%d+') -- has multiple QIDs in a row		local multipleQids = mw.ustring.find(s,'Q%d+[%p%s]+Q%d+') -- has multiple QIDs in a row

Hike395: fix detect return for blank input, also

2022-01-14T08:51:24Z

fix detect return for blank input, also

← Previous revision		Revision as of 08:51, 14 January 2022
Line 95:		Line 95:
	function p.main(frame)		function p.main(frame)
	local args = getArgs(frame)		local args = getArgs(frame)
	-- For template, return 1 if singular, blank if ~~not~~		-- For template, return 1 if singular, blank if plural or empty
	if p._main(args) ~~then~~		local result = p._main(args)
			if result == nil then
	return 1		return 1
	end		end
	return ""		return result and 1 or ""
	end		end

Hike395: if no inputs given, return blank

2022-01-14T08:26:40Z

if no inputs given, return blank

← Previous revision		Revision as of 08:26, 14 January 2022
Line 83:		Line 83:
	pluralForm = '[['..link..'\|'..pluralForm..']]'		pluralForm = '[['..link..'\|'..pluralForm..']]'
	end		end
			if args[2] then
⚫	return ~~args[2] and pluralForm or p._main(args)~~ and singularForm or pluralForm
			return pluralForm
			end
			local detect = p._main(args)
			if detect == nil then
			return "" -- return blank on complete failure
			end
		⚫	return detect and singularForm or pluralForm
	end		end