Lemondoge: Simplifications and some formatting improvements

2023-04-08T20:48:40Z

Simplifications and some formatting improvements

GKFX: Update

2022-12-26T22:34:37Z

Update

← Previous revision		Revision as of 22:34, 26 December 2022
Line 55:		Line 55:
	--if cladeCount==1 then		--if cladeCount==1 then
	cladeString = cladeString .. frame:extensionTag('templatestyles', '',		cladeString = cladeString .. frame:extensionTag('templatestyles', '',
	{ src="Template:Clade/sandbox.css" }) .. '\n'		{ src="Template:Clade/sandbox/styles.css" }) .. '\n'
	--end		--end

GKFX: Use sandbox CSS

2022-11-27T22:49:02Z

Use sandbox CSS

← Previous revision		Revision as of 22:49, 27 November 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/sandbox.css" }) .. '\n'
	--end		--end

Line 747:		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

GKFX: Reduce markup size

2022-11-27T22:44:10Z

Reduce markup size

← Previous revision		Revision as of 22:44, 27 November 2022
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

GKFX: Create sandbox copy of Module:Clade

2022-11-27T22:09:24Z

Create sandbox copy of Module:Clade

Show changes

Module:Clade/sandbox - Revision history

Lemondoge: Simplifications and some formatting improvements

GKFX: Update

GKFX: Use sandbox CSS

GKFX: Reduce markup size

GKFX: Create sandbox copy of Module:Clade