Bring pageSetup into what we look at.

diff --git a/parse-all-xml b/parse-all-xml
index c4146fc0194b17b7c82cb3c038f104e068d6d686..c1282e03ff3bf6476afb81d3824526303762f18c 100755 (executable)
--- a/parse-all-xml
+++ b/parse-all-xml
@@ -1,11 +1,10 @@
 #! /bin/sh
 
-# Parse the structure members that do not represent models or graphs
-# and that are not page setups (which are always the first structure member).
+# Parse the structure members that do not represent models or graphs.
 # Also skip those with borderProperties, which indicate the non-"light"
 # format.
 lightTables=`ls -1 unzipped/*/*.xml |grep -vE 'notes|table|warning|chart|model' \
-          | xargs grep -EL '<([a-z]*:)?(model|graph)'`
+          | xargs grep -EL '<([a-z]*:)?(model|graph|borderProperties)'`
 
 if test -n "$1"; then
     for d in $lightTables; do

diff --git a/parse-xml.c b/parse-xml.c
index 7fc3da2ed1ba84acd2c6867d957129cc2c3f156b..9faa946f45a7ac64574312b8505d139d4e07f2ee 100644 (file)
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -117,7 +117,7 @@ print_attribute (xmlNode *node, const char *attr)
     }
 }
 
-static xmlNode *
+static __attribute__((unused)) xmlNode *
 find_page_setup (xmlNode *node)
 {
   for (; node; node = node->next)
@@ -176,10 +176,14 @@ main (int argc, char **argv)
     }
 
   xmlNode *root = xmlDocGetRootElement(doc);
+
+#if 0
+  /* Limit what we look at to pageSetup node and below. */
   root = find_page_setup(root);
   if (!root)
     return 0;
   root->next = NULL;
+#endif
 
   if (!strcmp(argv[2], "containment"))
     print_containment (root);