* doc-i18n-tool/doc-i18n-tool.c: added the capacity to ignore

  presentation element (not cascading though), currently only
  "accel" is part of the list, edit and add it to the presentation
  element list. Asked by jdub.
Daniel

1 files changed, 56 insertions, 0 deletions

diff --git a/doc-i18n-tool/doc-i18n-tool.c b/doc-i18n-tool/doc-i18n-tool.c
index 7296faa..64cac50 100644
--- a/doc-i18n-tool/doc-i18n-tool.c
+++ b/doc-i18n-tool/doc-i18n-tool.c
@@ -52,6 +52,17 @@ struct poptOption options [] =
     { NULL, '\0', 0, NULL, 0}
   };
  
+/*
+ * Null terminated list of elements which should be considered
+ * presentational and should not break strings.
+ *
+ * Add elements names as needed.
+ */
+const char *presentation_elements[] = {
+    "accel",
+    NULL
+};
+
 
 xmlChar *
 processString (const xmlChar *value,
@@ -126,6 +137,51 @@ processNode (xmlNodePtr  node,
 	  node->content = res;
 	}
     }
+  else if (node->type == XML_ELEMENT_NODE)
+    {
+      int pres;
+      xmlNodePtr children = node->children;
+      const xmlChar *name;
+      const char **tst;
+
+      if (children == NULL)
+	  return;
+
+      pres = 1;
+      /* check to see if all children are only text or presentation elements */
+      while ((children != NULL) && (pres != 0)) {
+	  if (children->type == XML_ELEMENT_NODE) {
+	      name = children->name;
+	      tst = presentation_elements;
+	      while (*tst != NULL) {
+		  if (!xmlStrcmp((const xmlChar *)*tst, name))
+		      break;
+		  tst++;
+	      }
+	      if (*tst == NULL) {
+		  pres = 0;
+		  break;
+	      }
+	  }
+	  children = children->next;
+      }
+      if (pres == 1) {
+	  xmlChar *content;
+
+	  /*
+	   * get the value, scrap the node list, replace with 
+	   * the modified text content. Let the tree walking
+	   * process the text node at the next step.
+	   */
+	  content = xmlNodeGetContent(node);
+	  children = node->children;
+	  node->last = node->children = NULL;
+	  xmlFreeNodeList(children);
+	  children = xmlNewDocText(node->doc, content);
+	  xmlAddChild(node, children);
+	  xmlFree(content);
+      }
+    }
 }
 
 static void