Module:Clade - Revision history

Jts1882: add div to allow overflow: '
...
'

2024-03-28T16:33:49Z

add div to allow overflow: '<div class="clade"> ... </div>'

← Previous revision		Revision as of 16:33, 28 March 2024
Line 144:		Line 144:
	cladeString = p.addSubTrees(cladeString) -- add subtrees		cladeString = p.addSubTrees(cladeString) -- add subtrees

			--wrap in div to allow overflow display; new vector skin for mobile has issues (see talk page)
	if pargs['overflow'] == 'yes' then
			if pargs['overflow'] == 'yes' or 1==1 then -- force for all cases
⚫	return '<div ~~style="overflow:auto;"~~>\n' .. cladeString .. '</div>'
			local divCSS = ' class="clade"' -- ' style="overflow:auto;"'
			if string.find(cladeString, divCSS) then
			cladeString = string.gsub(cladeString, divCSS, "") -- delete CSS styling of inner clades (only want on outer)
			end
		⚫	return '<div' .. divCSS .. '>' .. cladeString .. '</div>'
	else		else
	return cladeString		return cladeString

Jts1882: add option to add scroll for overflows on narrow screens

2024-02-23T07:37:29Z

add option to add scroll for overflows on narrow screens

← Previous revision		Revision as of 07:37, 23 February 2024
Line 144:		Line 144:
	cladeString = p.addSubTrees(cladeString) -- add subtrees		cladeString = p.addSubTrees(cladeString) -- add subtrees

			if pargs['overflow'] == 'yes' then
⚫	return cladeString
			return '<div style="overflow:auto;">\n' .. cladeString .. '</div>'
			else
		⚫	return cladeString
			end
	--return '<div style="width:auto;">\n' .. cladeString .. '</div>'		--return '<div style="width:auto;">\n' .. cladeString .. '</div>'
	end		end

Ahecht: Allow direct invocation

2023-12-22T19:43:31Z

Allow direct invocation

← Previous revision		Revision as of 19:43, 22 December 2023
Line 9:		Line 9:
	]]		]]
	require('strict')		require('strict')
			local getArgs = require('Module:Arguments').getArgs
	local p = {}		local p = {}
	local pargs = {} -- parent arguments		local pargs = {} -- parent arguments
Line 39:		Line 40:
	local totalCount = 0		local totalCount = 0

	pargs = ~~frame:getParent~~()~~.args~~ -- parent arguments		pargs = getArgs(frame) -- parent arguments

	infoOutput = p.getCladeTreeInfo() -- get info about clade structure, e.g. lastNode (last \|N= child number)		infoOutput = p.getCladeTreeInfo() -- get info about clade structure, e.g. lastNode (last \|N= child number)
Line 58:		Line 59:
	--end		--end

	local tableStyle = frame.args.style or ""		local tableStyle = frame.args.style or pargs.style or ""

	if tableStyle ~= "" then		if tableStyle ~= "" then
Line 751:		Line 752:
	function p.showClade(frame)		function p.showClade(frame)
	--local code = frame.args.code or ""		--local code = frame.args.code or ""
	local code = frame:getParent().args['code2'] or ""		local code = frame:getParent().args['code2'] or frame.args['code2'] or ""

	--return code		--return code
Line 759:		Line 760:
	--return string.sub(test,6,-7)		--return string.sub(test,6,-7)

	local o1 =frame:getParent():getArgument('code2')		local o1 =frame:getParent():getArgument('code2') or frame:getArgument('code2')
	return o1:expand()		return o1:expand()

Line 845:		Line 846:
	]]		]]
	function p.cladeConverter(frame)		function p.cladeConverter(frame)
	pargs = ~~frame:getParent~~()~~.args~~		pargs = getArgs(frame)

	if frame.args['list'] or pargs['list'] then		if frame.args['list'] or pargs['list'] then

GKFX: Remove selectable whitespace from empty labels, and otherwise reduce WP:PEIS.

2022-12-26T22:36:09Z

Remove selectable whitespace from empty labels, and otherwise reduce WP:PEIS.

← Previous revision		Revision as of 22:36, 26 December 2022
Line 53:		Line 53:
	--cladeString =mw.text.killMarkers( cladeString ) -- also kills off strip markers using citation templates		--cladeString =mw.text.killMarkers( cladeString ) -- also kills off strip markers using citation templates
	--cladeString = mw.text.unstrip(cladeString)		--cladeString = mw.text.unstrip(cladeString)
	--if cladeCount==1 then		--if cladeCount==1 then
		⚫	cladeString = cladeString .. frame:extensionTag('templatestyles', '',
	local src = "Template:Clade/styles.css"
	~~cladeString~~ = ~~cladeString~~ .~~. p.templateStyle( frame, src~~ ) .. '\n'		{ src="Template:Clade/styles.css" }) .. '\n'
	--end		--end

Line 322:		Line 322:
	if image ~= "" then		if image ~= "" then
	--content = content .. image -- basic version		--content = content .. image -- basic version
	content = '\n{\| class="clade" style="width:auto;"' --defaults to width:100% because of class "clade"		content = '\n{\|class=clade style=width:auto' --defaults to width:100% because of class "clade"
	.. '\n\| class="clade-leaf~~" ' .. '~~\|\n' .. nodeLeaf		.. '\n\|class=clade-leaf\|\n' .. nodeLeaf
	.. '\n\| class="clade-leaf~~" ' .. '~~\|\n' .. image		.. '\n\|class=clade-leaf\|\n' .. image
	.. '\n\|}'		.. '\n\|}'
	-- note: the classes interfere with the node counter, so try simpler version with style		-- note: the classes interfere with the node counter, so try simpler version with style
	content = '\n{\| style="width:100%;border-spacing:0;" ' --width:auto is "tight"; 100% needed for image alignment		content = '\n{\|style=width:100%;border-spacing:0' --width:auto is "tight"; 100% needed for image alignment
	.. '\n\| style="border:0;padding:0~~;" ' .. '~~\|\n' .. nodeLeaf		.. '\n\|style=border:0;padding:0\|\n' .. nodeLeaf
	.. '\n\| style="border:0;padding:0~~;" ' .. '~~\|\n' .. image		.. '\n\|style=border:0;padding:0\|\n' .. image
	.. '\n\|}'		.. '\n\|}'
	end		end
Line 450:		Line 450:
	--if firstChars == "{{{" or nodeLabel == "" then		--if firstChars == "{{{" or nodeLabel == "" then
	if nodeLabel == "" then		if nodeLabel == "" then
			-- Has to be some content for layout, but can use CSS to add it instead.
	--return '<br/>' --' <br/>' -- remove space to reduce post-expand include size (the width=1.5em handles spacing)
			return ''
	--return '<br/>' -- must return something; this is critical for clade structure
	return ' ' --      (thin nbsp)
	else		else
	-- spaces can cause wrapping and can break tree structure, hence use span with nowrap class		-- spaces can cause wrapping and can break tree structure, hence use span with nowrap class
Line 466:		Line 465:

	if stylingElementDetected == true then		if stylingElementDetected == true then
	return '<div style="display:inline;" class="nowrap">' .. nodeLabel .. '</div>'		return '<div style=display:inline class=nowrap>' .. nodeLabel .. '</div>'
	else		else
	local nowrapString = string.gsub(nodeLabel," ", " ") -- replace spaces with non-breaking space		local nowrapString = string.gsub(nodeLabel, " ", " ") -- replace spaces with non-breaking space
	if not nowrapString:find("UNIQ.-QINU") and not nowrapString:find("%[%[.-%]%]") then -- unless a strip marker		if not nowrapString:find("UNIQ.-QINU") and not nowrapString:find("%[%[.-%]%]") then -- unless a strip marker
	nowrapString = string.gsub(nowrapString,"-", "‑") -- replace hyphen with non-breaking hyphen (‑)		nowrapString = string.gsub(nowrapString, "-", "‑") -- replace hyphen with non-breaking hyphen (‑)
	end		end
	return nowrapString		return nowrapString
Line 486:		Line 485:

	function p.newick(count,newickString)		function p.newick(count,newickString)

	local cladeString = ""
⚫	count = count+1
	--start table		--start table
	--~~cladeString = cladeString ..~~ '{\| style="border-collapse:collapse;border-spacing:0;border:0;margin:0;'		--'{\| style="border-collapse:collapse;border-spacing:0;border:0;margin:0;'
	cladeString = ~~cladeString ..~~ '{\| class="clade" '		local cladeString = '{\|class=clade '
		⚫	count = count + 1


	local j,k		local j,k
	j,k = string.find(newickString, '%(.*%)') -- find location of outer parenthesised term		j,k = string.find(newickString, '%(.*%)') -- find location of outer parenthesised term
Line 750:		Line 747:
	return infoOutput		return infoOutput

	end

	--[[ code for placing TemplateStyles from the module
	source: Anomie (CC-0) https://phabricator.wikimedia.org/T200442
	]]

	function p.templateStyle( frame, src )
⚫	~~return~~ frame:extensionTag( 'templatestyles', '', ~~{ src = src } );~~
	end		end

WOSlinker: use require('strict') instead of require('Module:No globals')

2022-10-22T09:07:28Z

use require('strict') instead of require('Module:No globals')

← Previous revision		Revision as of 09:07, 22 October 2022
Line 8:		Line 8:
	now uses templatestyles		now uses templatestyles
	]]		]]
	require('~~Module:No globals~~')		require('strict')
	local p = {}		local p = {}
	local pargs = {} -- parent arguments		local pargs = {} -- parent arguments

Jts1882: make preprocessing of nowiki wrapped code dependent on stripmarker

2021-12-28T16:50:21Z

make preprocessing of nowiki wrapped code dependent on stripmarker

← Previous revision		Revision as of 16:50, 28 December 2021
Line 903:		Line 903:
	local indent = p.getIndent(levelNumber)		local indent = p.getIndent(levelNumber)
	levelNumber=levelNumber+1		levelNumber=levelNumber+1


			local nowiki = false
	if listString:find("UNIQ.-QINU") then -- if wrapped in nowiki		if listString:find("UNIQ.-QINU") then -- if wrapped in nowiki
	mw.addWarning("Stripping content in nowiki tags")		mw.addWarning("Stripping content in nowiki tags")
	listString = mw.text.trim( mw.text.unstripNoWiki( listString ) )		listString = mw.text.trim( mw.text.unstripNoWiki( listString ) )
			nowiki = true
	end		end
	local listChar = "@"		local listChar = "@"
Line 955:		Line 957:
	child=child+1		child=child+1
	end		end


	cladeString = cladeString .. indent .. '}}'		cladeString = cladeString .. indent .. '}}'

			if nowiki then
⚫	return cladeString
	--return mw.getCurrentFrame():preprocess( '<nowiki>'.. cladeString .. '</nowiki>') --return wrapped in nowiki		return mw.getCurrentFrame():preprocess( '<nowiki>'.. cladeString .. '</nowiki>') --return wrapped in nowiki
			else
		⚫	return cladeString
			end
	end		end

Jts1882: remove nowiki preprocess

2021-12-28T16:30:21Z

remove nowiki preprocess

← Previous revision		Revision as of 16:30, 28 December 2021
Line 958:		Line 958:

	cladeString = cladeString .. indent .. '}}'		cladeString = cladeString .. indent .. '}}'


	return mw.getCurrentFrame():preprocess( '<nowiki>'.. cladeString .. '</nowiki>') --return wrapped in nowiki		return cladeString
			--return mw.getCurrentFrame():preprocess( '<nowiki>'.. cladeString .. '</nowiki>') --return wrapped in nowiki
	end		end

Jts1882: must set pargs in converter entry function

2021-12-28T15:14:36Z

must set pargs in converter entry function

← Previous revision		Revision as of 15:14, 28 December 2021
Line 856:		Line 856:
	]]		]]
	function p.cladeConverter(frame)		function p.cladeConverter(frame)
			pargs = frame:getParent().args

	if frame.args['list'] or pargs['list'] then		if frame.args['list'] or pargs['list'] then
	return p.listConverter(frame)		return p.listConverter(frame)

Jts1882: add entry function for clade converter

2021-12-28T14:50:50Z

add entry function for clade converter

← Previous revision		Revision as of 14:50, 28 December 2021
Line 557:		Line 557:
	function p.newickConverter(frame)		function p.newickConverter(frame)

	local newickString = frame.args['newickstring'] or pargs['newick']		local newickString = frame.args['newickstring'] or frame.args['newick'] or pargs['newickstring'] or pargs['newick']

	--if newickString == '{{{newickstring}}}' then return newickString end		--if newickString == '{{{newickstring}}}' then return newickString end
Line 798:		Line 798:
	end		end
	if string.match( listString, "^*", 1 ) then		if string.match( listString, "^*", 1 ) then
	mw.addWarning("first char is *")
	listChar = "*"		listChar = "*"
	end		end
Line 857:		Line 856:
	]]		]]
	function p.cladeConverter(frame)		function p.cladeConverter(frame)
			if frame.args['list'] or pargs['list'] then

			return p.listConverter(frame)
			elseif frame.args['newickstring'] or frame.args['newick'] or pargs['newickstring'] or pargs['newick'] then
			return p.newickConverter(frame)
			else
			local message = "Conversion needs wikitext list or newick string in parameters ''list'' or ''newick'' respectively"
			mw.addWarning(message)
			return message
			end
	end		end
	function p.listConverter(frame)		function p.listConverter(frame)

Jts1882: list converter -- output raw wikitext

2021-12-26T18:00:18Z

list converter -- output raw wikitext

← Previous revision		Revision as of 18:00, 26 December 2021
Line 879:		Line 879:
	resultString = cladeString		resultString = cladeString
	else		else
	-- show the ~~Newick~~ string		-- show the wikitext list string
	resultString = '<pre>'..listString..'</pre>'		resultString = '<pre>'..listString..'</pre>'
	-- show the converted clade structure		-- show the converted clade structure
Line 901:		Line 901:
	local listChar = "@"		local listChar = "@"
	if string.match( listString, "^*", 1 ) then		if string.match( listString, "^*", 1 ) then
	mw.addWarning("first char is *")
	listChar = "*"		listChar = "*"
	end		end
Line 950:		Line 949:

	cladeString = cladeString .. indent .. '}}'		cladeString = cladeString .. indent .. '}}'

	return cladeString
			return mw.getCurrentFrame():preprocess( '<nowiki>'.. cladeString .. '</nowiki>') --return wrapped in nowiki
	end		end