Module:Random slideshow - Revision history

Jonesey95: add class to the list of items that are removed (to fix non-removal of class=skin-invert-image at Portal:Water, for example)

2025-03-28T13:28:55Z

add class to the list of items that are removed (to fix non-removal of class=skin-invert-image at Portal:Water, for example)

← Previous revision		Revision as of 13:28, 28 March 2025
Line 97:		Line 97:
	file = mw.ustring.gsub(file, '\|%scenter%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%scenter%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%scentre%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%scentre%s([\|%]])', '%1')
			file = mw.ustring.gsub(file, '\|%sclass%s=.-([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%sframed?%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sframed?%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%sframeless%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sframeless%s([\|%]])', '%1')

Jonesey95: alphabetize removal strings for sanity before making changes

2025-03-28T13:27:17Z

alphabetize removal strings for sanity before making changes

← Previous revision		Revision as of 13:27, 28 March 2025
Line 92:		Line 92:
	for file in mw.ustring.gmatch(wikitext, '%b[]' ) do		for file in mw.ustring.gmatch(wikitext, '%b[]' ) do
	-- remove keywords that don't work in galleries		-- remove keywords that don't work in galleries
	file = mw.ustring.gsub(file, '\|%s~~thumb~~%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sbaseline%s([\|%]])', '%1')
⚫	file = mw.ustring.gsub(file, '\|%sthumbnail%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%sborder%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sborder%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%s~~left~~%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sbottom%s([\|%]])', '%1')
⚫	file = mw.ustring.gsub(file, '\|%s~~right~~%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%scenter%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%scenter%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%scentre%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%scentre%s([\|%]])', '%1')
			file = mw.ustring.gsub(file, '\|%sframed?%s([\|%]])', '%1')
			file = mw.ustring.gsub(file, '\|%sframeless%s([\|%]])', '%1')
		⚫	file = mw.ustring.gsub(file, '\|%slang%s=.-([\|%]])', '%1')
		⚫	file = mw.ustring.gsub(file, '\|%sleft%s([\|%]])', '%1')
		⚫	file = mw.ustring.gsub(file, '\|%slink%s=.-([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%snone%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%snone%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%s~~baseline~~%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sright%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%ssub%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%ssub%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%ssuper%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%ssuper%s([\|%]])', '%1')
⚫	file = mw.ustring.gsub(file, '\|%stop%s([\|%]])', '%1')
⚫	file = mw.ustring.gsub(file, '\|%s~~text%-top~~%s([\|%]])', '%1')
⚫	file = mw.ustring.gsub(file, '\|%s~~bottom~~%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%stext%-bottom%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%stext%-bottom%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%s~~framed?~~%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%stext%-top%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%s~~frameless~~%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sthumb%s([\|%]])', '%1')
		⚫	file = mw.ustring.gsub(file, '\|%sthumbnail%s([\|%]])', '%1')
		⚫	file = mw.ustring.gsub(file, '\|%stop%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%supright%s[0-9%.]%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%supright%s[0-9%.]%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%supright%s=.-([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%supright%s=.-([\|%]])', '%1')
⚫	file = mw.ustring.gsub(file, '\|%slink%s=.-([\|%]])', '%1')
⚫	file = mw.ustring.gsub(file, '\|%slang%s=.-([\|%]])', '%1')
	-- remove spaces prior to captions (which cause pre-formatted text)		-- remove spaces prior to captions (which cause pre-formatted text)
	file = mw.ustring.gsub(file, '\|%s*', '\|')		file = mw.ustring.gsub(file, '\|%s*', '\|')

Aidan9382: ignore tags

2024-08-18T11:18:41Z

ignore <onlyinclude> tags

← Previous revision		Revision as of 11:18, 18 August 2024
Line 171:		Line 171:
	content = excerptModule.getSection(content, args['section'..i]) or ''		content = excerptModule.getSection(content, args['section'..i]) or ''
	end		end
	content = excerptModule.cleanupText(content, {keepSubsections=true}) -- true means keep subsections		content = excerptModule.cleanupText(content, {keepSubsections=true, ignoreOnlyincludes=true}) -- true means keep subsections

	local galleryFiles = extractGalleryFiles(content)		local galleryFiles = extractGalleryFiles(content)

Aidan9382: remove unused require

2023-05-12T12:23:32Z

remove unused require

← Previous revision		Revision as of 12:23, 12 May 2023
Line 3:		Line 3:
	local excerptModule = require('Module:Excerpt/portals')		local excerptModule = require('Module:Excerpt/portals')
	local randomModule = require('Module:Random')		local randomModule = require('Module:Random')
	local redirectModule = require('Module:Redirect')

	function cleanupArgs(argsTable)		function cleanupArgs(argsTable)

Aidan9382: + ignored image keyword (lang=)

2023-02-09T17:52:13Z

+ ignored image keyword (lang=)

← Previous revision		Revision as of 17:52, 9 February 2023
Line 113:		Line 113:
	file = mw.ustring.gsub(file, '\|%supright%s=.-([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%supright%s=.-([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%slink%s=.-([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%slink%s=.-([\|%]])', '%1')
			file = mw.ustring.gsub(file, '\|%slang%s=.-([\|%]])', '%1')
	-- remove spaces prior to captions (which cause pre-formatted text)		-- remove spaces prior to captions (which cause pre-formatted text)
	file = mw.ustring.gsub(file, '\|%s*', '\|')		file = mw.ustring.gsub(file, '\|%s*', '\|')

Aidan9382: +position keyword incompatible with galleries ("none")

2023-01-23T18:42:04Z

+position keyword incompatible with galleries ("none")

← Previous revision		Revision as of 18:42, 23 January 2023
Line 100:		Line 100:
	file = mw.ustring.gsub(file, '\|%scenter%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%scenter%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%scentre%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%scentre%s([\|%]])', '%1')
			file = mw.ustring.gsub(file, '\|%snone%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%sbaseline%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sbaseline%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%ssub%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%ssub%s([\|%]])', '%1')

Aidan9382: Fix pipe removal logic to avoid incorrectly placing the temporary wikilink pipe break between 2 different wikilinks in rare edgecases (E.g. Baseball, File:JackieRobinson1945.jpg)

2022-11-28T12:02:23Z

Fix pipe removal logic to avoid incorrectly placing the temporary wikilink pipe break between 2 different wikilinks in rare edgecases (E.g. Baseball, File:JackieRobinson1945.jpg)

← Previous revision		Revision as of 12:02, 28 November 2022
Line 131:		Line 131:
	-- disable pipes in wikilinks		-- disable pipes in wikilinks
	file = file:gsub(		file = file:gsub(
	"%[%[(.-)\|(.-)]]",		"%[%[([^%]]-)\|(.-)]]",
	"[[%1__PIPE__%2]]")		"[[%1__PIPE__%2]]")
	-- move any alt parameter to the end to avoid putting the switcher in too early and causing a linter error		-- move any alt parameter to the end to avoid putting the switcher in too early and causing a linter error

Aidan9382: Move lint-fixing code to a much safer location so as to not screw over other functions like Module:Excerpt slideshow

2022-11-04T16:59:07Z

Move lint-fixing code to a much safer location so as to not screw over other functions like Module:Excerpt slideshow

← Previous revision		Revision as of 16:59, 4 November 2022
Line 39:		Line 39:
	local sortedLines = nonRandom and galleryLines or randomModule.main('array', randomiseArgs)		local sortedLines = nonRandom and galleryLines or randomModule.main('array', randomiseArgs)
	for i = 1, #sortedLines do		for i = 1, #sortedLines do
	local currentLine = sortedLines[i]
	--[==[ This code, despite the safety checks, is still too unstable. Disabled as of now
⚫	-- disable pipes in wikilinks
	currentLine = currentLine:gsub(
⚫	"%[%[(.-)\|(.-)]]",
⚫	"[[%1__PIPE__%2]]")
⚫	-- move any alt parameter to the end to avoid putting the switcher in too early and causing a linter error
	currentLine = currentLine:gsub(
⚫	"^(.+)(\|alt=[^\|])(.)$",
⚫	"%1%3%2")
⚫	-- bring back pipes in wikilinks
	currentLine = currentLine:gsub(
⚫	"%[%[(.-)__PIPE__(.-)]]",
⚫	"[[%1\|%2]]")
	--]==]
	-- insert a switcher-label span just after the first pipe, which should ideally be the caption		-- insert a switcher-label span just after the first pipe, which should ideally be the caption
	~~currentLine~~ = ~~currentLine~~:gsub(		sortedLines[i] = sortedLines[i]:gsub(
	"\|",		"\|",
	'\|<span class="switcher-label" style="display:none"><span class="randomSlideshow-sr-only">Image ' .. tostring(i) .. '</span></span>',		'\|<span class="switcher-label" style="display:none"><span class="randomSlideshow-sr-only">Image ' .. tostring(i) .. '</span></span>',
	1)		1)
	sortedLines[i] = currentLine
	end		end
	local galleryContent = table.concat(sortedLines, '\n')		local galleryContent = table.concat(sortedLines, '\n')
Line 141:		Line 125:
	end		end
	return files		return files
			end

			--Central function for fixing issues that could occur in both gallery-fetched and file-fetched files
			local function doubleCheck(file)
		⚫	-- disable pipes in wikilinks
			file = file:gsub(
		⚫	"%[%[(.-)\|(.-)]]",
		⚫	"[[%1__PIPE__%2]]")
		⚫	-- move any alt parameter to the end to avoid putting the switcher in too early and causing a linter error
			file = file:gsub(
		⚫	"^(.+)(\|alt=[^\|])(.)$",
		⚫	"%1%3%2")
		⚫	-- bring back pipes in wikilinks
			file = file:gsub(
		⚫	"%[%[(.-)__PIPE__(.-)]]",
		⚫	"[[%1\|%2]]")
			return file
	end		end

Line 178:		Line 179:
	local isOkay = excerptModule.checkImage(filename)		local isOkay = excerptModule.checkImage(filename)
	if isOkay then		if isOkay then
	table.insert(lines, f.." (from '''[["..pagename.."]]''')")		table.insert(lines, doubleCheck(f.." (from '''[["..pagename.."]]''')"))
	end		end
	end		end
Line 188:		Line 189:
	for _, f in pairs(extractRegularFiles(otherFiles)) do		for _, f in pairs(extractRegularFiles(otherFiles)) do
	if f and f ~= '' and mw.ustring.sub(f, 1, 5) == 'File:' and hasCaption(f) then		if f and f ~= '' and mw.ustring.sub(f, 1, 5) == 'File:' and hasCaption(f) then
	table.insert(lines, f.." (from '''[["..pagename.."]]''')")		table.insert(lines, doubleCheck(f.." (from '''[["..pagename.."]]''')"))
	end		end
	end		end

Aidan9382: Despite all the safety checks, its still causing disasters (bigger ones this time!). Chances are this needs to be moved OUT of makeOutput into some place safer. For the time being, reverting to stabler version. Apologies!

2022-11-04T16:47:25Z

Despite all the safety checks, its still causing disasters (bigger ones this time!). Chances are this needs to be moved OUT of makeOutput into some place safer. For the time being, reverting to stabler version. Apologies!

← Previous revision		Revision as of 16:47, 4 November 2022
Line 40:		Line 40:
	for i = 1, #sortedLines do		for i = 1, #sortedLines do
	local currentLine = sortedLines[i]		local currentLine = sortedLines[i]
			--[==[ This code, despite the safety checks, is still too unstable. Disabled as of now
	-- disable pipes in wikilinks		-- disable pipes in wikilinks
	currentLine = currentLine:gsub(		currentLine = currentLine:gsub(
Line 52:		Line 53:
	"%[%[(.-)__PIPE__(.-)]]",		"%[%[(.-)__PIPE__(.-)]]",
	"[[%1\|%2]]")		"[[%1\|%2]]")
			--]==]
	-- insert a switcher-label span just after the first pipe, which should ideally be the caption		-- insert a switcher-label span just after the first pipe, which should ideally be the caption
	currentLine = currentLine:gsub(		currentLine = currentLine:gsub(

Aidan9382: improve alt param position check by temporarily removing pipes in wikilinks during processing

2022-11-04T13:30:54Z

improve alt param position check by temporarily removing pipes in wikilinks during processing

← Previous revision		Revision as of 13:30, 4 November 2022
Line 39:		Line 39:
	local sortedLines = nonRandom and galleryLines or randomModule.main('array', randomiseArgs)		local sortedLines = nonRandom and galleryLines or randomModule.main('array', randomiseArgs)
	for i = 1, #sortedLines do		for i = 1, #sortedLines do
		⚫	local currentLine = sortedLines[i]
⚫	-- move ~~the~~ alt parameter to the end of the ~~file~~ ~~should~~ it ~~exist~~ to ~~fix~~ linter ~~errors~~
			-- disable pipes in wikilinks
	-- make sure the parameter isnt perhaps being confused by a wikilink inside it
	~~local altParam~~ = ~~sortedLines[i]~~:gsub(		currentLine = currentLine:gsub(
			"%[%[(.-)\|(.-)]]",
			"[[%1__PIPE__%2]]")
		⚫	-- move any alt parameter to the end to avoid putting the switcher in too early and causing a linter error
			currentLine = currentLine:gsub(
	"^(.+)(\|alt=[^\|])(.)$",		"^(.+)(\|alt=[^\|])(.)$",
	"%2")		"%1%3%2")
			-- bring back pipes in wikilinks
	if not string.find(altParam,"%[%[") then
	~~sortedLines[i]~~ = ~~sortedLines[i]~~:gsub(		currentLine = currentLine:gsub(
	"^(.+)(\|alt=[^\|])(.)$",		"%[%[(.-)__PIPE__(.-)]]",
	"%1%3%2")		"[[%1\|%2]]")
		⚫	-- insert a switcher-label span just after the first pipe, which should ideally be the caption
	end
			currentLine = currentLine:gsub(
⚫	-- insert a switcher-label span just after the first pipe
⚫	~~sortedLines[i]~~ = sortedLines[i]~~:gsub(~~
	"\|",		"\|",
	'\|<span class="switcher-label" style="display:none"><span class="randomSlideshow-sr-only">Image ' .. tostring(i) .. '</span></span>',		'\|<span class="switcher-label" style="display:none"><span class="randomSlideshow-sr-only">Image ' .. tostring(i) .. '</span></span>',
	1)		1)
	~~mw.log("Workin with",~~sortedLines[i])		sortedLines[i] = currentLine
	end		end
	local galleryContent = table.concat(sortedLines, '\n')		local galleryContent = table.concat(sortedLines, '\n')

← Previous revision		Revision as of 13:28, 28 March 2025
Line 97:		Line 97:
	file = mw.ustring.gsub(file, '\|%scenter%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%scenter%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%scentre%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%scentre%s([\|%]])', '%1')
			file = mw.ustring.gsub(file, '\|%sclass%s=.-([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%sframed?%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sframed?%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%sframeless%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sframeless%s([\|%]])', '%1')

← Previous revision		Revision as of 13:27, 28 March 2025
Line 92:		Line 92:
	for file in mw.ustring.gmatch(wikitext, '%b[]' ) do		for file in mw.ustring.gmatch(wikitext, '%b[]' ) do
	-- remove keywords that don't work in galleries		-- remove keywords that don't work in galleries
	file = mw.ustring.gsub(file, '\|%s~~thumb~~%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sbaseline%s([\|%]])', '%1')
⚫	file = mw.ustring.gsub(file, '\|%sthumbnail%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%sborder%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sborder%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%s~~left~~%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sbottom%s([\|%]])', '%1')
⚫	file = mw.ustring.gsub(file, '\|%s~~right~~%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%scenter%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%scenter%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%scentre%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%scentre%s([\|%]])', '%1')
			file = mw.ustring.gsub(file, '\|%sframed?%s([\|%]])', '%1')
			file = mw.ustring.gsub(file, '\|%sframeless%s([\|%]])', '%1')
		⚫	file = mw.ustring.gsub(file, '\|%slang%s=.-([\|%]])', '%1')
		⚫	file = mw.ustring.gsub(file, '\|%sleft%s([\|%]])', '%1')
		⚫	file = mw.ustring.gsub(file, '\|%slink%s=.-([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%snone%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%snone%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%s~~baseline~~%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sright%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%ssub%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%ssub%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%ssuper%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%ssuper%s([\|%]])', '%1')
⚫	file = mw.ustring.gsub(file, '\|%stop%s([\|%]])', '%1')
⚫	file = mw.ustring.gsub(file, '\|%s~~text%-top~~%s([\|%]])', '%1')
⚫	file = mw.ustring.gsub(file, '\|%s~~bottom~~%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%stext%-bottom%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%stext%-bottom%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%s~~framed?~~%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%stext%-top%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%s~~frameless~~%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sthumb%s([\|%]])', '%1')
		⚫	file = mw.ustring.gsub(file, '\|%sthumbnail%s([\|%]])', '%1')
		⚫	file = mw.ustring.gsub(file, '\|%stop%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%supright%s[0-9%.]%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%supright%s[0-9%.]%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%supright%s=.-([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%supright%s=.-([\|%]])', '%1')
⚫	file = mw.ustring.gsub(file, '\|%slink%s=.-([\|%]])', '%1')
⚫	file = mw.ustring.gsub(file, '\|%slang%s=.-([\|%]])', '%1')
	-- remove spaces prior to captions (which cause pre-formatted text)		-- remove spaces prior to captions (which cause pre-formatted text)
	file = mw.ustring.gsub(file, '\|%s*', '\|')		file = mw.ustring.gsub(file, '\|%s*', '\|')

← Previous revision		Revision as of 17:52, 9 February 2023
Line 113:		Line 113:
	file = mw.ustring.gsub(file, '\|%supright%s=.-([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%supright%s=.-([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%slink%s=.-([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%slink%s=.-([\|%]])', '%1')
			file = mw.ustring.gsub(file, '\|%slang%s=.-([\|%]])', '%1')
	-- remove spaces prior to captions (which cause pre-formatted text)		-- remove spaces prior to captions (which cause pre-formatted text)
	file = mw.ustring.gsub(file, '\|%s*', '\|')		file = mw.ustring.gsub(file, '\|%s*', '\|')

← Previous revision		Revision as of 18:42, 23 January 2023
Line 100:		Line 100:
	file = mw.ustring.gsub(file, '\|%scenter%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%scenter%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%scentre%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%scentre%s([\|%]])', '%1')
			file = mw.ustring.gsub(file, '\|%snone%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%sbaseline%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sbaseline%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%ssub%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%ssub%s([\|%]])', '%1')