Module:Block diagram - Revision history

Wnt: Other half of the previous bug

2013-05-09T06:51:33Z

Other half of the previous bug

← Previous revision		Revision as of 06:51, 9 May 2013
Line 72:		Line 72:
	table.insert(tableoutput,text)		table.insert(tableoutput,text)
	else		else
	table.insert(tableoutput,'{{vertical center\|')		table.insert(tableoutput,'{{vertical center\|1=')
	table.insert(tableoutput,text)		table.insert(tableoutput,text)
	if vcentertext then table.insert(tableoutput,'\|3='..vcentertext) end		if vcentertext then table.insert(tableoutput,'\|3='..vcentertext) end

Wnt: Bug: any field containing = will be eaten by vertical center.

2013-05-09T06:48:46Z

Bug: any field containing = will be eaten by vertical center.

← Previous revision		Revision as of 06:48, 9 May 2013
Line 74:		Line 74:
	table.insert(tableoutput,'{{vertical center\|')		table.insert(tableoutput,'{{vertical center\|')
	table.insert(tableoutput,text)		table.insert(tableoutput,text)
	if vcentertext then table.insert(tableoutput,'\|\|'..vcentertext) end		if vcentertext then table.insert(tableoutput,'\|3='..vcentertext) end
	table.insert(tableoutput,'}}')		table.insert(tableoutput,'}}')
	end		end

Wnt: shut off debug unless requested

2013-05-06T18:40:11Z

shut off debug unless requested

← Previous revision		Revision as of 18:40, 6 May 2013
Line 9:		Line 9:
	local totalwidth=args.width or pargs.width or 220		local totalwidth=args.width or pargs.width or 220
	local totalheight=args.height or pargs.height or 200		local totalheight=args.height or pargs.height or 200
			local debug=args.debug or pargs.debug
	local debuglog=""		local debuglog=""
	--- Allow searching of all text to end with:		--- Allow searching of all text to end with:
Line 83:		Line 84:
	textoutput='<div style="position:relative;text-align:center;top:0;left:0;width:'..totalwidth..'px;height:'..totalheight..'px;">'..textoutput..'</div>'		textoutput='<div style="position:relative;text-align:center;top:0;left:0;width:'..totalwidth..'px;height:'..totalheight..'px;">'..textoutput..'</div>'
	if nowiki then textoutput=frame:preprocess("<pre><nowiki>"..textoutput.."</nowiki></pre>") else textoutput=frame:preprocess(textoutput) end		if nowiki then textoutput=frame:preprocess("<pre><nowiki>"..textoutput.."</nowiki></pre>") else textoutput=frame:preprocess(textoutput) end
	~~return~~ textoutput,debuglog		if debug then textoutput=textoutput..debuglog end
			return textoutput
	end		end

Wnt: widening input for all, now that there are so many borders

2013-05-06T18:32:25Z

widening input for all, now that there are so many borders

← Previous revision		Revision as of 18:32, 6 May 2013
Line 18:		Line 18:
	local vn=mw.ustring.gsub(v,"%-","") --- remove dashes from standard html attribute names to allow internal use		local vn=mw.ustring.gsub(v,"%-","") --- remove dashes from standard html attribute names to allow internal use
	local vs=mw.ustring.gsub(v,"%-","%-") -- escape those hyphens for pattern search		local vs=mw.ustring.gsub(v,"%-","%-") -- escape those hyphens for pattern search
	textinput=mw.ustring.gsub(textinput,"<"..vs.."%s(%S)%s*>","<Module:Block diagram internal "..vn.." token:%1>")		textinput=mw.ustring.gsub(textinput,"<"..vs.."%s([^>])>","<Module:Block diagram internal "..vn.." token:%1>")
	debuglog=debuglog..v..vs..vn..textinput		debuglog=debuglog..v..vs..vn..textinput
	end		end

Wnt at 18:31, 6 May 2013

2013-05-06T18:31:16Z

← Previous revision		Revision as of 18:31, 6 May 2013
Line 21:		Line 21:
	debuglog=debuglog..v..vs..vn..textinput		debuglog=debuglog..v..vs..vn..textinput
	end		end
	--- border is special because it can contain many values
	textinput=mw.ustring.gsub(textinput,"<border %s([^>])>","<Module:Block diagram internal border token:%1>")
	prowl=mw.ustring.gmatch(textinput,"(.-)<Module:Block diagram internal (%S+) token:([^>]*)>")		prowl=mw.ustring.gmatch(textinput,"(.-)<Module:Block diagram internal (%S+) token:([^>]*)>")
	local tableoutput={}		local tableoutput={}
Line 58:		Line 56:
	table.insert(tableoutput,'%;border-style:')		table.insert(tableoutput,'%;border-style:')
	table.insert(tableoutput,borderstyle)		table.insert(tableoutput,borderstyle)
	table.insert(tableoutput,'%;border-width:')		table.insert(tableoutput,';border-width:')
	table.insert(tableoutput,borderwidth)		table.insert(tableoutput,borderwidth)
	table.insert(tableoutput,'%;border-color:')		table.insert(tableoutput,';border-color:')
	table.insert(tableoutput,bordercolor)		table.insert(tableoutput,bordercolor)
	table.insert(tableoutput,';color:')		table.insert(tableoutput,';color:')

Wnt: Border is too tricky for me after all - let's divide it into style, width, color

2013-05-06T18:28:13Z

Border is too tricky for me after all - let's divide it into style, width, color

← Previous revision		Revision as of 18:28, 6 May 2013
Line 14:		Line 14:
	--- Give all RECOGNIZED markup a consistent searchable string		--- Give all RECOGNIZED markup a consistent searchable string
	--- more styling should be added; seeking a first proof of concept now		--- more styling should be added; seeking a first proof of concept now
	local taglist={'left','top','right','bottom~~','border~~','color','background-color','text-align','vertical-align','vcentertext'}		local taglist={'left','top','right','bottom','color','background-color','text-align','vertical-align','vcentertext','border-style','border-color','border-width'}
	for i,v in pairs(taglist) do		for i,v in pairs(taglist) do
	local vn=mw.ustring.gsub(v,"%-","") --- remove dashes from standard html attribute names to allow internal use		local vn=mw.ustring.gsub(v,"%-","") --- remove dashes from standard html attribute names to allow internal use
Line 31:		Line 31:
	default['top']=0		default['top']=0
	default['bottom']=100		default['bottom']=100
	default['~~border~~']='~~1px~~ solid ~~black~~'		default['borderstyle']='solid'
			default['borderwidth']='1px'
			default['bordercolor']='black'
	default['color']='black'		default['color']='black'
	default['backgroundcolor']='white' -- elements should usually block elements behind them, like grid lines		default['backgroundcolor']='white' -- elements should usually block elements behind them, like grid lines
Line 54:		Line 56:
	table.insert(tableoutput,'%;right:')		table.insert(tableoutput,'%;right:')
	table.insert(tableoutput,100-right)		table.insert(tableoutput,100-right)
	table.insert(tableoutput,'%;border:')		table.insert(tableoutput,'%;border-style:')
	table.insert(tableoutput,~~border~~)		table.insert(tableoutput,borderstyle)
			table.insert(tableoutput,'%;border-width:')
			table.insert(tableoutput,borderwidth)
			table.insert(tableoutput,'%;border-color:')
			table.insert(tableoutput,bordercolor)
	table.insert(tableoutput,';color:')		table.insert(tableoutput,';color:')
	table.insert(tableoutput,color)		table.insert(tableoutput,color)

Wnt: special treatment of border

2013-05-06T18:11:19Z

special treatment of border

← Previous revision		Revision as of 18:11, 6 May 2013
Line 21:		Line 21:
	debuglog=debuglog..v..vs..vn..textinput		debuglog=debuglog..v..vs..vn..textinput
	end		end
			--- border is special because it can contain many values
			textinput=mw.ustring.gsub(textinput,"<border %s([^>])>","<Module:Block diagram internal border token:%1>")
	prowl=mw.ustring.gmatch(textinput,"(.-)<Module:Block diagram internal (%S+) token:([^>]*)>")		prowl=mw.ustring.gmatch(textinput,"(.-)<Module:Block diagram internal (%S+) token:([^>]*)>")
	local tableoutput={}		local tableoutput={}

Wnt: third parameter

2013-05-06T17:59:29Z

third parameter

← Previous revision		Revision as of 17:59, 6 May 2013
Line 67:		Line 67:
	table.insert(tableoutput,'{{vertical center\|')		table.insert(tableoutput,'{{vertical center\|')
	table.insert(tableoutput,text)		table.insert(tableoutput,text)
	if vcentertext then table.insert(tableoutput,'\|'..vcentertext) end		if vcentertext then table.insert(tableoutput,'\|\|'..vcentertext) end
	table.insert(tableoutput,'}}')		table.insert(tableoutput,'}}')
	end		end

Wnt: tinkering with a vcentertext tag, separating some table.inserts

2013-05-06T17:53:25Z

tinkering with a vcentertext tag, separating some table.inserts

← Previous revision		Revision as of 17:53, 6 May 2013
Line 14:		Line 14:
	--- Give all RECOGNIZED markup a consistent searchable string		--- Give all RECOGNIZED markup a consistent searchable string
	--- more styling should be added; seeking a first proof of concept now		--- more styling should be added; seeking a first proof of concept now
	local taglist={'left','top','right','bottom','border','color','background-color','text-align','vertical-align'}		local taglist={'left','top','right','bottom','border','color','background-color','text-align','vertical-align','vcentertext'}
	for i,v in pairs(taglist) do		for i,v in pairs(taglist) do
	local vn=mw.ustring.gsub(v,"%-","") --- remove dashes from standard html attribute names to allow internal use		local vn=mw.ustring.gsub(v,"%-","") --- remove dashes from standard html attribute names to allow internal use
Line 34:		Line 34:
	default['textalign']='center'		default['textalign']='center'
	default['verticalalign']='middle' -- pseudo html value, but this needs a special hack to work		default['verticalalign']='middle' -- pseudo html value, but this needs a special hack to work
			default['vcentertext']=''
	for i,j in pairs(default) do		for i,j in pairs(default) do
	_G[i]=j		_G[i]=j
Line 42:		Line 43:
	debuglog=debuglog..(text or "nil")..(tag or "nil")		debuglog=debuglog..(text or "nil")..(tag or "nil")
	if not tag then return debuglog end		if not tag then return debuglog end
	if (text or "")~="" then		if (text or "")~="" then
	table.insert(tableoutput,'<div style="position:absolute;top:')		table.insert(tableoutput,'<div style="position:absolute;top:')
	table.insert(tableoutput,top)		table.insert(tableoutput,top)
Line 63:		Line 64:
	if verticalalign=='top' then		if verticalalign=='top' then
	table.insert(tableoutput,text)		table.insert(tableoutput,text)
	else table.insert(tableoutput,'{{vertical center\|~~'..text..'}}~~')		else
			table.insert(tableoutput,'{{vertical center\|')
			table.insert(tableoutput,text)
			if vcentertext then table.insert(tableoutput,'\|'..vcentertext) end
			table.insert(tableoutput,'}}')
	end		end
	table.insert(tableoutput,'</div>')		table.insert(tableoutput,'</div>')

Wnt: Well that can't help

2013-05-06T17:40:07Z

Well that can't help

← Previous revision		Revision as of 17:40, 6 May 2013
Line 57:		Line 57:
	table.insert(tableoutput,';background-color:')		table.insert(tableoutput,';background-color:')
	table.insert(tableoutput,backgroundcolor)		table.insert(tableoutput,backgroundcolor)
		⚫	table.insert(tableoutput,';">')
	if textalign~='center' then		if textalign~='center' then
	table.insert(tableoutput,';text-align:'..textalign)		table.insert(tableoutput,';text-align:'..textalign)
	end		end
⚫	table.insert(tableoutput,';">')
	if verticalalign=='top' then		if verticalalign=='top' then
	table.insert(tableoutput,text)		table.insert(tableoutput,text)