Module:Delimited tag: Difference between revisions

Line 25:

['to'] = ' to ',

['br'] = ' ',

['newline'] = ' ',

['newline'] = ' ',

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

}

Line 43:

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

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

}

~~local delimitersWithSerial = {~~

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

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

~~['and-list'] = true,~~

~~['&-list'] = true,~~

~~['or-list'] = true~~

}

local delimiter = args['delimiter'] or args['delim'] or args['d'] or ' '

if finalDelimiterValues[delimiter] ~~then delimiter = finalDelimiterValues[~~delimiter~~] end~~

local finalDelimiter = finalDelimiterValues[delimiter] or delimiter

local midDelimiter = midDelimiterValues[delimiter] or delimiter

~~local serialDelimiter = delimitersWithSerial[delimiter] and ',' or ''~~

for i,~~unit~~ in ipairs(args) do

for i,val in ipairs(args) do

if (i > 1) then

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

local currentDelimiter = args[i+1] and midDelimiter or finalDelimiter

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

output = output .. currentDelimiter .. tag(val)

end

@@ Line 25: / Line 25: @@
 		['to'] = ' to&nbsp;',
 		['br'] = '<br/>',
-		 ['newline'] = '<br/>',
+		 ['newline'] = '<br>',
-		['list'] = '<br/>' .. listLevel,
+		['list'] = '\n' .. listLevel,
-		 ['bullet'] = '<br/>' .. listLevel,
+		 ['bullet'] = '\n' .. listLevel,
-		 ['*'] = '<br/>' .. listLevel,
+		 ['*'] = '\n' .. listLevel,
-		['and-list'] = ' and<br/>' .. listLevel,
+		['and-list'] = ', and\n' .. listLevel,
-		['or-list'] = ' or<br/>' .. listLevel,
+		['or-list'] = ', or\n' .. listLevel,
-		['&-list'] = ' &<br/>' .. listLevel,
+		['&-list'] = ' &\n' .. listLevel,
-		['amp-list'] = ' &<br/>' .. listLevel,
+		['amp-list'] = ' &\n' .. listLevel,
-		['comma-list'] = ',<br/>' .. listLevel,
+		['comma-list'] = ',\n' .. listLevel,
-		 [',-list'] = ',<br/>' .. listLevel,
+		 [',-list'] = ',\n' .. listLevel,
 	}
@@ Line 43: / Line 43: @@
 		['and-list'] = ',<br>\n' .. listLevel,
 		 ['&-list'] = ',<br>\n' .. listLevel,
-	}
-	local delimitersWithSerial = {
-		['and'] = true,
-		['or'] = true,
-		['and-list'] = true,
-		['&-list'] = true,
-		['or-list'] = true
 	}
 	local delimiter = args['delimiter'] or args['delim'] or args['d'] or '&nbsp;'
-	if finalDelimiterValues[delimiter] then delimiter = finalDelimiterValues[delimiter] end
+	local finalDelimiter = finalDelimiterValues[delimiter] or delimiter
 	local midDelimiter = midDelimiterValues[delimiter] or delimiter
-	local serialDelimiter = delimitersWithSerial[delimiter] and ',' or ''
-	for i,unit in ipairs(args) do
+	for i,val in ipairs(args) do
 		if (i > 1) then
-			local currentDelimiter = args[i*1+1] and midDelimiter or (serialDelimiter .. delimiter)
+			local currentDelimiter = args[i+1] and midDelimiter or finalDelimiter
-			output = output .. currentDelimiter .. tag(args[i])
+			output = output .. currentDelimiter .. tag(val)
 		end
 	end