Merge lp:~zorba-coders/zorba/fix_bug_962255 into lp:zorba

[Sorin Marian Nasoi]

Update modules_svg generation target. Add mechanism for core build to detect whether a given non-core module exists (by URI). Use that method to check for graphviz before generating modules_svg.

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Chris Hillery (ceejatec)]

Is there any difference between the old zorba_module_dependencies.xqi and the new zorba_module_dependencies.xqy ? Why was the filename changed?

Besides that, though, as mentioned on the other merge proposal, I don't think you can move the modules_svg target out of the core like this.

[Sorin Marian Nasoi (sorin.marian.nasoi)]

> Is there any difference between the old zorba_module_dependencies.xqi and the
> new zorba_module_dependencies.xqy ? Why was the filename changed?
>
> Besides that, though, as mentioned on the other merge proposal, I don't think
> you can move the modules_svg target out of the core like this.
What is the best solution to check if an external module (Graphviz in this case) is build from within Zorba?

Thanks for the help.

[Sorin Marian Nasoi (sorin.marian.nasoi)]

> Is there any difference between the old zorba_module_dependencies.xqi and the
> new zorba_module_dependencies.xqy ? Why was the filename changed?
The module itself was mostly re-written, but the reason for the extension change is XQDT: xqy is not a default extension for XQuery, while xqi is.

[Chris Hillery (ceejatec)]

Ok, so as discussed, the reason you moved the modules_svg target and associated dependencies was because you could not otherwise know whether Graphviz was available.

If so, then please do the following:

1. Change this fix_bug_962255 branch to always create the modules_svg target (as it appears that it used to do, but was commented out) and ensure that this works correctly when Graphviz *is* present.

2. Delete the fix_bug_962255_image_module proposal and branch (I believe they will no longer be necessary, correct?).

Then, I will add some code to allow detection of whether a non-core module exists, and put the appropriate wrapper around the modules_svg target.

[Sorin Marian Nasoi (sorin.marian.nasoi)]

> > Is there any difference between the old zorba_module_dependencies.xqi and
> the
> > new zorba_module_dependencies.xqy ? Why was the filename changed?
> The module itself was mostly re-written, but the reason for the extension
> change is XQDT: xqy is not a default extension for XQuery, while xqi is.
Sorry it's the other way around: in XQDT .xqi is not a default extension for XQuery files while .xqy is.

[Chris Hillery (ceejatec)]

Ok, I have added the changes discussed. xqdoc now depends on modules_svg (Sorin, you had it the other way around, but I think this is what you meant). modules_svg will be a dummy target if the Graphviz modules is not declared. If it is declared, it will generate the .svg file.

I'm voting Approve on this change. Sorin, you should inspect my changes and, if they seem OK, go ahead and mark the proposal Approved to run it through the queue.

review: Approve

[Sorin Marian Nasoi (sorin.marian.nasoi)]

> Ok, I have added the changes discussed. xqdoc now depends on modules_svg
> (Sorin, you had it the other way around, but I think this is what you meant).
> modules_svg will be a dummy target if the Graphviz modules is not declared. If
> it is declared, it will generate the .svg file.
Nope, the way it was correct.

"make xqdoc" deletes all previous output from build/doc/xqdoc and then regenerates the documentation. In the process of generating the new XQDoc documentation it will copy the "default" module dependency graph from doc/zorba/xqdoc/images/modules.svg to build/doc/xqdoc/xhtml/images/modules.svg

"make modules_svg" generates the new dependency graph in build/doc/xqdoc/xhtml/images/modules.svg

If it's the other way around (like you proposed) the following will happen:
"make modules_svg" generates the new dependency graph in build/doc/xqdoc/xhtml/images/modules.svg
"make xqdoc" deletes all previous output from build/doc/xqdoc and then regenerates the documentation. In the process of generating the new XQDoc documentation it will copy the "default" module dependency graph from doc/zorba/xqdoc/images/modules.svg to build/doc/xqdoc/xhtml/images/modules.svg

We can implement the way you suggest and have "make modules_svg" generate the output in doc/zorba/xqdoc/images/modules.svg.
The drawback of this approach is that mostly every time one runs "make xqdoc" and has Graphviz, they will see a file that was changed.

> I'm voting Approve on this change. Sorin, you should inspect my changes and,
> if they seem OK, go ahead and mark the proposal Approved to run it through the
> queue.
I will take a look on the changes: thanks for the help.

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Needs Fixing

[Chris Hillery (ceejatec)]

I'm a bit confused then... I thought the whole point of this exercise was to ensure that the graph was regenerated every time. But with the dependencies the way you say, the modules_svg target will only ever be executed by hand. Am I missing something?

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_962255-2012-05-18T14-34-05.391Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/fix_bug_962255 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job fix_bug_962255-2012-05-18T14-34-05.391Z is finished.
  The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[lp:~zorba-coders/zorba/fix_bug_962255]

10851. By Sorin Marian Nasoi <email address hidden> on 2012-05-18

Check if the modules_new.svg exists before deleting it.

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_962255-2012-05-18T15-42-06.591Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job fix_bug_962255-2012-05-18T15-42-06.591Z is finished. The final status was:

All tests succeeded!

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-05-03 12:31:51 +0000
+++ CMakeLists.txt	2012-05-18 15:41:19 +0000
@@ -520,13 +520,14 @@
 # ZorbaConfig knows about testdriver. We need to include "config"
 # before "modules" so external modules will be able to find
 # ZorbaConfig.cmake. We need to include "modules" before "include" so
-# config.h can know eg. whether we found CURL.
+# config.h can know eg. whether we found CURL. We need to include "modules"
+# before "doc" so xqdoc can know what non-core modules are available.
 
 ADD_SUBDIRECTORY(test)
 ADD_SUBDIRECTORY(config)
-ADD_SUBDIRECTORY(doc)
 ADD_SUBDIRECTORY(schemas)
 ADD_SUBDIRECTORY(modules)
+ADD_SUBDIRECTORY(doc)
 ADD_SUBDIRECTORY(include)
 
 ADD_DEFINITIONS(-Dzorba_EXPORTS)

=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake	2012-05-03 12:31:51 +0000
+++ cmake_modules/ZorbaModule.cmake	2012-05-18 15:41:19 +0000
@@ -142,10 +142,6 @@
 
   MANGLE_URI (${MODULE_URI} ".xq" module_path module_filename)
 
-  # Compute a CMake-symbol-safe version of the target URI, for storing
-  # things in CMake properties.
-  STRING (REGEX REPLACE "[/ ]" "_" uri_sym "${module_path}/${module_filename}")
-
   # Determine which module this is, numerically. This number will be
   # used to generate unique names, for instance for the target name
   # for the external library (if any) and for the compilation test. I
@@ -189,6 +185,7 @@
   # declared. If a *lower* version has already been declared, the
   # output file rules will be messed up, so die. If the *same* version
   # has already been declare, XQdoc will be messed up, so die.
+  STRING (REGEX REPLACE "[/:#% ]" "_" uri_sym "${MODULE_URI}")
   GET_PROPERTY (target_versions GLOBAL PROPERTY "${uri_sym}-versions")
   FOREACH (known_ver ${target_versions})
     IF (known_ver LESS version_int)
@@ -376,6 +373,16 @@
 
 ENDMACRO (DECLARE_ZORBA_MODULE)
 
+# Macro to see whether a given module has been declared, by URI.
+# For now this only returns a true or false value; version introspection
+# is not supported.
+MACRO (IS_ZORBA_MODULE_DECLARED IS_SET_VAR MODULE_URI)
+  # Just check for the existence of the "URI-versions" global property,
+  # as set by DECLARE_ZORBA_MODULE()
+  STRING (REGEX REPLACE "[/:#% ]" "_" uri_sym "${MODULE_URI}")
+  GET_PROPERTY (${IS_SET_VAR} GLOBAL PROPERTY "${uri_sym}-versions" SET)
+ENDMACRO (IS_ZORBA_MODULE_DECLARED)
+
 # Macro which declares a schema. This sets up the installation of the
 # schema into the URI_PATH folder so it will be found at runtime.
 #
@@ -943,7 +950,7 @@
       COMMENT "Building XQDoc XHTML documentation ..."
   )
   MESSAGE(STATUS "  added target xqdoc")
-  ADD_DEPENDENCIES(xqdoc xqdoc-xml)
+  ADD_DEPENDENCIES(xqdoc xqdoc-xml modules_svg)
   SET_TARGET_PROPERTIES (xqdoc PROPERTIES
     EXCLUDE_FROM_DEFAULT_BUILD 1
     FOLDER "Docs"

=== modified file 'doc/zorba/xqdoc/CMakeLists.txt'
--- doc/zorba/xqdoc/CMakeLists.txt	2012-05-03 12:31:51 +0000
+++ doc/zorba/xqdoc/CMakeLists.txt	2012-05-18 15:41:19 +0000
@@ -48,20 +48,30 @@
 CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/src/xqdoc-xml.xq
                 ${CMAKE_CURRENT_BINARY_DIR}/../../../xqdoc/generator/xqdoc-xml.xq COPYONLY)
 
-#   Add the modules_svg command for which a working zorba cmd is required.
-#  ADD_CUSTOM_TARGET(modules_svg
-#    ${ZORBA_EXE}
-#      --omit-xml-declaration
-#      -f
-#      -q "\"${CMAKE_CURRENT_SOURCE_DIR}/src/generate-module-dependencies-svg.xq\""
-#      -e "\"xqdocXMLPath:=${CMAKE_CURRENT_BINARY_DIR}/xml\""
-#      -o "\"${CMAKE_CURRENT_BINARY_DIR}/xhtml/images/modules.svg\""
-#      COMMENT "Building module dependencies SVG..."
-#  )
-#  SET_TARGET_PROPERTIES (modules_svg PROPERTIES
-#    EXCLUDE_FROM_DEFAULT_BUILD 1
-#    FOLDER "Docs"
-#  )
-#  ADD_DEPENDENCIES(modules_svg "xqdoc-zorba")
+# Add the modules_svg command for which a working zorba cmd is required.
+# We need to add this target in all cases because ADD_XQDOC_TARGETS() in
+# ZorbaModule.cmake expects it to exist. However, generating this depends
+# on the non-core Graphviz module. Therefore, we check to see if Graphviz
+# is available, and if not, add a dummy target with the same name.
+IS_ZORBA_MODULE_DECLARED(_graphviz_avail
+  "http://www.zorba-xquery.com/modules/image/graphviz")
+IF (_graphviz_avail)
+  ADD_CUSTOM_TARGET(modules_svg
+    ${ZORBA_EXE}
+    --omit-xml-declaration
+    -f
+    -q "\"${CMAKE_CURRENT_SOURCE_DIR}/src/generate-module-dependencies-svg.xq\""
+    -e "\"ZorbaBuildFolder:=${CMAKE_CURRENT_BINARY_DIR}/../../../\""
+    -o "\"${CMAKE_CURRENT_SOURCE_DIR}/images/modules_new.svg\""
+    COMMENT "Building module dependencies SVG..."
+    )
+ELSE (_graphviz_avail)
+  ADD_CUSTOM_TARGET(modules_svg
+    COMMENT "Not building modules dependencies SVG since Graphviz module not available")
+ENDIF (_graphviz_avail)
+  SET_TARGET_PROPERTIES (modules_svg PROPERTIES
+    EXCLUDE_FROM_DEFAULT_BUILD 1
+    FOLDER "Docs"
+    )
 
 ENDIF(NOT ZORBA_WITH_FILE_ACCESS)

=== modified file 'doc/zorba/xqdoc/images/modules.svg'
--- doc/zorba/xqdoc/images/modules.svg	2012-05-03 12:31:51 +0000
+++ doc/zorba/xqdoc/images/modules.svg	2012-05-18 15:41:19 +0000
@@ -1,1049 +1,1449 @@
-<!-- Generated by graphviz version 2.26.3 (20100126.1600)
- --><!-- Title: G Pages: 1 --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="8483pt" height="371pt" viewBox="0.00 0.00 8483.00 371.00">
-<g id="graph1" class="graph" transform="scale(1 1) rotate(0) translate(4 367)">
+<!-- Generated by graphviz version 2.28.0 (20111211.2114)
+ --><!-- Title: G Pages: 1 --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="6370pt" height="535pt" viewBox="0.00 0.00 6370.00 535.00">
+<g id="graph1" class="graph" transform="scale(1 1) rotate(0) translate(4 531)">
 <title>G</title>
-<polygon fill="white" stroke="white" points="-4,5 -4,-367 8480,-367 8480,5 -4,5"/>
+<a xlink:title="Zorba modules dependency graph">
+<polygon fill="white" stroke="white" points="-4,5 -4,-531 6367,-531 6367,5 -4,5"/>
+<text text-anchor="middle" x="3181" y="-7.8" font-family="Times,serif" font-size="14.00">Zorba modules dependency graph</text>
+</a>
 <g id="graph2" class="cluster"><title>cluster1</title>
-<polygon fill="mediumvioletred" stroke="mediumvioletred" points="1821,-274 1821,-355 2195,-355 2195,-274 1821,-274"/>
-<text text-anchor="middle" x="2008" y="-338.4" font-family="Times Roman,serif" font-size="14.00">www.w3.org</text>
-</g>
-<g id="graph3" class="cluster"><title>cluster2</title>
-<polygon fill="lightsteelblue" stroke="lightsteelblue" points="2376,-96 2376,-177 3474,-177 3474,-96 2376,-96"/>
-<text text-anchor="middle" x="2925" y="-160.4" font-family="Times Roman,serif" font-size="14.00">XDM</text>
-</g>
-<g id="graph4" class="cluster"><title>cluster3</title>
-<polygon fill="sienna" stroke="sienna" points="5589,-8 5589,-266 7647,-266 7647,-8 5589,-8"/>
-<text text-anchor="middle" x="6618" y="-249.4" font-family="Times Roman,serif" font-size="14.00">store</text>
-</g>
-<g id="graph5" class="cluster"><title>cluster4</title>
-<polygon fill="dimgray" stroke="dimgray" points="6344,-274 6344,-355 6431,-355 6431,-274 6344,-274"/>
-<text text-anchor="middle" x="6387.5" y="-338.4" font-family="Times Roman,serif" font-size="14.00">introspection</text>
-</g>
-<g id="graph6" class="cluster"><title>cluster5</title>
-<polygon fill="slategray" stroke="slategray" points="6987,-274 6987,-355 7099,-355 7099,-274 6987,-274"/>
-<text text-anchor="middle" x="7043" y="-338.4" font-family="Times Roman,serif" font-size="14.00">reflection</text>
-</g>
-<g id="graph7" class="cluster"><title>cluster6</title>
-<polygon fill="Gold" stroke="Gold" points="3482,-96 3482,-177 3948,-177 3948,-96 3482,-96"/>
-<text text-anchor="middle" x="3715" y="-160.4" font-family="Times Roman,serif" font-size="14.00">external</text>
-</g>
-<g id="graph8" class="cluster"><title>cluster7</title>
-<polygon fill="moccasin" stroke="moccasin" points="4883,-96 4883,-355 5241,-355 5241,-96 4883,-96"/>
-<text text-anchor="middle" x="5062" y="-338.4" font-family="Times Roman,serif" font-size="14.00">xqdoc</text>
-</g>
-<g id="graph9" class="cluster"><title>cluster8</title>
-<polygon fill="tan" stroke="tan" points="8,-8 8,-266 2368,-266 2368,-8 8,-8"/>
-<text text-anchor="middle" x="1188" y="-249.4" font-family="Times Roman,serif" font-size="14.00">data processing</text>
-</g>
-<g id="graph10" class="cluster"><title>cluster9</title>
-<polygon fill="RosyBrown" stroke="RosyBrown" points="3956,-96 3956,-177 4105,-177 4105,-96 3956,-96"/>
-<text text-anchor="middle" x="4030.5" y="-160.4" font-family="Times Roman,serif" font-size="14.00">programming languages</text>
-</g>
-<g id="graph11" class="cluster"><title>cluster10</title>
-<polygon fill="wheat" stroke="wheat" points="7655,-8 7655,-355 8347,-355 8347,-8 7655,-8"/>
-<text text-anchor="middle" x="8001" y="-338.4" font-family="Times Roman,serif" font-size="14.00">excel</text>
-</g>
-<g id="graph12" class="cluster"><title>cluster11</title>
-<polygon fill="LightGreen" stroke="LightGreen" points="5423,-185 5423,-266 5581,-266 5581,-185 5423,-185"/>
-<text text-anchor="middle" x="5502" y="-249.4" font-family="Times Roman,serif" font-size="14.00">cryptography</text>
-</g>
-<g id="graph13" class="cluster"><title>cluster12</title>
-<polygon fill="forestgreen" stroke="forestgreen" points="3728,-185 3728,-266 3898,-266 3898,-185 3728,-185"/>
-<text text-anchor="middle" x="3813" y="-249.4" font-family="Times Roman,serif" font-size="14.00">geo</text>
-</g>
-<g id="graph14" class="cluster"><title>cluster13</title>
-<polygon fill="olivedrab" stroke="olivedrab" points="4347,-8 4347,-177 4875,-177 4875,-8 4347,-8"/>
-<text text-anchor="middle" x="4611" y="-160.4" font-family="Times Roman,serif" font-size="14.00">image</text>
-</g>
-<g id="graph15" class="cluster"><title>cluster14</title>
-<polygon fill="darkkhaki" stroke="darkkhaki" points="4017,-185 4017,-355 4099,-355 4099,-185 4017,-185"/>
-<text text-anchor="middle" x="4058" y="-338.4" font-family="Times Roman,serif" font-size="14.00">OAuth</text>
-</g>
-<g id="graph16" class="cluster"><title>cluster15</title>
-<polygon fill="cornflowerblue" stroke="cornflowerblue" points="5249,-96 5249,-266 5415,-266 5415,-96 5249,-96"/>
-<text text-anchor="middle" x="5332" y="-249.4" font-family="Times Roman,serif" font-size="14.00">expath.org</text>
-</g>
-<g id="graph17" class="cluster"><title>cluster16</title>
-<polygon fill="yellow" stroke="yellow" points="8355,-274 8355,-355 8467,-355 8467,-274 8355,-274"/>
-<text text-anchor="middle" x="8411" y="-338.4" font-family="Times Roman,serif" font-size="14.00">www.functx.com</text>
-</g>
-<g id="graph18" class="cluster"><title>cluster17</title>
-<polygon fill="Chartreuse" stroke="Chartreuse" points="4181,-96 4181,-177 4339,-177 4339,-96 4181,-96"/>
-<text text-anchor="middle" x="4260" y="-160.4" font-family="Times Roman,serif" font-size="14.00">communication</text>
-</g>
-<g id="graph19" class="cluster"><title>clusterExternalCPPLibs</title>
-<polygon fill="darksalmon" stroke="darksalmon" points="3669,-9 3669,-88 4339,-88 4339,-9 3669,-9"/>
-<text text-anchor="middle" x="4004" y="-71.4" font-family="Times Roman,serif" font-size="14.00">External C++ Library dependencies</text>
-</g>
-<!-- xpath_functions_1 -->
-<g id="node2" class="node"><title>xpath_functions_1</title>
+<a xlink:title="www.w3.org">
+<polygon fill="mediumvioletred" stroke="black" points="500,-405 500,-519 739,-519 739,-405 500,-405"/>
+<text text-anchor="middle" x="619.5" y="-503.8" font-family="Times,serif" font-size="14.00">www.w3.org</text>
+</a>
+</g>
+<g id="graph3" class="cluster"><title>clusterwwww3org2005</title>
+<a xlink:title="www.w3.org/2005">
+<polygon fill="mediumvioletred" stroke="black" points="508,-413 508,-488 731,-488 731,-413 508,-413"/>
+<text text-anchor="middle" x="619.5" y="-472.8" font-family="Times,serif" font-size="14.00">2005</text>
+</a>
+</g>
+<g id="graph4" class="cluster"><title>cluster2</title>
+<a xlink:title="XDM">
+<polygon fill="lightsteelblue" stroke="black" points="1616,-130 1616,-244 2515,-244 2515,-130 1616,-130"/>
+<text text-anchor="middle" x="2065.5" y="-228.8" font-family="Times,serif" font-size="14.00">XDM</text>
+</a>
+</g>
+<g id="graph5" class="cluster"><title>clusterXDMatomic</title>
+<a xlink:title="XDM/atomic">
+<polygon fill="lightsteelblue" stroke="black" points="2086,-138 2086,-213 2507,-213 2507,-138 2086,-138"/>
+<text text-anchor="middle" x="2296.5" y="-197.8" font-family="Times,serif" font-size="14.00">atomic</text>
+</a>
+</g>
+<g id="graph6" class="cluster"><title>clusterXDMitem</title>
+<a xlink:title="XDM/item">
+<polygon fill="lightsteelblue" stroke="black" points="1986,-138 1986,-213 2078,-213 2078,-138 1986,-138"/>
+<text text-anchor="middle" x="2032" y="-197.8" font-family="Times,serif" font-size="14.00">item</text>
+</a>
+</g>
+<g id="graph7" class="cluster"><title>clusterXDMnode</title>
+<a xlink:title="XDM/node">
+<polygon fill="lightsteelblue" stroke="black" points="1624,-138 1624,-213 1978,-213 1978,-138 1624,-138"/>
+<text text-anchor="middle" x="1801" y="-197.8" font-family="Times,serif" font-size="14.00">node</text>
+</a>
+</g>
+<g id="graph8" class="cluster"><title>cluster3</title>
+<a xlink:title="store">
+<polygon fill="sienna" stroke="black" points="4387,-31 4387,-397 5093,-397 5093,-31 4387,-31"/>
+<text text-anchor="middle" x="4740" y="-381.8" font-family="Times,serif" font-size="14.00">store</text>
+</a>
+</g>
+<g id="graph9" class="cluster"><title>clusterstorecollections</title>
+<a xlink:title="store/collections">
+<polygon fill="sienna" stroke="black" points="4849,-39 4849,-366 5085,-366 5085,-39 4849,-39"/>
+<text text-anchor="middle" x="4967" y="-350.8" font-family="Times,serif" font-size="14.00">collections</text>
+</a>
+</g>
+<g id="graph10" class="cluster"><title>clusterstorecollectionsdynamic</title>
+<a xlink:title="store/collections/dynamic">
+<polygon fill="sienna" stroke="black" points="4857,-47 4857,-122 4999,-122 4999,-47 4857,-47"/>
+<text text-anchor="middle" x="4928" y="-106.8" font-family="Times,serif" font-size="14.00">dynamic</text>
+</a>
+</g>
+<g id="graph11" class="cluster"><title>clusterstorecollectionsstatic</title>
+<a xlink:title="store/collections/static">
+<polygon fill="sienna" stroke="black" points="4935,-260 4935,-335 5077,-335 5077,-260 4935,-260"/>
+<text text-anchor="middle" x="5006" y="-319.8" font-family="Times,serif" font-size="14.00">static</text>
+</a>
+</g>
+<g id="graph12" class="cluster"><title>clusterstorecollectionsw3c</title>
+<a xlink:title="store/collections/w3c">
+<polygon fill="sienna" stroke="black" points="4857,-138 4857,-335 4927,-335 4927,-138 4857,-138"/>
+<text text-anchor="middle" x="4892" y="-319.8" font-family="Times,serif" font-size="14.00">w3c</text>
+</a>
+</g>
+<g id="graph13" class="cluster"><title>clusterstoredatastructures</title>
+<a xlink:title="store/data structures">
+<polygon fill="sienna" stroke="black" points="4538,-138 4538,-213 4841,-213 4841,-138 4538,-138"/>
+<text text-anchor="middle" x="4689.5" y="-197.8" font-family="Times,serif" font-size="14.00">data structures</text>
+</a>
+</g>
+<g id="graph14" class="cluster"><title>clusterstoredocuments</title>
+<a xlink:title="store/documents">
+<polygon fill="sienna" stroke="black" points="4727,-260 4727,-335 4841,-335 4841,-260 4727,-260"/>
+<text text-anchor="middle" x="4784" y="-319.8" font-family="Times,serif" font-size="14.00">documents</text>
+</a>
+</g>
+<g id="graph15" class="cluster"><title>clusterstoreindexes</title>
+<a xlink:title="store/indexes">
+<polygon fill="sienna" stroke="black" points="4561,-252 4561,-366 4719,-366 4719,-252 4561,-252"/>
+<text text-anchor="middle" x="4640" y="-350.8" font-family="Times,serif" font-size="14.00">indexes</text>
+</a>
+</g>
+<g id="graph16" class="cluster"><title>clusterstoreindexesstatic</title>
+<a xlink:title="store/indexes/static">
+<polygon fill="sienna" stroke="black" points="4569,-260 4569,-335 4711,-335 4711,-260 4569,-260"/>
+<text text-anchor="middle" x="4640" y="-319.8" font-family="Times,serif" font-size="14.00">static</text>
+</a>
+</g>
+<g id="graph17" class="cluster"><title>clusterstoreintegrityconstraints</title>
+<a xlink:title="store/integrity constraints">
+<polygon fill="sienna" stroke="black" points="4395,-252 4395,-366 4553,-366 4553,-252 4395,-252"/>
+<text text-anchor="middle" x="4474" y="-350.8" font-family="Times,serif" font-size="14.00">integrity constraints</text>
+</a>
+</g>
+<g id="graph18" class="cluster"><title>clusterstoreintegrityconstraintsstatic</title>
+<a xlink:title="store/integrity constraints/static">
+<polygon fill="sienna" stroke="black" points="4403,-260 4403,-335 4545,-335 4545,-260 4403,-260"/>
+<text text-anchor="middle" x="4474" y="-319.8" font-family="Times,serif" font-size="14.00">static</text>
+</a>
+</g>
+<g id="graph19" class="cluster"><title>cluster4</title>
+<a xlink:title="introspection">
+<polygon fill="dimgray" stroke="black" points="4696,-413 4696,-488 4783,-488 4783,-413 4696,-413"/>
+<text text-anchor="middle" x="4739.5" y="-472.8" font-family="Times,serif" font-size="14.00">introspection</text>
+</a>
+</g>
+<g id="graph20" class="cluster"><title>cluster5</title>
+<a xlink:title="reflection">
+<polygon fill="slategray" stroke="black" points="1398,-138 1398,-213 1502,-213 1502,-138 1398,-138"/>
+<text text-anchor="middle" x="1450" y="-197.8" font-family="Times,serif" font-size="14.00">reflection</text>
+</a>
+</g>
+<g id="graph21" class="cluster"><title>cluster6</title>
+<a xlink:title="external">
+<polygon fill="Gold" stroke="black" points="2523,-138 2523,-213 2890,-213 2890,-138 2523,-138"/>
+<text text-anchor="middle" x="2706.5" y="-197.8" font-family="Times,serif" font-size="14.00">external</text>
+</a>
+</g>
+<g id="graph22" class="cluster"><title>cluster7</title>
+<a xlink:title="xqdoc">
+<polygon fill="moccasin" stroke="black" points="4099,-252 4099,-519 4379,-519 4379,-252 4099,-252"/>
+<text text-anchor="middle" x="4239" y="-503.8" font-family="Times,serif" font-size="14.00">xqdoc</text>
+</a>
+</g>
+<g id="graph23" class="cluster"><title>clusterxqdocxqdoc2xhtml</title>
+<a xlink:title="xqdoc/xqdoc2xhtml">
+<polygon fill="moccasin" stroke="black" points="4239,-260 4239,-488 4371,-488 4371,-260 4239,-260"/>
+<text text-anchor="middle" x="4305" y="-472.8" font-family="Times,serif" font-size="14.00">xqdoc2xhtml</text>
+</a>
+</g>
+<g id="graph24" class="cluster"><title>cluster8</title>
+<a xlink:title="data processing">
+<polygon fill="tan" stroke="black" points="8,-39 8,-366 1390,-366 1390,-39 8,-39"/>
+<text text-anchor="middle" x="699" y="-350.8" font-family="Times,serif" font-size="14.00">data processing</text>
+</a>
+</g>
+<g id="graph25" class="cluster"><title>clusterdataprocessingdatacleaning</title>
+<a xlink:title="data processing/data cleaning">
+<polygon fill="tan" stroke="black" points="16,-47 16,-335 788,-335 788,-47 16,-47"/>
+<text text-anchor="middle" x="402" y="-319.8" font-family="Times,serif" font-size="14.00">data cleaning</text>
+</a>
+</g>
+<g id="graph26" class="cluster"><title>clusterdataprocessingdataconverters</title>
+<a xlink:title="data processing/data converters">
+<polygon fill="tan" stroke="black" points="936,-260 936,-335 1382,-335 1382,-260 936,-260"/>
+<text text-anchor="middle" x="1159" y="-319.8" font-family="Times,serif" font-size="14.00">data converters</text>
+</a>
+</g>
+<g id="graph27" class="cluster"><title>clusterdataprocessingmetadata</title>
+<a xlink:title="data processing/metadata">
+<polygon fill="tan" stroke="black" points="796,-260 796,-335 928,-335 928,-260 796,-260"/>
+<text text-anchor="middle" x="862" y="-319.8" font-family="Times,serif" font-size="14.00">metadata</text>
+</a>
+</g>
+<g id="graph28" class="cluster"><title>cluster9</title>
+<a xlink:title="programming languages">
+<polygon fill="RosyBrown" stroke="black" points="2898,-130 2898,-244 3052,-244 3052,-130 2898,-130"/>
+<text text-anchor="middle" x="2975" y="-228.8" font-family="Times,serif" font-size="14.00">programming languages</text>
+</a>
+</g>
+<g id="graph29" class="cluster"><title>clusterprogramminglanguagesxquery</title>
+<a xlink:title="programming languages/xquery">
+<polygon fill="RosyBrown" stroke="black" points="2970,-138 2970,-213 3044,-213 3044,-138 2970,-138"/>
+<text text-anchor="middle" x="3007" y="-197.8" font-family="Times,serif" font-size="14.00">xquery</text>
+</a>
+</g>
+<g id="graph30" class="cluster"><title>cluster10</title>
+<a xlink:title="excel">
+<polygon fill="wheat" stroke="black" points="5101,-138 5101,-488 5695,-488 5695,-138 5101,-138"/>
+<text text-anchor="middle" x="5398" y="-472.8" font-family="Times,serif" font-size="14.00">excel</text>
+</a>
+</g>
+<g id="graph31" class="cluster"><title>cluster11</title>
+<a xlink:title="cryptography">
+<polygon fill="LightGreen" stroke="black" points="2562,-260 2562,-335 2712,-335 2712,-260 2562,-260"/>
+<text text-anchor="middle" x="2637" y="-319.8" font-family="Times,serif" font-size="14.00">cryptography</text>
+</a>
+</g>
+<g id="graph32" class="cluster"><title>cluster12</title>
+<a xlink:title="geo">
+<polygon fill="forestgreen" stroke="black" points="2304,-260 2304,-335 2468,-335 2468,-260 2304,-260"/>
+<text text-anchor="middle" x="2386" y="-319.8" font-family="Times,serif" font-size="14.00">geo</text>
+</a>
+</g>
+<g id="graph33" class="cluster"><title>cluster13</title>
+<a xlink:title="image">
+<polygon fill="olivedrab" stroke="black" points="3090,-138 3090,-213 3584,-213 3584,-138 3090,-138"/>
+<text text-anchor="middle" x="3337" y="-197.8" font-family="Times,serif" font-size="14.00">image</text>
+</a>
+</g>
+<g id="graph34" class="cluster"><title>cluster14</title>
+<a xlink:title="OAuth">
+<polygon fill="darkkhaki" stroke="black" points="2476,-260 2476,-488 2554,-488 2554,-260 2476,-260"/>
+<text text-anchor="middle" x="2515" y="-472.8" font-family="Times,serif" font-size="14.00">OAuth</text>
+</a>
+</g>
+<g id="graph35" class="cluster"><title>cluster15</title>
+<a xlink:title="expath.org">
+<polygon fill="cornflowerblue" stroke="black" points="3901,-138 3901,-366 4091,-366 4091,-138 3901,-138"/>
+<text text-anchor="middle" x="3996" y="-350.8" font-family="Times,serif" font-size="14.00">expath.org</text>
+</a>
+</g>
+<g id="graph36" class="cluster"><title>clusterexpathorgns</title>
+<a xlink:title="expath.org/ns">
+<polygon fill="cornflowerblue" stroke="black" points="4013,-260 4013,-335 4083,-335 4083,-260 4013,-260"/>
+<text text-anchor="middle" x="4048" y="-319.8" font-family="Times,serif" font-size="14.00">ns</text>
+</a>
+</g>
+<g id="graph37" class="cluster"><title>cluster16</title>
+<a xlink:title="www.functx.com">
+<polygon fill="yellow" stroke="black" points="5703,-413 5703,-488 5865,-488 5865,-413 5703,-413"/>
+<text text-anchor="middle" x="5784" y="-472.8" font-family="Times,serif" font-size="14.00">www.functx.com</text>
+</a>
+</g>
+<g id="graph38" class="cluster"><title>cluster17</title>
+<a xlink:title="communication">
+<polygon fill="Chartreuse" stroke="black" points="3624,-138 3624,-213 3773,-213 3773,-138 3624,-138"/>
+<text text-anchor="middle" x="3698.5" y="-197.8" font-family="Times,serif" font-size="14.00">communication</text>
+</a>
+</g>
+<g id="graph39" class="cluster"><title>cluster18</title>
+<a xlink:title="debugger">
+<polygon fill="DarkGoldenRod" stroke="black" points="1240,-413 1240,-488 1438,-488 1438,-413 1240,-413"/>
+<text text-anchor="middle" x="1339" y="-472.8" font-family="Times,serif" font-size="14.00">debugger</text>
+</a>
+</g>
+<g id="graph40" class="cluster"><title>cluster19</title>
+<a xlink:title="error">
+<polygon fill="DarkSeaGreen" stroke="black" points="5873,-413 5873,-488 6164,-488 6164,-413 5873,-413"/>
+<text text-anchor="middle" x="6018.5" y="-472.8" font-family="Times,serif" font-size="14.00">error</text>
+</a>
+</g>
+<g id="graph41" class="cluster"><title>cluster20</title>
+<a xlink:title="utils">
+<polygon fill="DarkSlateBlue" stroke="black" points="3781,-130 3781,-244 3893,-244 3893,-130 3781,-130"/>
+<text text-anchor="middle" x="3837" y="-228.8" font-family="Times,serif" font-size="14.00">utils</text>
+</a>
+</g>
+<g id="graph42" class="cluster"><title>clusterutilsutiljvm</title>
+<a xlink:title="utils/util jvm">
+<polygon fill="DarkSlateBlue" stroke="black" points="3789,-138 3789,-213 3885,-213 3885,-138 3789,-138"/>
+<text text-anchor="middle" x="3837" y="-197.8" font-family="Times,serif" font-size="14.00">util jvm</text>
+</a>
+</g>
+<g id="graph43" class="cluster"><title>cluster21</title>
+<a xlink:title="www.zorba-xquery.com">
+<polygon fill="DodgerBlue" stroke="black" points="6172,-405 6172,-519 6354,-519 6354,-405 6172,-405"/>
+<text text-anchor="middle" x="6263" y="-503.8" font-family="Times,serif" font-size="14.00">www.zorba-xquery.com</text>
+</a>
+</g>
+<g id="graph44" class="cluster"><title>clusterwwwzorbaxquerycommodules</title>
+<a xlink:title="www.zorba-xquery.com/modules">
+<polygon fill="DodgerBlue" stroke="black" points="6180,-413 6180,-488 6346,-488 6346,-413 6180,-413"/>
+<text text-anchor="middle" x="6263" y="-472.8" font-family="Times,serif" font-size="14.00">modules</text>
+</a>
+</g>
+<g id="graph45" class="cluster"><title>clusterExternalCPPLibs</title>
+<a xlink:title="Zorba modules dependency graph">
+<polygon fill="darksalmon" stroke="black" points="2757,-47 2757,-122 3426,-122 3426,-47 2757,-47"/>
+<text text-anchor="middle" x="3091.5" y="-106.8" font-family="Times,serif" font-size="14.00">External C++ Library dependencies</text>
+</a>
+</g>
+<!-- 40 -->
+<g id="node3" class="node"><title>40</title>
 <a xlink:href="../www.w3.org_2005_xpath-functions.html" xlink:title="(Zorba-core) module uri=http://www.w3.org/2005/xpath-functions">
-<ellipse fill="white" stroke="white" cx="2114" cy="-301" rx="73.0388" ry="19.0919"/>
-<text text-anchor="middle" x="2114" y="-297.9" font-family="Times Roman,serif" font-size="14.00" fill="red">xpath_functions</text>
+<ellipse fill="white" stroke="white" cx="657" cy="-439" rx="65.4659" ry="18"/>
+<text text-anchor="middle" x="657" y="-435.3" font-family="Times,serif" font-size="14.00" fill="red">xpath-functions</text>
 </a>
 </g>
-<!-- xpath_functions_math_1 -->
-<g id="node3" class="node"><title>xpath_functions_math_1</title>
+<!-- 41 -->
+<g id="node4" class="node"><title>41</title>
 <a xlink:href="../www.w3.org_2005_xpath-functions_math.html" xlink:title="(Zorba-core) module uri=http://www.w3.org/2005/xpath-functions/math">
-<ellipse fill="white" stroke="white" cx="1926" cy="-301" rx="97.0803" ry="19.0919"/>
-<text text-anchor="middle" x="1926" y="-297.9" font-family="Times Roman,serif" font-size="14.00" fill="red">xpath_functions_math</text>
+<ellipse fill="white" stroke="white" cx="545" cy="-439" rx="28.3955" ry="18"/>
+<text text-anchor="middle" x="545" y="-435.3" font-family="Times,serif" font-size="14.00" fill="red">math</text>
 </a>
 </g>
-<!-- atomic_datetime_2 -->
-<g id="node5" class="node"><title>atomic_datetime_2</title>
+<!-- 3 -->
+<g id="node7" class="node"><title>3</title>
 <a xlink:href="../www.zorba-xquery.com_modules_datetime.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/datetime">
-<ellipse fill="white" stroke="white" cx="2752" cy="-123" rx="75.8684" ry="19.0919"/>
-<text text-anchor="middle" x="2752" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="red">atomic_datetime</text>
+<ellipse fill="white" stroke="white" cx="2457" cy="-164" rx="41.394" ry="18"/>
+<text text-anchor="middle" x="2457" y="-160.3" font-family="Times,serif" font-size="14.00" fill="red">datetime</text>
 </a>
 </g>
-<!-- atomic_math_2 -->
-<g id="node6" class="node"><title>atomic_math_2</title>
+<!-- 5 -->
+<g id="node8" class="node"><title>5</title>
 <a xlink:href="../www.zorba-xquery.com_modules_math.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/math">
-<ellipse fill="white" stroke="white" cx="3239" cy="-123" rx="62.9325" ry="19.0919"/>
-<text text-anchor="middle" x="3239" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="red">atomic_math</text>
-</a>
-</g>
-<!-- node_node_2 -->
-<g id="node7" class="node"><title>node_node_2</title>
+<ellipse fill="white" stroke="white" cx="2369" cy="-164" rx="28.3955" ry="18"/>
+<text text-anchor="middle" x="2369" y="-160.3" font-family="Times,serif" font-size="14.00" fill="red">math</text>
+</a>
+</g>
+<!-- 10 -->
+<g id="node9" class="node"><title>10</title>
+<a xlink:href="../www.zorba-xquery.com_modules_random.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/random">
+<ellipse fill="white" stroke="white" cx="2284" cy="-164" rx="38.0212" ry="18"/>
+<text text-anchor="middle" x="2284" y="-160.3" font-family="Times,serif" font-size="14.00" fill="red">random</text>
+</a>
+</g>
+<!-- 13 -->
+<g id="node10" class="node"><title>13</title>
+<a xlink:href="../www.zorba-xquery.com_modules_string.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/string">
+<ellipse fill="white" stroke="white" cx="2197" cy="-164" rx="30.3206" ry="18"/>
+<text text-anchor="middle" x="2197" y="-160.3" font-family="Times,serif" font-size="14.00" fill="red">string</text>
+</a>
+</g>
+<!-- 14 -->
+<g id="node11" class="node"><title>14</title>
+<a xlink:href="../www.zorba-xquery.com_modules_uri.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/uri">
+<ellipse fill="white" stroke="white" cx="2121" cy="-164" rx="27" ry="18"/>
+<text text-anchor="middle" x="2121" y="-160.3" font-family="Times,serif" font-size="14.00" fill="red">uri</text>
+</a>
+</g>
+<!-- 12 -->
+<g id="node13" class="node"><title>12</title>
+<a xlink:href="../www.zorba-xquery.com_modules_schema.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/schema">
+<ellipse fill="white" stroke="white" cx="2032" cy="-164" rx="37.5442" ry="18"/>
+<text text-anchor="middle" x="2032" y="-160.3" font-family="Times,serif" font-size="14.00" fill="red">schema</text>
+</a>
+</g>
+<!-- 8 -->
+<g id="node15" class="node"><title>8</title>
 <a xlink:href="../www.zorba-xquery.com_modules_node.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/node">
-<ellipse fill="white" stroke="white" cx="3105" cy="-123" rx="53.2379" ry="19.0919"/>
-<text text-anchor="middle" x="3105" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="red">node_node</text>
-</a>
-</g>
-<!-- node_node_reference_2 -->
-<g id="node8" class="node"><title>node_node_reference_2</title>
+<ellipse fill="white" stroke="white" cx="1942" cy="-164" rx="27.4223" ry="18"/>
+<text text-anchor="middle" x="1942" y="-160.3" font-family="Times,serif" font-size="14.00" fill="red">node</text>
+</a>
+</g>
+<!-- 7 -->
+<g id="node16" class="node"><title>7</title>
+<a xlink:href="../www.zorba-xquery.com_modules_node-position.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/node-position">
+<ellipse fill="white" stroke="white" cx="1837" cy="-164" rx="59.2173" ry="18"/>
+<text text-anchor="middle" x="1837" y="-160.3" font-family="Times,serif" font-size="14.00" fill="red">node-position</text>
+</a>
+</g>
+<!-- 6 -->
+<g id="node17" class="node"><title>6</title>
 <a xlink:href="../www.zorba-xquery.com_modules_node-reference.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/node-reference">
-<ellipse fill="white" stroke="white" cx="2940" cy="-123" rx="94.0452" ry="19.0919"/>
-<text text-anchor="middle" x="2940" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="red">node_node_reference</text>
-</a>
-</g>
-<!-- atomic_random_2 -->
-<g id="node9" class="node"><title>atomic_random_2</title>
-<a xlink:href="../www.zorba-xquery.com_modules_random.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/random">
-<ellipse fill="white" stroke="white" cx="3393" cy="-123" rx="72.832" ry="19.0919"/>
-<text text-anchor="middle" x="3393" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="red">atomic_random</text>
-</a>
-</g>
-<!-- item_schema_2 -->
-<g id="node10" class="node"><title>item_schema_2</title>
-<a xlink:href="../www.zorba-xquery.com_modules_schema.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/schema">
-<ellipse fill="white" stroke="white" cx="2595" cy="-123" rx="62.9325" ry="19.0919"/>
-<text text-anchor="middle" x="2595" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="red">item_schema</text>
-</a>
-</g>
-<!-- atomic_string_2 -->
-<g id="node11" class="node"><title>atomic_string_2</title>
-<a xlink:href="../www.zorba-xquery.com_modules_string.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/string">
-<ellipse fill="white" stroke="white" cx="2449" cy="-123" rx="65.0538" ry="19.0919"/>
-<text text-anchor="middle" x="2449" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="red">atomic_string</text>
-</a>
-</g>
-<!-- data_structures_unordered_map_3 -->
-<g id="node13" class="node"><title>data_structures_unordered_map_3</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_data-structures_unordered-map.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/data-structures/unordered-map">
-<ellipse fill="white" stroke="white" cx="7504" cy="-212" rx="135.057" ry="19.0919"/>
-<text text-anchor="middle" x="7504" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="red">data_structures_unordered_map</text>
-</a>
-</g>
-<!-- collections_dynamic_ddl_3 -->
-<g id="node14" class="node"><title>collections_dynamic_ddl_3</title>
+<ellipse fill="white" stroke="white" cx="1696" cy="-164" rx="63.5411" ry="18"/>
+<text text-anchor="middle" x="1696" y="-160.3" font-family="Times,serif" font-size="14.00" fill="red">node-reference</text>
+</a>
+</g>
+<!-- 25 -->
+<g id="node21" class="node"><title>25</title>
 <a xlink:href="../www.zorba-xquery.com_modules_store_dynamic_collections_ddl.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl">
-<ellipse fill="white" stroke="white" cx="7366" cy="-35" rx="108.187" ry="19.0919"/>
-<text text-anchor="middle" x="7366" y="-31.9" font-family="Times Roman,serif" font-size="14.00" fill="red">collections_dynamic_ddl</text>
+<ellipse fill="white" stroke="white" cx="4892" cy="-73" rx="27" ry="18"/>
+<text text-anchor="middle" x="4892" y="-69.3" font-family="Times,serif" font-size="14.00" fill="red">ddl</text>
 </a>
 </g>
-<!-- collections_dynamic_dml_3 -->
-<g id="node15" class="node"><title>collections_dynamic_dml_3</title>
+<!-- 26 -->
+<g id="node22" class="node"><title>26</title>
 <a xlink:href="../www.zorba-xquery.com_modules_store_dynamic_collections_dml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/dynamic/collections/dml">
-<ellipse fill="white" stroke="white" cx="7147" cy="-123" rx="111.222" ry="19.0919"/>
-<text text-anchor="middle" x="7147" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="red">collections_dynamic_dml</text>
-</a>
-</g>
-<!-- collections_w3c_ddl_3 -->
-<g id="node16" class="node"><title>collections_w3c_ddl_3</title>
+<ellipse fill="white" stroke="white" cx="4964" cy="-73" rx="27" ry="18"/>
+<text text-anchor="middle" x="4964" y="-69.3" font-family="Times,serif" font-size="14.00" fill="red">dml</text>
+</a>
+</g>
+<!-- 29 -->
+<g id="node24" class="node"><title>29</title>
+<a xlink:href="../www.zorba-xquery.com_modules_store_static_collections_ddl.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/collections/ddl">
+<ellipse fill="white" stroke="white" cx="5042" cy="-286" rx="27" ry="18"/>
+<text text-anchor="middle" x="5042" y="-282.3" font-family="Times,serif" font-size="14.00" fill="red">ddl</text>
+</a>
+</g>
+<!-- 30 -->
+<g id="node25" class="node"><title>30</title>
+<a xlink:href="../www.zorba-xquery.com_modules_store_static_collections_dml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/collections/dml">
+<ellipse fill="white" stroke="white" cx="4970" cy="-286" rx="27" ry="18"/>
+<text text-anchor="middle" x="4970" y="-282.3" font-family="Times,serif" font-size="14.00" fill="red">dml</text>
+</a>
+</g>
+<!-- 27 -->
+<g id="node27" class="node"><title>27</title>
 <a xlink:href="../www.zorba-xquery.com_modules_store_dynamic_collections_w3c_ddl.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl">
-<ellipse fill="white" stroke="white" cx="7366" cy="-123" rx="90.0096" ry="19.0919"/>
-<text text-anchor="middle" x="7366" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="red">collections_w3c_ddl</text>
-</a>
-</g>
-<!-- collections_w3c_ddl_3&#45;&gt;collections_dynamic_ddl_3 -->
-<g id="edge80" class="edge"><title>collections_w3c_ddl_3-&gt;collections_dynamic_ddl_3</title>
-<path fill="none" stroke="black" d="M7366,-103.905C7366,-92.3736 7366,-77.4389 7366,-64.4228"/>
-<polygon fill="black" stroke="black" points="7369.5,-64.0574 7366,-54.0574 7362.5,-64.0575 7369.5,-64.0574"/>
-</g>
-<!-- collections_w3c_dml_3 -->
-<g id="node17" class="node"><title>collections_w3c_dml_3</title>
+<ellipse fill="white" stroke="white" cx="4892" cy="-164" rx="27" ry="18"/>
+<text text-anchor="middle" x="4892" y="-160.3" font-family="Times,serif" font-size="14.00" fill="red">ddl</text>
+</a>
+</g>
+<!-- 27&#45;&gt;25 -->
+<g id="edge102" class="edge"><title>27-&gt;25</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl">
+<path fill="none" stroke="black" d="M4892,-145.84C4892,-133.281 4892,-115.979 4892,-101.502"/>
+<polygon fill="black" stroke="black" points="4895.5,-101.107 4892,-91.1074 4888.5,-101.107 4895.5,-101.107"/>
+</a>
+</g>
+<!-- 28 -->
+<g id="node28" class="node"><title>28</title>
 <a xlink:href="../www.zorba-xquery.com_modules_store_dynamic_collections_w3c_dml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/dml">
-<ellipse fill="white" stroke="white" cx="7257" cy="-212" rx="94.0452" ry="19.0919"/>
-<text text-anchor="middle" x="7257" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="red">collections_w3c_dml</text>
-</a>
-</g>
-<!-- collections_w3c_dml_3&#45;&gt;collections_dynamic_dml_3 -->
-<g id="edge86" class="edge"><title>collections_w3c_dml_3-&gt;collections_dynamic_dml_3</title>
-<path fill="none" stroke="black" d="M7234.21,-193.559C7217.95,-180.402 7195.88,-162.551 7178.02,-148.097"/>
-<polygon fill="black" stroke="black" points="7180.12,-145.292 7170.14,-141.723 7175.71,-150.734 7180.12,-145.292"/>
-</g>
-<!-- collections_w3c_dml_3&#45;&gt;collections_w3c_ddl_3 -->
-<g id="edge84" class="edge"><title>collections_w3c_dml_3-&gt;collections_w3c_ddl_3</title>
-<path fill="none" stroke="black" d="M7279.85,-193.343C7295.98,-180.17 7317.78,-162.375 7335.41,-147.979"/>
-<polygon fill="black" stroke="black" points="7337.65,-150.668 7343.18,-141.633 7333.22,-145.246 7337.65,-150.668"/>
-</g>
-<!-- documents_dynamic_3 -->
-<g id="node18" class="node"><title>documents_dynamic_3</title>
+<ellipse fill="white" stroke="white" cx="4892" cy="-286" rx="27" ry="18"/>
+<text text-anchor="middle" x="4892" y="-282.3" font-family="Times,serif" font-size="14.00" fill="red">dml</text>
+</a>
+</g>
+<!-- 28&#45;&gt;26 -->
+<g id="edge106" class="edge"><title>28-&gt;26</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/dml, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/dml">
+<path fill="none" stroke="black" d="M4907.37,-271.185C4914.68,-263.806 4922.91,-254.162 4928,-244 4951.36,-197.396 4959.59,-136.252 4962.47,-101.43"/>
+<polygon fill="black" stroke="black" points="4965.98,-101.331 4963.23,-91.1011 4959,-100.817 4965.98,-101.331"/>
+</a>
+</g>
+<!-- 28&#45;&gt;27 -->
+<g id="edge104" class="edge"><title>28-&gt;27</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/dml, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl">
+<path fill="none" stroke="black" d="M4892,-267.807C4892,-248.114 4892,-215.583 4892,-192.39"/>
+<polygon fill="black" stroke="black" points="4895.5,-192.161 4892,-182.161 4888.5,-192.161 4895.5,-192.161"/>
+</a>
+</g>
+<!-- 63 -->
+<g id="node30" class="node"><title>63</title>
+<a xlink:href="../www.zorba-xquery.com_modules_store_data-structures_queue.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/store/data-structures/queue">
+<ellipse fill="white" stroke="white" cx="4801" cy="-164" rx="31.2735" ry="18"/>
+<text text-anchor="middle" x="4801" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">queue</text>
+</a>
+</g>
+<!-- 63&#45;&gt;25 -->
+<g id="edge136" class="edge"><title>63-&gt;25</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/store/data-structures/queue, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl">
+<path fill="none" stroke="black" d="M4816.44,-147.902C4831.21,-133.452 4853.64,-111.514 4870.23,-95.2913"/>
+<polygon fill="black" stroke="black" points="4872.69,-97.7814 4877.39,-88.287 4867.8,-92.7769 4872.69,-97.7814"/>
+</a>
+</g>
+<!-- 63&#45;&gt;26 -->
+<g id="edge138" class="edge"><title>63-&gt;26</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/store/data-structures/queue, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/dml">
+<path fill="none" stroke="black" d="M4818.7,-148.875C4828.3,-141.996 4840.68,-134.299 4853,-130 4884.65,-118.951 4898.86,-138.563 4928,-122 4937.28,-116.729 4944.89,-107.992 4950.69,-99.4067"/>
+<polygon fill="black" stroke="black" points="4953.81,-101.017 4956.07,-90.6662 4947.85,-97.3478 4953.81,-101.017"/>
+</a>
+</g>
+<!-- 51 -->
+<g id="node31" class="node"><title>51</title>
+<a xlink:href="../www.zorba-xquery.com_modules_store_data-structures_stack.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/store/data-structures/stack">
+<ellipse fill="white" stroke="white" cx="4723" cy="-164" rx="28.3955" ry="18"/>
+<text text-anchor="middle" x="4723" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">stack</text>
+</a>
+</g>
+<!-- 51&#45;&gt;25 -->
+<g id="edge112" class="edge"><title>51-&gt;25</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/store/data-structures/stack, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl">
+<path fill="none" stroke="black" d="M4737.22,-148.32C4743.76,-142.121 4751.86,-135.16 4760,-130 4791.28,-110.183 4830.77,-94.4902 4858.37,-84.8185"/>
+<polygon fill="black" stroke="black" points="4859.64,-88.0836 4867.96,-81.5312 4857.37,-81.4615 4859.64,-88.0836"/>
+</a>
+</g>
+<!-- 51&#45;&gt;26 -->
+<g id="edge114" class="edge"><title>51-&gt;26</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/store/data-structures/stack, TO: http://www.zorba-xquery.com/modules/store/dynamic/collections/dml">
+<path fill="none" stroke="black" d="M4735.8,-147.575C4742.29,-140.907 4750.76,-133.777 4760,-130 4794.6,-115.861 4894.98,-139.505 4928,-122 4937.66,-116.877 4945.46,-107.882 4951.29,-99.0523"/>
+<polygon fill="black" stroke="black" points="4954.32,-100.804 4956.46,-90.4276 4948.32,-97.2028 4954.32,-100.804"/>
+</a>
+</g>
+<!-- 23 -->
+<g id="node32" class="node"><title>23</title>
+<a xlink:href="../www.zorba-xquery.com_modules_store_data-structures_unordered-map.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/data-structures/unordered-map">
+<ellipse fill="white" stroke="white" cx="4611" cy="-164" rx="64.4914" ry="18"/>
+<text text-anchor="middle" x="4611" y="-160.3" font-family="Times,serif" font-size="14.00" fill="red">unordered-map</text>
+</a>
+</g>
+<!-- 24 -->
+<g id="node34" class="node"><title>24</title>
 <a xlink:href="../www.zorba-xquery.com_modules_store_dynamic_documents.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/dynamic/documents">
-<ellipse fill="white" stroke="white" cx="7053" cy="-212" rx="91.9239" ry="19.0919"/>
-<text text-anchor="middle" x="7053" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="red">documents_dynamic</text>
-</a>
-</g>
-<!-- collections_static_ddl_3 -->
-<g id="node19" class="node"><title>collections_static_ddl_3</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_static_collections_ddl.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/collections/ddl">
-<ellipse fill="white" stroke="white" cx="6848" cy="-212" rx="94.7523" ry="19.0919"/>
-<text text-anchor="middle" x="6848" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="red">collections_static_ddl</text>
-</a>
-</g>
-<!-- collections_static_dml_3 -->
-<g id="node20" class="node"><title>collections_static_dml_3</title>
-<a xlink:href="../www.zorba-xquery.com_modules_store_static_collections_dml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/collections/dml">
-<ellipse fill="white" stroke="white" cx="6637" cy="-212" rx="97.7889" ry="19.0919"/>
-<text text-anchor="middle" x="6637" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="red">collections_static_dml</text>
-</a>
-</g>
-<!-- indexes_static_ddl_3 -->
-<g id="node21" class="node"><title>indexes_static_ddl_3</title>
+<ellipse fill="white" stroke="white" cx="4784" cy="-286" rx="49.0941" ry="18"/>
+<text text-anchor="middle" x="4784" y="-282.3" font-family="Times,serif" font-size="14.00" fill="red">documents</text>
+</a>
+</g>
+<!-- 31 -->
+<g id="node37" class="node"><title>31</title>
 <a xlink:href="../www.zorba-xquery.com_modules_store_static_indexes_ddl.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/indexes/ddl">
-<ellipse fill="white" stroke="white" cx="6439" cy="-212" rx="82.2301" ry="19.0919"/>
-<text text-anchor="middle" x="6439" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="red">indexes_static_ddl</text>
+<ellipse fill="white" stroke="white" cx="4676" cy="-286" rx="27" ry="18"/>
+<text text-anchor="middle" x="4676" y="-282.3" font-family="Times,serif" font-size="14.00" fill="red">ddl</text>
 </a>
 </g>
-<!-- indexes_static_dml_3 -->
-<g id="node22" class="node"><title>indexes_static_dml_3</title>
+<!-- 32 -->
+<g id="node38" class="node"><title>32</title>
 <a xlink:href="../www.zorba-xquery.com_modules_store_static_indexes_dml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/indexes/dml">
-<ellipse fill="white" stroke="white" cx="6253" cy="-212" rx="85.7684" ry="19.0919"/>
-<text text-anchor="middle" x="6253" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="red">indexes_static_dml</text>
+<ellipse fill="white" stroke="white" cx="4604" cy="-286" rx="27" ry="18"/>
+<text text-anchor="middle" x="4604" y="-282.3" font-family="Times,serif" font-size="14.00" fill="red">dml</text>
 </a>
 </g>
-<!-- integrity_constraints_static_ddl_3 -->
-<g id="node23" class="node"><title>integrity_constraints_static_ddl_3</title>
+<!-- 33 -->
+<g id="node41" class="node"><title>33</title>
 <a xlink:href="../www.zorba-xquery.com_modules_store_static_integrity_constraints_ddl.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl">
-<ellipse fill="white" stroke="white" cx="6017" cy="-212" rx="132.229" ry="19.0919"/>
-<text text-anchor="middle" x="6017" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="red">integrity_constraints_static_ddl</text>
+<ellipse fill="white" stroke="white" cx="4510" cy="-286" rx="27" ry="18"/>
+<text text-anchor="middle" x="4510" y="-282.3" font-family="Times,serif" font-size="14.00" fill="red">ddl</text>
 </a>
 </g>
-<!-- integrity_constraints_static_dml_3 -->
-<g id="node24" class="node"><title>integrity_constraints_static_dml_3</title>
+<!-- 34 -->
+<g id="node42" class="node"><title>34</title>
 <a xlink:href="../www.zorba-xquery.com_modules_store_static_integrity_constraints_dml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml">
-<ellipse fill="white" stroke="white" cx="5732" cy="-212" rx="135.057" ry="19.0919"/>
-<text text-anchor="middle" x="5732" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="red">integrity_constraints_static_dml</text>
+<ellipse fill="white" stroke="white" cx="4438" cy="-286" rx="27" ry="18"/>
+<text text-anchor="middle" x="4438" y="-282.3" font-family="Times,serif" font-size="14.00" fill="red">dml</text>
 </a>
 </g>
-<!-- sctx_4 -->
-<g id="node26" class="node"><title>sctx_4</title>
+<!-- 20 -->
+<g id="node44" class="node"><title>20</title>
 <a xlink:href="../www.zorba-xquery.com_modules_introspection_sctx.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/introspection/sctx">
-<ellipse fill="white" stroke="white" cx="6387" cy="-301" rx="27" ry="19.0919"/>
-<text text-anchor="middle" x="6387" y="-297.9" font-family="Times Roman,serif" font-size="14.00" fill="red">sctx</text>
+<ellipse fill="white" stroke="white" cx="4739" cy="-439" rx="27" ry="18"/>
+<text text-anchor="middle" x="4739" y="-435.3" font-family="Times,serif" font-size="14.00" fill="red">sctx</text>
 </a>
 </g>
-<!-- reflection_5 -->
-<g id="node28" class="node"><title>reflection_5</title>
+<!-- 11 -->
+<g id="node46" class="node"><title>11</title>
 <a xlink:href="../www.zorba-xquery.com_modules_reflection.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/reflection">
-<ellipse fill="white" stroke="white" cx="7043" cy="-301" rx="48.0833" ry="19.0919"/>
-<text text-anchor="middle" x="7043" y="-297.9" font-family="Times Roman,serif" font-size="14.00" fill="red">reflection</text>
-</a>
-</g>
-<!-- file_6 -->
-<g id="node30" class="node"><title>file_6</title>
-<a xlink:href="../expath.org_ns_file.html" xlink:title="(Zorba-core) module uri=http://expath.org/ns/file">
-<ellipse fill="white" stroke="white" cx="3913" cy="-123" rx="27" ry="19.0919"/>
-<text text-anchor="middle" x="3913" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="red">file</text>
-</a>
-</g>
-<!-- fetch_6 -->
-<g id="node31" class="node"><title>fetch_6</title>
+<ellipse fill="white" stroke="white" cx="1450" cy="-164" rx="44.2946" ry="18"/>
+<text text-anchor="middle" x="1450" y="-160.3" font-family="Times,serif" font-size="14.00" fill="red">reflection</text>
+</a>
+</g>
+<!-- 4 -->
+<g id="node48" class="node"><title>4</title>
 <a xlink:href="../www.zorba-xquery.com_modules_fetch.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/fetch">
-<ellipse fill="white" stroke="white" cx="3837" cy="-123" rx="31.1127" ry="19.0919"/>
-<text text-anchor="middle" x="3837" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="red">fetch</text>
+<ellipse fill="white" stroke="white" cx="2853" cy="-164" rx="28.3955" ry="18"/>
+<text text-anchor="middle" x="2853" y="-160.3" font-family="Times,serif" font-size="14.00" fill="red">fetch</text>
 </a>
 </g>
-<!-- http_client_6 -->
-<g id="node32" class="node"><title>http_client_6</title>
+<!-- 2 -->
+<g id="node49" class="node"><title>2</title>
 <a xlink:href="../www.zorba-xquery.com_modules_http-client.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/http-client">
-<ellipse fill="white" stroke="white" cx="3736" cy="-123" rx="51.8276" ry="19.0919"/>
-<text text-anchor="middle" x="3736" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="red">http_client</text>
+<ellipse fill="white" stroke="white" cx="2760" cy="-164" rx="46.1964" ry="18"/>
+<text text-anchor="middle" x="2760" y="-160.3" font-family="Times,serif" font-size="14.00" fill="red">http-client</text>
 </a>
 </g>
-<!-- http_client_error_15 -->
-<g id="node86" class="node"><title>http_client_error_15</title>
+<!-- 1 -->
+<g id="node110" class="node"><title>1</title>
 <a xlink:href="../expath.org_ns_error.html" xlink:title="(Zorba-core) module uri=http://expath.org/ns/error">
-<ellipse fill="white" stroke="white" cx="5332" cy="-123" rx="75.1594" ry="19.0919"/>
-<text text-anchor="middle" x="5332" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="red">http_client_error</text>
+<ellipse fill="white" stroke="white" cx="3946" cy="-164" rx="27.4223" ry="18"/>
+<text text-anchor="middle" x="3946" y="-160.3" font-family="Times,serif" font-size="14.00" fill="red">error</text>
 </a>
 </g>
-<!-- http_client_6&#45;&gt;http_client_error_15 -->
-<g id="edge146" class="edge"><title>http_client_6-&gt;http_client_error_15</title>
-<path fill="none" stroke="black" d="M3749.65,-141.474C3762.26,-156.507 3782.53,-176.02 3806,-181 3825.43,-185.123 5216.57,-185.123 5236,-181 5260.55,-175.789 5284.72,-161.12 5302.67,-147.839"/>
-<polygon fill="black" stroke="black" points="5305.15,-150.345 5310.95,-141.478 5300.89,-144.793 5305.15,-150.345"/>
+<!-- 2&#45;&gt;1 -->
+<g id="edge76" class="edge"><title>2-&gt;1</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/http-client, TO: http://expath.org/ns/error">
+<path fill="none" stroke="black" d="M2765.74,-181.906C2774.23,-204.532 2792.61,-241.34 2824,-248 2838.35,-251.045 3865.65,-251.045 3880,-248 3907.66,-242.131 3925.78,-213.466 3935.91,-191.235"/>
+<polygon fill="black" stroke="black" points="3939.2,-192.455 3939.89,-181.883 3932.76,-189.714 3939.2,-192.455"/>
+</a>
 </g>
 <!-- cURL -->
-<g id="node97" class="node"><title>cURL</title>
+<g id="node133" class="node"><title>cURL</title>
 <a xlink:href="http://curl.haxx.se/" xlink:title="cURL Library">
-<polygon fill="none" stroke="red" points="3951,-53 3901,-53 3897,-49 3897,-17 3947,-17 3951,-21 3951,-53"/>
-<polyline fill="none" stroke="red" points="3947,-49 3897,-49 "/>
-<polyline fill="none" stroke="red" points="3947,-49 3947,-17 "/>
-<polyline fill="none" stroke="red" points="3947,-49 3951,-53 "/>
-<text text-anchor="middle" x="3924" y="-31.9" font-family="Times Roman,serif" font-size="14.00">cURL</text>
-</a>
-</g>
-<!-- http_client_6&#45;&gt;cURL -->
-<g id="edge40" class="edge"><title>http_client_6-&gt;cURL</title>
-<path fill="none" stroke="red" d="M3766.01,-107.37C3775.67,-102.986 3786.57,-98.6876 3797,-96 3816.66,-90.9345 3870.49,-98.2784 3888,-88 3898.1,-82.0675 3905.99,-72.0439 3911.77,-62.3002"/>
-<polygon fill="red" stroke="red" points="3915.02,-63.6518 3916.67,-53.1869 3908.85,-60.3362 3915.02,-63.6518"/>
-</g>
-<!-- process_6 -->
-<g id="node33" class="node"><title>process_6</title>
+<polygon fill="none" stroke="red" points="3183,-91 3133,-91 3129,-87 3129,-55 3179,-55 3183,-59 3183,-91"/>
+<polyline fill="none" stroke="red" points="3179,-87 3129,-87 "/>
+<polyline fill="none" stroke="red" points="3179,-87 3179,-55 "/>
+<polyline fill="none" stroke="red" points="3179,-87 3183,-91 "/>
+<text text-anchor="middle" x="3156" y="-69.3" font-family="Times,serif" font-size="14.00">cURL</text>
+</a>
+</g>
+<!-- 2&#45;&gt;cURL -->
+<g id="edge46" class="edge"><title>2-&gt;cURL</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/http-client, TO: cURL">
+<path fill="none" stroke="red" d="M2779.97,-147.6C2789.93,-140.848 2802.49,-133.642 2815,-130 2847.55,-120.523 3089.88,-137.557 3120,-122 3129.34,-117.175 3136.91,-108.693 3142.66,-100.187"/>
+<polygon fill="red" stroke="red" points="3145.76,-101.826 3147.98,-91.4675 3139.78,-98.1788 3145.76,-101.826"/>
+</a>
+</g>
+<!-- 70 -->
+<g id="node50" class="node"><title>70</title>
 <a xlink:href="../www.zorba-xquery.com_modules_process.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/process">
-<ellipse fill="white" stroke="white" cx="3626" cy="-123" rx="39.8075" ry="19.0919"/>
-<text text-anchor="middle" x="3626" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="green">process</text>
+<ellipse fill="white" stroke="white" cx="2658" cy="-164" rx="37.0701" ry="18"/>
+<text text-anchor="middle" x="2658" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">process</text>
 </a>
 </g>
-<!-- system_6 -->
-<g id="node34" class="node"><title>system_6</title>
+<!-- 77 -->
+<g id="node51" class="node"><title>77</title>
 <a xlink:href="../www.zorba-xquery.com_modules_system.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/system">
-<ellipse fill="white" stroke="white" cx="3529" cy="-123" rx="38.8909" ry="19.0919"/>
-<text text-anchor="middle" x="3529" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="green">system</text>
-</a>
-</g>
-<!-- project_xqdoc_7 -->
-<g id="node36" class="node"><title>project_xqdoc_7</title>
+<ellipse fill="white" stroke="white" cx="2567" cy="-164" rx="35.6194" ry="18"/>
+<text text-anchor="middle" x="2567" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">system</text>
+</a>
+</g>
+<!-- 22 -->
+<g id="node54" class="node"><title>22</title>
+<a xlink:href="../www.zorba-xquery.com_modules_xqdoc2xhtml_index.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/xqdoc2xhtml/">
+<ellipse fill="white" stroke="white" cx="4305" cy="-439" rx="57.2688" ry="18"/>
+<text text-anchor="middle" x="4305" y="-435.3" font-family="Times,serif" font-size="14.00" fill="red">xqdoc2xhtml</text>
+</a>
+</g>
+<!-- 22&#45;&gt;29 -->
+<g id="edge94" class="edge"><title>22-&gt;29</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xqdoc2xhtml/, TO: http://www.zorba-xquery.com/modules/store/static/collections/ddl">
+<path fill="none" stroke="black" d="M4358.77,-432.395C4433.45,-424.845 4572.83,-411.593 4692,-405 4709.42,-404.036 4992,-407.421 5006,-397 5031.53,-377.995 5039.25,-340.405 5041.42,-314.498"/>
+<polygon fill="black" stroke="black" points="5044.94,-314.394 5042.05,-304.199 5037.95,-313.967 5044.94,-314.394"/>
+</a>
+</g>
+<!-- 22&#45;&gt;30 -->
+<g id="edge92" class="edge"><title>22-&gt;30</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xqdoc2xhtml/, TO: http://www.zorba-xquery.com/modules/store/static/collections/dml">
+<path fill="none" stroke="black" d="M4358.78,-432.531C4433.46,-425.138 4572.86,-412.069 4692,-405 4705.26,-404.213 4920.28,-404.846 4931,-397 4957.01,-377.964 4965.76,-340.109 4968.65,-314.175"/>
+<polygon fill="black" stroke="black" points="4972.13,-314.488 4969.54,-304.215 4965.16,-313.863 4972.13,-314.488"/>
+</a>
+</g>
+<!-- 22&#45;&gt;4 -->
+<g id="edge98" class="edge"><title>22-&gt;4</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xqdoc2xhtml/, TO: http://www.zorba-xquery.com/modules/fetch">
+<path fill="none" stroke="black" d="M4281.93,-422.401C4270.7,-415.695 4256.68,-408.583 4243,-405 4205.8,-395.258 3935.15,-401.863 3897,-397 3617.14,-361.326 3558.9,-287.347 3279,-252 3257.78,-249.32 2912.17,-255.299 2894,-244 2875.6,-232.554 2865.05,-209.937 2859.28,-191.825"/>
+<polygon fill="black" stroke="black" points="2862.6,-190.709 2856.48,-182.064 2855.87,-192.642 2862.6,-190.709"/>
+</a>
+</g>
+<!-- 21 -->
+<g id="node55" class="node"><title>21</title>
+<a xlink:href="../www.zorba-xquery.com_modules_xqdoc2xhtml_error.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/xqdoc2xhtml/error">
+<ellipse fill="white" stroke="white" cx="4290" cy="-286" rx="27.4223" ry="18"/>
+<text text-anchor="middle" x="4290" y="-282.3" font-family="Times,serif" font-size="14.00" fill="red">error</text>
+</a>
+</g>
+<!-- 22&#45;&gt;21 -->
+<g id="edge90" class="edge"><title>22-&gt;21</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xqdoc2xhtml/, TO: http://www.zorba-xquery.com/modules/xqdoc2xhtml/error">
+<path fill="none" stroke="black" d="M4303.31,-420.972C4300.73,-395.03 4295.8,-345.357 4292.71,-314.326"/>
+<polygon fill="black" stroke="black" points="4296.18,-313.803 4291.71,-304.198 4289.21,-314.495 4296.18,-313.803"/>
+</a>
+</g>
+<!-- 9 -->
+<g id="node56" class="node"><title>9</title>
 <a xlink:href="../www.zorba-xquery.com_modules_project_xqdoc.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/project_xqdoc">
-<ellipse fill="white" stroke="white" cx="5147" cy="-212" rx="65.9683" ry="19.0919"/>
-<text text-anchor="middle" x="5147" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="red">project_xqdoc</text>
-</a>
-</g>
-<!-- project_xqdoc_7&#45;&gt;file_6 -->
-<g id="edge120" class="edge"><title>project_xqdoc_7-&gt;file_6</title>
-<path fill="none" stroke="black" d="M5110.68,-196.132C5098.61,-191.619 5084.94,-187.306 5072,-185 5041.37,-179.542 3979.65,-191.263 3952,-177 3940.79,-171.219 3932.06,-160.563 3925.72,-150.236"/>
-<polygon fill="black" stroke="black" points="3928.7,-148.397 3920.77,-141.376 3922.59,-151.812 3928.7,-148.397"/>
-</g>
-<!-- xqdoc_7 -->
-<g id="node37" class="node"><title>xqdoc_7</title>
+<ellipse fill="white" stroke="white" cx="4168" cy="-439" rx="61.1419" ry="18"/>
+<text text-anchor="middle" x="4168" y="-435.3" font-family="Times,serif" font-size="14.00" fill="red">project_xqdoc</text>
+</a>
+</g>
+<!-- 22&#45;&gt;9 -->
+<g id="edge96" class="edge"><title>22-&gt;9</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xqdoc2xhtml/, TO: http://www.zorba-xquery.com/modules/project_xqdoc">
+<path fill="none" stroke="black" d="M4247.32,-439C4244.69,-439 4242.06,-439 4239.43,-439"/>
+<polygon fill="black" stroke="black" points="4239.28,-435.5 4229.28,-439 4239.28,-442.5 4239.28,-435.5"/>
+</a>
+</g>
+<!-- 16 -->
+<g id="node57" class="node"><title>16</title>
 <a xlink:href="../www.zorba-xquery.com_modules_xqdoc.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/xqdoc">
-<ellipse fill="white" stroke="white" cx="5172" cy="-123" rx="34.8574" ry="19.0919"/>
-<text text-anchor="middle" x="5172" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="red">xqdoc</text>
-</a>
-</g>
-<!-- project_xqdoc_7&#45;&gt;xqdoc_7 -->
-<g id="edge118" class="edge"><title>project_xqdoc_7-&gt;xqdoc_7</title>
-<path fill="none" stroke="black" d="M5152.42,-192.688C5155.79,-180.711 5160.17,-165.103 5163.94,-151.696"/>
-<polygon fill="black" stroke="black" points="5167.34,-152.542 5166.67,-141.968 5160.6,-150.649 5167.34,-152.542"/>
-</g>
-<!-- xqdoc2xhtml_index_7 -->
-<g id="node38" class="node"><title>xqdoc2xhtml_index_7</title>
-<a xlink:href="../www.zorba-xquery.com_modules_xqdoc2xhtml_index.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/xqdoc2xhtml/">
-<ellipse fill="white" stroke="white" cx="5145" cy="-301" rx="87.889" ry="19.0919"/>
-<text text-anchor="middle" x="5145" y="-297.9" font-family="Times Roman,serif" font-size="14.00" fill="red">xqdoc2xhtml_index</text>
-</a>
-</g>
-<!-- xqdoc2xhtml_index_7&#45;&gt;collections_static_ddl_3 -->
-<g id="edge102" class="edge"><title>xqdoc2xhtml_index_7-&gt;collections_static_ddl_3</title>
-<path fill="none" stroke="black" d="M5232.7,-298.935C5430.33,-294.299 5925.58,-282.785 6340,-274 6384.89,-273.048 6700.49,-277.08 6744,-266 6768.17,-259.845 6793.04,-247.203 6812.39,-235.697"/>
-<polygon fill="black" stroke="black" points="6814.44,-238.547 6821.15,-230.347 6810.79,-232.574 6814.44,-238.547"/>
-</g>
-<!-- xqdoc2xhtml_index_7&#45;&gt;collections_static_dml_3 -->
-<g id="edge100" class="edge"><title>xqdoc2xhtml_index_7-&gt;collections_static_dml_3</title>
-<path fill="none" stroke="black" d="M5232.62,-299.041C5534.56,-292.257 6514.22,-269.968 6530,-266 6554.85,-259.752 6580.55,-247.02 6600.53,-235.488"/>
-<polygon fill="black" stroke="black" points="6602.47,-238.41 6609.29,-230.302 6598.9,-232.387 6602.47,-238.41"/>
-</g>
-<!-- xqdoc2xhtml_index_7&#45;&gt;file_6 -->
-<g id="edge106" class="edge"><title>xqdoc2xhtml_index_7-&gt;file_6</title>
-<path fill="none" stroke="black" d="M5069.64,-291.093C4898.26,-268.898 4466.05,-214.8 4103,-185 4086.26,-183.626 3966.75,-185.042 3952,-177 3940.93,-170.963 3932.21,-160.271 3925.85,-149.984"/>
-<polygon fill="black" stroke="black" points="3928.84,-148.158 3920.87,-141.176 3922.75,-151.603 3928.84,-148.158"/>
-</g>
-<!-- xqdoc2xhtml_index_7&#45;&gt;project_xqdoc_7 -->
-<g id="edge104" class="edge"><title>xqdoc2xhtml_index_7-&gt;project_xqdoc_7</title>
-<path fill="none" stroke="black" d="M5145.43,-281.688C5145.7,-269.909 5146.04,-254.619 5146.34,-241.363"/>
-<polygon fill="black" stroke="black" points="5149.84,-241.35 5146.57,-231.274 5142.84,-241.193 5149.84,-241.35"/>
-</g>
-<!-- xqdoc2xhtml_index_7&#45;&gt;xqdoc_7 -->
-<g id="edge96" class="edge"><title>xqdoc2xhtml_index_7-&gt;xqdoc_7</title>
-<path fill="none" stroke="black" d="M5199.45,-285.894C5208.39,-280.988 5216.51,-274.519 5222,-266 5241.49,-235.732 5233.98,-218.947 5222,-185 5216.96,-170.73 5207.1,-157.33 5197.45,-146.664"/>
-<polygon fill="black" stroke="black" points="5199.97,-144.233 5190.53,-139.408 5194.9,-149.062 5199.97,-144.233"/>
-</g>
-<!-- xqdoc2xhtml_error_7 -->
-<g id="node39" class="node"><title>xqdoc2xhtml_error_7</title>
-<a xlink:href="../www.zorba-xquery.com_modules_xqdoc2xhtml_error.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/xqdoc2xhtml/error">
-<ellipse fill="white" stroke="white" cx="4977" cy="-212" rx="85.7684" ry="19.0919"/>
-<text text-anchor="middle" x="4977" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="red">xqdoc2xhtml_error</text>
-</a>
-</g>
-<!-- xqdoc2xhtml_index_7&#45;&gt;xqdoc2xhtml_error_7 -->
-<g id="edge98" class="edge"><title>xqdoc2xhtml_index_7-&gt;xqdoc2xhtml_error_7</title>
-<path fill="none" stroke="black" d="M5107.61,-283.691C5096.11,-278.2 5083.46,-271.994 5072,-266 5053.42,-256.28 5033.17,-244.887 5016.16,-235.077"/>
-<polygon fill="black" stroke="black" points="5017.49,-231.798 5007.08,-229.811 5013.98,-237.854 5017.49,-231.798"/>
-</g>
-<!-- data_converters_base64_8 -->
-<g id="node41" class="node"><title>data_converters_base64_8</title>
-<a xlink:href="../www.zorba-xquery.com_modules_converters_base64.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/converters/base64">
-<ellipse fill="white" stroke="white" cx="2257" cy="-212" rx="103.238" ry="19.0919"/>
-<text text-anchor="middle" x="2257" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="red">data_converters_base64</text>
-</a>
-</g>
-<!-- data_converters_csv_8 -->
-<g id="node42" class="node"><title>data_converters_csv_8</title>
-<a xlink:href="../www.zorba-xquery.com_modules_converters_csv.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/converters/csv">
-<ellipse fill="white" stroke="white" cx="1320" cy="-212" rx="89.8026" ry="19.0919"/>
-<text text-anchor="middle" x="1320" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">data_converters_csv</text>
-</a>
-</g>
-<!-- data_converters_csv_8&#45;&gt;item_schema_2 -->
-<g id="edge64" class="edge"><title>data_converters_csv_8-&gt;item_schema_2</title>
-<path fill="none" stroke="black" d="M1368.83,-195.99C1384.66,-191.53 1402.41,-187.283 1419,-185 1449.38,-180.819 2493.94,-186.803 2523,-177 2540.41,-171.127 2557.02,-159.255 2569.89,-148.135"/>
-<polygon fill="black" stroke="black" points="2572.31,-150.665 2577.39,-141.369 2567.62,-145.466 2572.31,-150.665"/>
-</g>
-<!-- data_converters_html_8 -->
-<g id="node43" class="node"><title>data_converters_html_8</title>
-<a xlink:href="../www.zorba-xquery.com_modules_converters_html.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/converters/html">
-<ellipse fill="white" stroke="white" cx="915" cy="-212" rx="94.7523" ry="19.0919"/>
-<text text-anchor="middle" x="915" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">data_converters_html</text>
-</a>
-</g>
-<!-- data_converters_html_8&#45;&gt;item_schema_2 -->
-<g id="edge82" class="edge"><title>data_converters_html_8-&gt;item_schema_2</title>
-<path fill="none" stroke="black" d="M966.343,-195.971C982.972,-191.51 1001.61,-187.267 1019,-185 1060.43,-179.598 2483.4,-190.317 2523,-177 2540.42,-171.143 2557.02,-159.273 2569.89,-148.15"/>
-<polygon fill="black" stroke="black" points="2572.31,-150.678 2577.39,-141.381 2567.62,-145.481 2572.31,-150.678"/>
-</g>
-<!-- Tidy -->
-<g id="node102" class="node"><title>Tidy</title>
-<a xlink:href="http://tidy.sourceforge.net/" xlink:title="Tidy C++ Library">
-<polygon fill="none" stroke="red" points="3731,-53 3681,-53 3677,-49 3677,-17 3727,-17 3731,-21 3731,-53"/>
-<polyline fill="none" stroke="red" points="3727,-49 3677,-49 "/>
-<polyline fill="none" stroke="red" points="3727,-49 3727,-17 "/>
-<polyline fill="none" stroke="red" points="3727,-49 3731,-53 "/>
-<text text-anchor="middle" x="3704" y="-31.9" font-family="Times Roman,serif" font-size="14.00">Tidy</text>
-</a>
-</g>
-<!-- data_converters_html_8&#45;&gt;Tidy -->
-<g id="edge26" class="edge"><title>data_converters_html_8-&gt;Tidy</title>
-<path fill="none" stroke="red" d="M967.461,-196.074C983.821,-191.733 1002.03,-187.533 1019,-185 1102.15,-172.589 1124.59,-187.556 1208,-177 1379.75,-155.264 1416.93,-114.978 1589,-96 1675.48,-86.4619 2285.02,-90.1743 2372,-88 2885.39,-75.1662 3509.56,-44.7598 3666.73,-36.8874"/>
-<polygon fill="red" stroke="red" points="3667,-40.378 3676.81,-36.3809 3666.65,-33.3868 3667,-40.378"/>
-</g>
-<!-- data_converters_json_8 -->
-<g id="node44" class="node"><title>data_converters_json_8</title>
-<a xlink:href="../www.zorba-xquery.com_modules_converters_json.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/converters/json">
-<ellipse fill="white" stroke="white" cx="1120" cy="-212" rx="92.1303" ry="19.0919"/>
-<text text-anchor="middle" x="1120" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">data_converters_json</text>
-</a>
-</g>
-<!-- data_converters_json_8&#45;&gt;item_schema_2 -->
-<g id="edge124" class="edge"><title>data_converters_json_8-&gt;item_schema_2</title>
-<path fill="none" stroke="black" d="M1169.83,-195.979C1185.98,-191.518 1204.09,-187.274 1221,-185 1256.84,-180.179 2488.72,-188.542 2523,-177 2540.41,-171.136 2557.02,-159.265 2569.89,-148.143"/>
-<polygon fill="black" stroke="black" points="2572.31,-150.672 2577.39,-141.375 2567.62,-145.475 2572.31,-150.672"/>
-</g>
-<!-- Jansson -->
-<g id="node95" class="node"><title>Jansson</title>
-<a xlink:href="http://www.digip.org/jansson/" xlink:title="Jansson library for encoding, decoding and manipulating JSON data">
-<polygon fill="none" stroke="red" points="3807,-53 3753,-53 3749,-49 3749,-17 3803,-17 3807,-21 3807,-53"/>
-<polyline fill="none" stroke="red" points="3803,-49 3749,-49 "/>
-<polyline fill="none" stroke="red" points="3803,-49 3803,-17 "/>
-<polyline fill="none" stroke="red" points="3803,-49 3807,-53 "/>
-<text text-anchor="middle" x="3778" y="-31.9" font-family="Times Roman,serif" font-size="14.00">Jansson</text>
-</a>
-</g>
-<!-- data_converters_json_8&#45;&gt;Jansson -->
-<g id="edge32" class="edge"><title>data_converters_json_8-&gt;Jansson</title>
-<path fill="none" stroke="red" d="M1170.37,-195.996C1186.39,-191.594 1204.29,-187.38 1221,-185 1301.98,-173.466 1507.52,-184.176 1589,-177 1822.87,-156.404 1876.96,-114.628 2111,-96 2133.55,-94.2048 3719.9,-98.3844 3740,-88 3750.86,-82.3902 3759.32,-72.087 3765.47,-62.0462"/>
-<polygon fill="red" stroke="red" points="3768.67,-63.4824 3770.47,-53.041 3762.55,-60.0828 3768.67,-63.4824"/>
-</g>
-<!-- data_cleaning_character_based_string_similarity_8 -->
-<g id="node45" class="node"><title>data_cleaning_character_based_string_similarity_8</title>
+<ellipse fill="white" stroke="white" cx="4183" cy="-286" rx="32.2457" ry="18"/>
+<text text-anchor="middle" x="4183" y="-282.3" font-family="Times,serif" font-size="14.00" fill="red">xqdoc</text>
+</a>
+</g>
+<!-- 22&#45;&gt;16 -->
+<g id="edge88" class="edge"><title>22-&gt;16</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xqdoc2xhtml/, TO: http://www.zorba-xquery.com/modules/xqdoc">
+<path fill="none" stroke="black" d="M4272.16,-423.984C4259.33,-417.27 4245.27,-408.22 4235,-397 4212.91,-372.869 4198.52,-337.675 4190.59,-313.637"/>
+<polygon fill="black" stroke="black" points="4193.93,-312.572 4187.59,-304.082 4187.25,-314.671 4193.93,-312.572"/>
+</a>
+</g>
+<!-- 38 -->
+<g id="node109" class="node"><title>38</title>
+<a xlink:href="../expath.org_ns_file.html" xlink:title="(Zorba-core) module uri=http://expath.org/ns/file">
+<ellipse fill="white" stroke="white" cx="4048" cy="-286" rx="27" ry="18"/>
+<text text-anchor="middle" x="4048" y="-282.3" font-family="Times,serif" font-size="14.00" fill="red">file</text>
+</a>
+</g>
+<!-- 22&#45;&gt;38 -->
+<g id="edge100" class="edge"><title>22-&gt;38</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xqdoc2xhtml/, TO: http://expath.org/ns/file">
+<path fill="none" stroke="black" d="M4281.59,-422.418C4270.39,-415.803 4256.51,-408.761 4243,-405 4227.14,-400.583 4108.49,-406.441 4095,-397 4067.93,-378.06 4056.35,-340.182 4051.47,-314.217"/>
+<polygon fill="black" stroke="black" points="4054.9,-313.532 4049.81,-304.243 4048,-314.683 4054.9,-313.532"/>
+</a>
+</g>
+<!-- 9&#45;&gt;4 -->
+<g id="edge82" class="edge"><title>9-&gt;4</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/project_xqdoc, TO: http://www.zorba-xquery.com/modules/fetch">
+<path fill="none" stroke="black" d="M4107.6,-436.124C4006.2,-432.387 3795.48,-422.097 3619,-397 3292.96,-350.634 3156.16,-443.307 2894,-244 2877.03,-231.101 2866.45,-209.168 2860.29,-191.681"/>
+<polygon fill="black" stroke="black" points="2863.57,-190.441 2857.16,-182.001 2856.91,-192.592 2863.57,-190.441"/>
+</a>
+</g>
+<!-- 9&#45;&gt;21 -->
+<g id="edge84" class="edge"><title>9-&gt;21</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/project_xqdoc, TO: http://www.zorba-xquery.com/modules/xqdoc2xhtml/error">
+<path fill="none" stroke="black" d="M4196.66,-422.917C4208.4,-416.998 4222.2,-410.354 4235,-405 4244.98,-400.823 4250.55,-404.848 4258,-397 4279.24,-374.638 4286.49,-339.011 4288.9,-314.391"/>
+<polygon fill="black" stroke="black" points="4292.4,-314.504 4289.69,-304.263 4285.43,-313.963 4292.4,-314.504"/>
+</a>
+</g>
+<!-- 9&#45;&gt;16 -->
+<g id="edge78" class="edge"><title>9-&gt;16</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/project_xqdoc, TO: http://www.zorba-xquery.com/modules/xqdoc">
+<path fill="none" stroke="black" d="M4169.69,-420.972C4172.27,-395.03 4177.2,-345.357 4180.29,-314.326"/>
+<polygon fill="black" stroke="black" points="4183.79,-314.495 4181.29,-304.198 4176.82,-313.803 4183.79,-314.495"/>
+</a>
+</g>
+<!-- 9&#45;&gt;38 -->
+<g id="edge80" class="edge"><title>9-&gt;38</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/project_xqdoc, TO: http://expath.org/ns/file">
+<path fill="none" stroke="black" d="M4132.78,-424.077C4119.58,-417.467 4105.29,-408.467 4095,-397 4073.61,-373.17 4060.94,-338.143 4054.24,-314.051"/>
+<polygon fill="black" stroke="black" points="4057.57,-312.935 4051.65,-304.145 4050.79,-314.705 4057.57,-312.935"/>
+</a>
+</g>
+<!-- 78 -->
+<g id="node60" class="node"><title>78</title>
 <a xlink:href="../www.zorba-xquery.com_modules_data-cleaning_character-based-string-similarity.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/data-cleaning/character-based-string-similarity">
-<ellipse fill="white" stroke="white" cx="985" cy="-123" rx="198.904" ry="19.0919"/>
-<text text-anchor="middle" x="985" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="green">data_cleaning_character_based_string_similarity</text>
+<ellipse fill="white" stroke="white" cx="170" cy="-164" rx="126.133" ry="18"/>
+<text text-anchor="middle" x="170" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">character-based-string-similarity</text>
 </a>
 </g>
-<!-- data_cleaning_consolidation_8 -->
-<g id="node46" class="node"><title>data_cleaning_consolidation_8</title>
+<!-- 79 -->
+<g id="node61" class="node"><title>79</title>
 <a xlink:href="../www.zorba-xquery.com_modules_data-cleaning_consolidation.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/data-cleaning/consolidation">
-<ellipse fill="white" stroke="white" cx="681" cy="-212" rx="120.915" ry="19.0919"/>
-<text text-anchor="middle" x="681" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">data_cleaning_consolidation</text>
-</a>
-</g>
-<!-- data_cleaning_consolidation_8&#45;&gt;data_cleaning_character_based_string_similarity_8 -->
-<g id="edge116" class="edge"><title>data_cleaning_consolidation_8-&gt;data_cleaning_character_based_string_similarity_8</title>
-<path fill="none" stroke="black" d="M738.537,-195.155C788.205,-180.614 860.167,-159.546 913.521,-143.926"/>
-<polygon fill="black" stroke="black" points="914.644,-147.245 923.258,-141.076 912.677,-140.527 914.644,-147.245"/>
-</g>
-<!-- data_cleaning_set_similarity_8 -->
-<g id="node51" class="node"><title>data_cleaning_set_similarity_8</title>
+<ellipse fill="white" stroke="white" cx="126" cy="-286" rx="57.2688" ry="18"/>
+<text text-anchor="middle" x="126" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">consolidation</text>
+</a>
+</g>
+<!-- 79&#45;&gt;78 -->
+<g id="edge166" class="edge"><title>79-&gt;78</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/data-cleaning/consolidation, TO: http://www.zorba-xquery.com/modules/data-cleaning/character-based-string-similarity">
+<path fill="none" stroke="black" d="M132.211,-268.061C139.474,-248.252 151.591,-215.206 160.143,-191.882"/>
+<polygon fill="black" stroke="black" points="163.522,-192.835 163.678,-182.241 156.95,-190.425 163.522,-192.835"/>
+</a>
+</g>
+<!-- 84 -->
+<g id="node66" class="node"><title>84</title>
 <a xlink:href="../www.zorba-xquery.com_modules_data-cleaning_set-similarity.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/data-cleaning/set-similarity">
-<ellipse fill="white" stroke="white" cx="767" cy="-35" rx="121.83" ry="19.0919"/>
-<text text-anchor="middle" x="767" y="-31.9" font-family="Times Roman,serif" font-size="14.00" fill="green">data_cleaning_set_similarity</text>
-</a>
-</g>
-<!-- data_cleaning_consolidation_8&#45;&gt;data_cleaning_set_similarity_8 -->
-<g id="edge114" class="edge"><title>data_cleaning_consolidation_8-&gt;data_cleaning_set_similarity_8</title>
-<path fill="none" stroke="black" d="M746.422,-195.966C766.965,-191.592 789.813,-187.401 811,-185 821.546,-183.805 1185.57,-184.583 1193,-177 1218.19,-151.279 1216.58,-123.2 1193,-96 1173.07,-73.0138 1006.06,-54.5842 887.185,-44.2178"/>
-<polygon fill="black" stroke="black" points="887.183,-40.7047 876.919,-43.3321 886.581,-47.6788 887.183,-40.7047"/>
-</g>
-<!-- data_cleaning_conversion_8 -->
-<g id="node47" class="node"><title>data_cleaning_conversion_8</title>
+<ellipse fill="white" stroke="white" cx="535" cy="-73" rx="57.2688" ry="18"/>
+<text text-anchor="middle" x="535" y="-69.3" font-family="Times,serif" font-size="14.00" fill="green">set-similarity</text>
+</a>
+</g>
+<!-- 79&#45;&gt;84 -->
+<g id="edge164" class="edge"><title>79-&gt;84</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/data-cleaning/consolidation, TO: http://www.zorba-xquery.com/modules/data-cleaning/set-similarity">
+<path fill="none" stroke="black" d="M79.6308,-275.326C62.6123,-269.29 45.0637,-259.572 35,-244 7.49918,-201.446 1.22589,-167.768 35,-130 63.3807,-98.2632 338.55,-82.3859 468.137,-76.6194"/>
+<polygon fill="black" stroke="black" points="468.5,-80.107 478.337,-76.173 468.194,-73.1137 468.5,-80.107"/>
+</a>
+</g>
+<!-- 80 -->
+<g id="node62" class="node"><title>80</title>
 <a xlink:href="../www.zorba-xquery.com_modules_data-cleaning_conversion.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/data-cleaning/conversion">
-<ellipse fill="white" stroke="white" cx="1803" cy="-212" rx="111.222" ry="19.0919"/>
-<text text-anchor="middle" x="1803" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">data_cleaning_conversion</text>
-</a>
-</g>
-<!-- data_cleaning_conversion_8&#45;&gt;http_client_6 -->
-<g id="edge126" class="edge"><title>data_cleaning_conversion_8-&gt;http_client_6</title>
-<path fill="none" stroke="black" d="M1862.69,-195.894C1881.81,-191.458 1903.16,-187.25 1923,-185 1947.18,-182.258 3652.27,-185.676 3675,-177 3690.25,-171.182 3704.14,-159.639 3714.8,-148.715"/>
-<polygon fill="black" stroke="black" points="3717.42,-151.042 3721.65,-141.328 3712.28,-146.285 3717.42,-151.042"/>
-</g>
-<!-- data_cleaning_hybrid_string_similarity_8 -->
-<g id="node48" class="node"><title>data_cleaning_hybrid_string_similarity_8</title>
+<ellipse fill="white" stroke="white" cx="593" cy="-286" rx="49.0941" ry="18"/>
+<text text-anchor="middle" x="593" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">conversion</text>
+</a>
+</g>
+<!-- 80&#45;&gt;11 -->
+<g id="edge170" class="edge"><title>80-&gt;11</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/data-cleaning/conversion, TO: http://www.zorba-xquery.com/modules/reflection">
+<path fill="none" stroke="black" d="M614.502,-269.599C624.994,-262.936 638.111,-255.804 651,-252 681.1,-243.117 760.738,-246.761 792,-244 1018.78,-223.973 1288.08,-187.71 1398.7,-172.273"/>
+<polygon fill="black" stroke="black" points="1399.48,-175.697 1408.9,-170.845 1398.51,-168.765 1399.48,-175.697"/>
+</a>
+</g>
+<!-- 80&#45;&gt;2 -->
+<g id="edge168" class="edge"><title>80-&gt;2</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/data-cleaning/conversion, TO: http://www.zorba-xquery.com/modules/http-client">
+<path fill="none" stroke="black" d="M613.876,-269.641C624.436,-262.809 637.791,-255.522 651,-252 678.551,-244.653 2678.7,-257.142 2704,-244 2725.34,-232.915 2740.32,-209.547 2749.38,-191.087"/>
+<polygon fill="black" stroke="black" points="2752.58,-192.519 2753.58,-181.972 2746.22,-189.589 2752.58,-192.519"/>
+</a>
+</g>
+<!-- 81 -->
+<g id="node63" class="node"><title>81</title>
 <a xlink:href="../www.zorba-xquery.com_modules_data-cleaning_hybrid-string-similarity.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/data-cleaning/hybrid-string-similarity">
-<ellipse fill="white" stroke="white" cx="178" cy="-212" rx="162.134" ry="19.0919"/>
-<text text-anchor="middle" x="178" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">data_cleaning_hybrid_string_similarity</text>
-</a>
-</g>
-<!-- data_cleaning_hybrid_string_similarity_8&#45;&gt;data_cleaning_character_based_string_similarity_8 -->
-<g id="edge132" class="edge"><title>data_cleaning_hybrid_string_similarity_8-&gt;data_cleaning_character_based_string_similarity_8</title>
-<path fill="none" stroke="black" d="M264.706,-195.939C291.624,-191.592 321.456,-187.423 349,-185 442.655,-176.76 678.821,-189.523 772,-177 821.704,-170.32 876.529,-156.26 918.108,-144.162"/>
-<polygon fill="black" stroke="black" points="919.239,-147.478 927.843,-141.295 917.262,-140.763 919.239,-147.478"/>
-</g>
-<!-- data_cleaning_phonetic_string_similarity_8 -->
-<g id="node50" class="node"><title>data_cleaning_phonetic_string_similarity_8</title>
+<ellipse fill="white" stroke="white" cx="423" cy="-286" rx="93.3873" ry="18"/>
+<text text-anchor="middle" x="423" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">hybrid-string-similarity</text>
+</a>
+</g>
+<!-- 81&#45;&gt;78 -->
+<g id="edge176" class="edge"><title>81-&gt;78</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/data-cleaning/hybrid-string-similarity, TO: http://www.zorba-xquery.com/modules/data-cleaning/character-based-string-similarity">
+<path fill="none" stroke="black" d="M374.51,-270.516C352.855,-263.45 327.256,-254.259 305,-244 269.106,-227.454 230.389,-204.186 203.661,-187.188"/>
+<polygon fill="black" stroke="black" points="205.385,-184.136 195.078,-181.683 201.606,-190.028 205.385,-184.136"/>
+</a>
+</g>
+<!-- 83 -->
+<g id="node65" class="node"><title>83</title>
 <a xlink:href="../www.zorba-xquery.com_modules_data-cleaning_phonetic-string-similarity.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/data-cleaning/phonetic-string-similarity">
-<ellipse fill="white" stroke="white" cx="187" cy="-123" rx="171.12" ry="19.0919"/>
-<text text-anchor="middle" x="187" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="green">data_cleaning_phonetic_string_similarity</text>
-</a>
-</g>
-<!-- data_cleaning_hybrid_string_similarity_8&#45;&gt;data_cleaning_phonetic_string_similarity_8 -->
-<g id="edge134" class="edge"><title>data_cleaning_hybrid_string_similarity_8-&gt;data_cleaning_phonetic_string_similarity_8</title>
-<path fill="none" stroke="black" d="M179.953,-192.688C181.144,-180.909 182.69,-165.619 184.031,-152.363"/>
-<polygon fill="black" stroke="black" points="187.527,-152.575 185.051,-142.274 180.563,-151.871 187.527,-152.575"/>
-</g>
-<!-- data_cleaning_hybrid_string_similarity_8&#45;&gt;data_cleaning_set_similarity_8 -->
-<g id="edge128" class="edge"><title>data_cleaning_hybrid_string_similarity_8-&gt;data_cleaning_set_similarity_8</title>
-<path fill="none" stroke="black" d="M264.708,-195.95C291.625,-191.604 321.456,-187.433 349,-185 360.292,-184.003 748.784,-184.81 757,-177 772.651,-162.123 771.595,-101.389 769.347,-64.3363"/>
-<polygon fill="black" stroke="black" points="772.824,-63.8659 768.662,-54.1227 765.839,-64.3346 772.824,-63.8659"/>
-</g>
-<!-- data_cleaning_token_based_string_similarity_8 -->
-<g id="node52" class="node"><title>data_cleaning_token_based_string_similarity_8</title>
+<ellipse fill="white" stroke="white" cx="415" cy="-164" rx="100.611" ry="18"/>
+<text text-anchor="middle" x="415" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">phonetic-string-similarity</text>
+</a>
+</g>
+<!-- 81&#45;&gt;83 -->
+<g id="edge178" class="edge"><title>81-&gt;83</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/data-cleaning/hybrid-string-similarity, TO: http://www.zorba-xquery.com/modules/data-cleaning/phonetic-string-similarity">
+<path fill="none" stroke="black" d="M421.854,-267.807C420.541,-248.114 418.372,-215.583 416.826,-192.39"/>
+<polygon fill="black" stroke="black" points="420.302,-191.906 416.144,-182.161 413.317,-192.372 420.302,-191.906"/>
+</a>
+</g>
+<!-- 81&#45;&gt;84 -->
+<g id="edge172" class="edge"><title>81-&gt;84</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/data-cleaning/hybrid-string-similarity, TO: http://www.zorba-xquery.com/modules/data-cleaning/set-similarity">
+<path fill="none" stroke="black" d="M484.604,-272.34C499.788,-266.261 514.424,-257.276 524,-244 539.956,-221.879 538.63,-143.387 536.642,-101.236"/>
+<polygon fill="black" stroke="black" points="540.131,-100.921 536.119,-91.1154 533.14,-101.283 540.131,-100.921"/>
+</a>
+</g>
+<!-- 85 -->
+<g id="node67" class="node"><title>85</title>
 <a xlink:href="../www.zorba-xquery.com_modules_data-cleaning_token-based-string-similarity.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/data-cleaning/token-based-string-similarity">
-<ellipse fill="white" stroke="white" cx="562" cy="-123" rx="185.969" ry="19.0919"/>
-<text text-anchor="middle" x="562" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="green">data_cleaning_token_based_string_similarity</text>
-</a>
-</g>
-<!-- data_cleaning_hybrid_string_similarity_8&#45;&gt;data_cleaning_token_based_string_similarity_8 -->
-<g id="edge130" class="edge"><title>data_cleaning_hybrid_string_similarity_8-&gt;data_cleaning_token_based_string_similarity_8</title>
-<path fill="none" stroke="black" d="M271.099,-196.422C301.759,-190.85 335.946,-184.161 367,-177 408.948,-167.327 455.421,-154.54 492.473,-143.838"/>
-<polygon fill="black" stroke="black" points="493.544,-147.172 502.171,-141.022 491.592,-140.449 493.544,-147.172"/>
-</g>
-<!-- data_cleaning_normalization_8 -->
-<g id="node49" class="node"><title>data_cleaning_normalization_8</title>
+<ellipse fill="white" stroke="white" cx="667" cy="-164" rx="113.135" ry="18"/>
+<text text-anchor="middle" x="667" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">token-based-string-similarity</text>
+</a>
+</g>
+<!-- 81&#45;&gt;85 -->
+<g id="edge174" class="edge"><title>81-&gt;85</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/data-cleaning/hybrid-string-similarity, TO: http://www.zorba-xquery.com/modules/data-cleaning/token-based-string-similarity">
+<path fill="none" stroke="black" d="M471.775,-270.563C493.148,-263.565 518.26,-254.415 540,-244 573.936,-227.742 610.147,-204.576 635.183,-187.533"/>
+<polygon fill="black" stroke="black" points="637.292,-190.33 643.55,-181.781 633.327,-184.561 637.292,-190.33"/>
+</a>
+</g>
+<!-- 82 -->
+<g id="node64" class="node"><title>82</title>
 <a xlink:href="../www.zorba-xquery.com_modules_data-cleaning_normalization.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/data-cleaning/normalization">
-<ellipse fill="white" stroke="white" cx="1551" cy="-212" rx="123.037" ry="19.0919"/>
-<text text-anchor="middle" x="1551" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">data_cleaning_normalization</text>
-</a>
-</g>
-<!-- data_cleaning_normalization_8&#45;&gt;http_client_6 -->
-<g id="edge110" class="edge"><title>data_cleaning_normalization_8-&gt;http_client_6</title>
-<path fill="none" stroke="black" d="M1616.74,-195.889C1637.77,-191.453 1661.24,-187.246 1683,-185 1710.52,-182.158 3649.15,-186.858 3675,-177 3690.25,-171.186 3704.14,-159.644 3714.8,-148.718"/>
-<polygon fill="black" stroke="black" points="3717.42,-151.045 3721.65,-141.331 3712.28,-146.288 3717.42,-151.045"/>
-</g>
-<!-- data_cleaning_token_based_string_similarity_8&#45;&gt;data_cleaning_set_similarity_8 -->
-<g id="edge50" class="edge"><title>data_cleaning_token_based_string_similarity_8-&gt;data_cleaning_set_similarity_8</title>
-<path fill="none" stroke="black" d="M605.475,-104.337C637.812,-90.4564 682.038,-71.4716 716.038,-56.8766"/>
-<polygon fill="black" stroke="black" points="717.529,-60.0452 725.338,-52.8843 714.768,-53.6128 717.529,-60.0452"/>
-</g>
-<!-- data_converters_xml_8 -->
-<g id="node53" class="node"><title>data_converters_xml_8</title>
+<ellipse fill="white" stroke="white" cx="720" cy="-286" rx="59.1941" ry="18"/>
+<text text-anchor="middle" x="720" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">normalization</text>
+</a>
+</g>
+<!-- 82&#45;&gt;2 -->
+<g id="edge180" class="edge"><title>82-&gt;2</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/data-cleaning/normalization, TO: http://www.zorba-xquery.com/modules/http-client">
+<path fill="none" stroke="black" d="M746.062,-269.789C759.339,-262.901 776.021,-255.523 792,-252 817.933,-246.283 2680.43,-256.243 2704,-244 2725.34,-232.911 2740.32,-209.545 2749.38,-191.086"/>
+<polygon fill="black" stroke="black" points="2752.57,-192.518 2753.58,-181.971 2746.22,-189.587 2752.57,-192.518"/>
+</a>
+</g>
+<!-- 85&#45;&gt;84 -->
+<g id="edge182" class="edge"><title>85-&gt;84</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/data-cleaning/token-based-string-similarity, TO: http://www.zorba-xquery.com/modules/data-cleaning/set-similarity">
+<path fill="none" stroke="black" d="M642.172,-146.26C620.848,-131.883 589.978,-111.069 566.841,-95.4683"/>
+<polygon fill="black" stroke="black" points="568.636,-92.4573 558.388,-89.7689 564.722,-98.2613 568.636,-92.4573"/>
+</a>
+</g>
+<!-- 18 -->
+<g id="node69" class="node"><title>18</title>
+<a xlink:href="../www.zorba-xquery.com_modules_converters_base64.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/converters/base64">
+<ellipse fill="white" stroke="white" cx="1339" cy="-286" rx="35.1455" ry="18"/>
+<text text-anchor="middle" x="1339" y="-282.3" font-family="Times,serif" font-size="14.00" fill="red">base64</text>
+</a>
+</g>
+<!-- 65 -->
+<g id="node70" class="node"><title>65</title>
+<a xlink:href="../www.zorba-xquery.com_modules_converters_csv.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/converters/csv">
+<ellipse fill="white" stroke="white" cx="1187" cy="-286" rx="27" ry="18"/>
+<text text-anchor="middle" x="1187" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">csv</text>
+</a>
+</g>
+<!-- 65&#45;&gt;12 -->
+<g id="edge142" class="edge"><title>65-&gt;12</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/csv, TO: http://www.zorba-xquery.com/modules/schema">
+<path fill="none" stroke="black" d="M1198.99,-269.775C1205.32,-262.974 1213.7,-255.676 1223,-252 1262.22,-236.506 1945.17,-264.532 1982,-244 2002.19,-232.746 2015.39,-209.566 2023.13,-191.212"/>
+<polygon fill="black" stroke="black" points="2026.4,-192.468 2026.78,-181.88 2019.88,-189.917 2026.4,-192.468"/>
+</a>
+</g>
+<!-- 76 -->
+<g id="node71" class="node"><title>76</title>
+<a xlink:href="../www.zorba-xquery.com_modules_converters_exi.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/converters/exi">
+<ellipse fill="white" stroke="white" cx="1115" cy="-286" rx="27" ry="18"/>
+<text text-anchor="middle" x="1115" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">exi</text>
+</a>
+</g>
+<!-- 76&#45;&gt;12 -->
+<g id="edge162" class="edge"><title>76-&gt;12</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/exi, TO: http://www.zorba-xquery.com/modules/schema">
+<path fill="none" stroke="black" d="M1126.99,-269.771C1133.32,-262.97 1141.69,-255.672 1151,-252 1172.47,-243.528 1961.83,-255.231 1982,-244 2002.19,-232.755 2015.39,-209.575 2023.13,-191.217"/>
+<polygon fill="black" stroke="black" points="2026.4,-192.472 2026.78,-181.884 2019.88,-189.922 2026.4,-192.472"/>
+</a>
+</g>
+<!-- 64 -->
+<g id="node72" class="node"><title>64</title>
+<a xlink:href="../www.zorba-xquery.com_modules_converters_html.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/converters/html">
+<ellipse fill="white" stroke="white" cx="1043" cy="-286" rx="26.949" ry="18"/>
+<text text-anchor="middle" x="1043" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">html</text>
+</a>
+</g>
+<!-- 64&#45;&gt;12 -->
+<g id="edge140" class="edge"><title>64-&gt;12</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/html, TO: http://www.zorba-xquery.com/modules/schema">
+<path fill="none" stroke="black" d="M1054.99,-269.768C1061.32,-262.966 1069.69,-255.668 1079,-252 1102.34,-242.803 1960.08,-256.195 1982,-244 2002.2,-232.763 2015.4,-209.581 2023.13,-191.222"/>
+<polygon fill="black" stroke="black" points="2026.4,-192.475 2026.78,-181.888 2019.88,-189.926 2026.4,-192.475"/>
+</a>
+</g>
+<!-- Tidy -->
+<g id="node139" class="node"><title>Tidy</title>
+<a xlink:href="http://tidy.sourceforge.net/" xlink:title="Tidy C++ Library">
+<polygon fill="none" stroke="red" points="2895,-91 2845,-91 2841,-87 2841,-55 2891,-55 2895,-59 2895,-91"/>
+<polyline fill="none" stroke="red" points="2891,-87 2841,-87 "/>
+<polyline fill="none" stroke="red" points="2891,-87 2891,-55 "/>
+<polyline fill="none" stroke="red" points="2891,-87 2895,-91 "/>
+<text text-anchor="middle" x="2868" y="-69.3" font-family="Times,serif" font-size="14.00">Tidy</text>
+</a>
+</g>
+<!-- 64&#45;&gt;Tidy -->
+<g id="edge62" class="edge"><title>64-&gt;Tidy</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/html, TO: Tidy">
+<path fill="none" stroke="red" d="M1055,-269.803C1061.33,-263.009 1069.71,-255.708 1079,-252 1102.58,-242.588 1513.44,-255.65 1536,-244 1591.92,-215.126 1563.92,-158.569 1620,-130 1649.97,-114.729 2800.86,-136.945 2831,-122 2840.76,-117.162 2848.67,-108.39 2854.64,-99.656"/>
+<polygon fill="red" stroke="red" points="2857.66,-101.425 2859.96,-91.0816 2851.71,-97.737 2857.66,-101.425"/>
+</a>
+</g>
+<!-- 19 -->
+<g id="node73" class="node"><title>19</title>
+<a xlink:href="../www.zorba-xquery.com_modules_converters_json.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/converters/json">
+<ellipse fill="white" stroke="white" cx="1259" cy="-286" rx="27" ry="18"/>
+<text text-anchor="middle" x="1259" y="-282.3" font-family="Times,serif" font-size="14.00" fill="red">json</text>
+</a>
+</g>
+<!-- 19&#45;&gt;12 -->
+<g id="edge86" class="edge"><title>19-&gt;12</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/json, TO: http://www.zorba-xquery.com/modules/schema">
+<path fill="none" stroke="black" d="M1271,-269.779C1277.32,-262.98 1285.7,-255.681 1295,-252 1330.49,-237.956 1948.67,-262.603 1982,-244 2002.18,-232.734 2015.38,-209.556 2023.12,-191.205"/>
+<polygon fill="black" stroke="black" points="2026.39,-192.464 2026.78,-181.876 2019.87,-189.911 2026.39,-192.464"/>
+</a>
+</g>
+<!-- 15 -->
+<g id="node74" class="node"><title>15</title>
 <a xlink:href="../www.zorba-xquery.com_modules_xml.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/xml">
-<ellipse fill="white" stroke="white" cx="450" cy="-212" rx="92.1303" ry="19.0919"/>
-<text text-anchor="middle" x="450" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="red">data_converters_xml</text>
-</a>
-</g>
-<!-- data_formatting_xsl_fo_8 -->
-<g id="node54" class="node"><title>data_formatting_xsl_fo_8</title>
-<a xlink:href="../www.zorba-xquery.com_modules_xsl-fo.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/xsl-fo">
-<ellipse fill="white" stroke="white" cx="2034" cy="-212" rx="101.823" ry="19.0919"/>
-<text text-anchor="middle" x="2034" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">data_formatting_xsl_fo</text>
-</a>
-</g>
-<!-- data_formatting_xsl_fo_8&#45;&gt;file_6 -->
-<g id="edge52" class="edge"><title>data_formatting_xsl_fo_8-&gt;file_6</title>
-<path fill="none" stroke="black" d="M2088.86,-195.965C2106.61,-191.503 2126.49,-187.262 2145,-185 2168.88,-182.082 3855.82,-188.4 3877,-177 3887.63,-171.277 3895.68,-160.879 3901.43,-150.725"/>
-<polygon fill="black" stroke="black" points="3904.65,-152.108 3906.08,-141.61 3898.42,-148.927 3904.65,-152.108"/>
+<ellipse fill="white" stroke="white" cx="971" cy="-286" rx="27" ry="18"/>
+<text text-anchor="middle" x="971" y="-282.3" font-family="Times,serif" font-size="14.00" fill="red">xml</text>
+</a>
+</g>
+<!-- 74 -->
+<g id="node76" class="node"><title>74</title>
+<a xlink:href="../www.zorba-xquery.com_modules_schema-tools.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/schema-tools">
+<ellipse fill="white" stroke="white" cx="862" cy="-286" rx="57.2688" ry="18"/>
+<text text-anchor="middle" x="862" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">schema-tools</text>
+</a>
+</g>
+<!-- 74&#45;&gt;12 -->
+<g id="edge160" class="edge"><title>74-&gt;12</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/schema-tools, TO: http://www.zorba-xquery.com/modules/schema">
+<path fill="none" stroke="black" d="M887.292,-269.815C900.19,-262.933 916.411,-255.553 932,-252 960.438,-245.519 1956.5,-258.164 1982,-244 2002.21,-232.775 2015.4,-209.593 2023.14,-191.229"/>
+<polygon fill="black" stroke="black" points="2026.41,-192.481 2026.79,-181.893 2019.89,-189.932 2026.41,-192.481"/>
+</a>
+</g>
+<!-- Apache -->
+<g id="node134" class="node"><title>Apache</title>
+<a xlink:href="http://xmlbeans.apache.org/" xlink:title="Apache XMLBeans">
+<polygon fill="none" stroke="red" points="2822.5,-91 2769.5,-91 2765.5,-87 2765.5,-55 2818.5,-55 2822.5,-59 2822.5,-91"/>
+<polyline fill="none" stroke="red" points="2818.5,-87 2765.5,-87 "/>
+<polyline fill="none" stroke="red" points="2818.5,-87 2818.5,-55 "/>
+<polyline fill="none" stroke="red" points="2818.5,-87 2822.5,-91 "/>
+<text text-anchor="middle" x="2794" y="-69.3" font-family="Times,serif" font-size="14.00">Apache</text>
+</a>
+</g>
+<!-- 74&#45;&gt;Apache -->
+<g id="edge72" class="edge"><title>74-&gt;Apache</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/schema-tools, TO: Apache">
+<path fill="none" stroke="red" d="M887.628,-269.684C900.474,-262.862 916.554,-255.572 932,-252 947.536,-248.408 1493.06,-253.312 1506,-244 1549.59,-212.642 1502.9,-162.027 1546,-130 1595.7,-93.0659 2550.15,-77.4598 2755.35,-74.5244"/>
+<polygon fill="red" stroke="red" points="2755.42,-78.0239 2765.37,-74.3827 2755.32,-71.0246 2755.42,-78.0239"/>
+</a>
 </g>
 <!-- JDK -->
-<g id="node99" class="node"><title>JDK</title>
+<g id="node136" class="node"><title>JDK</title>
 <a xlink:href="http://www.oracle.com/technetwork/java/javase/downloads/index.html" xlink:title="JDK - Java Development Kit">
-<polygon fill="none" stroke="red" points="3879,-53 3829,-53 3825,-49 3825,-17 3875,-17 3879,-21 3879,-53"/>
-<polyline fill="none" stroke="red" points="3875,-49 3825,-49 "/>
-<polyline fill="none" stroke="red" points="3875,-49 3875,-17 "/>
-<polyline fill="none" stroke="red" points="3875,-49 3879,-53 "/>
-<text text-anchor="middle" x="3852" y="-31.9" font-family="Times Roman,serif" font-size="14.00">JDK</text>
-</a>
-</g>
-<!-- data_formatting_xsl_fo_8&#45;&gt;JDK -->
-<g id="edge22" class="edge"><title>data_formatting_xsl_fo_8-&gt;JDK</title>
-<path fill="none" stroke="red" d="M2072.46,-194.166C2134.08,-166.667 2259.45,-115.096 2372,-96 2391.77,-92.6451 3798.3,-97.4359 3816,-88 3826.6,-82.3505 3834.66,-72.041 3840.44,-62.0063"/>
-<polygon fill="red" stroke="red" points="3843.61,-63.4971 3845.11,-53.0096 3837.39,-60.2698 3843.61,-63.4971"/>
-</g>
-<!-- xslt_9 -->
-<g id="node56" class="node"><title>xslt_9</title>
+<polygon fill="none" stroke="red" points="2967,-91 2917,-91 2913,-87 2913,-55 2963,-55 2967,-59 2967,-91"/>
+<polyline fill="none" stroke="red" points="2963,-87 2913,-87 "/>
+<polyline fill="none" stroke="red" points="2963,-87 2963,-55 "/>
+<polyline fill="none" stroke="red" points="2963,-87 2967,-91 "/>
+<text text-anchor="middle" x="2940" y="-69.3" font-family="Times,serif" font-size="14.00">JDK</text>
+</a>
+</g>
+<!-- 74&#45;&gt;JDK -->
+<g id="edge70" class="edge"><title>74-&gt;JDK</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/schema-tools, TO: JDK">
+<path fill="none" stroke="red" d="M887.626,-269.679C900.473,-262.855 916.552,-255.566 932,-252 964.915,-244.403 1510.13,-259.779 1540,-244 1594.73,-215.087 1565.17,-158.724 1620,-130 1651.59,-113.449 2872.15,-138.05 2904,-122 2913.53,-117.199 2921.19,-108.556 2926.96,-99.9145"/>
+<polygon fill="red" stroke="red" points="2930.13,-101.443 2932.29,-91.0701 2924.13,-97.8325 2930.13,-101.443"/>
+</a>
+</g>
+<!-- 86 -->
+<g id="node79" class="node"><title>86</title>
+<a xlink:href="../www.zorba-xquery.com_modules_xqxq.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/xqxq">
+<ellipse fill="white" stroke="white" cx="3007" cy="-164" rx="28.3955" ry="18"/>
+<text text-anchor="middle" x="3007" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">xqxq</text>
+</a>
+</g>
+<!-- 75 -->
+<g id="node80" class="node"><title>75</title>
 <a xlink:href="../www.zorba-xquery.com_modules_languages_xslt.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/languages/xslt">
-<ellipse fill="white" stroke="white" cx="3996" cy="-123" rx="27" ry="19.0919"/>
-<text text-anchor="middle" x="3996" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="green">xslt</text>
+<ellipse fill="white" stroke="white" cx="2933" cy="-164" rx="27" ry="18"/>
+<text text-anchor="middle" x="2933" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">xslt</text>
 </a>
 </g>
 <!-- libxslt -->
-<g id="node101" class="node"><title>libxslt</title>
+<g id="node138" class="node"><title>libxslt</title>
 <a xlink:href="http://xmlsoft.org/XSLT/" xlink:title="libxslt Library">
-<polygon fill="none" stroke="red" points="4023,-53 3973,-53 3969,-49 3969,-17 4019,-17 4023,-21 4023,-53"/>
-<polyline fill="none" stroke="red" points="4019,-49 3969,-49 "/>
-<polyline fill="none" stroke="red" points="4019,-49 4019,-17 "/>
-<polyline fill="none" stroke="red" points="4019,-49 4023,-53 "/>
-<text text-anchor="middle" x="3996" y="-31.9" font-family="Times Roman,serif" font-size="14.00">libxslt</text>
-</a>
-</g>
-<!-- xslt_9&#45;&gt;libxslt -->
-<g id="edge36" class="edge"><title>xslt_9-&gt;libxslt</title>
-<path fill="none" stroke="red" d="M3996,-103.905C3996,-92.019 3996,-76.517 3996,-63.2275"/>
-<polygon fill="red" stroke="red" points="3999.5,-63.1552 3996,-53.1553 3992.5,-63.1553 3999.5,-63.1552"/>
-</g>
-<!-- datetime_10 -->
-<g id="node58" class="node"><title>datetime_10</title>
+<polygon fill="none" stroke="red" points="3039,-91 2989,-91 2985,-87 2985,-55 3035,-55 3039,-59 3039,-91"/>
+<polyline fill="none" stroke="red" points="3035,-87 2985,-87 "/>
+<polyline fill="none" stroke="red" points="3035,-87 3035,-55 "/>
+<polyline fill="none" stroke="red" points="3035,-87 3039,-91 "/>
+<text text-anchor="middle" x="3012" y="-69.3" font-family="Times,serif" font-size="14.00">libxslt</text>
+</a>
+</g>
+<!-- 75&#45;&gt;libxslt -->
+<g id="edge74" class="edge"><title>75-&gt;libxslt</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/languages/xslt, TO: libxslt">
+<path fill="none" stroke="red" d="M2946.8,-148.516C2952.59,-142.621 2959.48,-135.836 2966,-130 2970.24,-126.204 2972.04,-126.087 2976,-122 2982.57,-115.226 2988.99,-107.238 2994.55,-99.7421"/>
+<polygon fill="red" stroke="red" points="2997.65,-101.434 3000.64,-91.2714 2991.97,-97.3471 2997.65,-101.434"/>
+</a>
+</g>
+<!-- 53 -->
+<g id="node82" class="node"><title>53</title>
 <a xlink:href="../www.zorba-xquery.com_modules_excel_datetime.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/excel/datetime">
-<ellipse fill="white" stroke="white" cx="8294" cy="-301" rx="44.7575" ry="19.0919"/>
-<text text-anchor="middle" x="8294" y="-297.9" font-family="Times Roman,serif" font-size="14.00" fill="green">datetime</text>
-</a>
-</g>
-<!-- errors_10 -->
-<g id="node60" class="node"><title>errors_10</title>
-<a xlink:href="../www.zorba-xquery.com_modules_excel_errors.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/excel/errors">
-<ellipse fill="white" stroke="white" cx="8150" cy="-35" rx="33.9411" ry="19.0919"/>
-<text text-anchor="middle" x="8150" y="-31.9" font-family="Times Roman,serif" font-size="14.00" fill="green">errors</text>
-</a>
-</g>
-<!-- datetime_10&#45;&gt;errors_10 -->
-<g id="edge136" class="edge"><title>datetime_10-&gt;errors_10</title>
-<path fill="none" stroke="black" d="M8315.44,-284.127C8320.53,-278.916 8325.26,-272.751 8328,-266 8341.54,-232.641 8337.84,-219.63 8328,-185 8315.29,-140.27 8307.37,-127.314 8273,-96 8248.78,-73.9384 8215.11,-57.983 8189.12,-47.9362"/>
-<polygon fill="black" stroke="black" points="8190.17,-44.59 8179.58,-44.3746 8187.72,-51.1487 8190.17,-44.59"/>
-</g>
-<!-- text_10 -->
-<g id="node68" class="node"><title>text_10</title>
+<ellipse fill="white" stroke="white" cx="5645" cy="-439" rx="41.394" ry="18"/>
+<text text-anchor="middle" x="5645" y="-435.3" font-family="Times,serif" font-size="14.00" fill="green">datetime</text>
+</a>
+</g>
+<!-- 62 -->
+<g id="node91" class="node"><title>62</title>
 <a xlink:href="../www.zorba-xquery.com_modules_excel_text.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/excel/text">
-<ellipse fill="white" stroke="white" cx="8292" cy="-212" rx="27" ry="19.0919"/>
-<text text-anchor="middle" x="8292" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">text</text>
-</a>
-</g>
-<!-- datetime_10&#45;&gt;text_10 -->
-<g id="edge138" class="edge"><title>datetime_10-&gt;text_10</title>
-<path fill="none" stroke="black" d="M8293.57,-281.688C8293.3,-269.909 8292.96,-254.619 8292.66,-241.363"/>
-<polygon fill="black" stroke="black" points="8296.16,-241.193 8292.43,-231.274 8289.16,-241.35 8296.16,-241.193"/>
-</g>
-<!-- engineering_10 -->
-<g id="node59" class="node"><title>engineering_10</title>
+<ellipse fill="white" stroke="white" cx="5660" cy="-286" rx="27" ry="18"/>
+<text text-anchor="middle" x="5660" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">text</text>
+</a>
+</g>
+<!-- 53&#45;&gt;62 -->
+<g id="edge116" class="edge"><title>53-&gt;62</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/excel/datetime, TO: http://www.zorba-xquery.com/modules/excel/text">
+<path fill="none" stroke="black" d="M5646.69,-420.972C5649.27,-395.03 5654.2,-345.357 5657.29,-314.326"/>
+<polygon fill="black" stroke="black" points="5660.79,-314.495 5658.29,-304.198 5653.82,-313.803 5660.79,-314.495"/>
+</a>
+</g>
+<!-- 54 -->
+<g id="node83" class="node"><title>54</title>
 <a xlink:href="../www.zorba-xquery.com_modules_excel_engineering.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/excel/engineering">
-<ellipse fill="white" stroke="white" cx="8175" cy="-301" rx="56.0679" ry="19.0919"/>
-<text text-anchor="middle" x="8175" y="-297.9" font-family="Times Roman,serif" font-size="14.00" fill="green">engineering</text>
+<ellipse fill="white" stroke="white" cx="5533" cy="-439" rx="51.4931" ry="18"/>
+<text text-anchor="middle" x="5533" y="-435.3" font-family="Times,serif" font-size="14.00" fill="green">engineering</text>
 </a>
 </g>
-<!-- engineering_10&#45;&gt;errors_10 -->
-<g id="edge150" class="edge"><title>engineering_10-&gt;errors_10</title>
-<path fill="none" stroke="black" d="M8213.33,-287.035C8222.33,-281.856 8230.8,-274.981 8236,-266 8254.04,-234.847 8242,-220.496 8236,-185 8229.01,-143.7 8226.34,-132.045 8205,-96 8196.99,-82.4723 8185.68,-69.2834 8175.4,-58.6501"/>
-<polygon fill="black" stroke="black" points="8177.7,-55.9966 8168.15,-51.3909 8172.74,-60.9414 8177.7,-55.9966"/>
-</g>
-<!-- math_10 -->
-<g id="node64" class="node"><title>math_10</title>
+<!-- 59 -->
+<g id="node87" class="node"><title>59</title>
 <a xlink:href="../www.zorba-xquery.com_modules_excel_math.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/excel/math">
-<ellipse fill="white" stroke="white" cx="7933" cy="-123" rx="31.1127" ry="19.0919"/>
-<text text-anchor="middle" x="7933" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="green">math</text>
-</a>
-</g>
-<!-- engineering_10&#45;&gt;math_10 -->
-<g id="edge154" class="edge"><title>engineering_10-&gt;math_10</title>
-<path fill="none" stroke="black" d="M8143.18,-285.258C8132.57,-280.753 8120.51,-276.413 8109,-274 8091.54,-270.34 7800.46,-278.77 7788,-266 7762.86,-240.229 7768.17,-215.046 7788,-185 7810.96,-150.21 7857.9,-134.872 7892.17,-128.154"/>
-<polygon fill="black" stroke="black" points="7893.13,-131.538 7902.36,-126.333 7891.9,-124.647 7893.13,-131.538"/>
-</g>
-<!-- engineering_10&#45;&gt;text_10 -->
-<g id="edge152" class="edge"><title>engineering_10-&gt;text_10</title>
-<path fill="none" stroke="black" d="M8214.21,-287.305C8226.72,-281.835 8240.13,-274.731 8251,-266 8260.63,-258.27 8269.25,-247.809 8276.07,-238.153"/>
-<polygon fill="black" stroke="black" points="8279.14,-239.865 8281.81,-229.612 8273.33,-235.961 8279.14,-239.865"/>
-</g>
-<!-- information_10 -->
-<g id="node61" class="node"><title>information_10</title>
+<ellipse fill="white" stroke="white" cx="5436" cy="-164" rx="28.3955" ry="18"/>
+<text text-anchor="middle" x="5436" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">math</text>
+</a>
+</g>
+<!-- 54&#45;&gt;59 -->
+<g id="edge120" class="edge"><title>54-&gt;59</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/excel/engineering, TO: http://www.zorba-xquery.com/modules/excel/math">
+<path fill="none" stroke="black" d="M5560.41,-423.64C5578.95,-413.649 5600.5,-401.368 5603,-397 5619.02,-369.045 5619.71,-279.55 5603,-252 5574.77,-205.46 5512.61,-182.656 5472.61,-172.4"/>
+<polygon fill="black" stroke="black" points="5473.24,-168.953 5462.7,-170 5471.59,-175.756 5473.24,-168.953"/>
+</a>
+</g>
+<!-- 54&#45;&gt;62 -->
+<g id="edge118" class="edge"><title>54-&gt;62</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/excel/engineering, TO: http://www.zorba-xquery.com/modules/excel/text">
+<path fill="none" stroke="black" d="M5558,-423.109C5568.84,-417.015 5581.82,-410.192 5594,-405 5604.73,-400.427 5610.56,-405.053 5619,-397 5641.99,-375.064 5652.19,-339.042 5656.64,-314.23"/>
+<polygon fill="black" stroke="black" points="5660.15,-314.46 5658.27,-304.034 5653.24,-313.359 5660.15,-314.46"/>
+</a>
+</g>
+<!-- 55 -->
+<g id="node84" class="node"><title>55</title>
 <a xlink:href="../www.zorba-xquery.com_modules_excel_information.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/excel/information">
-<ellipse fill="white" stroke="white" cx="8170" cy="-212" rx="56.7776" ry="19.0919"/>
-<text text-anchor="middle" x="8170" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">information</text>
-</a>
-</g>
-<!-- information_10&#45;&gt;errors_10 -->
-<g id="edge60" class="edge"><title>information_10-&gt;errors_10</title>
-<path fill="none" stroke="black" d="M8187,-193.64C8190.68,-188.602 8194.05,-182.893 8196,-177 8207.31,-142.821 8207.43,-130.138 8196,-96 8191.51,-82.6017 8182.8,-69.7918 8174.15,-59.4005"/>
-<polygon fill="black" stroke="black" points="8176.54,-56.8188 8167.31,-51.6203 8171.28,-61.4412 8176.54,-56.8188"/>
-</g>
-<!-- information_10&#45;&gt;math_10 -->
-<g id="edge62" class="edge"><title>information_10-&gt;math_10</title>
-<path fill="none" stroke="black" d="M8131.92,-197.701C8087.03,-180.844 8012.99,-153.04 7969.02,-136.527"/>
-<polygon fill="black" stroke="black" points="7970.18,-133.222 7959.58,-132.983 7967.72,-139.775 7970.18,-133.222"/>
-</g>
-<!-- logical_10 -->
-<g id="node62" class="node"><title>logical_10</title>
+<ellipse fill="white" stroke="white" cx="5542" cy="-286" rx="52.4675" ry="18"/>
+<text text-anchor="middle" x="5542" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">information</text>
+</a>
+</g>
+<!-- 55&#45;&gt;59 -->
+<g id="edge122" class="edge"><title>55-&gt;59</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/excel/information, TO: http://www.zorba-xquery.com/modules/excel/math">
+<path fill="none" stroke="black" d="M5527.26,-268.315C5508.74,-247.345 5476.87,-211.263 5456.11,-187.77"/>
+<polygon fill="black" stroke="black" points="5458.52,-185.209 5449.28,-180.031 5453.27,-189.843 5458.52,-185.209"/>
+</a>
+</g>
+<!-- 56 -->
+<g id="node85" class="node"><title>56</title>
 <a xlink:href="../www.zorba-xquery.com_modules_excel_logical.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/excel/logical">
-<ellipse fill="white" stroke="white" cx="8150" cy="-123" rx="36.977" ry="19.0919"/>
-<text text-anchor="middle" x="8150" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="green">logical</text>
+<ellipse fill="white" stroke="white" cx="5362" cy="-439" rx="34.1708" ry="18"/>
+<text text-anchor="middle" x="5362" y="-435.3" font-family="Times,serif" font-size="14.00" fill="green">logical</text>
 </a>
 </g>
-<!-- logical_10&#45;&gt;errors_10 -->
-<g id="edge148" class="edge"><title>logical_10-&gt;errors_10</title>
-<path fill="none" stroke="black" d="M8150,-103.905C8150,-92.3736 8150,-77.4389 8150,-64.4228"/>
-<polygon fill="black" stroke="black" points="8153.5,-64.0574 8150,-54.0574 8146.5,-64.0575 8153.5,-64.0574"/>
-</g>
-<!-- lookup_10 -->
-<g id="node63" class="node"><title>lookup_10</title>
+<!-- 57 -->
+<g id="node86" class="node"><title>57</title>
 <a xlink:href="../www.zorba-xquery.com_modules_excel_lookup.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/excel/lookup">
-<ellipse fill="white" stroke="white" cx="7701" cy="-212" rx="38.1838" ry="19.0919"/>
-<text text-anchor="middle" x="7701" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">lookup</text>
-</a>
-</g>
-<!-- lookup_10&#45;&gt;errors_10 -->
-<g id="edge156" class="edge"><title>lookup_10-&gt;errors_10</title>
-<path fill="none" stroke="black" d="M7722.28,-196.072C7756.5,-171.185 7826.68,-123.128 7893,-96 7965.22,-66.4597 8054.98,-49.2395 8107.05,-41.0123"/>
-<polygon fill="black" stroke="black" points="8107.6,-44.4695 8116.94,-39.4858 8106.53,-37.5513 8107.6,-44.4695"/>
-</g>
-<!-- lookup_10&#45;&gt;math_10 -->
-<g id="edge158" class="edge"><title>lookup_10-&gt;math_10</title>
-<path fill="none" stroke="black" d="M7726.56,-197.777C7734.87,-193.412 7744.21,-188.77 7753,-185 7800.89,-164.451 7858.07,-145.695 7894.93,-134.318"/>
-<polygon fill="black" stroke="black" points="7896.23,-137.583 7904.77,-131.31 7894.18,-130.889 7896.23,-137.583"/>
-</g>
-<!-- math_10&#45;&gt;errors_10 -->
-<g id="edge108" class="edge"><title>math_10-&gt;errors_10</title>
-<path fill="none" stroke="black" d="M7959.18,-112.385C7997.53,-96.8304 8069.19,-67.7719 8112.94,-50.0283"/>
-<polygon fill="black" stroke="black" points="8114.41,-53.2089 8122.36,-46.2074 8111.78,-46.722 8114.41,-53.2089"/>
-</g>
-<!-- math_sumproduct_10 -->
-<g id="node65" class="node"><title>math_sumproduct_10</title>
+<ellipse fill="white" stroke="white" cx="5436" cy="-286" rx="35.1455" ry="18"/>
+<text text-anchor="middle" x="5436" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">lookup</text>
+</a>
+</g>
+<!-- 57&#45;&gt;59 -->
+<g id="edge124" class="edge"><title>57-&gt;59</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/excel/lookup, TO: http://www.zorba-xquery.com/modules/excel/math">
+<path fill="none" stroke="black" d="M5436,-267.807C5436,-248.114 5436,-215.583 5436,-192.39"/>
+<polygon fill="black" stroke="black" points="5439.5,-192.161 5436,-182.161 5432.5,-192.161 5439.5,-192.161"/>
+</a>
+</g>
+<!-- 58 -->
+<g id="node88" class="node"><title>58</title>
 <a xlink:href="../www.zorba-xquery.com_modules_excel_math-sumproduct.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/excel/math-sumproduct">
-<ellipse fill="white" stroke="white" cx="7879" cy="-212" rx="82.0244" ry="19.0919"/>
-<text text-anchor="middle" x="7879" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">math_sumproduct</text>
-</a>
-</g>
-<!-- math_sumproduct_10&#45;&gt;math_10 -->
-<g id="edge112" class="edge"><title>math_sumproduct_10-&gt;math_10</title>
-<path fill="none" stroke="black" d="M7890.45,-193.125C7898.12,-180.485 7908.33,-163.659 7916.83,-149.658"/>
-<polygon fill="black" stroke="black" points="7919.92,-151.302 7922.12,-140.937 7913.94,-147.671 7919.92,-151.302"/>
-</g>
-<!-- statistical_10 -->
-<g id="node66" class="node"><title>statistical_10</title>
+<ellipse fill="white" stroke="white" cx="5309" cy="-286" rx="73.1654" ry="18"/>
+<text text-anchor="middle" x="5309" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">math-sumproduct</text>
+</a>
+</g>
+<!-- 58&#45;&gt;59 -->
+<g id="edge126" class="edge"><title>58-&gt;59</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/excel/math-sumproduct, TO: http://www.zorba-xquery.com/modules/excel/math">
+<path fill="none" stroke="black" d="M5326.66,-268.315C5349.29,-246.93 5388.56,-209.826 5413.36,-186.388"/>
+<polygon fill="black" stroke="black" points="5416.01,-188.708 5420.87,-179.296 5411.2,-183.62 5416.01,-188.708"/>
+</a>
+</g>
+<!-- 61 -->
+<g id="node89" class="node"><title>61</title>
 <a xlink:href="../www.zorba-xquery.com_modules_excel_statistical.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/excel/statistical">
-<ellipse fill="white" stroke="white" cx="8027" cy="-212" rx="48.0833" ry="19.0919"/>
-<text text-anchor="middle" x="8027" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">statistical</text>
-</a>
-</g>
-<!-- statistical_10&#45;&gt;errors_10 -->
-<g id="edge92" class="edge"><title>statistical_10-&gt;errors_10</title>
-<path fill="none" stroke="black" d="M8035.09,-192.918C8045.66,-169.067 8065.6,-127.547 8089,-96 8099.08,-82.414 8112.13,-68.9432 8123.58,-58.1301"/>
-<polygon fill="black" stroke="black" points="8126.22,-60.456 8131.19,-51.1 8121.47,-55.3137 8126.22,-60.456"/>
-</g>
-<!-- statistical_10&#45;&gt;math_10 -->
-<g id="edge90" class="edge"><title>statistical_10-&gt;math_10</title>
-<path fill="none" stroke="black" d="M8008.43,-194.416C7993.81,-180.572 7973.3,-161.161 7957.37,-146.069"/>
-<polygon fill="black" stroke="black" points="7959.62,-143.385 7949.95,-139.051 7954.81,-148.468 7959.62,-143.385"/>
-</g>
-<!-- statistical_zorba_10 -->
-<g id="node67" class="node"><title>statistical_zorba_10</title>
+<ellipse fill="white" stroke="white" cx="5173" cy="-286" rx="44.2946" ry="18"/>
+<text text-anchor="middle" x="5173" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">statistical</text>
+</a>
+</g>
+<!-- 61&#45;&gt;59 -->
+<g id="edge132" class="edge"><title>61-&gt;59</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/excel/statistical, TO: http://www.zorba-xquery.com/modules/excel/math">
+<path fill="none" stroke="black" d="M5195.15,-270.399C5204.75,-264.354 5216.23,-257.49 5227,-252 5287.13,-221.342 5360.64,-192.665 5402.52,-177.108"/>
+<polygon fill="black" stroke="black" points="5403.79,-180.371 5411.96,-173.626 5401.36,-173.804 5403.79,-180.371"/>
+</a>
+</g>
+<!-- 60 -->
+<g id="node90" class="node"><title>60</title>
 <a xlink:href="../www.zorba-xquery.com_modules_excel_statistical-zorba.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/excel/statistical-zorba">
-<ellipse fill="white" stroke="white" cx="8027" cy="-301" rx="73.0388" ry="19.0919"/>
-<text text-anchor="middle" x="8027" y="-297.9" font-family="Times Roman,serif" font-size="14.00" fill="green">statistical_zorba</text>
-</a>
-</g>
-<!-- statistical_zorba_10&#45;&gt;errors_10 -->
-<g id="edge58" class="edge"><title>statistical_zorba_10-&gt;errors_10</title>
-<path fill="none" stroke="black" d="M8064.57,-284.646C8072.11,-279.703 8079.19,-273.535 8084,-266 8124.96,-201.894 8075.67,-166.604 8104,-96 8109.26,-82.8872 8118.11,-70.1252 8126.65,-59.6925"/>
-<polygon fill="black" stroke="black" points="8129.51,-61.7345 8133.35,-51.8628 8124.19,-57.1807 8129.51,-61.7345"/>
-</g>
-<!-- statistical_zorba_10&#45;&gt;math_10 -->
-<g id="edge54" class="edge"><title>statistical_zorba_10-&gt;math_10</title>
-<path fill="none" stroke="black" d="M7956.49,-295.992C7885.55,-290.22 7784.97,-279.737 7773,-266 7749.35,-238.862 7752.66,-214.701 7773,-185 7787.14,-164.351 7851.65,-144.098 7894.31,-132.617"/>
-<polygon fill="black" stroke="black" points="7895.34,-135.966 7904.12,-130.029 7893.55,-129.198 7895.34,-135.966"/>
-</g>
-<!-- statistical_zorba_10&#45;&gt;statistical_10 -->
-<g id="edge56" class="edge"><title>statistical_zorba_10-&gt;statistical_10</title>
-<path fill="none" stroke="black" d="M8027,-281.688C8027,-269.909 8027,-254.619 8027,-241.363"/>
-<polygon fill="black" stroke="black" points="8030.5,-241.274 8027,-231.274 8023.5,-241.274 8030.5,-241.274"/>
-</g>
-<!-- text_10&#45;&gt;errors_10 -->
-<g id="edge76" class="edge"><title>text_10-&gt;errors_10</title>
-<path fill="none" stroke="black" d="M8289.3,-192.789C8284.98,-168.049 8274.47,-124.815 8251,-96 8234.32,-75.525 8208.83,-60.202 8187.62,-50.0346"/>
-<polygon fill="black" stroke="black" points="8189.08,-46.8539 8178.54,-45.8596 8186.16,-53.2148 8189.08,-46.8539"/>
-</g>
-<!-- text_10&#45;&gt;math_10 -->
-<g id="edge78" class="edge"><title>text_10-&gt;math_10</title>
-<path fill="none" stroke="black" d="M8271.21,-199.58C8260.97,-194.097 8248.22,-188.184 8236,-185 8179.12,-170.18 8161.79,-187.708 8104,-177 8056.08,-168.121 8002.82,-149.908 7968.67,-137.097"/>
-<polygon fill="black" stroke="black" points="7969.74,-133.756 7959.14,-133.475 7967.25,-140.3 7969.74,-133.756"/>
-</g>
-<!-- hash_11 -->
-<g id="node70" class="node"><title>hash_11</title>
+<ellipse fill="white" stroke="white" cx="5175" cy="-439" rx="65.9423" ry="18"/>
+<text text-anchor="middle" x="5175" y="-435.3" font-family="Times,serif" font-size="14.00" fill="green">statistical-zorba</text>
+</a>
+</g>
+<!-- 60&#45;&gt;59 -->
+<g id="edge128" class="edge"><title>60-&gt;59</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/excel/statistical-zorba, TO: http://www.zorba-xquery.com/modules/excel/math">
+<path fill="none" stroke="black" d="M5144.86,-422.934C5135.09,-416.401 5125.4,-407.751 5120,-397 5091.1,-339.401 5080.94,-303.261 5120,-252 5153.88,-207.528 5321.94,-180.068 5398.22,-169.707"/>
+<polygon fill="black" stroke="black" points="5398.9,-173.147 5408.35,-168.358 5397.98,-166.208 5398.9,-173.147"/>
+</a>
+</g>
+<!-- 60&#45;&gt;61 -->
+<g id="edge130" class="edge"><title>60-&gt;61</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/excel/statistical-zorba, TO: http://www.zorba-xquery.com/modules/excel/statistical">
+<path fill="none" stroke="black" d="M5174.77,-420.972C5174.43,-395.03 5173.77,-345.357 5173.36,-314.326"/>
+<polygon fill="black" stroke="black" points="5176.86,-314.15 5173.23,-304.198 5169.86,-314.243 5176.86,-314.15"/>
+</a>
+</g>
+<!-- 62&#45;&gt;59 -->
+<g id="edge134" class="edge"><title>62-&gt;59</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/excel/text, TO: http://www.zorba-xquery.com/modules/excel/math">
+<path fill="none" stroke="black" d="M5644.29,-270.917C5636.92,-264.69 5627.82,-257.54 5619,-252 5569.36,-220.83 5506.82,-193.381 5469.2,-178.013"/>
+<polygon fill="black" stroke="black" points="5470.32,-174.691 5459.74,-174.188 5467.7,-181.181 5470.32,-174.691"/>
+</a>
+</g>
+<!-- 67 -->
+<g id="node93" class="node"><title>67</title>
 <a xlink:href="../www.zorba-xquery.com_modules_cryptography_hash.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/cryptography/hash">
-<ellipse fill="white" stroke="white" cx="5544" cy="-212" rx="28.9914" ry="19.0919"/>
-<text text-anchor="middle" x="5544" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">hash</text>
+<ellipse fill="white" stroke="white" cx="2677" cy="-286" rx="27" ry="18"/>
+<text text-anchor="middle" x="2677" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">hash</text>
 </a>
 </g>
-<!-- hmac_11 -->
-<g id="node71" class="node"><title>hmac_11</title>
+<!-- 66 -->
+<g id="node94" class="node"><title>66</title>
 <a xlink:href="../www.zorba-xquery.com_modules_cryptography_hmac.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/cryptography/hmac">
-<ellipse fill="white" stroke="white" cx="5464" cy="-212" rx="33.234" ry="19.0919"/>
-<text text-anchor="middle" x="5464" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">hmac</text>
+<ellipse fill="white" stroke="white" cx="2601" cy="-286" rx="30.3206" ry="18"/>
+<text text-anchor="middle" x="2601" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">hmac</text>
 </a>
 </g>
-<!-- geo_12 -->
-<g id="node73" class="node"><title>geo_12</title>
+<!-- 43 -->
+<g id="node96" class="node"><title>43</title>
 <a xlink:href="../expath.org_ns_geo.html" xlink:title="(External module) module uri=http://expath.org/ns/geo">
-<ellipse fill="white" stroke="white" cx="3863" cy="-212" rx="27" ry="19.0919"/>
-<text text-anchor="middle" x="3863" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">geo</text>
+<ellipse fill="white" stroke="white" cx="2433" cy="-286" rx="27" ry="18"/>
+<text text-anchor="middle" x="2433" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">geo</text>
 </a>
 </g>
 <!-- GEOS -->
-<g id="node98" class="node"><title>GEOS</title>
+<g id="node135" class="node"><title>GEOS</title>
 <a xlink:href="http://trac.osgeo.org/geos/" xlink:title="GEOS (Geometry Engine - Open Source)">
-<polygon fill="none" stroke="red" points="4095,-53 4045,-53 4041,-49 4041,-17 4091,-17 4095,-21 4095,-53"/>
-<polyline fill="none" stroke="red" points="4091,-49 4041,-49 "/>
-<polyline fill="none" stroke="red" points="4091,-49 4091,-17 "/>
-<polyline fill="none" stroke="red" points="4091,-49 4095,-53 "/>
-<text text-anchor="middle" x="4068" y="-31.9" font-family="Times Roman,serif" font-size="14.00">GEOS</text>
-</a>
-</g>
-<!-- geo_12&#45;&gt;GEOS -->
-<g id="edge34" class="edge"><title>geo_12-&gt;GEOS</title>
-<path fill="none" stroke="red" d="M3888.9,-206.566C3918.7,-200.492 3969.19,-190.755 4013,-185 4023.61,-183.606 4101.75,-184.877 4109,-177 4133.38,-150.508 4119.5,-130.436 4109,-96 4108.68,-94.9573 4097.02,-77.6377 4086.21,-61.7202"/>
-<polygon fill="red" stroke="red" points="4088.89,-59.4359 4080.37,-53.1336 4083.1,-63.3713 4088.89,-59.4359"/>
-</g>
-<!-- geoproj_12 -->
-<g id="node74" class="node"><title>geoproj_12</title>
+<polygon fill="none" stroke="red" points="3111,-91 3061,-91 3057,-87 3057,-55 3107,-55 3111,-59 3111,-91"/>
+<polyline fill="none" stroke="red" points="3107,-87 3057,-87 "/>
+<polyline fill="none" stroke="red" points="3107,-87 3107,-55 "/>
+<polyline fill="none" stroke="red" points="3107,-87 3111,-91 "/>
+<text text-anchor="middle" x="3084" y="-69.3" font-family="Times,serif" font-size="14.00">GEOS</text>
+</a>
+</g>
+<!-- 43&#45;&gt;GEOS -->
+<g id="edge48" class="edge"><title>43-&gt;GEOS</title>
+<a xlink:title="FROM: http://expath.org/ns/geo, TO: GEOS">
+<path fill="none" stroke="red" d="M2445.89,-270.113C2452.84,-263.214 2462.03,-255.73 2472,-252 2486.99,-246.392 3035.64,-254.161 3048,-244 3069.65,-226.207 3078.83,-144.728 3082.25,-101.354"/>
+<polygon fill="red" stroke="red" points="3085.75,-101.44 3082.99,-91.2096 3078.77,-100.926 3085.75,-101.44"/>
+</a>
+</g>
+<!-- 44 -->
+<g id="node97" class="node"><title>44</title>
 <a xlink:href="../www.zorba-xquery.com_modules_geoproj.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/geoproj">
-<ellipse fill="white" stroke="white" cx="3777" cy="-212" rx="41.0122" ry="19.0919"/>
-<text text-anchor="middle" x="3777" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">geoproj</text>
-</a>
-</g>
-<!-- geoproj_12&#45;&gt;item_schema_2 -->
-<g id="edge88" class="edge"><title>geoproj_12-&gt;item_schema_2</title>
-<path fill="none" stroke="black" d="M3735.99,-211.399C3541.39,-208.46 2718.31,-195.006 2667,-177 2649.78,-170.958 2633.29,-159.194 2620.45,-148.184"/>
-<polygon fill="black" stroke="black" points="2622.74,-145.536 2612.95,-141.484 2618.08,-150.756 2622.74,-145.536"/>
-</g>
-<!-- animation_13 -->
-<g id="node76" class="node"><title>animation_13</title>
+<ellipse fill="white" stroke="white" cx="2350" cy="-286" rx="37.5442" ry="18"/>
+<text text-anchor="middle" x="2350" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">geoproj</text>
+</a>
+</g>
+<!-- 44&#45;&gt;12 -->
+<g id="edge110" class="edge"><title>44-&gt;12</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/geoproj, TO: http://www.zorba-xquery.com/modules/schema">
+<path fill="none" stroke="black" d="M2312.95,-283.094C2248.58,-279.176 2119.37,-268.442 2082,-244 2062.97,-231.557 2049.8,-209.082 2041.77,-191.277"/>
+<polygon fill="black" stroke="black" points="2044.95,-189.808 2037.83,-181.959 2038.5,-192.533 2044.95,-189.808"/>
+</a>
+</g>
+<!-- 49 -->
+<g id="node99" class="node"><title>49</title>
 <a xlink:href="../www.zorba-xquery.com_modules_image_animation.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/image/animation">
-<ellipse fill="white" stroke="white" cx="4817" cy="-123" rx="50.2046" ry="19.0919"/>
-<text text-anchor="middle" x="4817" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="green">animation</text>
-</a>
-</g>
-<!-- error_13 -->
-<g id="node78" class="node"><title>error_13</title>
-<a xlink:href="../www.zorba-xquery.com_modules_image_error.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/image/error">
-<ellipse fill="white" stroke="white" cx="4662" cy="-35" rx="29.9071" ry="19.0919"/>
-<text text-anchor="middle" x="4662" y="-31.9" font-family="Times Roman,serif" font-size="14.00" fill="green">error</text>
-</a>
-</g>
-<!-- animation_13&#45;&gt;error_13 -->
-<g id="edge48" class="edge"><title>animation_13-&gt;error_13</title>
-<path fill="none" stroke="black" d="M4788.93,-107.064C4762.12,-91.8451 4721.78,-68.9387 4693.8,-53.0529"/>
-<polygon fill="black" stroke="black" points="4695.24,-49.8495 4684.82,-47.9559 4691.79,-55.9368 4695.24,-49.8495"/>
+<ellipse fill="white" stroke="white" cx="3428" cy="-164" rx="46.2191" ry="18"/>
+<text text-anchor="middle" x="3428" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">animation</text>
+</a>
 </g>
 <!-- Magick -->
-<g id="node94" class="node"><title>Magick</title>
+<g id="node132" class="node"><title>Magick</title>
 <a xlink:href="http://www.imagemagick.org/Magick++/" xlink:title="Magick++ C++ Library">
-<polygon fill="none" stroke="red" points="4331,-53 4277,-53 4273,-49 4273,-17 4327,-17 4331,-21 4331,-53"/>
-<polyline fill="none" stroke="red" points="4327,-49 4273,-49 "/>
-<polyline fill="none" stroke="red" points="4327,-49 4327,-17 "/>
-<polyline fill="none" stroke="red" points="4327,-49 4331,-53 "/>
-<text text-anchor="middle" x="4302" y="-31.9" font-family="Times Roman,serif" font-size="14.00">Magick</text>
-</a>
-</g>
-<!-- animation_13&#45;&gt;Magick -->
-<g id="edge20" class="edge"><title>animation_13-&gt;Magick</title>
-<path fill="none" stroke="red" d="M4788.72,-107.218C4779.25,-102.711 4768.43,-98.3795 4758,-96 4735.52,-90.8726 4363.6,-98.3575 4343,-88 4331.67,-82.3017 4322.55,-71.8403 4315.81,-61.708"/>
-<polygon fill="red" stroke="red" points="4318.71,-59.7331 4310.52,-53.0166 4312.73,-63.3769 4318.71,-59.7331"/>
-</g>
-<!-- basic_13 -->
-<g id="node77" class="node"><title>basic_13</title>
+<polygon fill="none" stroke="red" points="3260.25,-91 3205.75,-91 3201.75,-87 3201.75,-55 3256.25,-55 3260.25,-59 3260.25,-91"/>
+<polyline fill="none" stroke="red" points="3256.25,-87 3201.75,-87 "/>
+<polyline fill="none" stroke="red" points="3256.25,-87 3256.25,-55 "/>
+<polyline fill="none" stroke="red" points="3256.25,-87 3260.25,-91 "/>
+<text text-anchor="middle" x="3231" y="-69.3" font-family="Times,serif" font-size="14.00">Magick</text>
+</a>
+</g>
+<!-- 49&#45;&gt;Magick -->
+<g id="edge56" class="edge"><title>49-&gt;Magick</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/image/animation, TO: Magick">
+<path fill="none" stroke="red" d="M3407.28,-147.713C3397.15,-141.075 3384.49,-133.931 3372,-130 3350.1,-123.106 3289.26,-132.791 3269,-122 3259.43,-116.904 3251.45,-108.249 3245.32,-99.6798"/>
+<polygon fill="red" stroke="red" points="3248.22,-97.7185 3239.81,-91.2742 3242.37,-101.556 3248.22,-97.7185"/>
+</a>
+</g>
+<!-- 46 -->
+<g id="node100" class="node"><title>46</title>
 <a xlink:href="../www.zorba-xquery.com_modules_image_basic.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/image/basic">
-<ellipse fill="white" stroke="white" cx="4718" cy="-123" rx="31.1127" ry="19.0919"/>
-<text text-anchor="middle" x="4718" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="green">basic</text>
-</a>
-</g>
-<!-- basic_13&#45;&gt;error_13 -->
-<g id="edge94" class="edge"><title>basic_13-&gt;error_13</title>
-<path fill="none" stroke="black" d="M4706.67,-105.192C4698.7,-92.6677 4687.89,-75.6921 4678.91,-61.5724"/>
-<polygon fill="black" stroke="black" points="4681.64,-59.3392 4673.32,-52.7816 4675.73,-63.0973 4681.64,-59.3392"/>
-</g>
-<!-- basic_13&#45;&gt;Magick -->
-<g id="edge28" class="edge"><title>basic_13-&gt;Magick</title>
-<path fill="none" stroke="red" d="M4699.64,-107.408C4693.2,-102.853 4685.66,-98.4446 4678,-96 4642.53,-84.6839 4376.23,-104.8 4343,-88 4331.76,-82.3162 4322.69,-71.9586 4315.97,-61.8978"/>
-<polygon fill="red" stroke="red" points="4318.88,-59.9532 4310.67,-53.2578 4312.92,-63.6124 4318.88,-59.9532"/>
-</g>
-<!-- graphviz_13 -->
-<g id="node79" class="node"><title>graphviz_13</title>
+<ellipse fill="white" stroke="white" cx="3335" cy="-164" rx="28.3955" ry="18"/>
+<text text-anchor="middle" x="3335" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">basic</text>
+</a>
+</g>
+<!-- 46&#45;&gt;Magick -->
+<g id="edge50" class="edge"><title>46-&gt;Magick</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/image/basic, TO: Magick">
+<path fill="none" stroke="red" d="M3320.98,-148.185C3314.25,-141.81 3305.76,-134.747 3297,-130 3285.62,-123.833 3279.76,-129.198 3269,-122 3260.35,-116.209 3252.75,-107.821 3246.67,-99.6711"/>
+<polygon fill="red" stroke="red" points="3249.49,-97.592 3240.9,-91.3835 3243.74,-101.591 3249.49,-97.592"/>
+</a>
+</g>
+<!-- 50 -->
+<g id="node101" class="node"><title>50</title>
 <a xlink:href="../www.zorba-xquery.com_modules_image_graphviz.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/image/graphviz">
-<ellipse fill="white" stroke="white" cx="4400" cy="-123" rx="44.7575" ry="19.0919"/>
-<text text-anchor="middle" x="4400" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="green">graphviz</text>
+<ellipse fill="white" stroke="white" cx="3534" cy="-164" rx="41.394" ry="18"/>
+<text text-anchor="middle" x="3534" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">graphviz</text>
 </a>
 </g>
 <!-- Graphviz -->
-<g id="node100" class="node"><title>Graphviz</title>
+<g id="node137" class="node"><title>Graphviz</title>
 <a xlink:href="http://www.graphviz.org/" xlink:title="Graphviz - Graph Visualization Software">
-<polygon fill="none" stroke="red" points="4255,-53 4193,-53 4189,-49 4189,-17 4251,-17 4255,-21 4255,-53"/>
-<polyline fill="none" stroke="red" points="4251,-49 4189,-49 "/>
-<polyline fill="none" stroke="red" points="4251,-49 4251,-17 "/>
-<polyline fill="none" stroke="red" points="4251,-49 4255,-53 "/>
-<text text-anchor="middle" x="4222" y="-31.9" font-family="Times Roman,serif" font-size="14.00">Graphviz</text>
-</a>
-</g>
-<!-- graphviz_13&#45;&gt;Graphviz -->
-<g id="edge24" class="edge"><title>graphviz_13-&gt;Graphviz</title>
-<path fill="none" stroke="red" d="M4372.61,-107.707C4363.45,-103.229 4353.02,-98.7912 4343,-96 4309,-86.5308 4294.96,-104.944 4264,-88 4252.93,-81.94 4243.75,-71.6227 4236.82,-61.6927"/>
-<polygon fill="red" stroke="red" points="4239.69,-59.6849 4231.33,-53.1826 4233.81,-63.4821 4239.69,-59.6849"/>
-</g>
-<!-- manipulation_13 -->
-<g id="node80" class="node"><title>manipulation_13</title>
+<polygon fill="none" stroke="red" points="3345.25,-91 3282.75,-91 3278.75,-87 3278.75,-55 3341.25,-55 3345.25,-59 3345.25,-91"/>
+<polyline fill="none" stroke="red" points="3341.25,-87 3278.75,-87 "/>
+<polyline fill="none" stroke="red" points="3341.25,-87 3341.25,-55 "/>
+<polyline fill="none" stroke="red" points="3341.25,-87 3345.25,-91 "/>
+<text text-anchor="middle" x="3312" y="-69.3" font-family="Times,serif" font-size="14.00">Graphviz</text>
+</a>
+</g>
+<!-- 50&#45;&gt;Graphviz -->
+<g id="edge58" class="edge"><title>50-&gt;Graphviz</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/image/graphviz, TO: Graphviz">
+<path fill="none" stroke="red" d="M3515.35,-147.622C3506.18,-140.964 3494.62,-133.829 3483,-130 3455.93,-121.079 3380.65,-134.431 3355,-122 3344.62,-116.97 3335.63,-108.211 3328.59,-99.5398"/>
+<polygon fill="red" stroke="red" points="3331.27,-97.2703 3322.46,-91.378 3325.67,-101.475 3331.27,-97.2703"/>
+</a>
+</g>
+<!-- 47 -->
+<g id="node102" class="node"><title>47</title>
 <a xlink:href="../www.zorba-xquery.com_modules_image_manipulation.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/image/manipulation">
-<ellipse fill="white" stroke="white" cx="4606" cy="-123" rx="62.9325" ry="19.0919"/>
-<text text-anchor="middle" x="4606" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="green">manipulation</text>
-</a>
-</g>
-<!-- manipulation_13&#45;&gt;error_13 -->
-<g id="edge122" class="edge"><title>manipulation_13-&gt;error_13</title>
-<path fill="none" stroke="black" d="M4617.88,-104.337C4625.83,-91.8387 4636.42,-75.2021 4645.23,-61.358"/>
-<polygon fill="black" stroke="black" points="4648.3,-63.051 4650.71,-52.7353 4642.39,-59.2929 4648.3,-63.051"/>
-</g>
-<!-- manipulation_13&#45;&gt;Magick -->
-<g id="edge30" class="edge"><title>manipulation_13-&gt;Magick</title>
-<path fill="none" stroke="red" d="M4570.77,-107.247C4559.27,-102.801 4546.3,-98.497 4534,-96 4513.18,-91.7735 4361.87,-97.7542 4343,-88 4331.81,-82.2154 4322.75,-71.8422 4316.02,-61.797"/>
-<polygon fill="red" stroke="red" points="4318.94,-59.857 4310.71,-53.1775 4312.98,-63.5277 4318.94,-59.857"/>
-</g>
-<!-- paint_13 -->
-<g id="node81" class="node"><title>paint_13</title>
+<ellipse fill="white" stroke="white" cx="3231" cy="-164" rx="57.2688" ry="18"/>
+<text text-anchor="middle" x="3231" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">manipulation</text>
+</a>
+</g>
+<!-- 47&#45;&gt;Magick -->
+<g id="edge52" class="edge"><title>47-&gt;Magick</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/image/manipulation, TO: Magick">
+<path fill="none" stroke="red" d="M3231,-145.84C3231,-133.281 3231,-115.979 3231,-101.502"/>
+<polygon fill="red" stroke="red" points="3234.5,-101.107 3231,-91.1074 3227.5,-101.107 3234.5,-101.107"/>
+</a>
+</g>
+<!-- 48 -->
+<g id="node103" class="node"><title>48</title>
 <a xlink:href="../www.zorba-xquery.com_modules_image_paint.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/image/paint">
-<ellipse fill="white" stroke="white" cx="4494" cy="-123" rx="31.1127" ry="19.0919"/>
-<text text-anchor="middle" x="4494" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="green">paint</text>
-</a>
-</g>
-<!-- paint_13&#45;&gt;error_13 -->
-<g id="edge160" class="edge"><title>paint_13-&gt;error_13</title>
-<path fill="none" stroke="black" d="M4514.39,-108.385C4520.57,-104.19 4527.45,-99.7418 4534,-96 4564.7,-78.453 4601.25,-61.3916 4627.42,-49.7956"/>
-<polygon fill="black" stroke="black" points="4629.16,-52.855 4636.9,-45.6294 4626.34,-46.4458 4629.16,-52.855"/>
-</g>
-<!-- paint_13&#45;&gt;Magick -->
-<g id="edge44" class="edge"><title>paint_13-&gt;Magick</title>
-<path fill="none" stroke="red" d="M4475.56,-107.623C4469.13,-103.082 4461.6,-98.628 4454,-96 4430.63,-87.9196 4364.8,-99.686 4343,-88 4331.9,-82.0477 4322.85,-71.6487 4316.11,-61.6296"/>
-<polygon fill="red" stroke="red" points="4319.03,-59.6965 4310.78,-53.044 4313.08,-63.3867 4319.03,-59.6965"/>
-</g>
-<!-- client_14 -->
-<g id="node83" class="node"><title>client_14</title>
+<ellipse fill="white" stroke="white" cx="3127" cy="-164" rx="28.3955" ry="18"/>
+<text text-anchor="middle" x="3127" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">paint</text>
+</a>
+</g>
+<!-- 48&#45;&gt;Magick -->
+<g id="edge54" class="edge"><title>48-&gt;Magick</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/image/paint, TO: Magick">
+<path fill="none" stroke="red" d="M3140.59,-148.172C3147.13,-141.794 3155.4,-134.733 3164,-130 3175.34,-123.758 3181.2,-129.129 3192,-122 3200.78,-116.205 3208.55,-107.816 3214.8,-99.6669"/>
+<polygon fill="red" stroke="red" points="3217.76,-101.547 3220.74,-91.3801 3212.07,-97.4689 3217.76,-101.547"/>
+</a>
+</g>
+<!-- 68 -->
+<g id="node105" class="node"><title>68</title>
 <a xlink:href="../www.zorba-xquery.com_modules_oauth_client.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/oauth/client">
-<ellipse fill="white" stroke="white" cx="4058" cy="-301" rx="33.234" ry="19.0919"/>
-<text text-anchor="middle" x="4058" y="-297.9" font-family="Times Roman,serif" font-size="14.00" fill="green">client</text>
-</a>
-</g>
-<!-- client_14&#45;&gt;atomic_datetime_2 -->
-<g id="edge72" class="edge"><title>client_14-&gt;atomic_datetime_2</title>
-<path fill="none" stroke="black" d="M4025,-299.847C3853.68,-293.531 3064.88,-260.314 2837,-177 2817.74,-169.959 2798.29,-158.036 2782.86,-147.182"/>
-<polygon fill="black" stroke="black" points="2784.89,-144.326 2774.73,-141.299 2780.78,-149.997 2784.89,-144.326"/>
-</g>
-<!-- client_14&#45;&gt;atomic_random_2 -->
-<g id="edge66" class="edge"><title>client_14-&gt;atomic_random_2</title>
-<path fill="none" stroke="black" d="M4024.85,-300.182C3964.34,-298.104 3832.25,-290.864 3724,-266 3610.68,-239.972 3582.36,-228.258 3478,-177 3460.42,-168.366 3441.95,-156.949 3426.74,-146.838"/>
-<polygon fill="black" stroke="black" points="3428.43,-143.76 3418.19,-141.066 3424.52,-149.562 3428.43,-143.76"/>
-</g>
-<!-- client_14&#45;&gt;hmac_11 -->
-<g id="edge68" class="edge"><title>client_14-&gt;hmac_11</title>
-<path fill="none" stroke="black" d="M4091.23,-299.692C4202.6,-295.353 4572.83,-281.302 4879,-274 4894,-273.642 5405.46,-272.463 5419,-266 5431.13,-260.208 5441.15,-249.402 5448.64,-238.97"/>
-<polygon fill="black" stroke="black" points="5451.7,-240.68 5454.32,-230.413 5445.87,-236.809 5451.7,-240.68"/>
-</g>
-<!-- error_14 -->
-<g id="node84" class="node"><title>error_14</title>
+<ellipse fill="white" stroke="white" cx="2515" cy="-439" rx="30.3206" ry="18"/>
+<text text-anchor="middle" x="2515" y="-435.3" font-family="Times,serif" font-size="14.00" fill="green">client</text>
+</a>
+</g>
+<!-- 68&#45;&gt;10 -->
+<g id="edge144" class="edge"><title>68-&gt;10</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/oauth/client, TO: http://www.zorba-xquery.com/modules/random">
+<path fill="none" stroke="black" d="M2484.69,-436.639C2431.35,-433.559 2324.02,-424.077 2300,-397 2249.06,-339.577 2264.96,-239.487 2276.51,-191.776"/>
+<polygon fill="black" stroke="black" points="2279.96,-192.445 2279.03,-181.891 2273.17,-190.718 2279.96,-192.445"/>
+</a>
+</g>
+<!-- 68&#45;&gt;18 -->
+<g id="edge150" class="edge"><title>68-&gt;18</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/oauth/client, TO: http://www.zorba-xquery.com/modules/converters/base64">
+<path fill="none" stroke="black" d="M2485.64,-434.23C2327.05,-413.866 1572.92,-317.036 1382.67,-292.607"/>
+<polygon fill="black" stroke="black" points="1383.11,-289.135 1372.74,-291.333 1382.22,-296.078 1383.11,-289.135"/>
+</a>
+</g>
+<!-- 68&#45;&gt;66 -->
+<g id="edge146" class="edge"><title>68-&gt;66</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/oauth/client, TO: http://www.zorba-xquery.com/modules/cryptography/hmac">
+<path fill="none" stroke="black" d="M2532.67,-424.284C2541.22,-416.93 2551.1,-407.279 2558,-397 2575.34,-371.159 2587.23,-337.3 2594.04,-314.009"/>
+<polygon fill="black" stroke="black" points="2597.48,-314.693 2596.81,-304.119 2590.74,-312.803 2597.48,-314.693"/>
+</a>
+</g>
+<!-- 69 -->
+<g id="node106" class="node"><title>69</title>
 <a xlink:href="../www.zorba-xquery.com_modules_oauth_error.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/oauth/error">
-<ellipse fill="white" stroke="white" cx="4058" cy="-212" rx="29.9071" ry="19.0919"/>
-<text text-anchor="middle" x="4058" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">error</text>
-</a>
-</g>
-<!-- client_14&#45;&gt;error_14 -->
-<g id="edge74" class="edge"><title>client_14-&gt;error_14</title>
-<path fill="none" stroke="black" d="M4058,-281.688C4058,-269.909 4058,-254.619 4058,-241.363"/>
-<polygon fill="black" stroke="black" points="4061.5,-241.274 4058,-231.274 4054.5,-241.274 4061.5,-241.274"/>
-</g>
-<!-- http_client_15 -->
-<g id="node87" class="node"><title>http_client_15</title>
+<ellipse fill="white" stroke="white" cx="2515" cy="-286" rx="27.4223" ry="18"/>
+<text text-anchor="middle" x="2515" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">error</text>
+</a>
+</g>
+<!-- 68&#45;&gt;69 -->
+<g id="edge152" class="edge"><title>68-&gt;69</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/oauth/client, TO: http://www.zorba-xquery.com/modules/oauth/error">
+<path fill="none" stroke="black" d="M2515,-420.972C2515,-395.03 2515,-345.357 2515,-314.326"/>
+<polygon fill="black" stroke="black" points="2518.5,-314.198 2515,-304.198 2511.5,-314.198 2518.5,-314.198"/>
+</a>
+</g>
+<!-- 71 -->
+<g id="node111" class="node"><title>71</title>
 <a xlink:href="../expath.org_ns_http-client.html" xlink:title="(External module) module uri=http://expath.org/ns/http-client">
-<ellipse fill="white" stroke="white" cx="5309" cy="-212" rx="51.8276" ry="19.0919"/>
-<text text-anchor="middle" x="5309" y="-208.9" font-family="Times Roman,serif" font-size="14.00" fill="green">http_client</text>
-</a>
-</g>
-<!-- client_14&#45;&gt;http_client_15 -->
-<g id="edge70" class="edge"><title>client_14-&gt;http_client_15</title>
-<path fill="none" stroke="black" d="M4091.23,-299.776C4202.6,-295.7 4572.86,-282.38 4879,-274 4899.33,-273.444 5225.98,-273.19 5245,-266 5260.69,-260.07 5275.24,-248.517 5286.48,-237.614"/>
-<polygon fill="black" stroke="black" points="5289.21,-239.834 5293.72,-230.246 5284.21,-234.93 5289.21,-239.834"/>
-</g>
-<!-- http_client_15&#45;&gt;http_client_6 -->
-<g id="edge140" class="edge"><title>http_client_15-&gt;http_client_6</title>
-<path fill="none" stroke="black" d="M5278.86,-196.413C5268.42,-191.797 5256.46,-187.351 5245,-185 5205.6,-176.915 3834.57,-191.36 3797,-177 3781.76,-171.174 3767.86,-159.631 3757.2,-148.708"/>
-<polygon fill="black" stroke="black" points="3759.72,-146.278 3750.36,-141.322 3754.59,-151.036 3759.72,-146.278"/>
-</g>
-<!-- http_client_15&#45;&gt;data_converters_html_8 -->
-<g id="edge144" class="edge"><title>http_client_15-&gt;data_converters_html_8</title>
-<path fill="none" stroke="black" d="M5294.56,-230.41C5281.29,-245.403 5260.07,-264.892 5236,-270 5221.71,-273.033 1042.29,-273.033 1028,-270 999.751,-264.005 970.834,-248.966 949.324,-235.704"/>
-<polygon fill="black" stroke="black" points="951.196,-232.748 940.876,-230.353 947.45,-238.661 951.196,-232.748"/>
-</g>
-<!-- http_client_15&#45;&gt;http_client_error_15 -->
-<g id="edge142" class="edge"><title>http_client_15-&gt;http_client_error_15</title>
-<path fill="none" stroke="black" d="M5313.99,-192.688C5317.09,-180.711 5321.12,-165.103 5324.58,-151.696"/>
-<polygon fill="black" stroke="black" points="5327.98,-152.526 5327.1,-141.968 5321.21,-150.774 5327.98,-152.526"/>
-</g>
-<!-- http_client_15&#45;&gt;cURL -->
-<g id="edge38" class="edge"><title>http_client_15-&gt;cURL</title>
-<path fill="none" stroke="red" d="M5278.86,-196.426C5268.42,-191.811 5256.46,-187.362 5245,-185 5215.94,-179.008 4203.84,-189.635 4177,-177 4134.47,-156.981 4151.05,-116.995 4109,-96 4079.33,-81.1892 3988.88,-104.3 3960,-88 3949.62,-82.1391 3941.62,-71.8947 3935.83,-61.965"/>
-<polygon fill="red" stroke="red" points="3938.89,-60.2737 3931.12,-53.0691 3932.7,-63.5455 3938.89,-60.2737"/>
-</g>
-<!-- functx_16 -->
-<g id="node89" class="node"><title>functx_16</title>
+<ellipse fill="white" stroke="white" cx="3956" cy="-286" rx="46.1964" ry="18"/>
+<text text-anchor="middle" x="3956" y="-282.3" font-family="Times,serif" font-size="14.00" fill="green">http-client</text>
+</a>
+</g>
+<!-- 68&#45;&gt;71 -->
+<g id="edge148" class="edge"><title>68-&gt;71</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/oauth/client, TO: http://expath.org/ns/http-client">
+<path fill="none" stroke="black" d="M2544.77,-434.881C2724.44,-416.053 3664.44,-317.552 3901.62,-292.699"/>
+<polygon fill="black" stroke="black" points="3902.14,-296.163 3911.72,-291.64 3901.41,-289.201 3902.14,-296.163"/>
+</a>
+</g>
+<!-- 71&#45;&gt;2 -->
+<g id="edge154" class="edge"><title>71-&gt;2</title>
+<a xlink:title="FROM: http://expath.org/ns/http-client, TO: http://www.zorba-xquery.com/modules/http-client">
+<path fill="none" stroke="black" d="M3909.61,-284.488C3701.69,-282.047 2863.75,-270.588 2815,-244 2794.23,-232.673 2779.61,-209.717 2770.7,-191.457"/>
+<polygon fill="black" stroke="black" points="2773.78,-189.794 2766.44,-182.161 2767.42,-192.71 2773.78,-189.794"/>
+</a>
+</g>
+<!-- 71&#45;&gt;64 -->
+<g id="edge158" class="edge"><title>71-&gt;64</title>
+<a xlink:title="FROM: http://expath.org/ns/http-client, TO: http://www.zorba-xquery.com/modules/converters/html">
+<path fill="none" stroke="black" d="M3911.85,-291.546C3750.88,-311.451 3180.12,-379.265 2707,-401 2684.54,-402.032 1110,-405.668 1088,-401 1052.58,-393.483 1044.31,-345.823 1042.78,-314.264"/>
+<polygon fill="black" stroke="black" points="1046.28,-314.155 1042.49,-304.26 1039.28,-314.357 1046.28,-314.155"/>
+</a>
+</g>
+<!-- 71&#45;&gt;1 -->
+<g id="edge156" class="edge"><title>71-&gt;1</title>
+<a xlink:title="FROM: http://expath.org/ns/http-client, TO: http://expath.org/ns/error">
+<path fill="none" stroke="black" d="M3954.57,-267.807C3952.93,-248.114 3950.22,-215.583 3948.28,-192.39"/>
+<polygon fill="black" stroke="black" points="3951.75,-191.836 3947.43,-182.161 3944.77,-192.417 3951.75,-191.836"/>
+</a>
+</g>
+<!-- 71&#45;&gt;cURL -->
+<g id="edge64" class="edge"><title>71-&gt;cURL</title>
+<a xlink:title="FROM: http://expath.org/ns/http-client, TO: cURL">
+<path fill="none" stroke="red" d="M3911.42,-280.877C3822.57,-272.478 3630.94,-253.389 3620,-244 3580.07,-209.726 3629.62,-162.21 3588,-130 3570.6,-116.532 3211.58,-132.039 3192,-122 3182.51,-117.133 3174.85,-108.477 3169.07,-99.8428"/>
+<polygon fill="red" stroke="red" points="3171.91,-97.7644 3163.74,-91.0131 3165.91,-101.383 3171.91,-97.7644"/>
+</a>
+</g>
+<!-- 39 -->
+<g id="node113" class="node"><title>39</title>
 <a xlink:href="../www.functx.com_index.html" xlink:title="(Zorba-core) module uri=http://www.functx.com/">
-<ellipse fill="white" stroke="white" cx="8411" cy="-301" rx="36.0624" ry="19.0919"/>
-<text text-anchor="middle" x="8411" y="-297.9" font-family="Times Roman,serif" font-size="14.00" fill="red">functx</text>
+<ellipse fill="white" stroke="white" cx="5784" cy="-439" rx="72.192" ry="18"/>
+<text text-anchor="middle" x="5784" y="-435.3" font-family="Times,serif" font-size="14.00" fill="red">www.functx.com</text>
 </a>
 </g>
-<!-- imap_17 -->
-<g id="node91" class="node"><title>imap_17</title>
+<!-- 73 -->
+<g id="node115" class="node"><title>73</title>
 <a xlink:href="../www.zorba-xquery.com_modules_email_imap.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/email/imap">
-<ellipse fill="white" stroke="white" cx="4300" cy="-123" rx="31.1127" ry="19.0919"/>
-<text text-anchor="middle" x="4300" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="green">imap</text>
-</a>
-</g>
-<!-- c‑client -->
-<g id="node96" class="node"><title>c‑client</title>
-<a xlink:href="http://www.washington.edu/imap/" xlink:title="c‑client Library part of UW IMAP toolkit">
-<polygon fill="none" stroke="red" points="4171,-53 4117,-53 4113,-49 4113,-17 4167,-17 4171,-21 4171,-53"/>
-<polyline fill="none" stroke="red" points="4167,-49 4113,-49 "/>
-<polyline fill="none" stroke="red" points="4167,-49 4167,-17 "/>
-<polyline fill="none" stroke="red" points="4167,-49 4171,-53 "/>
-<text text-anchor="middle" x="4142" y="-31.9" font-family="Times Roman,serif" font-size="14.00">c‑client</text>
-</a>
-</g>
-<!-- imap_17&#45;&gt;c‑client -->
-<g id="edge42" class="edge"><title>imap_17-&gt;c‑client</title>
-<path fill="none" stroke="red" d="M4281.12,-107.463C4274.77,-103.027 4267.41,-98.6762 4260,-96 4226.39,-83.8578 4210.93,-105.886 4180,-88 4169.57,-81.969 4161.24,-71.7931 4155.08,-61.9607"/>
-<polygon fill="red" stroke="red" points="4158.03,-60.085 4150.02,-53.1563 4151.96,-63.571 4158.03,-60.085"/>
-</g>
-<!-- smtp_17 -->
-<g id="node92" class="node"><title>smtp_17</title>
+<ellipse fill="white" stroke="white" cx="3736" cy="-164" rx="28.3955" ry="18"/>
+<text text-anchor="middle" x="3736" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">imap</text>
+</a>
+</g>
+<!-- cclient -->
+<g id="node131" class="node"><title>cclient</title>
+<a xlink:href="http://www.washington.edu/imap/" xlink:title="c-client library part of UW IMAP toolkit">
+<polygon fill="none" stroke="red" points="3418,-91 3368,-91 3364,-87 3364,-55 3414,-55 3418,-59 3418,-91"/>
+<polyline fill="none" stroke="red" points="3414,-87 3364,-87 "/>
+<polyline fill="none" stroke="red" points="3414,-87 3414,-55 "/>
+<polyline fill="none" stroke="red" points="3414,-87 3418,-91 "/>
+<text text-anchor="middle" x="3391" y="-69.3" font-family="Times,serif" font-size="14.00">cclient</text>
+</a>
+</g>
+<!-- 73&#45;&gt;cclient -->
+<g id="edge68" class="edge"><title>73-&gt;cclient</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/email/imap, TO: cclient">
+<path fill="none" stroke="red" d="M3722.53,-148.124C3715.8,-141.575 3707.14,-134.388 3698,-130 3607.93,-86.7405 3488.3,-76.7467 3428.45,-74.54"/>
+<polygon fill="red" stroke="red" points="3428.44,-71.038 3418.34,-74.2212 3428.22,-78.0346 3428.44,-71.038"/>
+</a>
+</g>
+<!-- 72 -->
+<g id="node116" class="node"><title>72</title>
 <a xlink:href="../www.zorba-xquery.com_modules_email_smtp.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/email/smtp">
-<ellipse fill="white" stroke="white" cx="4220" cy="-123" rx="31.1127" ry="19.0919"/>
-<text text-anchor="middle" x="4220" y="-119.9" font-family="Times Roman,serif" font-size="14.00" fill="green">smtp</text>
-</a>
-</g>
-<!-- smtp_17&#45;&gt;c‑client -->
-<g id="edge46" class="edge"><title>smtp_17-&gt;c‑client</title>
-<path fill="none" stroke="red" d="M4200.86,-107.808C4193.96,-101.942 4186.33,-94.9696 4180,-88 4172.7,-79.9515 4165.53,-70.4863 4159.42,-61.7986"/>
-<polygon fill="red" stroke="red" points="4162.24,-59.7213 4153.7,-53.4515 4156.46,-63.6788 4162.24,-59.7213"/>
+<ellipse fill="white" stroke="white" cx="3661" cy="-164" rx="28.3955" ry="18"/>
+<text text-anchor="middle" x="3661" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">smtp</text>
+</a>
+</g>
+<!-- 72&#45;&gt;cclient -->
+<g id="edge66" class="edge"><title>72-&gt;cclient</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/email/smtp, TO: cclient">
+<path fill="none" stroke="red" d="M3645.71,-148.765C3637.93,-142.199 3628.01,-134.812 3618,-130 3555.21,-99.809 3474.58,-84.9292 3428.26,-78.4006"/>
+<polygon fill="red" stroke="red" points="3428.46,-74.8961 3418.08,-77.0237 3427.52,-81.8329 3428.46,-74.8961"/>
+</a>
+</g>
+<!-- 35 -->
+<g id="node118" class="node"><title>35</title>
+<a xlink:href="../www.zorba-xquery.com_modules_debugger_dbgp-message-handler.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/debugger/dbgp-message-handler">
+<ellipse fill="white" stroke="white" cx="1339" cy="-439" rx="90.4879" ry="18"/>
+<text text-anchor="middle" x="1339" y="-435.3" font-family="Times,serif" font-size="14.00" fill="red">dbgp-message-handler</text>
+</a>
+</g>
+<!-- 35&#45;&gt;18 -->
+<g id="edge108" class="edge"><title>35-&gt;18</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/debugger/dbgp-message-handler, TO: http://www.zorba-xquery.com/modules/converters/base64">
+<path fill="none" stroke="black" d="M1339,-420.972C1339,-395.03 1339,-345.357 1339,-314.326"/>
+<polygon fill="black" stroke="black" points="1342.5,-314.198 1339,-304.198 1335.5,-314.198 1342.5,-314.198"/>
+</a>
+</g>
+<!-- 42 -->
+<g id="node120" class="node"><title>42</title>
+<a xlink:href="../www.w3.org_2005_xqt-errors.html" xlink:title="(Zorba-core) module uri=http://www.w3.org/2005/xqt-errors">
+<ellipse fill="white" stroke="white" cx="6111" cy="-439" rx="45.244" ry="18"/>
+<text text-anchor="middle" x="6111" y="-435.3" font-family="Times,serif" font-size="14.00" fill="red">xqt-errors</text>
+</a>
+</g>
+<!-- 36 -->
+<g id="node121" class="node"><title>36</title>
+<a xlink:href="../www.zorba-xquery.com_errors.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/errors">
+<ellipse fill="white" stroke="white" cx="6016" cy="-439" rx="31.2965" ry="18"/>
+<text text-anchor="middle" x="6016" y="-435.3" font-family="Times,serif" font-size="14.00" fill="red">errors</text>
+</a>
+</g>
+<!-- 37 -->
+<g id="node122" class="node"><title>37</title>
+<a xlink:href="../www.zorba-xquery.com_warnings.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/warnings">
+<ellipse fill="white" stroke="white" cx="5924" cy="-439" rx="42.3456" ry="18"/>
+<text text-anchor="middle" x="5924" y="-435.3" font-family="Times,serif" font-size="14.00" fill="red">warnings</text>
+</a>
+</g>
+<!-- 52 -->
+<g id="node125" class="node"><title>52</title>
+<a xlink:href="../www.zorba-xquery.com_modules_util-jvm.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/util-jvm">
+<ellipse fill="white" stroke="white" cx="3837" cy="-164" rx="39.4691" ry="18"/>
+<text text-anchor="middle" x="3837" y="-160.3" font-family="Times,serif" font-size="14.00" fill="green">util-jvm</text>
+</a>
+</g>
+<!-- 52&#45;&gt;JDK -->
+<g id="edge60" class="edge"><title>52-&gt;JDK</title>
+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/util-jvm, TO: JDK">
+<path fill="none" stroke="red" d="M3816.7,-148.537C3805.55,-141.471 3791.14,-133.708 3777,-130 3755.48,-124.357 2995.85,-132.05 2976,-122 2966.48,-117.181 2958.82,-108.535 2953.05,-99.8952"/>
+<polygon fill="red" stroke="red" points="2955.88,-97.8142 2947.72,-91.0548 2949.88,-101.427 2955.88,-97.8142"/>
+</a>
+</g>
+<!-- 45 -->
+<g id="node128" class="node"><title>45</title>
+<a xlink:href="../www.zorba-xquery.com_modules_csx.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/csx">
+<ellipse fill="white" stroke="white" cx="6311" cy="-439" rx="27" ry="18"/>
+<text text-anchor="middle" x="6311" y="-435.3" font-family="Times,serif" font-size="14.00" fill="green">csx</text>
+</a>
+</g>
+<!-- 17 -->
+<g id="node129" class="node"><title>17</title>
+<a xlink:href="../www.zorba-xquery.com_modules_full-text.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/full-text">
+<ellipse fill="white" stroke="white" cx="6227" cy="-439" rx="38.4949" ry="18"/>
+<text text-anchor="middle" x="6227" y="-435.3" font-family="Times,serif" font-size="14.00" fill="red">full-text</text>
+</a>
 </g>
 </g>
 </svg>
\ No newline at end of file

=== modified file 'doc/zorba/xqdoc/src/generate-module-dependencies-svg.xq'
--- doc/zorba/xqdoc/src/generate-module-dependencies-svg.xq	2012-05-03 12:31:51 +0000
+++ doc/zorba/xqdoc/src/generate-module-dependencies-svg.xq	2012-05-18 15:41:19 +0000
@@ -14,17 +14,17 @@
  : limitations under the License.
 :)
 
-import module namespace z="http://www.zorba-xquery.com/module-dependencies" at "zorba_module_dependencies.xqi";
+import module namespace z="http://www.zorba-xquery.com/module-dependencies" at "zorba_module_dependencies.xqy";
 
 import module namespace dot="http://www.zorba-xquery.com/modules/image/graphviz";
 
 (: make xqdoc has to be run prior to thins in order to generate the XQDoc XML's :)
 (: this variable sets the destination of the XQDoc XML's :)
-declare variable $xqdocXMLPath as xs:string external;
+declare variable $ZorbaBuildFolder external;
 
 (
-z:create-collections($xqdocXMLPath)
-, dot:dot(z:create_graph(),()) 
+z:create-collections($ZorbaBuildFolder)
+, dot:dot(z:create_graph(),())
 (:, z:create_graph():)
 ,z:delete-collections()
 )
\ No newline at end of file

=== removed file 'doc/zorba/xqdoc/src/zorba_module_dependencies.xqi'
--- doc/zorba/xqdoc/src/zorba_module_dependencies.xqi	2012-05-15 23:55:36 +0000
+++ doc/zorba/xqdoc/src/zorba_module_dependencies.xqi	1970-01-01 00:00:00 +0000
@@ -1,432 +0,0 @@
-(:
- : Copyright 2006-2009 The FLWOR Foundation.
- :
- : Licensed under the Apache License, Version 2.0 (the "License");
- : you may not use this file except in compliance with the License.
- : You may obtain a copy of the License at
- :
- : http://www.apache.org/licenses/LICENSE-2.0
- :
- : Unless required by applicable law or agreed to in writing, software
- : distributed under the License is distributed on an "AS IS" BASIS,
- : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- : See the License for the specific language governing permissions and
- : limitations under the License.
-:)
-
-(:
- : author Sorin Nasoi
- :)
-
-module namespace z = "http://www.zorba-xquery.com/module-dependencies";
-
-declare namespace an = "http://www.zorba-xquery.com/annotations";
-declare namespace zm = "http://www.zorba-xquery.com/manifest";
-
-import module namespace file = "http://expath.org/ns/file";
-import module namespace dot = "http://www.zorba-xquery.com/modules/image/graphviz";
-import module namespace xqdoc2html = "http://www.zorba-xquery.com/modules/xqdoc2xhtml/";
-import module namespace functx = "http://www.functx.com/";
-
-import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
-import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
-
-import schema namespace xqdoc = "http://www.xqdoc.org/1.0";
-  
-declare variable $z:nodesCollector := <modules/>;
-
-declare variable $z:edgesCollector := <edges/>;
-
-declare variable $z:typeModule          := 'module';
-declare variable $z:typeExternalLibrary := 'library';
-declare variable $z:typeSchema          := 'schema';
-
-declare variable $z:colors      as xs:string* := ('red'       , 'green');
-declare variable $z:moduleTypes as xs:string* := ('Zorba-core', 'External module');
-
-(:~
- :  Collector for the Zorba manifest
- :)
-declare %private variable $z:ZorbaManifest := <manifest/>;
-
-(:=========================================================================================================:)
-declare variable $z:level1Weight as xs:string* := 
-("www.w3.org", "XDM", "store", "introspection", "reflection",
- "external", "xqdoc","data processing", "programming languages", "excel", 
- "cryptography", "geo", "image", "OAuth", "expath.org",
- "www.functx.com", "communication");
- 
-declare variable $z:level1Colors as xs:string* := 
-("mediumvioletred", "lightsteelblue", "sienna", "dimgray", "slategray",
- "Gold", "moccasin","tan", "RosyBrown", "wheat", 
- "LightGreen", "forestgreen", "olivedrab", "darkkhaki", "cornflowerblue",
- "yellow", "Chartreuse");
- 
-
-declare variable $z:collection as xs:QName := xs:QName("z:collection");
-declare collection z:collection as node()*;
-
-declare %private function z:fix-uri($moduleUri) as xs:string
-{
-  (: TODO there's a bug in the ZorbaManifest.xml :)
-  if($moduleUri = "http://expath.org/ns/http-client") then 
-    concat($moduleUri,".xq") 
-  else $moduleUri
-};
-
-declare %private function z:get-project-root(
-  $moduleUri as xs:string
-  ) as xs:string
-{
-  xs:string(data($z:ZorbaManifest/module[@uri= z:fix-uri($moduleUri)]/@projectRoot))
-};
-
-declare %private function z:get-is-core(
-  $moduleUri) as xs:boolean
-{
-  xs:boolean(data($z:ZorbaManifest/module[@uri= z:fix-uri($moduleUri)]/@isCore))
-};
-
-declare %an:sequential function z:create-collection-categories (
-$collectionName as xs:QName,
-$xqdocXmlPath as xs:string)
-{
-  ddl:create($collectionName);
-  
-  (: gather all the XQDoc XML's :)
-  for $xqdocRelPath in file:list($xqdocXmlPath, fn:false(), "*.xml")
-  let $path := fn:concat($xqdocXmlPath, file:directory-separator(), $xqdocRelPath )
-  let $xqdoc := fn:parse-xml(file:read-text($path))
-  return dml:apply-insert-nodes($collectionName, $xqdoc);
-};
-
-declare %an:sequential function z:create-collections($xqdocXMLPath as xs:string) 
-{ 
-  variable $xqdocBuildPath as xs:string := 
-  fn:substring-before($xqdocXMLPath, fn:concat(file:directory-separator(),"xml"));
-  
-  variable $xqdocXmlConfigPath as xs:string := 
-  fn:concat($xqdocBuildPath, file:directory-separator(), "config");
-  
-  variable $manifestXMLPath := trace(concat($xqdocXMLPath,file:directory-separator(),
-                                  "..",file:directory-separator(), 
-                                  "..",file:directory-separator(),
-                                  "..",file:directory-separator(),
-                                  "..",file:directory-separator(),"ZorbaManifest.xml"),"$manifestXMLPath");
-  variable $manifestXML := fn:parse-xml(file:read-text($manifestXMLPath));    
-  variable $moduleManifests := $manifestXML//*:module;    
-       
-  for $module in $moduleManifests
-  return
-    insert node <module uri="{data($module/zm:uri)}"
-                        isCore="{data($module/@isCore)}"
-                        version="{if (exists(data($module/@version))) then data($module/@version) else ''}"
-                        projectRoot="{data($module/zm:projectRoot)}"/> as last into $z:ZorbaManifest;
-  
-  z:create-collection-categories (xs:QName("z:collection"), $xqdocXMLPath);
-  
-  z:fill-nodesCollector();
-  
-  z:fill_edgesCollector();
-};
-
-declare %an:sequential function z:delete-collections()
-{ 
-  dml:delete-nodes(dml:collection(xs:QName("z:collection")));                           
-  ddl:delete(xs:QName("z:collection"));
-};
- 
-(:~
- : Fill the $z:nodesCollector with all the available modules.
- :)
-declare %an:sequential function z:fill-nodesCollector() as xs:string*
-{
-  for $category in $z:level1Weight
-  return
-    for $docNode in dml:collection(xs:QName("z:collection"))
-    let $xqdoc := $docNode/xqdoc:xqdoc
-    let $lModuleUri := data($xqdoc/xqdoc:module/xqdoc:uri)
-    let $lModuleProject := if(exists($xqdoc/xqdoc:module/xqdoc:custom[@tag="project"])) 
-                                then $xqdoc/xqdoc:module/xqdoc:custom[@tag="project"]/text() 
-                                else data($xqdoc/xqdoc:module/xqdoc:uri)
-    let $tok := tokenize($lModuleProject,"/")[1]
-    let $subProject as xs:string? := replace(replace(substring-after($lModuleProject,concat($tok,"/")),"/","_")," ","_")
-    let $subProjectFinal := if(not(contains($subProject,"2005")) 
-                               and ($subProject ne "") 
-                               and not($lModuleProject = $lModuleUri)) 
-                            then concat($subProject,"_") 
-                            else ()
-    let $lName := concat($subProjectFinal,fn:replace(substring-before(data($xqdoc/xqdoc:module/xqdoc:name),"."),"-","_"))
-    where (fn:starts-with($lModuleProject, $category) or
-           fn:contains($lModuleProject, $category))
-    return
-    if(exists($lName)) then
-      z:collect-node ($lModuleUri, 
-                      $lName, 
-                      $category, 
-                      fn:string(index-of($z:level1Weight,$category))
-                      )
-    else () 
-};
-
-declare %private %an:sequential function z:collect-node (
-  $moduleURI as xs:string, 
-  $name as xs:string,
-  $lModuleProject as xs:string,
-  $catUi as xs:string) 
-{
-  insert node <module uri="{$moduleURI}" 
-                      name="{$name}" 
-                      moduleProject="{$lModuleProject}" 
-                      catUi="{$catUi}" /> 
-  as last into $z:nodesCollector;
-};
-
-(:~
- : Fill $z:edgesCollector with all the edges (the links between the nodes) for both modules and eternal library dependencies.
- :)
-declare %an:sequential function z:fill_edgesCollector()
-{  
-  for $docNode in dml:collection(xs:QName("z:collection"))
-  let $xqdoc := $docNode/xqdoc:xqdoc
-  return
-    (
-    (: add imported modules :)
-    if (fn:count($xqdoc/xqdoc:imports//xqdoc:import[@type = "library"]) > 0) then
-      for $import in $xqdoc/xqdoc:imports//xqdoc:import[@type = "library"]
-      let $from := $z:nodesCollector//module[@uri=data($xqdoc/xqdoc:module/xqdoc:uri)]
-      let $to := $z:nodesCollector//module[@uri=string($import/xqdoc:uri/text())]
-      return
-        z:collect-edge(data($z:nodesCollector//module[@uri = data($xqdoc/xqdoc:module/xqdoc:uri)]/@catUri),
-                       concat(data($from/@name),'_',data($from/@catUi)),
-                       data($xqdoc/xqdoc:module/xqdoc:uri),
-                       concat(data($to/@name),'_',data($to/@catUi)),
-                       string($import/xqdoc:uri/text()),
-                       $z:typeModule)                      
-    else
-      (),
-    (: add external c++ libraries dependencies :)
-    
-    if (fn:count($xqdoc/xqdoc:module/xqdoc:comment//xqdoc:library) > 0) then
-      for $libraryDependency in $xqdoc/xqdoc:module/xqdoc:comment//xqdoc:library
-      let $from := $z:nodesCollector//module[@uri=data($xqdoc/xqdoc:module/xqdoc:uri)]
-      let $to := $libraryDependency/*:a
-      return
-        z:collect-edge(data($z:nodesCollector//module[@uri eq data($xqdoc/xqdoc:module/xqdoc:uri)]/@catUri),
-                       concat(data($from/@name),'_',data($from/@catUi)),
-                       data($xqdoc/xqdoc:module/xqdoc:uri),
-                       concat(data($to/text()),'|',data($to/@href) ),
-                       "",
-                       $z:typeExternalLibrary) 
-    else
-      ())
-};
-
-declare %private %an:sequential function z:collect-edge (
-  $catUri as xs:string?,
-  $nameFrom as xs:string?,
-  $uriFrom as xs:string?,  
-  $nameTo as xs:string?,
-  $uriTo as xs:string?,
-  $type as xs:string?) 
-{
-  insert node <edge catUri  ="{$catUri}" 
-                    nameFrom="{$nameFrom}"
-                    uriFrom ="{$uriFrom}"
-                    nameTo  ="{$nameTo}"
-                    uriTo   ="{$uriTo}"
-                    type    ="{$type}" /> 
-  as last into $z:edgesCollector;
-};
-
-declare function z:test()
-{
-(:
-  string-join(
-  for $edge in $z:edgesCollector//edge
-  return fn:concat($edge/@catUri,"|", $edge/@nameFrom, "|",  $edge/@uriFrom, "|", $edge/@nameTo),"
-")
- 
-  string-join(
-  for $module in $z:nodesCollector//module
-  return fn:concat($module/@uri,"|", $module/@name, "|",  $module/@moduleProject, "|", $module/@catUi),"
-")
-:)
-};
-
-(:~
- : This function returns the module type (see $z:moduleType)
- : based on the existance of the externals functions withing the module and also
- : it takes into account the imported modules.
- :)
-declare function z:get_module_type($moduleUri as xs:string) as xs:integer
-{
-  if(z:get-is-core($moduleUri)) then xs:integer(1)
-  else xs:integer(2)
-};
-
-(:~
- : Format the properties of a module dot shape (link to a file, tooltip, color of the text showing the module name).
- :)
-declare function z:get_shape_properties( 
-  $ModuleUri as xs:string,
-  $lLabel as xs:string) as xs:string
-{
-  let $file as xs:string := concat(xqdoc2html:get-filename($ModuleUri),".html")
-  let $type := z:get_module_type($ModuleUri)
-  return
-    fn:concat('[URL="../',$file,'" tooltip="(',$z:moduleTypes[$type],') module uri=', $ModuleUri,'" label="',$lLabel,'" fontcolor="', $z:colors[$type] ,'"]')
-};
-
-(:~
- : Get the nodes that represent modules based on a provided category URI.
- :)
-declare function z:nodes_modules(
-  $category as xs:string) as xs:string 
-{             
-  let $nodes :=
-  string-join(
-  for $node in $z:nodesCollector//module
-    let $lModuleUri := data($node/@uri)
-    let $lLabel := data($node/@name)
-    let $lName := concat($lLabel,'_', data($node/@catUi),z:get_shape_properties($lModuleUri, $lLabel))
-    where $node[@moduleProject = $category]
-    order by $lModuleUri
-    return
-      $lName,";
-    ")
-  return
-    if($nodes eq '') then ''
-    else concat($nodes,';')
-    
-};
-
-(:~
- : Get the nodes that represent external library dependencies.
- :)
-declare function z:nodes_external_libraries() as xs:string 
-{
-  let $nodes :=
-  string-join(
-  for $edge in $z:edgesCollector//edge
-  let $tok := tokenize(data($edge/@nameTo),'\|')
-  let $nodeLabel := replace(tokenize($tok[1],' ')[1],'\+','')
-  let $link := $tok[2]
-  let $node := data($edge/@nameTo)
-  let $lName := concat($nodeLabel,'[URL="',$link,'" tooltip="', $tok[1],'" label="',$nodeLabel,'"]')
-  where data($edge/@type) eq $z:typeExternalLibrary
-  group by $nodeLabel
-    return
-      $lName,";
-    ")
-  return
-    if($nodes eq '') then ''
-    else concat($nodes,';')
-};
-
-(:~
- : Get all the edges (the links between the nodes) for both modules and eternal library dependencies.
- :)
-declare function z:edges($category) as xs:string
-{
-let $lcatUri := data($category/@uri)
-let $edges :=
-  string-join(
-    for $edge in $z:edgesCollector//edge    
-    where $lcatUri eq $edge/@catUri
-    return concat($edge/@nameFrom,'->',$edge/@nameTo),
-  ';
-')
-return
-  if($edges eq '') then ''
-  else concat($edges,';')
-};
-
-(:~
- : Get all the edges (the links between the nodes) between modules.
- :)
-declare function z:edges_modules() as xs:string
-{
-let $edges :=
-  string-join(
-    for $edge in $z:edgesCollector//edge
-    where data($edge/@type) eq $z:typeModule
-    return concat('    ',$edge/@nameFrom,'->',$edge/@nameTo),
-  ';
-')
-return
-  if($edges eq '') then ''
-  else concat($edges,';')
-};
-
-(:~
- : Get all the edges (the links between the nodes) between modules and externall c++ libraries.
- :)
-declare function z:edges_libraries() as xs:string
-{
-let $edges :=
-  string-join(
-    for $edge in $z:edgesCollector//edge
-    let $tok := tokenize(data($edge/@nameTo),'\|')
-    let $nodeLabel := replace(tokenize($tok[1],' ')[1],'\+','')
-    where data($edge/@type) eq $z:typeExternalLibrary
-    return concat('    ',$edge/@nameFrom,'->',$nodeLabel,'[color="red"]'),
-  ';
-')
-return
-  if($edges eq '') then ''
-  else concat($edges,';')
-};
-
-(:~
- : Generate the cluster for the external c++ libraries.
- :)
-declare function z:create_subgraph_libraries() as xs:string
-{
-  concat('
-  
-    subgraph clusterExternalCPPLibs  { style=filled; color=darksalmon; node [shape=box3d, color=red];
-    ',
-    z:nodes_external_libraries(),'
-
-',
-    z:edges_libraries(),'
-    label="External C++ Library dependencies"; }')
-};
-
-(:~
- : Generate the cluster for a specific category.
- :)
-declare function z:create_subgraph(
-  $category as xs:string) as xs:string
-{
-concat('
-    subgraph cluster',
-        index-of($z:level1Weight,$category),
-        (:   '{ node [style=filled];  color=',data($category/@color),';   :)
-        ' { style=filled; color=',$z:level1Colors[index-of($z:level1Weight,$category)],'; node [style="filled", color=white];
-    ',
-z:nodes_modules($category),'
-',
-'    label="',$category,'";','}')
-};
-
-(:~
- : Generate the BIG cluster.
- :)
-declare function z:create_graph() as xs:string
-{
-    concat('digraph G {
-' ,
-            string-join(
-              for $cat1 in  $z:level1Weight
-              return z:create_subgraph($cat1)
-              ,('
-  ')), z:create_subgraph_libraries()
-    ,"
-  
-",
-  z:edges_modules(),"
-  }"
-  )
-};

=== added file 'doc/zorba/xqdoc/src/zorba_module_dependencies.xqy'
--- doc/zorba/xqdoc/src/zorba_module_dependencies.xqy	1970-01-01 00:00:00 +0000
+++ doc/zorba/xqdoc/src/zorba_module_dependencies.xqy	2012-05-18 15:41:19 +0000
@@ -0,0 +1,462 @@
+(:
+ : Copyright 2006-2009 The FLWOR Foundation.
+ :
+ : Licensed under the Apache License, Version 2.0 (the "License");
+ : you may not use this file except in compliance with the License.
+ : You may obtain a copy of the License at
+ :
+ : http://www.apache.org/licenses/LICENSE-2.0
+ :
+ : Unless required by applicable law or agreed to in writing, software
+ : distributed under the License is distributed on an "AS IS" BASIS,
+ : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ : See the License for the specific language governing permissions and
+ : limitations under the License.
+:)
+
+(:
+ : author Sorin Nasoi
+ :)
+
+module namespace z = "http://www.zorba-xquery.com/module-dependencies";
+
+declare namespace an = "http://www.zorba-xquery.com/annotations";
+declare namespace zm = "http://www.zorba-xquery.com/manifest";
+
+import module namespace file        = "http://expath.org/ns/file";
+import module namespace functx      = "http://www.functx.com/";
+
+import module namespace dot         = "http://www.zorba-xquery.com/modules/image/graphviz";
+import module namespace xqd         = "http://www.zorba-xquery.com/modules/xqdoc";
+import module namespace xqdoc2html  = "http://www.zorba-xquery.com/modules/xqdoc2xhtml/";
+import module namespace pxqdoc      = "http://www.zorba-xquery.com/modules/project_xqdoc";
+import module namespace fetch       = "http://www.zorba-xquery.com/modules/fetch";
+import module namespace dml         = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
+import module namespace ddl         = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
+import module namespace err         = "http://www.zorba-xquery.com/modules/xqdoc2xhtml/error";
+
+declare namespace werr = "http://www.w3.org/2005/xqt-errors";
+
+import schema namespace xqdoc = "http://www.xqdoc.org/1.0";
+
+declare variable $z:nodesCollector := <modules/>;
+
+declare variable $z:edgesCollector := <edges/>;
+
+declare variable $z:typeModule          := 'module';
+declare variable $z:typeExternalLibrary := 'library';
+declare variable $z:typeSchema          := 'schema';
+
+declare variable $z:colors      as xs:string* := ('red'       , 'green');
+declare variable $z:moduleTypes as xs:string* := ('Zorba-core', 'External module');
+
+(:~
+ :  Collector for the Zorba manifest
+ :)
+declare %private variable $z:ZorbaManifest := <manifest/>;
+
+(:=========================================================================================================:)
+declare variable $z:level1Weight as xs:string* := 
+("www.w3.org", "XDM", "store", "introspection", "reflection",
+ "external", "xqdoc","data processing", "programming languages", "excel",
+ "cryptography", "geo", "image", "OAuth", "expath.org",
+ "www.functx.com", "communication", "debugger", "error", "utils", 
+ "www.zorba-xquery.com");
+ 
+declare variable $z:level1Colors as xs:string* :=
+("mediumvioletred", "lightsteelblue", "sienna", "dimgray", "slategray",
+ "Gold", "moccasin","tan", "RosyBrown", "wheat",
+ "LightGreen", "forestgreen", "olivedrab", "darkkhaki", "cornflowerblue",
+ "yellow", "Chartreuse", "DarkGoldenRod", "DarkSeaGreen", "DarkSlateBlue ",
+ "DodgerBlue");
+ 
+
+declare variable $z:collection as xs:QName := xs:QName("z:collection");
+declare collection z:collection as node()*;
+
+declare %private function z:get-is-core(
+  $moduleUri) as xs:boolean
+{
+  if(fn:string(data($z:ZorbaManifest/module[@uri= $moduleUri]/@isCore)) = "true") then fn:true()
+  else fn:false()
+};
+
+declare %an:sequential function z:create-collections($ZorbaBuildFolder as xs:string)
+{
+  ddl:create($z:collection);
+
+  variable $zorbaManifestPath := concat($ZorbaBuildFolder,
+                                        file:directory-separator(),
+                                        "ZorbaManifest.xml");
+
+  variable $manifestXML := pxqdoc:load-manifest($zorbaManifestPath);
+  variable $moduleManifests := $manifestXML/zm:manifest/zm:module;
+  if(count($moduleManifests) eq xs:integer(0)) then ();
+  else
+  {
+    try 
+    {
+      for $module in $moduleManifests
+      let $moduleURI := data($module/zm:uri)
+      let $moduleFetched := fetch:content($moduleURI, "MODULE")
+      let $xqdoc := xqd:xqdoc-content($moduleFetched)
+      return
+      {
+        insert node <module uri="{$moduleURI}"
+                            isCore="{data($module/@isCore)}"
+                            version="{if (exists(data($module/@version))) then data($module/@version) else ''}"
+                            projectRoot="{data($module/zm:projectRoot)}"/> as last into $z:ZorbaManifest;
+        
+        dml:apply-insert-nodes($z:collection, $xqdoc);
+      }
+    }
+    catch *
+    {
+      fn:error($err:UE004,
+               concat("Error processing module ",
+                      $werr:code,
+                      " - ",
+                      $werr:description));
+    }
+  }
+  
+  z:fill-nodesCollector();
+  
+  z:fill_edgesCollector();
+};
+
+declare %an:sequential function z:delete-collections()
+{ 
+  dml:delete-nodes(dml:collection(xs:QName("z:collection")));
+  ddl:delete(xs:QName("z:collection"));
+};
+
+declare %private function z:getModuleProject(
+    $moduleUri as xs:string) as xs:string {
+    
+    for $docNode in dml:collection(xs:QName("z:collection"))
+    let $lModuleUri := data($docNode/xqdoc:module/xqdoc:uri),
+        $lModuleProject := $docNode/xqdoc:module/xqdoc:comment/xqdoc:custom[@tag="project"]/text(),
+        $lTmp := substring-after($lModuleUri,'http://'),
+        $lTmpTok := tokenize($lTmp,'/'),
+        $lTmp2 := if(ends-with($lTmp,'/')) then substring($lTmp,1,string-length($lTmp)-1) else string-join(functx:value-except($lTmpTok,$lTmpTok[last()]),'/'),
+        $lModuleName    := if(ends-with($lModuleUri,'/')) then $lTmpTok[last()-1] else $lTmpTok[last()],
+        $structure      := if(exists($lModuleProject)) then $lModuleProject else $lTmp2
+    where fn:string($lModuleUri) eq $moduleUri
+    return $structure
+};
+
+(:~
+ : Fill the $z:nodesCollector with all the available modules.
+ :)
+declare %an:sequential function z:fill-nodesCollector()
+{
+  for $docNode in dml:collection(xs:QName("z:collection"))
+  let $lModuleUri := data($docNode/xqdoc:module/xqdoc:uri)
+  let $structure := z:getModuleProject(fn:string($lModuleUri))
+  return
+    z:collect-node ($lModuleUri,
+                    $structure,
+                    fn:string(index-of(dml:collection(xs:QName("z:collection")), $docNode))
+                    )
+};
+
+declare %private %an:sequential function z:collect-node (
+  $moduleURI        as xs:string,
+  $lModuleProject   as xs:string,
+  $index            as xs:string)
+{
+  insert node <module uri="{$moduleURI}"
+                      moduleProject="{$lModuleProject}"
+                      index="{$index}" />
+  as last into $z:nodesCollector;
+};
+
+declare %private function z:get_subgraphs() as xs:string*
+{
+    let $subgraphs as xs:string* := distinct-values(
+                        for $module in $z:nodesCollector//module
+                        return fn:string(data($module/@moduleProject))
+                      )
+    (: Order the subgraphs based on the Level1Weight :)
+    return for $str in $z:level1Weight
+           return
+             for $tmp in $subgraphs
+             where starts-with($tmp, $str)
+             order by $tmp
+             return $tmp
+};
+
+
+(:~
+ : Fill $z:edgesCollector with all the edges (the links between the nodes) for both modules and eternal library dependencies.
+ :)
+declare %an:sequential function z:fill_edgesCollector()
+{  
+  for $xqdoc in dml:collection(xs:QName("z:collection"))
+  return
+    (
+    (: add imported modules :)
+    if (fn:count($xqdoc/xqdoc:imports//xqdoc:import[@type = "library"]) > 0) then
+      for $import in $xqdoc/xqdoc:imports//xqdoc:import[@type = "library"]
+      let $from := $z:nodesCollector//module[@uri=data($xqdoc/xqdoc:module/xqdoc:uri)]
+      let $to := $z:nodesCollector//module[@uri=string($import/xqdoc:uri/text())]
+      return
+        z:collect-edge(data($z:nodesCollector//module[@uri = data($xqdoc/xqdoc:module/xqdoc:uri)]/@catUri),
+                       fn:string(data($from/@index)),
+                       data($xqdoc/xqdoc:module/xqdoc:uri),
+                       fn:string(data($to/@index)),
+                       string($import/xqdoc:uri/text()),
+                       $z:typeModule)
+    else
+      (),
+    (: add external c++ libraries dependencies :)
+    
+    if (fn:count($xqdoc/xqdoc:module/xqdoc:comment/xqdoc:custom[@tag="library"]) > 0) then
+      for $libraryDependency in $xqdoc/xqdoc:module/xqdoc:comment/xqdoc:custom[@tag="library"]
+      let $from := $z:nodesCollector//module[@uri=data($xqdoc/xqdoc:module/xqdoc:uri)]
+      let $to := $libraryDependency/*:a
+      return
+        z:collect-edge(fn:string(data($from/@moduleProject)),
+                       fn:string(data($from/@index)),
+                       fn:string(data($from/@uri)),
+                       concat(fn:data($to),'|',data($to/@href) ),
+                       "",
+                       $z:typeExternalLibrary)
+    else
+      ())
+};
+
+declare %private %an:sequential function z:collect-edge (
+  $catUri   as xs:string?,
+  $nameFrom as xs:string?,
+  $uriFrom  as xs:string?,
+  $nameTo   as xs:string?,
+  $uriTo    as xs:string?,
+  $type     as xs:string?)
+{
+  insert node <edge catUri  ="{$catUri}"
+                    nameFrom="{$nameFrom}"
+                    uriFrom ="{$uriFrom}"
+                    nameTo  ="{$nameTo}"
+                    uriTo   ="{$uriTo}"
+                    type    ="{$type}" />
+  as last into $z:edgesCollector;
+};
+
+declare function z:test() as xs:string
+{
+(:
+  string-join(
+  for $edge in $z:edgesCollector//edge
+  return fn:concat($edge/@catUri,"|", $edge/@nameFrom, "|",  $edge/@uriFrom, "|", $edge/@nameTo),"
+")
+ :)
+ (:
+  string-join(
+  for $module in $z:nodesCollector//module
+  return fn:concat($module/@uri,"|", $module/@moduleProject, "|", $module/@catUi),"
+")
+:)
+};
+
+(:~
+ : This function returns the module type (see $z:moduleType)
+ : based on the existance of the externals functions withing the module and also
+ : it takes into account the imported modules.
+ :)
+declare function z:get_module_type($moduleUri as xs:string) as xs:integer
+{
+  if(z:get-is-core($moduleUri)) then xs:integer(1)
+  else xs:integer(2)
+};
+
+(:~
+ : Format the properties of a module dot shape (link to a file, tooltip, color of the text showing the module name).
+ :)
+declare function z:get_shape_properties( 
+  $ModuleUri as xs:string,
+  $lLabel as xs:string) as xs:string
+{
+  let $file as xs:string := concat(xqdoc2html:get-filename($ModuleUri),".html")
+  let $type := z:get_module_type($ModuleUri)
+  return
+    fn:concat('[URL="../',$file,'" tooltip="(',$z:moduleTypes[$type],') module uri=', $ModuleUri,'" label="',$lLabel,'" fontcolor="', $z:colors[$type] ,'"]')
+};
+
+(:~
+ : Get the nodes that represent modules based on a provided category URI.
+ :)
+declare function z:nodes_modules(
+  $category as xs:string) as xs:string
+{
+  let $nodes :=
+  string-join(
+  for $module in $z:nodesCollector//module
+    let $lModuleUri := data($module/@uri)
+    let $tok := tokenize($lModuleUri,"/")
+    let $lLabel := if(ends-with($lModuleUri,'/')) then $tok[last()-1] else $tok[last()]
+    let $lName := concat(data($module/@index),z:get_shape_properties($lModuleUri, $lLabel))
+    where fn:string(data($module/@moduleProject)) = $category
+    order by $lModuleUri
+    return
+      $lName,";
+    ")
+  return
+    if($nodes eq '') then ''
+    else concat($nodes,';')
+    
+};
+
+(:~
+ : Get the nodes that represent external library dependencies.
+ :)
+declare function z:nodes_external_libraries() as xs:string
+{
+  let $nodes :=
+  string-join(
+  for $edge in $z:edgesCollector//edge
+  let $tok := tokenize(data($edge/@nameTo),'\|')
+  let $nodeLabel := replace(replace(tokenize($tok[1],' ')[1],'\+',''),'-','')
+  let $link := $tok[2]
+  let $node := data($edge/@nameTo)
+  let $lName := concat($nodeLabel,'[URL="',$link,'" tooltip="', $tok[1],'" label="',$nodeLabel,'"]')
+  where data($edge/@type) eq $z:typeExternalLibrary
+  group by $nodeLabel
+    return
+      $lName,";
+    ")
+  return
+    if($nodes eq '') then ''
+    else concat($nodes,';')
+};
+
+(:~
+ : Get all the edges (the links between the nodes) between modules.
+ :)
+declare function z:edges_modules() as xs:string
+{
+let $edges :=
+  string-join(
+    for $edge in $z:edgesCollector//edge
+    where data($edge/@type) eq $z:typeModule
+    return concat('    ',$edge/@nameFrom,'->',$edge/@nameTo,'[tooltip="FROM: ',concat($edge/@uriFrom,', TO: ',$edge/@uriTo),'"]')
+,';
+')
+return
+  if($edges eq '') then ''
+  else concat($edges,';')
+};
+
+(:~
+ : Get all the edges (the links between the nodes) between modules and externall c++ libraries.
+ :)
+declare function z:edges_libraries() as xs:string
+{
+let $edges :=
+  string-join(
+    for $edge in $z:edgesCollector//edge
+    let $tok := tokenize(data($edge/@nameTo),'\|')
+    let $nodeLabel := replace(replace(tokenize($tok[1],' ')[1],'\+',''),"-","")
+    where data($edge/@type) eq $z:typeExternalLibrary
+    return concat('    ',$edge/@nameFrom,'->',$nodeLabel,'[tooltip="FROM: ', 
+    concat($edge/@uriFrom,', TO: ',$nodeLabel) 
+    ,'" color="red"]'),
+  ';
+')
+return
+  if($edges eq '') then ''
+  else concat($edges,';')
+};
+
+(:~
+ : Generate the cluster for the external c++ libraries.
+ :)
+declare function z:create_subgraph_libraries() as xs:string
+{
+  concat('
+  
+    subgraph clusterExternalCPPLibs  { style=filled; color=darksalmon; node [shape=box3d, color=red];
+    ',
+    z:nodes_external_libraries(),'
+
+',
+    z:edges_libraries(),'
+    label="External C++ Library dependencies"; }')
+};
+
+(:~
+ : Generate the cluster for a specific category.
+ :)
+declare function z:create_subgraph(
+  $category   as xs:string,
+  $subGraphs  as xs:string*) as xs:string
+{
+  concat('
+    subgraph cluster',
+      index-of($z:level1Weight, $category),
+      ' { style=filled; color=',$z:level1Colors[index-of($z:level1Weight,$category)],'; node [style="filled", color=white];
+    ',
+    z:create_subgraph-rec($category,
+                          for $tmp in $subGraphs
+                          where (starts-with($tmp, $category) and (contains($tmp,"/")))
+                          return $tmp),'
+    ',
+z:nodes_modules($category),'
+',
+'    label="',$category,'"; tooltip="',$category,'"}')
+};
+
+declare %private function z:create_subgraph-rec(
+  $category   as xs:string,
+  $subGraphs  as xs:string*
+  ) as xs:string
+{
+let $lSubGraphs := distinct-values( for $tmp in $subGraphs
+                                    return tokenize(substring-after($tmp, concat($category,"/")),"/")[1]
+                                    )
+return
+string-join(
+for $sg in $lSubGraphs
+let $newSg := concat($category,"/",$sg)
+return
+concat('
+    subgraph cluster',
+        translate($newSg," -./",""),'{ style=filled;
+    ',
+        z:create_subgraph-rec($newSg,
+                          for $tmp in $subGraphs
+                          where starts-with($tmp, $newSg)
+                          return $tmp),'
+    ',
+z:nodes_modules($newSg),'
+',
+'    label="',$sg,'"; tooltip="',$newSg,'"}'),'
+')
+};
+
+(:~
+ : Generate the BIG cluster.
+ :)
+declare function z:create_graph() as xs:string
+{
+let $subgraphs := z:get_subgraphs()
+return
+    concat('digraph G { penwidth=1; pencolor=black; label="Zorba modules dependency graph"; tooltip="Zorba modules dependency graph"
+' ,
+            string-join(
+              for $cat1 in  $z:level1Weight
+              return z:create_subgraph( $cat1, 
+                                        for $val in $subgraphs
+                                        where starts-with($val, $cat1)
+                                        return $val
+                                       )
+              ,('
+  ')), z:create_subgraph_libraries()
+    ,"
+  
+",
+  z:edges_modules(),"
+  }"
+  )
+};
\ No newline at end of file

=== modified file 'modules/com/zorba-xquery/www/modules/project_xqdoc.xq'
--- modules/com/zorba-xquery/www/modules/project_xqdoc.xq	2012-05-03 12:31:51 +0000
+++ modules/com/zorba-xquery/www/modules/project_xqdoc.xq	2012-05-18 15:41:19 +0000
@@ -70,8 +70,14 @@
   else ();
 };
 
-declare %private %an:nondeterministic function pxqdoc:load-manifest(
-  $zorbaManifestPath as xs:string)
+(:~
+ : This function loads the ZorbaManifest.xml
+ :
+ : @param $zorbaManifestPath location of ZorbaManifest.xml.
+ : @return the manifest.
+ :)
+declare %an:nondeterministic function pxqdoc:load-manifest(
+  $zorbaManifestPath as xs:string) as document-node()?
 {
   try 
   {

=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-05-03 12:31:51 +0000
+++ modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-05-18 15:41:19 +0000
@@ -199,28 +199,14 @@
 
 };
 
-(:~
- : Returns the URI of the module given the passed <pre>$folderPath</pre> using
- : the Zorba URI resolving mechanism.
- :
- : @param $folderPath the folder path.
- : @return the URI of the module.
- :)
- (:
-declare %private function xqdoc2html:get-URI-from-location($folderPath as xs:string) as xs:string {
-  let $tok := tokenize($folderPath, fn:concat("\",file:directory-separator()))
-  return
-    fn:concat('http://', $tok[3],'.', $tok[2],'.', $tok[1], substring-after($folderPath, $tok[3]))
-};
-:)
-
-(:~ Returns the string resulting from replacing the directory-separators (i.e. / ) with '_'
+(:~ 
+ : Returns the string resulting from replacing the directory-separators (i.e. // ) with '_'
  :
  : @param $moduleURI the path to the module URI.
- : @return the string resulting from replacing the directory-separators (i.e. / ) with '_'.
+ : @return the string resulting from replacing the directory-separators (i.e. // ) with '_'.
  :
  :)
-declare %private function xqdoc2html:get-filename($moduleURI as xs:string) as xs:string {
+declare function xqdoc2html:get-filename($moduleURI as xs:string) as xs:string {
   let $lmodule := if(fn:ends-with($moduleURI,"/")) then fn:concat($moduleURI,"index") else $moduleURI
   return
     replace(
@@ -419,6 +405,17 @@
 
   dml:delete-nodes(dml:collection(xs:QName("xqdoc2html:collection")));
   ddl:delete(xs:QName("xqdoc2html:collection"));
+  
+  (:delete modules_new.svg if it exists:)
+  variable $SVGGraph := fn:concat($xhtmlRequisitesPath,
+                        file:directory-separator(),
+                        "images",
+                        file:directory-separator(),
+                        "modules_new.svg");
+
+  if(file:exists($SVGGraph)) then
+        file:delete($SVGGraph);
+  else ();
 };
 
 declare %private function xqdoc2html:get-project-root(