Module:TaxonItalics and Module:TaxonItalics/sandbox: Difference between pages

Content deleted Content added

@@ Line 154: / Line 154: @@
     name = mw.text.trim(name)
     -- if the name begins with '[', then assume formatting is present
-    if  mw.ustring.sub(name,1,1) == '[' then return name end
+    if mw.ustring.sub(name,1,1) == '[' then return name end
     -- otherwise begin by replacing any use of the HTML italic tags
     -- by Wikimedia markup; replace any entity alternatives to the hybrid symbol
@@ Line 189: / Line 189: @@
                 end
                 result = words[1] .. " " .. words[2] .. " " .. words[3]
+            elseif abbreviated then -- not a name as above; only deal with abbreviation
-            else
-                -- not a name as above; only deal with abbreviation
+                if #words > 1 then
-                if abbreviated then
+                	result = l.abbreviate(words[1])
-                	if #words > 1 then
+                	for i = 2, #words-1, 1 do
-                		result = l.abbreviate(words[1])
+                		result = result .. " " .. l.abbreviate(words[i])
-                		for i = 2, #words-1, 1 do
-                			result = result .. " " .. l.abbreviate(words[i])
-                		end
-                		result = result .. " " .. words[#words]
                 	end
-                else
+                	result = result .. " " .. words[#words]
-                	result = name
                 end
+            else
+                result = name
             end
             -- deal with any hybrid symbol as it should not be italicized
@@ Line 238: / Line 235: @@
 function p.hasConnectingTerm(name)
 	local words = mw.text.split(name, " ", true)
-	if #words == 4 and cTerms3[words[3]] then return true
+	return (#words == 4 and cTerms3[words[3]])
-	elseif #words == 3 and cTerms2[words[2]] then return true
+		or (#words == 3 and cTerms2[words[2]])
-	else return false
-	end
 end