Module:Delimited tag: Difference between revisions

Line 17:

local finalDelimiterValues = {

['none'] = '<nowiki/>',

[','] = ', ',

['comma'] = ', ',

['~~and~~'] = ' and ',

[','] = ', ',

['&'] = '~~ ~~& ', ['amp'] = '~~ ~~& ',

['and'] = ' and ',

['or'] = '~~ ~~or ',

['&'] = ' & ',

['to'] = '~~ ~~to ',

['amp'] = ' & ',

['br'] = ' ', ['newline'] = ' ',

['or'] = ' or ',

['list'] = ' ' .. listLevel, ['bullet'] = ' ' .. listLevel, ['*'] = ' ' .. listLevel,

['to'] = ' to ',

['and-list'] = '~~ ~~and ' .. listLevel,

['br'] = ' ',

['or-list'] = '~~ ~~or ' .. listLevel,

['newline'] = ' ',

['&-list'] = '~~ ~~& ' .. listLevel, ['amp-list'] = '~~ ~~& ' .. listLevel,

['list'] = ' ' .. listLevel,

['bullet'] = ' ' .. listLevel,

['*'] = ' ' .. listLevel,

['and-list'] = ' and ' .. listLevel,

['or-list'] = ' or ' .. listLevel,

['&-list'] = ' & ' .. listLevel,

['amp-list'] = ' & ' .. listLevel,

['comma-list'] = ', ' .. listLevel,

[',-list'] = ', ' .. listLevel,

}

local midDelimiterValues = {

['and'] = '~~ ~~', ['&'] = '~~ ~~', ['amp'] = '~~ ~~',

['and'] = ', ',

['and-list'] = ', \n' .. listLevel, ['&-list'] = ', \n' .. listLevel,

['&'] = ', ',

['amp'] = ', ',

['and-list'] = ', \n' .. listLevel,

['&-list'] = ', \n' .. listLevel,

}

Line 50:

Line 60:

for i,unit in ipairs(args) do

if (i > 1) then

local currentDelimiter = args[i+1] and midDelimiter or (serialDelimiter .. delimiter)

local currentDelimiter = args[i*1+1] and midDelimiter or (serialDelimiter .. delimiter)

output = output .. currentDelimiter .. tag(args[i])

end

@@ Line 17: / Line 17: @@
 	local finalDelimiterValues = {
 		['none'] = '<nowiki/>',
-		[','] = ',&#32;',
+		['comma'] = ',&#32;',
-		['and'] = '&#32;and&#32;',
+		 [','] = ',&#32;',
-		['&'] = '&nbsp;&amp;&nbsp;', ['amp'] = '&nbsp;&amp;&nbsp;',
+		['and'] = ' and&#32;',
-		['or'] = '&#32;or&nbsp;',
+		['&'] = ' &amp;&nbsp;',
-		['to'] = '&#32;to&nbsp;',
+		 ['amp'] = ' &amp;&nbsp;',
-		['br'] = '<br/>', ['newline'] = '<br/>',
+		['or'] = ' or&nbsp;',
-		['list'] = '<br/>' .. listLevel, ['bullet'] = '<br/>' .. listLevel, ['*'] = '<br/>' .. listLevel,
+		['to'] = ' to&nbsp;',
-		['and-list'] = '&#32;and<br/>' .. listLevel,
+		['br'] = '<br/>',
-		['or-list'] = '&#32;or<br/>' .. listLevel,
+		 ['newline'] = '<br/>',
-		['&-list'] = '&#32;&<br/>' .. listLevel, ['amp-list'] = '&#32;&<br/>' .. listLevel,
+		['list'] = '<br/>' .. listLevel,
+		 ['bullet'] = '<br/>' .. listLevel,
+		 ['*'] = '<br/>' .. listLevel,
+		['and-list'] = ' and<br/>' .. listLevel,
+		['or-list'] = ' or<br/>' .. listLevel,
+		['&-list'] = ' &<br/>' .. listLevel,
+		['amp-list'] = ' &<br/>' .. listLevel,
 		['comma-list'] = ',<br/>' .. listLevel,
+		 [',-list'] = ',<br/>' .. listLevel,
 	}
 	local midDelimiterValues = {
-		['and'] = '&#32;', ['&'] = '&#32;', ['amp'] = '&#32;',
+		['and'] = ', ',
-		['and-list'] = ',<br>\n' .. listLevel, ['&-list'] = ',<br>\n' .. listLevel,
+		 ['&'] = ', ',
+		 ['amp'] = ', ',
+		['and-list'] = ',<br>\n' .. listLevel,
+		 ['&-list'] = ',<br>\n' .. listLevel,
 	}
@@ Line 50: / Line 60: @@
 	for i,unit in ipairs(args) do
 		if (i > 1) then
-			local currentDelimiter = args[i+1] and midDelimiter or (serialDelimiter .. delimiter)
+			local currentDelimiter = args[i*1+1] and midDelimiter or (serialDelimiter .. delimiter)
 			output = output .. currentDelimiter .. tag(args[i])
 		end