28078: update _xmlsoft

2 files changed, 34 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 3c6ede754..ea4e3673d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-07-15  Doug Kearns  <dougkearns@gmail.com>
 
+	* 28078: Completion/Unix/Command/_xmlsoft: update.
+
 	* Michael Hwang: 28075: Completion/Unix/Command/_gpg: add gpg-zip
 	completion and other general improvements.
 
@@ -13372,5 +13374,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5024 $
+* $Revision: 1.5025 $
 *****************************************************
diff --git a/Completion/Unix/Command/_xmlsoft b/Completion/Unix/Command/_xmlsoft
index 213260dd0..a1f727442 100644
--- a/Completion/Unix/Command/_xmlsoft
+++ b/Completion/Unix/Command/_xmlsoft
@@ -1,7 +1,28 @@
 #compdef xsltproc xmllint -value-,XML_CATALOG_FILES,-default-
 
-# xmllint: using libxml version 20622
-# xsltproc: using libxslt version 10100
+# xmllint: using libxml version 20707
+# xsltproc: using libxml 20707, libxslt 10126 and libexslt 815
+
+local -a encoding
+
+encoding=(
+  UTF-8
+  UTF-16
+  ISO-10646-UCS-2
+  ISO-10646-UCS-4
+  ISO-8859-1
+  ISO-8859-2
+  ISO-8859-3
+  ISO-8859-4
+  ISO-8859-5
+  ISO-8859-6
+  ISO-8859-7
+  ISO-8859-8
+  ISO-8859-9
+  ISO-2022-JP
+  SHIFT_JIS
+  EUC-JP
+)
 
 case $service in
   xsltproc)
@@ -17,8 +38,9 @@ case $service in
       '--nodtdattr[do not default attributes from the DTD]' \
       '--noout[do not dump the result]' \
       '--maxdepth[increase the maximum depth]:depth' \
-      '--maxparsedepth[increase the maximum parser depth]:depth' \
+      '--maxparserdepth[increase the maximum parser depth]:depth' \
       '--html[input document is an HTML file]' \
+      '--encoding[the input document character encoding]:encoding:(${encoding[@]})' \
       '--param[pass a parameter,value pair]:name::value (xpath expression)' \
       '--stringparam[pass a parameter]:name::value' \
       '--path[provide a set of paths for resources]:paths:_files -/' \
@@ -28,33 +50,13 @@ case $service in
       '--writesubtree[allow file write only with the path subtree]:path:_files -/' \
       '--catalogs[use SGML catalogs]' \
       '--xinclude[do XInclude processing on document input]' \
+      '--xincludestyle[do XInclude processing on stylesheets]' \
       '--load-trace[print trace of all external entites loaded]' \
       {--profile,--norman}'[dump profiling information]' \
       '1:stylesheet:_files -g "*.xsl(-.)"' \
       ':file:_files -g "*.xml(-.)"' && return
   ;;
   xmllint)
-    local -a encoding
-
-    encoding=(
-      UTF-8
-      UTF-16
-      ISO-10646-UCS-2
-      ISO-10646-UCS-4
-      ISO-8859-1
-      ISO-8859-2
-      ISO-8859-3
-      ISO-8859-4
-      ISO-8859-5
-      ISO-8859-6
-      ISO-8859-7
-      ISO-8859-8
-      ISO-8859-9
-      ISO-2022-JP
-      SHIFT_JIS
-      EUC-JP
-    )
-
     _arguments \
       '--version[display the version of the XML library used]' \
       '--debug[dump a debug tree of the in-memory document]' \
@@ -62,6 +64,7 @@ case $service in
       '--debugent[debug the entities defined in the document]' \
       '--copy[used to test the internal copy implementation]' \
       '--recover[output what was parsable on broken XML documents]' \
+      '--huge[remove any internal arbitrary parser limits]' \
       '--noent[substitute entity references by their value]' \
       "(--output -o)--noout[don't output the result tree]" \
       '--path[provide a set of paths for resources]:paths:_files -/' \
@@ -91,6 +94,7 @@ case $service in
       '--encode[output in the given encoding]:encoding:(${encoding[@]})' \
       '--dropdtd[remove the DOCTYPE of the input docs]' \
       '--c14n[save in W3C canonical format]' \
+      '--c14n11[save in W3C canonical format v1.1 (with comments)]' \
       '--exc-c14n[save in W3C exclusive canonical format]' \
       '--nsclean[remove redundant namespace declarations]' \
       '--testIO[test user I/O support]' \
@@ -100,6 +104,7 @@ case $service in
       '(--noxincludenode)--xinclude[do XInclude processing]' \
       '(--xinclude)--noxincludenode[do XInclude processing but do not generate XInclude nodes]' \
       '--loaddtd[fetch external DTD]' \
+      '--nofixup-base-uris[do not fixup xml:base uris]' \
       '--dtdattr[loaddtd + populate the tree with inherited attributes]' \
       '--stream[use the streaming interface to process very large files]' \
       '--walker[create a reader and walk though the resulting doc]' \
@@ -110,6 +115,8 @@ case $service in
       '(--dtdvalid --postvalid --relaxng)--schematron[do validation against specified schematron]:schema:_webbrowser' \
       '--sax1[use the old SAX1 interfaces for processing]' \
       '--sax[do not build a tree but work just at the SAX level]' \
+      '--oldxml10[use XML-1.0 parsing rules before the 5th edition]' \
+      '--xpath[evaluate the XPath expression, inply --noout]:XPath expression:' \
       '*:XML file:_webbrowser' && return
   ;;
   *XML_CATALOG_FILES*)