Difference between revisions of "Module:Aligned table"

Revision as of 21:17, 22 April 2014

Documentation for this module may be created at Module:Aligned table/doc

-- This module implements {{aligned table}}

local p = {}

function p.table(frame)
	local args = (frame.args[3] ~= nil) and frame.args or frame:getParent().args
	local entries = {}
	local colclass = {}
	local colstyle = {}
	local cols = tonumber(args['cols']) or 2
	local class = args['class'] or ''
	local style = args['style'] or ''
	local leftright = args['leftright'] or ''
	local fullwidth = args['fullwidth'] or ''
	
	if leftright ~= '' then
		colstyle[1] = 'text-align:left;'
		colstyle[2] = 'text-align:right;'
	end

	local root = mw.html.create('table')
	
	if fullwidth ~= '' then
		root
			:css('width', '100%')
			:css('border-collapse', 'collapse')
			:css('border-spacing', '0px')
			:css('border', 'none')
	end
	if class ~= '' then
		root:addClass(class)
	end
	if style ~= '' then
		root:cssText(style)
	end
	for i = 1,cols do
		colclass[ i ] = colclass[ i ] or ''
		colstyle[ i ] = colstyle[ i ] or ''
		if args['align' .. tostring(i)] then
			colstyle[ i ] = 'text-align:' .. args['align' .. tostring(i)] .. ';' .. colstyle[ i ]
		end
		if args['nowrap' .. tostring(i)] and args['nowrap' .. tostring(i)] ~= '' then
			colstyle[ i ] = 'white-space:nowrap;' .. colstyle[ i ]
		end
		if args['style' .. tostring(i)] then
			colstyle[ i ] = colstyle[ i ] .. args['style' .. tostring(i)]
		end
		if args['class' .. tostring(i)] then
			colclass[ i ] =  args['class' .. tostring(i)]
		end
	end
	
	for k, v in pairs( args ) do
		if type( k ) == 'number' then
			i = math.fmod(k-1,cols) + 1
			local j = (k - i) / cols + 1
			local cell = mw.html.create('td')
			if args['class' .. tostring(j) .. '.' .. tostring(i)] then
				cell:addClass(args['class' .. tostring(j) .. '.' .. tostring(i)])
			elseif args['rowclass' .. tostring(j)] then
				cell:addClass(args['rowclass' .. tostring(j)] .. '"')
			elseif colclass[i] ~= '' then
				cell:addClass(colclass[i])
			end
			if args['style' .. tostring(j) .. '.' .. tostring(i)] then
				cell:cssText(args['style' .. tostring(j) .. '.' .. tostring(i)])
			elseif args['rowstyle' .. tostring(j)] then
				cell:cssText(args['rowstyle' .. tostring(j)])
			elseif colstyle[i] ~= '' then
				cell:cssText(colstyle[i])
			end
			cell:wikitext(v)
			entries[ k ] = tostring(cell)
			if i == 1 then
				entries[ k ] = '<tr style="vertical-align:top">' .. entries[ k ]
			end
			if i == cols then
				entries[ k ] = entries[k] .. '</tr>'
			end
        end
    end
    root:wikitext(table.concat( entries, '\n' ))

    return tostring(root)
 end

return p

@@ Line 18: / Line 18: @@
 		colstyle[2] = 'text-align:right;'
 	end
-	-- create the root table
 	local root = mw.html.create('table')
-	-- add table style for fullwidth
 	if fullwidth ~= '' then
 		root
@@ Line 28: / Line 28: @@
 			:css('border', 'none')
 	end
-	-- add table classes
 	if class ~= '' then
 		root:addClass(class)
 	end
-	-- add table style
 	if style ~= '' then
 		root:cssText(style)
 	end
-	-- build arrays with the column styles and classes
 	for i = 1,cols do
 		colclass[ i ] = colclass[ i ] or ''
@@ Line 53: / Line 50: @@
 		end
 	end
-	-- compute the maximum cell index
-	local cellcount = 0
 	for k, v in pairs( args ) do
 		if type( k ) == 'number' then
-			cellcount = math.max(cellcount, k)
+			i = math.fmod(k-1,cols) + 1
-		end
+			local j = (k - i) / cols + 1
-	end
+			local cell = mw.html.create('td')
-	-- compute the number of rows
-	local rows = math.ceil(cellcount / cols)
-	-- build the table content
-	for j=1,rows do
-		-- start a new row
-		local row = root:tag('tr')
-		row:css('vertical-align', 'top')
-		-- loop over the cells in each row
-		for i=1,cols do
-			local cell = row:tag('td')
 			if args['class' .. tostring(j) .. '.' .. tostring(i)] then
 				cell:addClass(args['class' .. tostring(j) .. '.' .. tostring(i)])
@@ Line 85: / Line 70: @@
 				cell:cssText(colstyle[i])
 			end
-			cell:wikitext(args[rows*(j - 1) + i] or '')
+			cell:wikitext(v)
+			entries[ k ] = tostring(cell)
+			if i == 1 then
+				entries[ k ] = '<tr style="vertical-align:top">' .. entries[ k ]
+			end
+			if i == cols then
+				entries[ k ] = entries[k] .. '</tr>'
+			end
          end
      end
-	-- return the root table
+    root:wikitext(table.concat( entries, '\n' ))
      return tostring(root)
   end
 return p