zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-978722 into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #978722 in Zorba: "change annotation prefix from "ann" to "an""
  https://bugs.launchpad.net/zorba/+bug/978722

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-978722/+merge/101516

fix for bug #978722 (change annotation prefix from "ann" to "an")
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-978722/+merge/101516
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'modules/com/zorba-xquery/www/modules/converters/json.xq'
--- modules/com/zorba-xquery/www/modules/converters/json.xq	2012-02-11 01:09:29 +0000
+++ modules/com/zorba-xquery/www/modules/converters/json.xq	2012-04-11 09:20:28 +0000
@@ -100,7 +100,7 @@
 import schema namespace json-options =
   "http://www.zorba-xquery.com/modules/converters/json-options";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 declare namespace zerr = "http://www.zorba-xquery.com/errors";;
 
@@ -252,7 +252,7 @@
   $options as item()?
 ) as element()* external;
 
-declare %ann:streamable %private function json:serialize-internal(
+declare %an:streamable %private function json:serialize-internal(
   $xml as item()*,
   $options as item()?
 ) as xs:string external;

=== modified file 'modules/com/zorba-xquery/www/modules/datetime.xq'
--- modules/com/zorba-xquery/www/modules/datetime.xq	2012-03-28 05:19:57 +0000
+++ modules/com/zorba-xquery/www/modules/datetime.xq	2012-04-11 09:20:28 +0000
@@ -28,7 +28,7 @@
  :
  :)
 module namespace datetime = "http://www.zorba-xquery.com/modules/datetime";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
 declare option ver:module-version "2.0";
 
@@ -39,7 +39,7 @@
  :
  : @return the non-stable datetime value
  :)
-declare %ann:nondeterministic function datetime:current-dateTime ( ) as xs:dateTime external;
+declare %an:nondeterministic function datetime:current-dateTime ( ) as xs:dateTime external;
 
 (:~
  : Return the current time value.
@@ -48,7 +48,7 @@
  :
  : @return the non-stable time value
  :)
-declare %ann:nondeterministic function datetime:current-time ( ) as xs:time external;
+declare %an:nondeterministic function datetime:current-time ( ) as xs:time external;
 
 (:~
  : Return the current date value.
@@ -57,11 +57,11 @@
  :
  : @return the non-stable date value
  :)
-declare %ann:nondeterministic function datetime:current-date ( ) as xs:date external;
+declare %an:nondeterministic function datetime:current-date ( ) as xs:date external;
 
 (:~
  : Return the the number of milliseconds since the Epoch.
  :
  : @return the said number of milliseconds.
  :)
-declare %ann:nondeterministic function datetime:timestamp ( ) as xs:long external;
+declare %an:nondeterministic function datetime:timestamp ( ) as xs:long external;

=== modified file 'modules/com/zorba-xquery/www/modules/fetch.xq'
--- modules/com/zorba-xquery/www/modules/fetch.xq	2012-03-28 05:19:57 +0000
+++ modules/com/zorba-xquery/www/modules/fetch.xq	2012-04-11 09:20:28 +0000
@@ -33,7 +33,7 @@
  :)
 module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 
 declare namespace zerr = "http://www.zorba-xquery.com/errors";;
 
@@ -49,7 +49,7 @@
  : URI Resolvers</a>. Therefore, it queries all URI mappers
  : and resolvers with kind <tt>EntityData::SOME_CONTENT</tt>.</p>
  :
- : <p>The function is annotated with the <tt>ann:streamable</tt>
+ : <p>The function is annotated with the <tt>an:streamable</tt>
  : annotation, that is it returns a streamable string. A streamable
  : string can only be consumed once. Please see section "Streamable Strings"
  : in the <a href="../../html/options_and_annotations.html">
@@ -65,7 +65,7 @@
  : @see <a href="../../html/uriresolvers.html">URI Resolvers</a>.
  : @see <a href="../../html/options_and_annotations.html">Documentation of Zorba's annotations</a>.
  :)
-declare %ann:streamable function fetch:content($uri as xs:string) as xs:string
+declare %an:streamable function fetch:content($uri as xs:string) as xs:string
 {
   fetch:content($uri, "SOME_CONTENT")
 };
@@ -79,7 +79,7 @@
  : URI Resolvers</a>. Therefore, it queries all URI mappers
  : and resolvers with the specified entity kind.</p>
  :
- : <p>The function is annotated with the <tt>ann:streamable</tt>
+ : <p>The function is annotated with the <tt>an:streamable</tt>
  : annotation, that is it returns a streamable string. A streamable
  : string can only be consumed once. Please see section "Streamable Strings"
  : in the <a href="../../html/options_and_annotations.html">
@@ -97,4 +97,4 @@
  : @see <a href="../../html/options_and_annotations.html">Documentation of Zorba's annotations</a>.
  :)
 
-declare %ann:streamable function fetch:content($uri as xs:string, $entityKind as xs:string) as xs:string external;
+declare %an:streamable function fetch:content($uri as xs:string, $entityKind as xs:string) as xs:string external;

=== modified file 'modules/com/zorba-xquery/www/modules/http-client.xq'
--- modules/com/zorba-xquery/www/modules/http-client.xq	2012-03-28 05:19:57 +0000
+++ modules/com/zorba-xquery/www/modules/http-client.xq	2012-04-11 09:20:28 +0000
@@ -248,7 +248,7 @@
 
 import schema namespace http-schema = "http://expath.org/ns/http-client";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 
@@ -291,7 +291,7 @@
  : @example test/rbkt/Queries/zorba/http-client/send-request/send-request_href.xq
  : @example test/rbkt/Queries/zorba/http-client/send-request/http3-post.xq
  :)
-declare %ann:sequential function http:send-request(
+declare %an:sequential function http:send-request(
   $request as element(http-schema:request)?,
   $href as xs:string?,
   $bodies as item()*) as item()+ 
@@ -334,7 +334,7 @@
  :
  : @example test/rbkt/Queries/zorba/http-client/get/get_text.xq
  :)
-declare %ann:nondeterministic function http:get($href as xs:string) as item()+
+declare %an:nondeterministic function http:get($href as xs:string) as item()+
 {
   http:http-nondeterministic-impl(validate {<http-schema:request method="GET" href="{$href}" follow-redirect="true"/>}, (), ())
 };
@@ -353,7 +353,7 @@
  :
  : @example test/rbkt/Queries/zorba/http-client/get-node/get-node_xml_query.xq
  :)
-declare %ann:nondeterministic function http:get-node($href as xs:string) as item()+
+declare %an:nondeterministic function http:get-node($href as xs:string) as item()+
 {
   http:http-nondeterministic-impl(validate {<http-schema:request method="GET" href="{$href}" follow-redirect="true" override-media-type="text/xml; charset=utf-8"/>}, (), ())
 };
@@ -373,7 +373,7 @@
  :
  : @example test/rbkt/Queries/zorba/http-client/get-text/get-text_xml_query.xq 
  :)
-declare %ann:nondeterministic function http:get-text($href as xs:string) as item()+
+declare %an:nondeterministic function http:get-text($href as xs:string) as item()+
 {
   http:http-nondeterministic-impl(validate {<http-schema:request method="GET" href="{$href}" follow-redirect="true" override-media-type="text/plain; charset=utf-8"/>}, (), ())
 };
@@ -393,7 +393,7 @@
  :
  : @example test/rbkt/Queries/zorba/http-client/get-binary/get-binary_xml_query.xq
  :)
-declare %ann:nondeterministic function http:get-binary($href as xs:string) as item()+
+declare %an:nondeterministic function http:get-binary($href as xs:string) as item()+
 {
   http:http-nondeterministic-impl(validate {<http-schema:request method="GET" href="{$href}" follow-redirect="true" override-media-type="binary"/>}, (), ())
 };
@@ -411,7 +411,7 @@
  :
  : @example test/rbkt/Queries/zorba/http-client/head/head_status.xq
  :)
-declare %ann:nondeterministic function http:head($href as xs:string) as item() {
+declare %an:nondeterministic function http:head($href as xs:string) as item() {
   http:http-nondeterministic-impl(
     validate {
       <http-schema:request method="HEAD" href="{$href}">
@@ -431,7 +431,7 @@
  :
  : @example test/rbkt/Queries/zorba/http-client/options/options.xq
  :)
-declare %ann:nondeterministic function http:options($href as xs:string) as xs:string* {
+declare %an:nondeterministic function http:options($href as xs:string) as xs:string* {
   let $resp := http:http-nondeterministic-impl(
     validate {
       <http-schema:request method="OPTIONS" href="{$href}">
@@ -460,7 +460,7 @@
  :
  : @example test/rbkt/Queries/zorba/http-client/put/put2_element.xq
  :)
-declare %ann:sequential function http:put($href as xs:string, $body as item()) as item()+
+declare %an:sequential function http:put($href as xs:string, $body as item()) as item()+
 {
   variable $media-type as xs:string+ :=
     typeswitch($body)
@@ -504,7 +504,7 @@
  :
  : @example test/rbkt/Queries/zorba/http-client/put/put3_html_br.xq
  :)
-declare %ann:sequential function http:put($href as xs:string, $body as item(), $content-type as xs:string) as item()+
+declare %an:sequential function http:put($href as xs:string, $body as item(), $content-type as xs:string) as item()+
 {
   variable $method :=
     typeswitch ($body)
@@ -545,7 +545,7 @@
  :
  : @example test/rbkt/Queries/zorba/http-client/delete/delete.xq
  :)
-declare %ann:sequential function http:delete($href as xs:string) as item()+
+declare %an:sequential function http:delete($href as xs:string) as item()+
 {
   http:http-sequential-impl(
     validate {
@@ -572,7 +572,7 @@
  :
  : @example test/rbkt/Queries/zorba/http-client/post/post2_comment.xq
  :)
-declare %ann:sequential function http:post($href as xs:string, $body as item()) as item()+
+declare %an:sequential function http:post($href as xs:string, $body as item()) as item()+
 {
   variable $media-type as xs:string :=
     typeswitch($body)
@@ -617,7 +617,7 @@
  :
  : @example test/rbkt/Queries/zorba/http-client/post/post3_xml.xq
  :)
-declare %ann:sequential function http:post($href as xs:string, $body as item(), $content-type as xs:string) as item()+
+declare %an:sequential function http:post($href as xs:string, $body as item(), $content-type as xs:string) as item()+
 {
   variable $method :=
     typeswitch ($body)
@@ -645,13 +645,13 @@
   $result
 };
 
-declare %private %ann:sequential function http:http-sequential-impl(
+declare %private %an:sequential function http:http-sequential-impl(
   $request as schema-element(http-schema:request)?,
   $href as xs:string?,
   $bodies as item()*) as item()+ external;
 
 
-declare %private %ann:nondeterministic function http:http-nondeterministic-impl(
+declare %private %an:nondeterministic function http:http-nondeterministic-impl(
   $request as schema-element(http-schema:request)?,
   $href as xs:string?,
   $bodies as item()*) as item()+ external;

=== modified file 'modules/com/zorba-xquery/www/modules/project_xqdoc.xq'
--- modules/com/zorba-xquery/www/modules/project_xqdoc.xq	2012-03-28 05:19:57 +0000
+++ modules/com/zorba-xquery/www/modules/project_xqdoc.xq	2012-04-11 09:20:28 +0000
@@ -33,7 +33,7 @@
 import schema namespace xqdoc = "http://www.xqdoc.org/1.0";;
 import schema namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 declare namespace zm = "http://www.zorba-xquery.com/manifest";;
 import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";;
 
@@ -58,7 +58,7 @@
  : @param $xqdocPath where to generate the XQDoc XML documents.
  : @return empty sequence.
  :)
-declare %ann:sequential function pxqdoc:delete-XML-dir(
+declare %an:sequential function pxqdoc:delete-XML-dir(
   $xqdocPath as xs:string)
 {
   variable $xqdocXMLPath  := fn:concat( $xqdocPath,
@@ -70,7 +70,7 @@
   else ();
 };
 
-declare %private %ann:nondeterministic function pxqdoc:load-manifest(
+declare %private %an:nondeterministic function pxqdoc:load-manifest(
   $zorbaManifestPath as xs:string)
 {
   try 
@@ -90,7 +90,7 @@
  : @param $xqdocPath where to generate the XQDoc XML documents.
  : @return empty sequence.
  :)
-declare %ann:sequential function pxqdoc:generate-xqdoc-XML(
+declare %an:sequential function pxqdoc:generate-xqdoc-XML(
   $zorbaManifestPath as xs:string,
   $xqdocPath as xs:string)
 {
@@ -147,4 +147,4 @@
       "http:__",
       ""
   )
-};
\ No newline at end of file
+};

=== modified file 'modules/com/zorba-xquery/www/modules/random.xq'
--- modules/com/zorba-xquery/www/modules/random.xq	2012-03-28 05:19:57 +0000
+++ modules/com/zorba-xquery/www/modules/random.xq	2012-04-11 09:20:28 +0000
@@ -26,7 +26,7 @@
  :)
 module namespace r = "http://www.zorba-xquery.com/modules/random";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 declare namespace zerr = "http://www.zorba-xquery.com/errors";;
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
@@ -75,7 +75,7 @@
  : @return <tt>$num</tt> random integers, or the empty
  :  sequence if <tt>$num</tt> is negative.
  :)
-declare %ann:nondeterministic function r:random(
+declare %an:nondeterministic function r:random(
   $num as xs:integer
 ) as xs:integer* external;
 
@@ -88,7 +88,7 @@
  :
  : @return a random integer
  :)
-declare %ann:nondeterministic function r:random() as xs:integer
+declare %an:nondeterministic function r:random() as xs:integer
 {
   r:random(1)
 };
@@ -157,7 +157,7 @@
  :
  : @error r:invalid-arg if <tt>$lower</tt> is greater than <tt>$upper</tt>
  :)
-declare %ann:nondeterministic function r:random-between(
+declare %an:nondeterministic function r:random-between(
   $lower as xs:integer,
   $upper as xs:integer,
   $num as xs:integer) as xs:integer*
@@ -192,7 +192,7 @@
  : @param $upper the upper bound for the random number
  : @return a random integer within the given range
  :)
-declare %ann:nondeterministic function r:random-between(
+declare %an:nondeterministic function r:random-between(
   $lower as xs:integer,
   $upper as xs:integer
 ) as xs:integer
@@ -206,5 +206,5 @@
  :
  : @return the generated UUID as xs:string
 :)
-declare %ann:nondeterministic function r:uuid() as xs:string external;
+declare %an:nondeterministic function r:uuid() as xs:string external;
 

=== modified file 'modules/com/zorba-xquery/www/modules/reflection.xq'
--- modules/com/zorba-xquery/www/modules/reflection.xq	2012-03-28 05:19:57 +0000
+++ modules/com/zorba-xquery/www/modules/reflection.xq	2012-04-11 09:20:28 +0000
@@ -29,7 +29,7 @@
 
 module namespace reflection = "http://www.zorba-xquery.com/modules/reflection";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 
@@ -43,7 +43,7 @@
  : variable, taken from a file, etc. The first parameter must always be a 
  : QName identifying a known function.
  :
- : The function is declared with the %ann:variadic annotation. Hence, it allows
+ : The function is declared with the %an:variadic annotation. Hence, it allows
  : for an arbitrary number of parameters. All of these parameters (except the
  : first one) will be passed to the function that is called.
  :
@@ -61,7 +61,7 @@
  : @example test/rbkt/Queries/zorba/reflection/reflection-invoke-01.xq
  : @example test/rbkt/Queries/zorba/reflection/reflection-invoke-92.xq
  :)
-declare %ann:variadic function reflection:invoke(
+declare %an:variadic function reflection:invoke(
   $name as xs:QName
 ) as item()* external;
 
@@ -77,7 +77,7 @@
  :
  : @see reflection:invoke()
  :)
-declare %ann:nondeterministic %ann:variadic updating function reflection:invoke-n(
+declare %an:nondeterministic %an:variadic updating function reflection:invoke-n(
   $name as xs:QName
 ) as item()* external;
 
@@ -93,7 +93,7 @@
  :
  : @see reflection:invoke-n()
  :)
-declare %ann:nondeterministic %ann:variadic updating function reflection:invoke-u(
+declare %an:nondeterministic %an:variadic updating function reflection:invoke-u(
   $name as xs:QName
 ) external;
 
@@ -109,7 +109,7 @@
  :
  : @see reflection:invoke()
  :)
-declare %ann:variadic %ann:sequential function reflection:invoke-s(
+declare %an:variadic %an:sequential function reflection:invoke-s(
   $name as xs:QName
 ) as item()* external;
 
@@ -178,7 +178,7 @@
  :
  : @return the result of evaluating the query
  :)
-declare %ann:nondeterministic function reflection:eval-n(
+declare %an:nondeterministic function reflection:eval-n(
     $query as xs:string
 ) as item()* external;
 
@@ -197,7 +197,7 @@
  :
  : @see reflection:eval()
  :)
-declare %ann:nondeterministic updating function reflection:eval-u(
+declare %an:nondeterministic updating function reflection:eval-u(
     $query as xs:string
 ) external;
 
@@ -217,6 +217,6 @@
  :
  : @see reflection:eval()
  :)
-declare %ann:sequential function reflection:eval-s(
+declare %an:sequential function reflection:eval-s(
     $query as xs:string
 ) as item()* external;

=== modified file 'modules/com/zorba-xquery/www/modules/store/data-structures/unordered-map.xq'
--- modules/com/zorba-xquery/www/modules/store/data-structures/unordered-map.xq	2012-03-28 05:19:57 +0000
+++ modules/com/zorba-xquery/www/modules/store/data-structures/unordered-map.xq	2012-04-11 09:20:28 +0000
@@ -40,7 +40,7 @@
 
 declare namespace zerr = "http://www.zorba-xquery.com/errors";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
 declare option ver:module-version "2.0";
@@ -63,7 +63,7 @@
  :        xs:anyAtomicType.
  : @error zerr:ZSTR0001 if a map with the given name already exists.
  :)
-declare %ann:variadic %ann:sequential function map:create(
+declare %an:variadic %an:sequential function map:create(
   $name as xs:QName,
   $key-type as xs:QName) as empty-sequence() external;
 
@@ -77,7 +77,7 @@
  :
  : @error zerr:ZDDY0023 if a map with the given name does not exist.
  :)
-declare %ann:sequential function map:delete(
+declare %an:sequential function map:delete(
   $name as xs:QName) as empty-sequence() external;
 
 (:~
@@ -107,7 +107,7 @@
  : @see map:create
  :
  :)
-declare %ann:variadic %ann:sequential function map:insert(
+declare %an:variadic %an:sequential function map:insert(
   $name as xs:QName,
   $value as item()*,
   $key as xs:anyAtomicType?) as empty-sequence() external;
@@ -133,7 +133,7 @@
  :
  : @see map:create
  :)
-declare %ann:variadic function map:get(
+declare %an:variadic function map:get(
   $name as xs:QName,
   $key as xs:anyAtomicType?) as item()* external;
 
@@ -158,7 +158,7 @@
  : @see map:create
  :
  :)
-declare %ann:variadic %ann:sequential function map:remove(
+declare %an:variadic %an:sequential function map:remove(
   $name as xs:QName,
   $key as xs:anyAtomicType?) as empty-sequence() external;
 

=== modified file 'modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq	2012-03-28 05:19:57 +0000
+++ modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq	2012-04-11 09:20:28 +0000
@@ -35,7 +35,7 @@
 module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 
 declare namespace zerr = "http://www.zorba-xquery.com/errors";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
 declare option ver:module-version "2.0";
@@ -134,7 +134,7 @@
  : @see dml:insert-nodes-first
  :
  :)
-declare %ann:sequential function dml:apply-insert-nodes-first(
+declare %an:sequential function dml:apply-insert-nodes-first(
   $name as xs:QName,
   $content as node()*) as node()* external;
 
@@ -154,7 +154,7 @@
  : @see dml:insert-nodes-last
  :
  :)
-declare %ann:sequential function dml:apply-insert-nodes-last(
+declare %an:sequential function dml:apply-insert-nodes-last(
   $name as xs:QName,
   $content as node()*) as node()* external;
 
@@ -176,7 +176,7 @@
  : @see dml:insert-nodes-before
  :
  :)
-declare %ann:sequential function dml:apply-insert-nodes-before(
+declare %an:sequential function dml:apply-insert-nodes-before(
   $name as xs:QName,
   $target as node(),
   $content as node()*) as node()* external;
@@ -199,7 +199,7 @@
  : @see dml:insert-nodes-after
  :
  :)
-declare %ann:sequential function dml:apply-insert-nodes-after(
+declare %an:sequential function dml:apply-insert-nodes-after(
   $name as xs:QName,
   $pos as node(),
   $content as node()*) as node()* external;

=== modified file 'modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml.xq	2012-03-28 05:19:57 +0000
+++ modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml.xq	2012-04-11 09:20:28 +0000
@@ -43,7 +43,7 @@
 import module namespace qdml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 
 declare namespace zerr = "http://www.zorba-xquery.com/errors";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
 declare option ver:module-version "2.0";
@@ -153,7 +153,7 @@
  : @see dml:insert-nodes-first
  :
  :)
-declare %ann:sequential function dml:apply-insert-nodes-first(
+declare %an:sequential function dml:apply-insert-nodes-first(
   $name as xs:string,
   $content as node()*) as node()*
 {
@@ -176,7 +176,7 @@
  : @see dml:insert-nodes-last
  :
  :)
-declare %ann:sequential function dml:apply-insert-nodes-last(
+declare %an:sequential function dml:apply-insert-nodes-last(
   $name as xs:string,
   $content as node()*) as node()*
 {
@@ -201,7 +201,7 @@
  : @see dml:insert-nodes-before
  :
  :)
-declare %ann:sequential function dml:apply-insert-nodes-before(
+declare %an:sequential function dml:apply-insert-nodes-before(
   $name as xs:string,
   $target as node(),
   $content as node()*) as node()*
@@ -227,7 +227,7 @@
  : @see dml:insert-nodes-after
  :
  :)
-declare %ann:sequential function dml:apply-insert-nodes-after(
+declare %an:sequential function dml:apply-insert-nodes-after(
   $name as xs:string,
   $pos as node(),
   $content as node()*) as node()*

=== modified file 'modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq	2012-03-28 05:19:57 +0000
+++ modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq	2012-04-11 09:20:28 +0000
@@ -42,7 +42,7 @@
  :)
 module namespace cdml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 declare namespace zerr = "http://www.zorba-xquery.com/errors";;
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
@@ -195,7 +195,7 @@
  : @see cdml:insert-nodes
  :
  :)
-declare %ann:sequential function cdml:apply-insert-nodes(
+declare %an:sequential function cdml:apply-insert-nodes(
   $name as xs:QName,
   $content as node()*) as node()*  external;
 
@@ -221,7 +221,7 @@
  : @see cdml:insert-nodes-first
  :
  :)
-declare %ann:sequential function cdml:apply-insert-nodes-first(
+declare %an:sequential function cdml:apply-insert-nodes-first(
   $name as xs:QName,
   $content as node()*) as node()*  external;
 
@@ -246,7 +246,7 @@
  : @see cdml:insert-nodes-last
  :
  :)
-declare %ann:sequential function cdml:apply-insert-nodes-last(
+declare %an:sequential function cdml:apply-insert-nodes-last(
   $name as xs:QName,
   $content as node()*) as node()*  external;
 
@@ -275,7 +275,7 @@
  : @see cdml:insert-nodes-before
  :
  :)
-declare %ann:sequential function cdml:apply-insert-nodes-before(
+declare %an:sequential function cdml:apply-insert-nodes-before(
   $name as xs:QName,
   $target as node(),
   $content as node()*) as node()*  external;
@@ -305,7 +305,7 @@
  : @see cdml:insert-nodes-after
  :
  :)
-declare %ann:sequential function cdml:apply-insert-nodes-after(
+declare %an:sequential function cdml:apply-insert-nodes-after(
   $name as xs:QName,
   $pos as node(),
   $content as node()*) as node()*  external;

=== modified file 'modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq	2012-03-28 05:19:57 +0000
+++ modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq	2012-04-11 09:20:28 +0000
@@ -43,7 +43,7 @@
 module namespace idml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
 declare namespace zerr = "http://www.zorba-xquery.com/errors";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
 
@@ -80,7 +80,7 @@
  :        the sequence type specified in the corresponding keyspec.
  :
  :)
-declare %ann:variadic function idml:probe-index-point-value(
+declare %an:variadic function idml:probe-index-point-value(
   $name as xs:QName, 
   $key_i as xs:anyAtomicType?) as node()*  external; 
 
@@ -187,7 +187,7 @@
  :        lower and upper bound, neither T1 is a subtype of T2 nor T2 is a 
  :        subtype of T1.   
  :)
-declare %ann:variadic function idml:probe-index-range-value(
+declare %an:variadic function idml:probe-index-range-value(
   $name                 as xs:QName, 
   $lowerBound-i         as xs:anyAtomicType?,
   $upperBound-i         as xs:anyAtomicType?,

=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc.xq	2012-03-28 05:19:57 +0000
+++ modules/com/zorba-xquery/www/modules/xqdoc.xq	2012-04-11 09:20:28 +0000
@@ -61,7 +61,7 @@
  :)
 module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
 
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
@@ -80,7 +80,7 @@
  : @error zerr::ZXQD0002 if the xqdoc comments in the
  :  module contain invalid XML
  :)
-declare %ann:nondeterministic function xqd:xqdoc(
+declare %an:nondeterministic function xqd:xqdoc(
   $module-uri as xs:string
 ) as element() external;
 

=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-03-28 05:19:57 +0000
+++ modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-04-11 09:20:28 +0000
@@ -38,7 +38,7 @@
 import schema namespace xqdoc = "http://www.xqdoc.org/1.0";;
 import schema namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 declare namespace werr = "http://www.w3.org/2005/xqt-errors";;
 declare namespace z = "http://www.zorba-xquery.com/manifest";;
 
@@ -125,7 +125,7 @@
  : @param $collector the name of the collector.
  : @return empty sequence.
  :)
-declare %private %ann:sequential function xqdoc2html:collect-schema (
+declare %private %an:sequential function xqdoc2html:collect-schema (
   $schemaURI as xs:string,
   $fileName as xs:string,
   $collector)
@@ -174,7 +174,7 @@
  :    E.g. ("cpp", "h", "xml")
  : @return The empty sequence.
  :)
-declare %private %ann:sequential function xqdoc2html:gather-and-copy(
+declare %private %an:sequential function xqdoc2html:gather-and-copy(
   $sourcePath       as xs:string,
   $destinationPath  as xs:string,
   $extensions       as xs:string+)
@@ -239,7 +239,7 @@
  : @param $extensions The sequence of file types to copy (e.g. ("cpp", "h", "xml")).
  : @return The empty sequence.
  :)
-declare %private %ann:sequential function xqdoc2html:copy-files(
+declare %private %an:sequential function xqdoc2html:copy-files(
   $sourcePath       as xs:string,
   $destinationPath  as xs:string,
   $extensions       as xs:string+)
@@ -266,7 +266,7 @@
  : @param $xqdocBuildPath where to generate the XQDoc XML documents.
  : @return Empty sequence.
  :)
-declare %ann:sequential function xqdoc2html:copy-xhtml-requisites(
+declare %an:sequential function xqdoc2html:copy-xhtml-requisites(
   $xhtmlRequisitesPath  as xs:string,
   $xqdocBuildPath       as xs:string)
 {
@@ -300,7 +300,7 @@
 
 (:_____________________________________________________________________________________________________:)
 
-declare %private %ann:sequential function xqdoc2html:create-general-menu()
+declare %private %an:sequential function xqdoc2html:create-general-menu()
 {
   {
     variable $allStructures     := for $entry in $xqdoc2html:menuEntries/entry return $entry/@structure;
@@ -313,7 +313,7 @@
   }
 };
 
-declare %private %ann:sequential function xqdoc2html:create-collection-categories (
+declare %private %an:sequential function xqdoc2html:create-collection-categories (
 $collectionName as xs:QName,
 $xqdocXmlPath as xs:string)
 {
@@ -326,7 +326,7 @@
   return dml:apply-insert-nodes($collectionName, $xqdoc);
 };
 
-declare %private %ann:sequential function xqdoc2html:collectZorbaManifestEntries(
+declare %private %an:sequential function xqdoc2html:collectZorbaManifestEntries(
   $zorbaManifestPath as xs:string,
   $xqdocBuildPath as xs:string)
 {
@@ -365,7 +365,7 @@
  : @param $xhtmlRequisitesPath the path where the XHTML requisites are stored.
  : @return Empty sequence.
  :)
-declare %ann:sequential function xqdoc2html:main(
+declare %an:sequential function xqdoc2html:main(
   $zorbaManifestPath as xs:string,
   $xqdocBuildPath as xs:string,
   $indexHtmlPath  as xs:string,
@@ -474,7 +474,7 @@
   </html>
 };
 
-declare %private %ann:sequential function xqdoc2html:copy-schemas(
+declare %private %an:sequential function xqdoc2html:copy-schemas(
   $schemas,
   $xqdocXhtmlPath as xs:string
 )
@@ -510,7 +510,7 @@
  : @param $zorbaPath path to zorba source dir
  : @return A string sequence with a status message for each processed module.
  :)
-declare %private %ann:sequential function xqdoc2html:generate-xqdoc-xhtml(
+declare %private %an:sequential function xqdoc2html:generate-xqdoc-xhtml(
   $generalLeftMenu,
   $xhtmlRequisitesPath  as xs:string,
   $xqdocXhtmlPath       as xs:string
@@ -598,7 +598,7 @@
  : @param $xqdocXhtmlPath where to generate the XQDoc XHTML documents.
  : @return the processed $xhtml.
  :)
-declare %private %ann:sequential function xqdoc2html:configure-xml (
+declare %private %an:sequential function xqdoc2html:configure-xml (
   $xqdoc,
   $examplePath as xs:string,
   $xqdocXhtmlPath as xs:string)
@@ -624,7 +624,7 @@
  : @param $examplePath string with the paths where the examples are kept separated by ; .
  : @return The created XHTML page.
  :)
-declare %private %ann:sequential function xqdoc2html:copy-examples(
+declare %private %an:sequential function xqdoc2html:copy-examples(
   $xqdoc,
   $examplesFolderDestination as xs:string,
   $examplePath as xs:string)
@@ -665,7 +665,7 @@
  :        separated by <pre>;</pre>.
  : @return The full path of the file to be resolved.
  :)
-declare %private %ann:nondeterministic function xqdoc2html:resolve-file-path(
+declare %private %an:nondeterministic function xqdoc2html:resolve-file-path(
   $relativeFilePath as xs:string,
   $directoryPath as xs:string
 ) as xs:string
@@ -683,7 +683,7 @@
     fn:error($err:UE010, fn:concat("The path <", $directoryPath, "> must point to an existing directory:"))
 };
 
-declare %private %ann:sequential function xqdoc2html:copy-example(
+declare %private %an:sequential function xqdoc2html:copy-example(
   $exampleSource as xs:string,
   $exampleDestination as xs:string,
   $examplePath as xs:string)
@@ -827,7 +827,7 @@
         }
 };
 
-declare %private %ann:sequential function xqdoc2html:parse-spec-args(
+declare %private %an:sequential function xqdoc2html:parse-spec-args(
   $exampleSource as xs:string,
   $specLines as xs:string*) as xs:string
 {
@@ -868,7 +868,7 @@
 
 };
 
-declare %private %ann:sequential function xqdoc2html:load-expected-results(
+declare %private %an:sequential function xqdoc2html:load-expected-results(
   $result_split as xs:string*) as xs:string
 {
   if(fn:empty($result_split)) then
@@ -889,7 +889,7 @@
  xqdoc2html:load-expected-results(fn:subsequence($result_split, 2)))
 };
 
-declare %private %ann:sequential function xqdoc2html:parse-spec-results(
+declare %private %an:sequential function xqdoc2html:parse-spec-results(
   $exampleSource as xs:string,
   $specLines as xs:string*) as xs:string
 {
@@ -966,7 +966,7 @@
        else ()}
        {if(contains($type, "nondeterministic ")) then
         <a  href="{$ZorbaOptAndAnn}"
-            title="%ann:nondeterministic"
+            title="%an:nondeterministic"
             target="_blank"><img src="{concat($imagesPath, "Nondeterministic.gif")}" alt="Nondeterministic"/></a>
        else ()}
        {if(contains($type, "variadic")) then
@@ -1001,7 +1001,7 @@
  : @param $examplePath string with the paths where the examples are kept separated by ; .
  : @return The created XHTML page.
  :)
-declare %private %ann:sequential function xqdoc2html:add-left-menu(
+declare %private %an:sequential function xqdoc2html:add-left-menu(
   $menu,
   $templatePath as xs:string) {
   let $doc := fn:parse-xml(file:read-text($templatePath))
@@ -1023,7 +1023,7 @@
  : @param $examplePath string with the paths where the examples are kept separated by ; .
  : @return The created XHTML page.
  :)
-declare %private %ann:sequential function xqdoc2html:doc(
+declare %private %an:sequential function xqdoc2html:doc(
   $xqdoc,
   $menu,
   $templatePath as xs:string,
@@ -1068,7 +1068,7 @@
  : @param $xqdocXhtmlPath location where the resulting Xhtml will be saved on disk.
  : @return The 'body' of the XHTML.
  :)
-declare %private %ann:nondeterministic function xqdoc2html:body(
+declare %private %an:nondeterministic function xqdoc2html:body(
   $xqdoc,
   $xqdocXhtmlPath as xs:string)
 {
@@ -1181,7 +1181,7 @@
  : @param $indexCollector the modules names part of the left menu.
  : @return the XHTML for the 'Module Resources'.
  :)
-declare %private %ann:nondeterministic function xqdoc2html:module-resources(
+declare %private %an:nondeterministic function xqdoc2html:module-resources(
   $xqdocXhtmlPath as xs:string,
   $moduleUri as xs:string)
 {
@@ -1321,14 +1321,14 @@
       let $name := $variable/xqdoc:uri/text()
       let $type := $variable/xqdoc:comment/xqdoc:custom[@tag="type"]/text()
       let $isExternal := $variable/xqdoc:comment/xqdoc:custom[@tag="isExternal"]/text()
-      let $ann := string-join((for $annotation in $variable/xqdoc:annotations/xqdoc:annotation
+      let $an := string-join((for $annotation in $variable/xqdoc:annotations/xqdoc:annotation
                                return data($annotation/@localname),
                                if($isExternal) then "external" else ""," ")," ")
 
       where (count($variable/xqdoc:annotations/xqdoc:annotation[@localname="private"]) = 0)
       order by $name
       return (<tr>
-              <td>{xqdoc2html:add-images($ann)}</td>
+              <td>{xqdoc2html:add-images($an)}</td>
               <td>${$name}
                   {if(exists($type)) then concat(" as ",$type) else ""}
                   {if(exists($isExternal)) then " external" else ()}<br/>
@@ -1464,7 +1464,7 @@
  : @param $xqdocXhtmlPath location where the resulting Xhtml will be saved on disk.
  : @return the XHTML for the function details.
  :)
-declare %private %ann:nondeterministic function xqdoc2html:functions($functions, $xqdocXhtmlPath) {
+declare %private %an:nondeterministic function xqdoc2html:functions($functions, $xqdocXhtmlPath) {
     if(count($functions)) then (
       <div class="section"><span id="functions">Functions</span></div>,
       for $function in $functions
@@ -1682,7 +1682,7 @@
  : @param $xqdocXhtmlPath location where the resulting Xhtml will be saved on disk.
  : @return the XHTML for the function 'example' annotations.
  :)
-declare %private %ann:nondeterministic function xqdoc2html:annotations-example($comment, $xqdocXhtmlPath) {
+declare %private %an:nondeterministic function xqdoc2html:annotations-example($comment, $xqdocXhtmlPath) {
   let $example := $comment//xqdoc:custom[@tag="example"]
   return
     if (count($example) = 0) then ()
@@ -1784,7 +1784,7 @@
  : @param $templatePath the path to the main.html template.
  : @return The content of the function index page.
  :)
-declare %private %ann:sequential function xqdoc2html:generate-function-index-xhtml(
+declare %private %an:sequential function xqdoc2html:generate-function-index-xhtml(
   $indexFunctionLeft,
   $templatePath as xs:string,
   $functionIndexPath as xs:string
@@ -1815,7 +1815,7 @@
   }
 };
 
-declare %private %ann:sequential function xqdoc2html:collect-entry (
+declare %private %an:sequential function xqdoc2html:collect-entry (
   $href as xs:string,
   $name as xs:string,
   $structure as xs:string,
@@ -1829,7 +1829,7 @@
                       moduleURI="{$moduleURI}" /> as last into $xqdoc2html:menuEntries;
 };
 
-declare %private %ann:sequential function xqdoc2html:collect-menu-entries()
+declare %private %an:sequential function xqdoc2html:collect-menu-entries()
 {
   for $docNode in dml:collection(xs:QName("xqdoc2html:collection"))
       let $module := $docNode/xqdoc:xqdoc/xqdoc:module,
@@ -1859,7 +1859,7 @@
  : @param $moduleUri module URI.
  : @return $table after the subcategory together with the modules were added to it.
  :)
-declare %private %ann:sequential function xqdoc2html:create-module-helper(
+declare %private %an:sequential function xqdoc2html:create-module-helper(
   $table,
   $category as xs:string,
   $currentCategory as xs:string
@@ -1910,7 +1910,7 @@
 (:~
  : Recursive helper
  :)
-declare %private %ann:sequential function xqdoc2html:create-module-table-rec(
+declare %private %an:sequential function xqdoc2html:create-module-table-rec(
   $level1 as xs:string*,
   $leveln as xs:string*,
   $curentCat as xs:string,
@@ -1956,7 +1956,7 @@
  : @param $moduleUri module URI.
  : @return $root after the subcategories were added to it.
  :)
-declare %private %ann:sequential function xqdoc2html:create-module-table(
+declare %private %an:sequential function xqdoc2html:create-module-table(
   $level1 as xs:string*,
   $root)
 {
@@ -1986,7 +1986,7 @@
 };
 
 (:
-declare %private %ann:sequential function xqdoc2html:create-specialized-left-menu(
+declare %private %an:sequential function xqdoc2html:create-specialized-left-menu(
   $generalLeftMenu,
   $moduleUri as xs:string)
 {
@@ -2030,7 +2030,7 @@
  : @param $zorbaVersion Zorba version.
  : @return The content of the new index.html.
  :)
-declare %private %ann:sequential function xqdoc2html:generate-index-html(
+declare %private %an:sequential function xqdoc2html:generate-index-html(
   $templatePath as xs:string,
   $menu,
   $modules,

=== modified file 'modules/org/expath/ns/file.xq'
--- modules/org/expath/ns/file.xq	2012-03-28 05:19:57 +0000
+++ modules/org/expath/ns/file.xq	2012-04-11 09:20:28 +0000
@@ -24,7 +24,7 @@
 module namespace file = "http://expath.org/ns/file";;
 
 import schema namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
 declare option ver:module-version "2.0";
 
@@ -46,7 +46,7 @@
  : @error file:FOFL0004 If <pre>$file</pre> points to a directory.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:sequential function file:append(
+declare %an:sequential function file:append(
   $file as xs:string,
   $content as item()*,
   $serializer-params as element(output:serialization-parameters)?
@@ -67,7 +67,7 @@
  : @error file:FOFL0004 If <pre>$file</pre> points to a directory.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:sequential function file:append-binary(
+declare %an:sequential function file:append-binary(
   $file as xs:string,
   $content as xs:base64Binary*
 ) as empty-sequence() external;
@@ -81,7 +81,7 @@
  : @error file:FOFL0004 If <pre>$file</pre> points to a directory.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %private %ann:sequential function file:append-text(
+declare %private %an:sequential function file:append-text(
   $file as xs:string,
   $content as xs:string*
 ) as empty-sequence() external;
@@ -99,7 +99,7 @@
  :    parent directory does not exist either.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:nondeterministic %ann:sequential function file:copy(
+declare %an:nondeterministic %an:sequential function file:copy(
   $source as xs:string,
   $destination as xs:string
 ) as empty-sequence()
@@ -126,7 +126,7 @@
  : @error file:FOFL0004 If <pre>$sourceFile</pre> points to a directory.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %private %ann:sequential function file:copy-file-impl(
+declare %private %an:sequential function file:copy-file-impl(
   $sourceFile as xs:string,
   $destination as xs:string
 ) as empty-sequence() external;
@@ -143,7 +143,7 @@
  :    parent directory does not exist either.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %private %ann:nondeterministic %ann:sequential function file:copy-directory-impl(
+declare %private %an:nondeterministic %an:sequential function file:copy-directory-impl(
   $sourceDir as xs:string,
   $destination as xs:string
 ) as empty-sequence()
@@ -182,7 +182,7 @@
  : @error file:FOFL0003 If <pre>$destination</pre> directory does not exist.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %private %ann:nondeterministic %ann:sequential function file:copy-directory-content(
+declare %private %an:nondeterministic %an:sequential function file:copy-directory-content(
   $sourceDir as xs:string,
   $destination as xs:string
 ) as empty-sequence()
@@ -208,7 +208,7 @@
  :    existing file.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:sequential function file:create-directory(
+declare %an:sequential function file:create-directory(
   $dir as xs:string
 ) as empty-sequence() external;
 
@@ -223,7 +223,7 @@
  : @error file:FOFL0001 If the <pre>$path</pre> path does not exist.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:nondeterministic %ann:sequential function file:delete(
+declare %an:nondeterministic %an:sequential function file:delete(
   $path as xs:string
 ) as empty-sequence()
 {
@@ -244,7 +244,7 @@
  : @error file:FOFL0001 If the <pre>$file</pre> path does not exist.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %private %ann:sequential function file:delete-file-impl(
+declare %private %an:sequential function file:delete-file-impl(
   $file as xs:string
 ) as empty-sequence() external;
 
@@ -257,7 +257,7 @@
  : @error file:FOFL0003 If <pre>$dir</pre> does not point to a directory.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %private %ann:nondeterministic %ann:sequential function file:delete-directory-impl(
+declare %private %an:nondeterministic %an:sequential function file:delete-directory-impl(
   $dir as xs:string
 ) as empty-sequence()
 {
@@ -278,7 +278,7 @@
  : @param $path The path/URI to test for existence.
  : @return true if the path/URI points to an existing file system item.
  :)
-declare %ann:nondeterministic function file:exists(
+declare %an:nondeterministic function file:exists(
   $path as xs:string
 ) as xs:boolean external;
 
@@ -289,7 +289,7 @@
  : @param $dir The path/URI to test.
  : @return true if the path/URI points to a directory.
  :)
-declare %ann:nondeterministic function file:is-directory(
+declare %an:nondeterministic function file:is-directory(
   $dir as xs:string
 ) as xs:boolean external;
 
@@ -299,7 +299,7 @@
  : @param $dir The path/URI to test.
  : @return true if the path/URI points to a file.
  :)
-declare %ann:nondeterministic function file:is-file(
+declare %an:nondeterministic function file:is-file(
   $file as xs:string
 ) as xs:boolean external;
 
@@ -316,7 +316,7 @@
  :    directory does not exist either.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:sequential function file:move(
+declare %an:sequential function file:move(
   $source as xs:string,
   $destination as xs:string
 ) as empty-sequence()
@@ -335,7 +335,7 @@
  : @error file:FOFL0004 If <pre>$source</pre> points to a directory.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:nondeterministic function file:read-binary(
+declare %an:nondeterministic function file:read-binary(
   $file as xs:string
 ) as xs:base64Binary external;
 
@@ -352,7 +352,7 @@
  : @error file:FOFL0004 If <pre>$source</pre> points to a directory.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:nondeterministic function file:read-text(
+declare %an:nondeterministic function file:read-text(
   $file as xs:string
 ) as xs:string
 {
@@ -374,7 +374,7 @@
  : @error file:FOFL0006 If <pre>$encoding</pre> is not supported.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:nondeterministic function file:read-text(
+declare %an:nondeterministic function file:read-text(
   $file as xs:string,
   $encoding as xs:string
 ) as xs:string external;
@@ -392,7 +392,7 @@
  : @error file:FOFL0004 If <pre>$source</pre> points to a directory.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:nondeterministic function file:read-text-lines(
+declare %an:nondeterministic function file:read-text-lines(
   $file as xs:string
 ) as xs:string*
 {
@@ -419,7 +419,7 @@
  : @error file:FOFL0006 If <pre>$encoding</pre> is not supported.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:nondeterministic function file:read-text-lines(
+declare %an:nondeterministic function file:read-text-lines(
   $file as xs:string,
   $encoding as xs:string
 ) as xs:string*
@@ -437,7 +437,7 @@
  : @param $destinationDir The existing destination directory.
  : @return The empty sequence.
  :)
-declare %private %ann:nondeterministic %ann:sequential function file:copy-directory(
+declare %private %an:nondeterministic %an:sequential function file:copy-directory(
   $sourceDir as xs:string,
   $destinationDir as xs:string
 ) as empty-sequence()
@@ -476,7 +476,7 @@
  : @error file:FOFL0004 If <pre>$file</pre> points to a directory.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:sequential function file:write(
+declare %an:sequential function file:write(
   $file as xs:string,
   $content as item()*,
   $serializer-params as element(output:serialization-parameters)?
@@ -497,7 +497,7 @@
  : @error file:FOFL0004 If <pre>$file</pre> points to a directory.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:sequential function file:write-binary(
+declare %an:sequential function file:write-binary(
   $file as xs:string,
   $content as xs:base64Binary*
 ) as empty-sequence() external;
@@ -511,7 +511,7 @@
  : @error file:FOFL0004 If <pre>$file</pre> points to a directory.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:sequential function file:write-binary(
+declare %an:sequential function file:write-binary(
   $file as xs:string,
   $content as xs:base64Binary*
 ) as empty-sequence() external;
@@ -528,7 +528,7 @@
  : @error file:FOFL0004 If <pre>$file</pre> points to a directory.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %private %ann:sequential function file:write-text(
+declare %private %an:sequential function file:write-text(
   $file as xs:string,
   $content as xs:string*
 ) as empty-sequence() external;
@@ -544,7 +544,7 @@
  : @error file:FOFL0003 If <pre>$dir</pre> does not point to an existing directory.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:nondeterministic function file:list(
+declare %an:nondeterministic function file:list(
   $dir as xs:string
 ) as xs:string* external;
 
@@ -563,7 +563,7 @@
  : @error file:FOFL0003 If <pre>$dir</pre> does not point to an existing directory.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:nondeterministic function file:list(
+declare %an:nondeterministic function file:list(
   $path as xs:string,
   $recursive as xs:boolean
 ) as xs:string*
@@ -600,7 +600,7 @@
  : @error file:FOFL0003 If <pre>$dir</pre> does not point to an existing directory.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:nondeterministic function file:list(
+declare %an:nondeterministic function file:list(
   $path as xs:string,
   $recursive as xs:boolean,
   $pattern as xs:string
@@ -641,7 +641,7 @@
  : @error file:FOFL0001 If the <pre>$path</pre> does not exist.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:nondeterministic function file:last-modified(
+declare %an:nondeterministic function file:last-modified(
   $path as xs:string
 ) as xs:dateTime external;
 
@@ -654,7 +654,7 @@
  : @error file:FOFL0004 If the <pre>$file</pre> points to a directory.
  : @error file:FOFL9999 If any other error occurs.
  :)
-declare %ann:nondeterministic function file:size(
+declare %an:nondeterministic function file:size(
   $file as xs:string
 ) as xs:integer external;