From: Ben Pfaff <blp@cs.stanford.edu>
Date: Fri, 7 Aug 2015 15:10:19 +0000 (-0700)
Subject: Bring pageSetup into what we look at.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=992e58c9b4d996d98e26c55151201ff1216b4d08

Bring pageSetup into what we look at.
---

diff --git a/parse-all-xml b/parse-all-xml
index c4146fc019..c1282e03ff 100755
--- 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 7fc3da2ed1..9faa946f45 100644
--- 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);