Module:Gallery - Revision history

Arthurfragoso: Returning to the new version + fixes tested in the sandbox and in a local mediawiki. The problem was because the parser was interpreting the pipe as part of the url in the reported case.

2025-02-10T10:31:44Z

Returning to the new version + fixes tested in the sandbox and in a local mediawiki. The problem was because the parser was interpreting the pipe as part of the url in the reported case.

Show changes

Jonesey95: Reverting all the way back; alt text errors still present. Testing in sandbox will continue.

2025-02-10T03:16:27Z

Reverting all the way back; alt text errors still present. Testing in sandbox will continue.

@@ Line 1: / Line 1: @@
--- This module implements {{gallery}} by wrapping the <gallery> core extension tag.
+-- This module implements {{gallery}}
 local p = {}
@@ Line 7: / Line 7: @@
 local function trim(s)
-	return mw.ustring.gsub(mw.ustring.gsub(s or '', '%s', ' '), '^%s*(.-)%s*$', '%1')
+	return mw.ustring.gsub(mw.ustring.gsub(s, '%s', ' '), '^%s*(.-)%s*$', '%1')
 end
 local tracking, preview
 local function checkarg(k,v)
@@ Line 48: / Line 17: @@
 			k == 'width' or k == 'height' or k == 'whitebg' or
 			k == 'mode' or k == 'footer' or k == 'perrow' or k == 'noborder' or
-			k:match('^alt%d+$') or k:match('^class%d+$') or k:match('^%d+$') then
+			k:match('^alt%d+$') or k:match('^%d+$') then
 			-- valid
 		elseif k == 'captionstyle' then
@@ Line 86: / Line 55: @@
 	end
-	if (args.align or '') == 'centre' then
+    if (args.align or '') == 'centre' then
 		args.align = 'center'
 	end
@@ Line 128: / Line 97: @@
 	end
 	local gallery = {}
-	local imageCount = 0
+	local imageCount = math.ceil(#args / 2)
 		end
 	end

Jonesey95: rv the last two changes; broken alt text causing caption issues; see talk

2025-02-10T02:32:38Z

rv the last two changes; broken alt text causing caption issues; see talk

← Previous revision		Revision as of 02:32, 10 February 2025
Line 5:		Line 5:
	local templatestyles = 'Module:Gallery/styles.css'		local templatestyles = 'Module:Gallery/styles.css'
	local yesno = require('Module:Yesno')		local yesno = require('Module:Yesno')
	local plaintextModule = require('Module:Plain text')

	local function plaintext(text)
	return plaintextModule.main({ args = { text, encode = "no" } })
	end

	local function trim(s)		local function trim(s)
Line 21:		Line 16:

	-- Check if it starts with "File:", "Image:", or "Media:"		-- Check if it starts with "File:", "Image:", or "Media:"
	~~local~~ prefix = file:match("^(%a+):")		prefix = file:match("^(%a+):")
	if prefix and (prefix == "file" or prefix == "image" or prefix == "media") then		if prefix and (prefix == "file" or prefix == "image" or prefix == "media") then
	return true		return true
Line 179:		Line 174:
	-- It is necessary because we add classes codes in the next step,		-- It is necessary because we add classes codes in the next step,
	-- we do not want to let the alt empty with just the non-printing characters.		-- we do not want to let the alt empty with just the non-printing characters.
	alt = (caption ~~~= '') and plaintext(caption) or ''~~		alt = caption
	end		end

Arthurfragoso: Text.getPlain don't strips wikilinks and images. But the 'Module:Plain text' does the desired function

2025-02-07T20:07:55Z

Text.getPlain don't strips wikilinks and images. But the 'Module:Plain text' does the desired function

← Previous revision		Revision as of 20:07, 7 February 2025
Line 5:		Line 5:
	local templatestyles = 'Module:Gallery/styles.css'		local templatestyles = 'Module:Gallery/styles.css'
	local yesno = require('Module:Yesno')		local yesno = require('Module:Yesno')
	local ~~Text~~ = require('Module:~~Text~~')		local plaintextModule = require('Module:Plain text')

	Text = Text.Text()
			local function plaintext(text)
			return plaintextModule.main({ args = { text, encode = "no" } })
			end

	local function trim(s)		local function trim(s)
Line 18:		Line 21:

	-- Check if it starts with "File:", "Image:", or "Media:"		-- Check if it starts with "File:", "Image:", or "Media:"
	prefix = file:match("^(%a+):")		local prefix = file:match("^(%a+):")
	if prefix and (prefix == "file" or prefix == "image" or prefix == "media") then		if prefix and (prefix == "file" or prefix == "image" or prefix == "media") then
	return true		return true
Line 176:		Line 179:
	-- It is necessary because we add classes codes in the next step,		-- It is necessary because we add classes codes in the next step,
	-- we do not want to let the alt empty with just the non-printing characters.		-- we do not want to let the alt empty with just the non-printing characters.
	alt = (caption ~= '') and ~~Text.getPlain~~(caption) or ''		alt = (caption ~= '') and plaintext(caption) or ''
	end		end

Arthurfragoso: Removes wikilinks and wikicode when adding the caption to the alt text

2025-02-07T16:56:10Z

Removes wikilinks and wikicode when adding the caption to the alt text

← Previous revision		Revision as of 16:56, 7 February 2025
Line 5:		Line 5:
	local templatestyles = 'Module:Gallery/styles.css'		local templatestyles = 'Module:Gallery/styles.css'
	local yesno = require('Module:Yesno')		local yesno = require('Module:Yesno')
			local Text = require('Module:Text')
			Text = Text.Text()

	local function trim(s)		local function trim(s)
Line 174:		Line 176:
	-- It is necessary because we add classes codes in the next step,		-- It is necessary because we add classes codes in the next step,
	-- we do not want to let the alt empty with just the non-printing characters.		-- we do not want to let the alt empty with just the non-printing characters.
	alt = caption		alt = (caption ~= '') and Text.getPlain(caption) or ''
	end		end

Arthurfragoso: adds classN for enabling darkmode skin-invert-image

2025-02-07T03:38:22Z

adds classN for enabling darkmode skin-invert-image

← Previous revision		Revision as of 03:38, 7 February 2025
Line 48:		Line 48:
	k == 'width' or k == 'height' or k == 'whitebg' or		k == 'width' or k == 'height' or k == 'whitebg' or
	k == 'mode' or k == 'footer' or k == 'perrow' or k == 'noborder' or		k == 'mode' or k == 'footer' or k == 'perrow' or k == 'noborder' or
	k:match('^alt%d+$') or k:match('^%d+$') then		k:match('^alt%d+$') or k:match('^class%d+$') or k:match('^%d+$') then
	-- valid		-- valid
	elseif k == 'captionstyle' then		elseif k == 'captionstyle' then
Line 86:		Line 86:
	end		end

	if (args.align or '') == 'centre' then		if (args.align or '') == 'centre' then
	args.align = 'center'		args.align = 'center'
	end		end
Line 132:		Line 132:

	local imageCount = 0		local imageCount = 0

			local zwsp = string.char(0xE2, 0x80, 0x8B) -- U+200B Zero Width Space
			local zwnj = string.char(0xE2, 0x80, 0x8C) -- U+200C Zero Width Non-Joiner

			-- create a coding to identify classes
			-- using unicode non-printing characters
			-- this is a workaround until we get the class arg in the <gallery> tag
			-- https://phabricator.wikimedia.org/T344784

			local skininvert = zwsp .. zwsp .. zwsp;
			local bgtransparent = zwsp .. zwsp .. zwnj;

	for i = 1, #args do		for i = 1, #args do
Line 147:		Line 158:
	end		end

	local altCount = 0; ~~-- remove after migration~~		local altCount = 0;

	-- Run through virtualgallery and builds gallery		-- Run through virtualgallery and builds gallery
Line 154:		Line 165:
	local caption = virtualgallery[n][2] or ''		local caption = virtualgallery[n][2] or ''
	local alt = trim(args['alt' .. n] or '')		local alt = trim(args['alt' .. n] or '')
			local class = trim(args['class' .. n] or '')

			-- we count alt text only before any modification
	--remove after migration
	if alt ~= '' then		if alt ~= '' then
	altCount = altCount + 1		altCount = altCount + 1
			else
			-- if alt is empty, we use the caption as a alt text.
			-- It is necessary because we add classes codes in the next step,
			-- we do not want to let the alt empty with just the non-printing characters.
			alt = caption
			end

			-- we attach the non-printing code to the end of the alt text
			if mw.ustring.find(class, 'skin%-invert') then -- this matches both skin-invert and skin-invert-image
			alt = alt .. skininvert
			end

			-- as it is possible to combine multiple classes, we use find instead of ==
			if mw.ustring.find(class, 'bg%-transparent') then
			alt = alt .. bgtransparent
	end		end

Arthurfragoso: missed ".tif" extension

2025-02-03T05:08:46Z

missed ".tif" extension

← Previous revision		Revision as of 05:08, 3 February 2025
Line 24:		Line 24:
	"apng", "djvu", "flac", "gif", "jfi", "jfif", "jif", "jpe", "jpeg", "jpg",		"apng", "djvu", "flac", "gif", "jfi", "jfif", "jif", "jpe", "jpeg", "jpg",
	"m1a", "m1v", "m2a", "m2v", "mid", "mp1", "mp2", "mp3", "mpa", "mpe", "mpeg", "mpg",		"m1a", "m1v", "m2a", "m2v", "mid", "mp1", "mp2", "mp3", "mpa", "mpe", "mpeg", "mpg",
	"mpv", "oga", "ogg", "ogv", "opus", "pdf", "png", "stl", "svg", "svgz", "tiff",		"mpv", "oga", "ogg", "ogv", "opus", "pdf", "png", "stl", "svg", "svgz", "tif", "tiff",
	"wav", "wave", "webm", "webp", "xcf"		"wav", "wave", "webm", "webp", "xcf"
	}		}

Arthurfragoso: Refactored argument parsing and gallery building algorithm. There should be no visible difference to existing articles. Ping me if you find any abnormality, or revert the changes.

2025-02-03T03:28:59Z

Refactored argument parsing and gallery building algorithm. There should be no visible difference to existing articles. Ping me if you find any abnormality, or revert the changes.

@@ Line 1: / Line 1: @@
--- This module implements {{gallery}}
+-- This module implements {{gallery}} by wrapping the <gallery> core extension tag.
 local p = {}
@@ Line 7: / Line 7: @@
 local function trim(s)
-	return mw.ustring.gsub(mw.ustring.gsub(s, '%s', ' '), '^%s*(.-)%s*$', '%1')
+	return mw.ustring.gsub(mw.ustring.gsub(s or '', '%s', ' '), '^%s*(.-)%s*$', '%1')
 end
 local tracking, preview
 local function checkarg(k,v)
@@ Line 97: / Line 128: @@
 	end
 	local gallery = {}
-	local imageCount = math.ceil(#args / 2)
+	local imageCount = 0
-    for i = 1, imageCount do
+	for i = 1, #args do
-		local img = trim(args[i*2 - 1] or '')
+	    local currentfield = trim(args[i]) or ''
 		end
 	end

Arthurfragoso: Reverting to debug reported problems 1273397623 by Arthurfragoso (talk)

2025-02-02T04:17:34Z

Reverting to debug reported problems 1273397623 by Arthurfragoso (talk)

@@ Line 1: / Line 1: @@
--- This module implements {{gallery}} by wrapping the <gallery> core extension tag.
+-- This module implements {{gallery}}
 local p = {}
@@ Line 7: / Line 7: @@
 local function trim(s)
-	return mw.ustring.gsub(mw.ustring.gsub(s or '', '%s', ' '), '^%s*(.-)%s*$', '%1')
+	return mw.ustring.gsub(mw.ustring.gsub(s, '%s', ' '), '^%s*(.-)%s*$', '%1')
 end
@@ Line 65: / Line 55: @@
 	end
-	if (args.align or '') == 'centre' then
+    if (args.align or '') == 'centre' then
 		args.align = 'center'
 	end
@@ Line 107: / Line 97: @@
 	end
 	local gallery = {}
-	local imageCount = 0
+	local imageCount = math.ceil(#args / 2)
-	    local img = virtualgallery[n][1]
+		local caption = trim(args[i*2] or '')
-	    local caption = virtualgallery[n][2] or ''
+		local alt = trim(args['alt' .. i] or '')
 	end

Arthurfragoso: Refactored argument parsing and gallery building algorithm. There should be no visible difference to existing articles but it provides greater flexibility for future editors using arguments and improves the module's extensibility. Ping me if you find any abnormality, or revert the changes.

2025-02-02T03:06:57Z

Refactored argument parsing and gallery building algorithm. There should be no visible difference to existing articles but it provides greater flexibility for future editors using arguments and improves the module's extensibility. Ping me if you find any abnormality, or revert the changes.

@@ Line 1: / Line 1: @@
--- This module implements {{gallery}}
+-- This module implements {{gallery}} by wrapping the <gallery> core extension tag.
 local p = {}
@@ Line 7: / Line 7: @@
 local function trim(s)
-	return mw.ustring.gsub(mw.ustring.gsub(s, '%s', ' '), '^%s*(.-)%s*$', '%1')
+	return mw.ustring.gsub(mw.ustring.gsub(s or '', '%s', ' '), '^%s*(.-)%s*$', '%1')
 end
@@ Line 55: / Line 65: @@
 	end
-    if (args.align or '') == 'centre' then
+	if (args.align or '') == 'centre' then
 		args.align = 'center'
 	end
@@ Line 97: / Line 107: @@
 	end
 	local gallery = {}
-	local imageCount = math.ceil(#args / 2)
+	local imageCount = 0
-		local caption = trim(args[i*2] or '')
+	    local img = virtualgallery[n][1]
-		local alt = trim(args['alt' .. i] or '')
+	    local caption = virtualgallery[n][2] or ''
 	end