Module:Hatnote list/sandbox - Revision history

Nihiltres: Minor prettification of punctuationCollapse update

2023-11-10T23:01:37Z

Minor prettification of punctuationCollapse update

← Previous revision		Revision as of 23:01, 10 November 2023
Line 96:		Line 96:
	}		}

	--Collapses duplicate punctuation		--Collapses duplicate punctuation at end of string, ignoring italics and links
	local function punctuationCollapse (text)		local function punctuationCollapse (text)
	if text:match("[.?!]('?)%1(%]?)%2[.]$") ~~then~~		return text:match("[.?!]('?)%1(%]?)%2%.$") and text:sub(1, -2) or text
	-- text ends with two punctuation marks (ignoring ''italic'' and [[link]] markup)
	return text:sub(1, -2)
	else
	return text
	end
	end		end

Dexxor: refactor punctuationCollapse

2023-04-06T12:47:23Z

refactor punctuationCollapse

@@ Line 98: / Line 98: @@
 --Collapses duplicate punctuation
 local function punctuationCollapse (text)
 end

Johnuniq: clean whitespace

2023-04-06T05:52:03Z

clean whitespace

← Previous revision		Revision as of 05:52, 6 April 2023
Line 100:		Line 100:
	local replacements = {		local replacements = {
	["%.%.$"] = ".",		["%.%.$"] = ".",
	["%.''%.$"] = ".''",		["%.''%.$"] = ".''",
	["%?%.$"] = "?",		["%?%.$"] = "?",
	["%?''%.$"] = "?''",		["%?''%.$"] = "?''",
Line 156:		Line 156:
	-- until the "and"'s stop. Blanks are ignored: "1\|and\|\|and\|3" → {1, 3}		-- until the "and"'s stop. Blanks are ignored: "1\|and\|\|and\|3" → {1, 3}
	while args[i + 2] == options.andKeyword do		while args[i + 2] == options.andKeyword do
	if args[i + 3] then		if args[i + 3] then
	table.insert(forRow.pages, args[i + 3])		table.insert(forRow.pages, args[i + 3])
	end		end
Line 167:		Line 167:
	table.insert(forTable, forRow)		table.insert(forTable, forRow)
	until terminated or i > maxArg		until terminated or i > maxArg


	return forTable		return forTable
	end		end

LightNightLights: /* top */Try to add support for italicized titles (based on WP:ITHAT)

2023-04-06T02:15:53Z

top: Try to add support for italicized titles (based on WP:ITHAT)

← Previous revision		Revision as of 02:15, 6 April 2023
Line 100:		Line 100:
	local replacements = {		local replacements = {
	["%.%.$"] = ".",		["%.%.$"] = ".",
			["%.''%.$"] = ".''",
	["%?%.$"] = "?",		["%?%.$"] = "?",
			["%?''%.$"] = "?''",
	["%!%.$"] = "!",		["%!%.$"] = "!",
			["%!''%.$"] = "!''",
	["%.%]%]%.$"] = ".]]",		["%.%]%]%.$"] = ".]]",
			["%.''%]%]%.$"] = ".'']]",
	["%?%]%]%.$"] = "?]]",		["%?%]%]%.$"] = "?]]",
	["%!%]%]%.$"] = "!]]"		["%?''%]%]%.$"] = "?'']]",
			["%!%]%]%.$"] = "!]]",
			["%!''%]%]%.$"] = "!'']]"
	}		}
	for k, v in pairs(replacements) do text = string.gsub(text, k, v) end		for k, v in pairs(replacements) do text = string.gsub(text, k, v) end

Nihiltres: Extract searchDisp function for readability and tag functions local as appropriate

2021-12-24T21:55:01Z

Extract searchDisp function for readability and tag functions local as appropriate

← Previous revision		Revision as of 21:55, 24 December 2021
Line 30:		Line 30:
	formatted = false		formatted = false
	}		}

		⚫	--Searches display text only
		⚫	local function searchDisp(haystack, needle)
			return string.find(
		⚫	string.sub(haystack, (string.find(haystack, '\|') or 0) + 1), needle
			)
		⚫	end

	-- Stringifies a list generically; probably shouldn't be used directly		-- Stringifies a list generically; probably shouldn't be used directly
	function stringifyList(list, options)		local function stringifyList(list, options)
	-- Type-checks, defaults, and a shortcut		-- Type-checks, defaults, and a shortcut
	checkType("stringifyList", 1, list, "table")		checkType("stringifyList", 1, list, "table")
Line 50:		Line 57:
	-- Set the separator; if any item contains it, use the alternate separator		-- Set the separator; if any item contains it, use the alternate separator
	local separator = options.separator		local separator = options.separator
⚫	--~~searches~~ display text only
⚫	local function searchDisp(t, f)
⚫	~~return string.find(~~string.sub(t, (string.find(t, '\|') or 0) + 1), f)
⚫	end
	for k, v in pairs(list) do		for k, v in pairs(list) do
	if searchDisp(v, separator) then		if searchDisp(v, separator) then
Line 94:		Line 97:

	--Collapses duplicate punctuation		--Collapses duplicate punctuation
	function punctuationCollapse (text)		local function punctuationCollapse (text)
	local replacements = {		local replacements = {
	["%.%.$"] = ".",		["%.%.$"] = ".",

Nihiltres: Add missing-target categorization to second use of mFormatLink._formatLink

2021-12-24T17:32:30Z

Add missing-target categorization to second use of mFormatLink._formatLink

← Previous revision		Revision as of 17:32, 24 December 2021
Line 179:		Line 179:
	p.andList(v.pages, true) or		p.andList(v.pages, true) or
	mFormatLink._formatLink{		mFormatLink._formatLink{
			categorizeMissing = mHatnote.missingTargetCat,
	link = mHatnote.disambiguate(options.title)		link = mHatnote.disambiguate(options.title)
	}		}

Nihiltres: Set up migration to use Module:Format link

2021-12-21T19:58:43Z

Set up migration to use Module:Format link

← Previous revision		Revision as of 19:58, 21 December 2021
Line 9:		Line 9:

	local mArguments --initialize lazily		local mArguments --initialize lazily
			local mFormatLink = require('Module:Format link')
	local mHatnote = require('Module:Hatnote')		local mHatnote = require('Module:Hatnote')
	local libraryUtil = require('libraryUtil')		local libraryUtil = require('libraryUtil')
Line 42:		Line 43:
	local s = options.space		local s = options.space
	-- Format the list if requested		-- Format the list if requested
	if options.formatted then ~~list = mHatnote.formatPages(unpack(list)) end~~		if options.formatted then
			list = mFormatLink.formatPages(
			{categorizeMissing = mHatnote.missingTargetCat}, list
			)
			end
	-- Set the separator; if any item contains it, use the alternate separator		-- Set the separator; if any item contains it, use the alternate separator
	local separator = options.separator		local separator = options.separator
Line 171:		Line 176:
	for k, v in pairs(forSeeTable) do		for k, v in pairs(forSeeTable) do
	local useStr = v.use or options.otherText		local useStr = v.use or options.otherText
	local pagesStr = p.andList(v.pages, true) or ~~mHatnote~~._formatLink{link = mHatnote.disambiguate(options.title)}		local pagesStr =
			p.andList(v.pages, true) or
			mFormatLink._formatLink{
			link = mHatnote.disambiguate(options.title)
			}
	local forSeeStr = string.format(options.forSeeForm, useStr, pagesStr)		local forSeeStr = string.format(options.forSeeForm, useStr, pagesStr)
	forSeeStr = punctuationCollapse(forSeeStr)		forSeeStr = punctuationCollapse(forSeeStr)

Jackmcbarn: export conjList

2020-08-02T05:40:09Z

export conjList

← Previous revision		Revision as of 05:40, 2 August 2020
Line 65:		Line 65:

	--DRY function		--DRY function
	function conjList (conj, list, fmt)		function p.conjList (conj, list, fmt)
	return stringifyList(list, {conjunction = conj, formatted = fmt})		return stringifyList(list, {conjunction = conj, formatted = fmt})
	end		end

	-- Stringifies lists with "and" or "or"		-- Stringifies lists with "and" or "or"
	function p.andList (...) return conjList("and", ...) end		function p.andList (...) return p.conjList("and", ...) end
	function p.orList (...) return conjList("or", ...) end		function p.orList (...) return p.conjList("or", ...) end

	--------------------------------------------------------------------------------		--------------------------------------------------------------------------------

Mr. Stradivarius: switch back to Module:Hatnote instead of Module:Hatnote/sandbox

2020-06-16T15:00:42Z

switch back to Module:Hatnote instead of Module:Hatnote/sandbox

← Previous revision		Revision as of 15:00, 16 June 2020
Line 9:		Line 9:

	local mArguments --initialize lazily		local mArguments --initialize lazily
	local mHatnote = require('Module:Hatnote~~/sandbox~~')		local mHatnote = require('Module:Hatnote')
	local libraryUtil = require('libraryUtil')		local libraryUtil = require('libraryUtil')
	local checkType = libraryUtil.checkType		local checkType = libraryUtil.checkType

Mr. Stradivarius: update with new _formatLink syntax for Module:Hatnote; using the Module:Hatnote/sandbox for now, but will switch back to Module:Hatnote in a short while

2020-06-16T14:34:21Z

update with new _formatLink syntax for Module:Hatnote; using the Module:Hatnote/sandbox for now, but will switch back to Module:Hatnote in a short while

← Previous revision		Revision as of 14:34, 16 June 2020
Line 9:		Line 9:

	local mArguments --initialize lazily		local mArguments --initialize lazily
	local mHatnote = require('Module:Hatnote')		local mHatnote = require('Module:Hatnote/sandbox')
	local libraryUtil = require('libraryUtil')		local libraryUtil = require('libraryUtil')
	local checkType = libraryUtil.checkType		local checkType = libraryUtil.checkType
Line 171:		Line 171:
	for k, v in pairs(forSeeTable) do		for k, v in pairs(forSeeTable) do
	local useStr = v.use or options.otherText		local useStr = v.use or options.otherText
	local pagesStr = p.andList(v.pages, true) or mHatnote._formatLink(mHatnote.disambiguate(options.title))		local pagesStr = p.andList(v.pages, true) or mHatnote._formatLink{link = mHatnote.disambiguate(options.title)}
	local forSeeStr = string.format(options.forSeeForm, useStr, pagesStr)		local forSeeStr = string.format(options.forSeeForm, useStr, pagesStr)
	forSeeStr = punctuationCollapse(forSeeStr)		forSeeStr = punctuationCollapse(forSeeStr)