Only set the LOGO macro if 'Logo' metadata is used, and correctly sea…

…rch *all* macros for inclusion, not just custom ones.

bikeshed/conditional.py

@@ -1,3 +1,4 @@
+import itertools
 import re
 
 from . import config
@@ -63,8 +64,8 @@ def evalConditions(doc, el, conditionString):
         if cond["type"] == "status":
             yield config.looselyMatch(cond["value"], doc.md.status)
         elif cond["type"] == "text macro":
-            for k, _ in doc.md.customTextMacros:
-                if k == cond["value"]:
+            for k in doc.macros.keys():
+                if k.upper() == cond["value"]:
                     yield True
                     break
             else:

bikeshed/metadata.py

@@ -86,7 +86,7 @@ def __init__(self):
         self.lineNumbers = False
         self.linkDefaults = defaultdict(list)
         self.localBoilerplate = config.BoolSet(default=False)
-        self.logo = ""
+        self.logo = None
         self.mailingList = None
         self.mailingListArchives = None
         self.markupShorthands = config.BoolSet(["css", "dfn", "biblio", "markup", "idl", "algorithm"])
@@ -323,7 +323,8 @@ def fillTextMacros(self, macros, doc):
             macros["snapshotid"] = self.warning[2]
         if self.warning and len(self.warning) >= 4:
             macros["snapshoturl"] = self.warning[3]
-        macros["logo"] = self.logo
+        if self.logo:
+            macros["logo"] = self.logo
         if self.repository:
             macros["repository"] = self.repository.name
             macros["repositoryurl"] = self.repository.url