Script to fix missing "match" attribute on cs:if and cs:else-if, part III

Author: rmzelle

csl-reindenting-and-match-fix.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-# Python script to find "type" conditionals that test for multiple item types
-# with "match" set (explicitly or implicitly) to "all"
+# Python script to add 'match="any"' to ambiguous conditionals (citeproc-js
+# default was incorrectly set to "any", should be "all")
 # Author: Rintze M. Zelle
-# Version: 2013-02-25
+# Version: 2013-03-04
 # * Requires lxml library (http://lxml.de/)
 
 import os, glob, re
@@ -14,68 +14,52 @@
 for stylepath in glob.glob( os.path.join(path, '*.csl') ):
     styles.append(os.path.join(stylepath))
 
-# Determine which terms should be defined in a locale element
-def findNamesInUse(styleElement):
-    termsToDefine = []
-
-    if (styleElement.find('.//{http://purl.org/net/xbiblio/csl}label[@form="verb-short"]') is not None):    
-        changingNames = ["director", "editor", "editorial-director", "illustrator", "translator"]
-        for csNames in styleElement.findall(".//{http://purl.org/net/xbiblio/csl}names"):
-            for changingName in changingNames:
-                if ((changingName in csNames.get("variable")) and (changingName not in termsToDefine)):
-                    termsToDefine.append(changingName)
-    return(termsToDefine)
-
 # cs:if or cs:else-if
-# with "type", with multiple values (contains a space)
-# without "match", or with 'match="all"'
-# for now, just print style names
+# * conditional with 2 or more test values (attribute value contains a space)
+# * two or more conditionals
+# * no "match"
 for style in styles:
     parser = etree.XMLParser(remove_blank_text=True)
     parsedStyle = etree.parse(style, parser)
     styleElement = parsedStyle.getroot()
 
     fixedStyle = False
 
-    typeTests = styleElement.findall('.//{http://purl.org/net/xbiblio/csl}if[@type]')
-    for typeTest in typeTests:
-        itemTypesTested = typeTest.get("type")
-        # if the value of "type" includes a space, it tests for multiple item types 
-        if " " in itemTypesTested:
-            # there is a problem if "match" is set to "all"
-            if "match" in typeTest.attrib:
-                if typeTest.get("match") == "all":
-                    print("Warning: 'match' set to 'all' while testing for multiple item types with 'type'")
-                    print(os.path.basename(style))
-            # there is a problem if "match" is not set
-            else:
-                # if there is only a "type" attribute, add 'match="any"'
-                if(len(typeTest.attrib) == 1):
-                    typeTest.attrib["match"]="any"
-                    fixedStyle = True
-                else:
-                    print("Warning: can't set 'match', testing multiple conditionals")
-                    print(os.path.basename(style))
+    ifElements = styleElement.findall('.//{http://purl.org/net/xbiblio/csl}if')
+    for element in ifElements:
+        elementAttributes = element.attrib
+        
+        if "match" in elementAttributes:
+            continue
+        
+        if(len(elementAttributes) > 1):
+            element.attrib["match"]="any"
+            fixedStyle = True
+            continue
+        
+        for attribute in elementAttributes:
+          if " " in elementAttributes[attribute]:
+            element.attrib["match"]="any"
+            fixedStyle = True
+            continue
 
-    typeTests = styleElement.findall('.//{http://purl.org/net/xbiblio/csl}else-if[@type]')
-    for typeTest in typeTests:
-        itemTypesTested = typeTest.get("type")
-        # if the value of "type" includes a space, it tests for multiple item types 
-        if " " in itemTypesTested:
-            # there is a problem if "match" is set to "all"
-            if "match" in typeTest.attrib:
-                if typeTest.get("match") == "all":
-                    print("Warning: 'match' set to 'all' while testing for multiple item types with 'type'")
-                    print(os.path.basename(style))
-            # there is a problem if "match" is not set
-            else:
-                # if there is only a "type" attribute, add 'match="any"'
-                if(len(typeTest.attrib) == 1):
-                    typeTest.attrib["match"]="any"
-                    fixedStyle = True
-                else:
-                    print("Warning: can't set 'match', testing multiple conditionals")
-                    print(os.path.basename(style))
+    elseifElements = styleElement.findall('.//{http://purl.org/net/xbiblio/csl}else-if')
+    for element in elseifElements:
+        elementAttributes = element.attrib
+        
+        if "match" in elementAttributes:
+            continue
+        
+        if(len(elementAttributes) > 1):
+            element.attrib["match"]="any"
+            fixedStyle = True
+            continue
+        
+        for attribute in elementAttributes:
+          if " " in elementAttributes[attribute]:
+            element.attrib["match"]="any"
+            fixedStyle = True
+            continue
 
     if (fixedStyle == False):
         continue