Fix bug in removing d prefix from exclude-result-prefixes.

diff --git a/releasetools/xslnons-build b/releasetools/xslnons-build
index d53c1e6b2ab17f9c9e928ac99e1694e5d28b56a9..dbc23588af062770ba99f6bbbefd78e40862dd1b 100755 (executable)
--- a/releasetools/xslnons-build
+++ b/releasetools/xslnons-build
@@ -255,7 +255,11 @@ sub nsfilter {
   # This version if only "d"
   s|\s*exclude-result-prefixes\s*=\s*"d"\s*| |s;
   # This version if d added to others at end
-  s|(exclude-result-prefixes\s*=\s*".*?) d"|$1"|s;
+  s|(exclude-result-prefixes\s*=\s*".*?)\s+d"|$1"|s;
+  # This version if d added at beginning 
+  s|(exclude-result-prefixes\s*=\s*")d\s+(.*?")|$1$2|s;
+  # This version if d added in middle
+  s|(exclude-result-prefixes\s*=\s*".*?)\s+d\s+(.*?")|$1$2|s;
 
   # Convert stripNS to addNS
   s|href="../common/addns.xsl"|href="../common/stripns.xsl"|sg;