Merge lp:~zorba-coders/zorba/bug-978722_image into lp:zorba/image-module

[Matthias Brantner]

fix for bug #978722 (change annotation prefix from "ann" to "an")

fix for bug #978722 (change annotation prefix from "ann" to "an")

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-978722_image-2012-04-11T11-53-19.907Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-978722_image-2012-04-11T11-53-19.907Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

[William Candillon (wcandillon)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-978722_image-2012-04-12T12-21-54.809Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-978722_image-2012-04-12T12-21-54.809Z is finished. The final status was:

All tests succeeded!

=== modified file 'test/Queries/image/animation.xq'
--- test/Queries/image/animation.xq	2011-07-03 23:37:25 +0000
+++ test/Queries/image/animation.xq	2012-04-11 10:11:20 +0000
@@ -8,7 +8,7 @@
 import module namespace ani = 'http://www.zorba-xquery.com/modules/image/animation';
 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://www.zorba-xquery.com/annotations";
 
 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
 
@@ -33,7 +33,7 @@
 (:~
  : @return true if the ani:create-animated-gif function works.
  :)
-declare %ann:nondeterministic function local:test-create-animated-gif() as xs:boolean {
+declare %an:nondeterministic function local:test-create-animated-gif() as xs:boolean {
     let $gif1 := file:read-binary(concat($local:image-dir, "bird.gif"))
     let $gif2 := file:read-binary(concat($local:image-dir, "bird2.gif"))
     let $animatedGif := ani:create-animated-gif(($gif1, $gif2), xs:unsignedInt(10), xs:unsignedInt(0))
@@ -44,7 +44,7 @@
 (:~
  : @return true if the ani:create-morphed-gif function works.
  :)
-declare %ann:nondeterministic function local:test-create-morphed-gif() as xs:boolean {
+declare %an:nondeterministic function local:test-create-morphed-gif() as xs:boolean {
     let $gif1 := file:read-binary(concat($local:image-dir, "bird.gif"))
     let $gif2 := file:read-binary(concat($local:image-dir, "bird2.gif"))
     let $animatedGif := ani:create-morphed-gif(($gif1, $gif2), xs:unsignedInt(10), xs:unsignedInt(0), xs:unsignedInt(2  ))
@@ -55,7 +55,7 @@
 
 
 
-declare %ann:nondeterministic %ann:sequential function local:main() as xs:string* {
+declare %an:nondeterministic %an:sequential function local:main() as xs:string* {
 
   let $a := local:test-create-animated-gif()
   return

=== modified file 'test/Queries/image/basic.xq'
--- test/Queries/image/basic.xq	2011-08-04 04:09:00 +0000
+++ test/Queries/image/basic.xq	2012-04-11 10:11:20 +0000
@@ -6,7 +6,7 @@
 import module namespace basic = 'http://www.zorba-xquery.com/modules/image/basic';
 import module namespace file = 'http://expath.org/ns/file';
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://www.zorba-xquery.com/annotations";
 
 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
 
@@ -55,7 +55,7 @@
 (:~
  : @return true if the basic:create function works.
  :)
-declare %ann:nondeterministic function local:test-create() as xs:boolean {
+declare %an:nondeterministic function local:test-create() as xs:boolean {
   let $blank-gif := basic:create(xs:unsignedInt(10), xs:unsignedInt(20), "GIF")
   let $blank-png := basic:create(xs:unsignedInt(10), xs:unsignedInt(20), "PNG")
   let $blank-jpg := basic:create(xs:unsignedInt(10), xs:unsignedInt(20), "JPEG")
@@ -89,7 +89,7 @@
 (:~
  : @return true if the basic:compress function works.
  :) 
-declare %ann:nondeterministic function local:test-compress() as xs:boolean {
+declare %an:nondeterministic function local:test-compress() as xs:boolean {
     let $uncompressed := file:read-binary(concat($local:image-dir, "uncompressed.jpg"))
     let $compressed := basic:compress($uncompressed, xs:unsignedInt(20))
     let $compressed-ref := file:read-binary(concat($local:image-dir, "compressed.jpg")) 
@@ -99,7 +99,7 @@
 (:~
  : @return true if the basic:equals function works.
  :)
-declare %ann:nondeterministic function local:test-equals() as xs:boolean {
+declare %an:nondeterministic function local:test-equals() as xs:boolean {
   (basic:equals($local:gif, $local:gif) and (not (basic:equals($local:gif, file:read-binary(concat($local:image-dir, "manipulation/gamma1Bird.gif"))))))
 };
 
@@ -107,20 +107,20 @@
 (:~
  : @return true if the basic:exif function works.
  :)
-declare %ann:nondeterministic function local:test-exif() as xs:boolean {
+declare %an:nondeterministic function local:test-exif() as xs:boolean {
     let $exif := file:read-binary(concat($local:image-dir, "exif.jpg"))
    return ((basic:exif($exif, "ExifImageWidth") eq "20") and fn:empty(basic:exif($exif, "supercalifragilisticexpialidocious")))
 };
 
 
-declare %ann:nondeterministic function local:test-convert-svg() as xs:boolean {
+declare %an:nondeterministic function local:test-convert-svg() as xs:boolean {
     let $svg-converted := basic:convert-svg(file:read-binary(concat($local:image-dir, "test.svg")), "JPEG")
     let $to-compare := file:read-binary(concat($local:image-dir, "test.jpeg"))
     return basic:equals($svg-converted, $to-compare)
 };
 
 
-declare %ann:nondeterministic %ann:sequential function local:main() as xs:string* {
+declare %an:nondeterministic %an:sequential function local:main() as xs:string* {
 
   let $a := local:test-width()
   return

=== modified file 'test/Queries/image/manipulation_1.xq'
--- test/Queries/image/manipulation_1.xq	2011-07-03 23:37:25 +0000
+++ test/Queries/image/manipulation_1.xq	2012-04-11 10:11:20 +0000
@@ -8,7 +8,7 @@
 import module namespace man = 'http://www.zorba-xquery.com/modules/image/manipulation';
 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://www.zorba-xquery.com/annotations";
 
 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
 
@@ -40,7 +40,7 @@
 (:~
  : @return true if the man:resize function works.
  :)
-declare %ann:nondeterministic function local:test-resize() as xs:boolean {
+declare %an:nondeterministic function local:test-resize() as xs:boolean {
     let $resized := man:resize($local:gif, xs:unsignedInt(500), xs:unsignedInt(600))
     let $resized-ref as xs:base64Binary := file:read-binary(concat($local:image-dir, "manipulation/bigBird.gif"))
     return basic:equals($resized, $resized-ref)
@@ -51,7 +51,7 @@
 (:~
  : @return true if the man:zoom function works.
  :)
-declare %ann:nondeterministic function local:test-zoom() as xs:boolean {
+declare %an:nondeterministic function local:test-zoom() as xs:boolean {
     let $zoomed := man:zoom($local:jpg, 2)
     let $ref-zoomed := file:read-binary(concat($local:image-dir, "manipulation/zoomedBird.jpg"))
     return basic:equals($zoomed, $ref-zoomed)
@@ -63,7 +63,7 @@
 (:~
  : @return true if the man:zoom-by-width function works.
  :)
-declare %ann:nondeterministic function local:test-zoom-by-width() as xs:boolean {
+declare %an:nondeterministic function local:test-zoom-by-width() as xs:boolean {
     let $zoomed := man:zoom-by-width($local:jpg, xs:unsignedInt(268))
     let $ref-zoomed := file:read-binary(concat($local:image-dir, "manipulation/zoomedBird.jpg"))
     return basic:equals($zoomed, $ref-zoomed)
@@ -72,7 +72,7 @@
 (:~
  : @return true if the man:zoom-by-height function works.
  :)
-declare %ann:nondeterministic function local:test-zoom-by-height() as xs:boolean {
+declare %an:nondeterministic function local:test-zoom-by-height() as xs:boolean {
     let $zoomed := man:zoom-by-height($local:jpg, xs:unsignedInt(320))
     let $ref-zoomed := file:read-binary(concat($local:image-dir, "manipulation/zoomedBird.jpg"))
     return basic:equals($zoomed, $ref-zoomed)
@@ -81,7 +81,7 @@
 (:~
  : @return true if the man:sub-image function works.
  :)
-declare %ann:nondeterministic function local:test-sub-image() as xs:boolean {
+declare %an:nondeterministic function local:test-sub-image() as xs:boolean {
     let $sub := man:sub-image($local:jpg, xs:unsignedInt(20), xs:unsignedInt(20), xs:unsignedInt(200), xs:unsignedInt(30))
     let $ref-sub := file:read-binary(concat($local:image-dir, "manipulation/subBird.jpg"))
     return basic:equals($sub, $ref-sub)
@@ -90,7 +90,7 @@
 (:~
  : @return true if the man:overlay function works.
  :)
-declare %ann:nondeterministic function local:test-overlay() {
+declare %an:nondeterministic function local:test-overlay() {
     let $ref-overlay:= file:read-binary(concat($local:image-dir, "manipulation/overlayBird.jpg"))
     let $ref-zoomed := file:read-binary(concat($local:image-dir, "manipulation/zoomedBird.jpg"))
     return basic:equals(man:overlay($ref-zoomed, $local:png, xs:unsignedInt(50), xs:unsignedInt(50), 
@@ -100,7 +100,7 @@
 
 
 
-declare %ann:nondeterministic %ann:sequential function local:main() as xs:string* {
+declare %an:nondeterministic %an:sequential function local:main() as xs:string* {
 
   let $a := local:test-resize()
   return

=== modified file 'test/Queries/image/manipulation_2.xq'
--- test/Queries/image/manipulation_2.xq	2011-07-03 23:37:25 +0000
+++ test/Queries/image/manipulation_2.xq	2012-04-11 10:11:20 +0000
@@ -8,7 +8,7 @@
 import module namespace man = 'http://www.zorba-xquery.com/modules/image/manipulation';
 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://www.zorba-xquery.com/annotations";
 
 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
 
@@ -37,7 +37,7 @@
 (:~
  : @return true if the man:rotate function works.
  :)
-declare %ann:nondeterministic function local:test-rotate() as xs:boolean {
+declare %an:nondeterministic function local:test-rotate() as xs:boolean {
     let $rotated := man:rotate($local:jpg, xs:int(180))
     let $rotated-ref := file:read-binary(concat($local:image-dir, "manipulation/rotatedBird.jpg"))
     return basic:equals($rotated, $rotated-ref)
@@ -48,7 +48,7 @@
 (:~
  : @return true if the man:rotate function works.
  :)
-declare %ann:nondeterministic function local:test-erase() as xs:boolean {
+declare %an:nondeterministic function local:test-erase() as xs:boolean {
     let $erased := man:erase($local:jpg)
     let $erased-ref := file:read-binary(concat($local:image-dir, "manipulation/erased.jpg"))
     return basic:equals($erased, $erased-ref)
@@ -57,7 +57,7 @@
 (:~
  : @return true if the man:flop function works.
  :)
-declare %ann:nondeterministic function local:test-flop() as xs:boolean {
+declare %an:nondeterministic function local:test-flop() as xs:boolean {
     let $flopped := man:flop($local:jpg)
     let $flopped-ref := file:read-binary(concat($local:image-dir, "manipulation/floppedBird.jpg"))
     return basic:equals($flopped, $flopped-ref)
@@ -67,7 +67,7 @@
 (:~
  : @return true if the man:flip function works.
  :)
-declare %ann:nondeterministic function local:test-flip() as xs:boolean {
+declare %an:nondeterministic function local:test-flip() as xs:boolean {
     let $flipped := man:flip($local:jpg)
     let $flipped-ref := file:read-binary(concat($local:image-dir, "manipulation/flippedBird.jpg"))
     return basic:equals($flipped, $flipped-ref)
@@ -76,7 +76,7 @@
 (:~
  : @return true if the man:trim function works.
  :)
-declare %ann:nondeterministic function local:test-trim() as xs:boolean {
+declare %an:nondeterministic function local:test-trim() as xs:boolean {
     let $trimmed := man:trim($local:jpg)
     let $trimmed-ref := file:read-binary(concat($local:image-dir, "manipulation/trimmedBird.jpg"))
     return basic:equals($trimmed, $trimmed-ref)
@@ -87,7 +87,7 @@
 (:~
  : @return true if the man:blur function works.
  :)
-declare %ann:nondeterministic function local:test-blur() as xs:boolean {
+declare %an:nondeterministic function local:test-blur() as xs:boolean {
     let $blurred := man:blur($local:jpg, xs:int(8), xs:int(-4))
     let $blurred-ref := file:read-binary(concat($local:image-dir, "manipulation/blurredBird.jpg"))
     return basic:equals($blurred, $blurred-ref)
@@ -96,7 +96,7 @@
 
 
 
-declare %ann:nondeterministic %ann:sequential function local:main() as xs:string* {
+declare %an:nondeterministic %an:sequential function local:main() as xs:string* {
 
   let $a := local:test-rotate()
   return

=== modified file 'test/Queries/image/manipulation_3.xq'
--- test/Queries/image/manipulation_3.xq	2011-07-03 23:37:25 +0000
+++ test/Queries/image/manipulation_3.xq	2012-04-11 10:11:20 +0000
@@ -8,7 +8,7 @@
 import module namespace man = 'http://www.zorba-xquery.com/modules/image/manipulation';
 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://www.zorba-xquery.com/annotations";
 
 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
 
@@ -40,7 +40,7 @@
 (:~
  : @return true if the man:despecle function works.
  :)
-declare %ann:nondeterministic function local:test-despeckle() as xs:boolean {
+declare %an:nondeterministic function local:test-despeckle() as xs:boolean {
     let $despeckled := man:despeckle($local:jpg)
     let $despeckled-ref :=  file:read-binary(concat($local:image-dir, "manipulation/despeckledBird.jpg"))
     return basic:equals($despeckled, $despeckled-ref)
@@ -50,7 +50,7 @@
 (:~
  : @return true if the man:despecle function works.
  :)
-declare %ann:nondeterministic function local:test-enhance() as xs:boolean {
+declare %an:nondeterministic function local:test-enhance() as xs:boolean {
     let $enhanced := man:enhance(man:enhance($local:jpg))
     let $enhanced-ref :=  file:read-binary(concat($local:image-dir, "manipulation/enhancedBird.jpg"))
     return basic:equals($enhanced, $enhanced-ref)
@@ -61,7 +61,7 @@
 (:~
  : @return true if the man:charcoal function works.
  :)
-declare %ann:nondeterministic function local:test-charcoal() as xs:boolean {
+declare %an:nondeterministic function local:test-charcoal() as xs:boolean {
     let $charcoaled := man:charcoal($local:jpg, 0.5, 0.5)
     let $charcoaled-ref :=  file:read-binary(concat($local:image-dir, "manipulation/charcoaledBird.jpg"))
     return basic:equals($charcoaled, $charcoaled-ref)
@@ -71,14 +71,14 @@
 (:~
  : @return true if the man:solarize function works.
  :)
-declare %ann:nondeterministic function local:test-solarize() as xs:boolean {
+declare %an:nondeterministic function local:test-solarize() as xs:boolean {
     let $solarized := man:solarize($local:jpg, 0.3)
     let $solarized-ref :=  file:read-binary(concat($local:image-dir, "manipulation/solarizedBird.jpg"))
     return basic:equals($solarized, $solarized-ref)
 };
 
 
-declare %ann:nondeterministic %ann:sequential function local:main() as xs:string* {
+declare %an:nondeterministic %an:sequential function local:main() as xs:string* {
 
   let $a := local:test-despeckle()
   return

=== modified file 'test/Queries/image/manipulation_4.xq'
--- test/Queries/image/manipulation_4.xq	2011-07-03 23:37:25 +0000
+++ test/Queries/image/manipulation_4.xq	2012-04-11 10:11:20 +0000
@@ -8,7 +8,7 @@
 import module namespace man = 'http://www.zorba-xquery.com/modules/image/manipulation';
 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://www.zorba-xquery.com/annotations";
 
 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
 
@@ -38,7 +38,7 @@
 (:~
  : @return true if the man:stereo function works.
  :)
-declare %ann:nondeterministic function local:test-stereo() as xs:boolean {
+declare %an:nondeterministic function local:test-stereo() as xs:boolean {
     let $right-image := man:zoom($local:jpg, 0.9)
     let $stereod := man:stereo($local:jpg, $right-image)
     let $stereod-ref := file:read-binary(concat($local:image-dir, "manipulation/stereodBird.jpg"))
@@ -48,7 +48,7 @@
 (:~
  : @return true if the man:transparent function works.
  :)
-declare %ann:nondeterministic function local:test-transparent() as xs:boolean {
+declare %an:nondeterministic function local:test-transparent() as xs:boolean {
     let $transparented := man:transparent($local:gif, "#000000")
     let $transparented-ref := file:read-binary(concat($local:image-dir, "manipulation/transparentedBird.gif"))
     return basic:equals($transparented, $transparented-ref)
@@ -57,7 +57,7 @@
 (:~
  : @return true if the man:swirl function works.
  :)
-declare %ann:nondeterministic function local:test-swirl() as xs:boolean {
+declare %an:nondeterministic function local:test-swirl() as xs:boolean {
     let $swirled := man:swirl($local:gif, -500)
     let $swirled-ref := file:read-binary(concat($local:image-dir, "manipulation/swirledBird.gif"))
     return basic:equals($swirled, $swirled-ref)
@@ -66,7 +66,7 @@
 (:~
  : @return true if the man:reduce-noise function works.
  :)
-declare %ann:nondeterministic function local:test-reduce-noise() as xs:boolean {
+declare %an:nondeterministic function local:test-reduce-noise() as xs:boolean {
     let $reduced := man:reduce-noise($local:gif, -0.4)
     let $reduced-ref := file:read-binary(concat($local:image-dir, "manipulation/reducedBird.gif"))
     return basic:equals($reduced, $reduced-ref)
@@ -76,14 +76,14 @@
 (:~
  : @return true if the man:contrast function works.
  :)
-declare %ann:nondeterministic function local:test-contrast() as xs:boolean {
+declare %an:nondeterministic function local:test-contrast() as xs:boolean {
     let $contrasted := man:contrast($local:gif, 0.8)
     let $contrasted-ref := file:read-binary(concat($local:image-dir, "manipulation/contrastedBird.gif"))
     return basic:equals($contrasted, $contrasted-ref)
 };
 
 
-declare %ann:nondeterministic %ann:sequential function local:main() as xs:string* {
+declare %an:nondeterministic %an:sequential function local:main() as xs:string* {
 
   let $a := local:test-stereo()
   return

=== modified file 'test/Queries/image/manipulation_5.xq'
--- test/Queries/image/manipulation_5.xq	2011-07-03 23:37:25 +0000
+++ test/Queries/image/manipulation_5.xq	2012-04-11 10:11:20 +0000
@@ -8,7 +8,7 @@
 import module namespace man = 'http://www.zorba-xquery.com/modules/image/manipulation';
 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://www.zorba-xquery.com/annotations";
 
 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
 
@@ -40,7 +40,7 @@
 (:~
  : @return true if the man:gamma function works.
  :)
-declare %ann:nondeterministic function local:test-gamma() as xs:boolean {
+declare %an:nondeterministic function local:test-gamma() as xs:boolean {
     let $gamma1 := man:gamma($local:gif, 1.8)
     let $gamma1-ref := file:read-binary(concat($local:image-dir, "manipulation/gamma1Bird.gif"))
     return basic:equals($gamma1, $gamma1-ref)
@@ -49,7 +49,7 @@
 (:~
  : @return true if the man:gamma with seperate values for each color (rgb) function works.
  :)
-declare %ann:nondeterministic function local:test-gamma-rgb() as xs:boolean {
+declare %an:nondeterministic function local:test-gamma-rgb() as xs:boolean {
     let $gamma2 := man:gamma($local:gif, 1.8, 4, 1)
     let $gamma2-ref := file:read-binary(concat($local:image-dir, "manipulation/gamma2Bird.gif"))
     return basic:equals($gamma2, $gamma2-ref)
@@ -58,7 +58,7 @@
 (:~
  : @return true if the man:implode function works.
  :)
-declare %ann:nondeterministic function local:test-implode() as xs:boolean {
+declare %an:nondeterministic function local:test-implode() as xs:boolean {
     let $implode := man:implode($local:gif, 0.6)
     let $implode-ref := file:read-binary(concat($local:image-dir, "manipulation/implodeBird.gif"))
     return basic:equals($implode, $implode-ref)
@@ -67,7 +67,7 @@
 (:~
  : @return true if the man:oil-paint function works.
  :)
-declare %ann:nondeterministic function local:test-oil-paint() as xs:boolean {
+declare %an:nondeterministic function local:test-oil-paint() as xs:boolean {
     let $oil-paint := man:oil-paint($local:gif, 0.6)
     let $oil-paint-ref := file:read-binary(concat($local:image-dir, "manipulation/oilPaintBird.gif"))
     return basic:equals($oil-paint,  $oil-paint-ref)
@@ -76,7 +76,7 @@
 (:~
  : @return true if the man:watermark function works.
  :)
-declare %ann:nondeterministic function local:test-watermark() as xs:boolean {
+declare %an:nondeterministic function local:test-watermark() as xs:boolean {
   let $watermark := man:watermark($local:gif, $local:jpg)
   let $watermark-ref := file:read-binary(concat($local:image-dir, "manipulation/watermarked.gif"))
   return basic:equals($watermark, $watermark-ref)
@@ -84,7 +84,7 @@
 };
 
 
-declare  %ann:nondeterministic %ann:sequential function local:main() as xs:string* {
+declare  %an:nondeterministic %an:sequential function local:main() as xs:string* {
 
   let $a := local:test-gamma()
   return

=== modified file 'test/Queries/image/paint_1.xq'
--- test/Queries/image/paint_1.xq	2011-08-07 00:38:36 +0000
+++ test/Queries/image/paint_1.xq	2012-04-11 10:11:20 +0000
@@ -8,7 +8,7 @@
 import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://www.zorba-xquery.com/annotations";
 
 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
 
@@ -38,20 +38,20 @@
 (:~
  : @return true if the man:draw-line function works.
  :)
-declare %ann:nondeterministic function local:test-draw-line() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-line() as xs:boolean {
     let $draw := paint:paint($local:gif, <image:line><image:start><image:x>-20</image:x><image:y>-20</image:y></image:start><image:end><image:x>80</image:x><image:y>80</image:y></image:end></image:line>) 
     let $draw-ref := file:read-binary(concat($local:image-dir,"paint/line.gif"))
     return basic:equals($draw, $draw-ref)
 };
 
-declare %ann:nondeterministic function local:test-draw-line-color-red() {
+declare %an:nondeterministic function local:test-draw-line-color-red() {
     let $draw := paint:paint($local:gif, <image:line><image:strokeColor>#6F0000</image:strokeColor><image:start><image:x>0</image:x><image:y>0</image:y></image:start><image:end><image:x>80</image:x><image:y>80</image:y></image:end></image:line>) 
     let $draw-ref := file:read-binary(concat($local:image-dir,"paint/redLine.gif"))
     return basic:equals($draw, $draw-ref)
 
 };
 
-declare %ann:nondeterministic function local:test-draw-line-color-green() {
+declare %an:nondeterministic function local:test-draw-line-color-green() {
     let $draw := paint:paint($local:gif, <image:line><image:strokeColor>#006F00</image:strokeColor><image:start><image:x>0</image:x><image:y>0</image:y></image:start><image:end><image:x>80</image:x><image:y>80</image:y></image:end></image:line>)
 
     let $draw-ref := file:read-binary(concat($local:image-dir,"paint/greenLine.gif"))
@@ -59,14 +59,14 @@
 
 };
 
-declare %ann:nondeterministic function local:test-draw-line-color-blue() {
+declare %an:nondeterministic function local:test-draw-line-color-blue() {
     let $draw := paint:paint($local:gif, <image:line><image:strokeColor>#00006F</image:strokeColor><image:start><image:x>0</image:x><image:y>0</image:y></image:start><image:end><image:x>80</image:x><image:y>80</image:y></image:end></image:line>) 
     let $draw-ref := file:read-binary(concat($local:image-dir,"paint/blueLine.gif"))
     return basic:equals($draw, $draw-ref)
 
 };
 
-declare %ann:nondeterministic function local:test-stroke-width() {
+declare %an:nondeterministic function local:test-stroke-width() {
     let $draw := paint:paint($local:gif, (<image:line><image:strokeWidth>10</image:strokeWidth><image:strokeColor>#000000</image:strokeColor><image:start><image:x>0</image:x><image:y>0</image:y></image:start><image:end><image:x>80</image:x><image:y>80</image:y></image:end></image:line>,<image:line><image:strokeColor>#FF00FF</image:strokeColor><image:start><image:x>30</image:x><image:y>0</image:y></image:start><image:end><image:x>70</image:x><image:y>90</image:y></image:end></image:line>))
     let $draw-ref := file:read-binary(concat($local:image-dir,"paint/wideLine.gif"))
     return basic:equals($draw, $draw-ref)
@@ -76,7 +76,7 @@
 
 
 
-declare %ann:nondeterministic %ann:sequential function local:main() as xs:string* {
+declare %an:nondeterministic %an:sequential function local:main() as xs:string* {
 
   let $a := local:test-draw-line()
   return

=== modified file 'test/Queries/image/paint_2.xq'
--- test/Queries/image/paint_2.xq	2011-08-07 00:38:36 +0000
+++ test/Queries/image/paint_2.xq	2012-04-11 10:11:20 +0000
@@ -8,7 +8,7 @@
 import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
 import schema namespace img = 'http://www.zorba-xquery.com/modules/image/image';
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://www.zorba-xquery.com/annotations";
 
 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
 
@@ -35,14 +35,14 @@
 };
 
 
-declare %ann:nondeterministic function local:test-draw-poly-line() as xs:boolean 
+declare %an:nondeterministic function local:test-draw-poly-line() as xs:boolean 
 {
   let $draw := paint:paint($local:gif, <img:polyLine><img:point><img:x>10</img:x><img:y>10</img:y></img:point><img:point><img:x>40</img:x><img:y>80</img:y></img:point><img:point><img:x>50</img:x><img:y>30</img:y></img:point><img:point><img:x>200</img:x><img:y>200</img:y></img:point></img:polyLine>)
   let $draw-ref := file:read-binary(concat($local:image-dir, "paint/polyLine.gif"))
   return basic:equals($draw, $draw-ref)
 };
 
-declare %ann:nondeterministic function local:test-draw-poly-line-anti-aliased() as xs:boolean
+declare %an:nondeterministic function local:test-draw-poly-line-anti-aliased() as xs:boolean
 {
   let $draw := paint:paint($local:gif, <img:polyLine><img:antiAliasing>true</img:antiAliasing><img:point><img:x>10</img:x><img:y>10</img:y></img:point><img:point><img:x>40</img:x><img:y>80</img:y></img:point><img:point><img:x>50</img:x><img:y>30</img:y></img:point></img:polyLine>)
   let $draw-ref := file:read-binary(concat($local:image-dir, "paint/polyLineAntiAliased.gif"))
@@ -53,7 +53,7 @@
 (:~
  : @return true if the man:draw-poly-line function works.
  :)
-declare %ann:nondeterministic function local:test-draw-poly-line-red() as xs:boolean 
+declare %an:nondeterministic function local:test-draw-poly-line-red() as xs:boolean 
 {
     let $draw := paint:paint($local:gif, <img:polyLine><img:strokeColor>#FF0000</img:strokeColor><img:antiAliasing>true</img:antiAliasing><img:point><img:x>10</img:x><img:y>10</img:y></img:point><img:point><img:x>40</img:x><img:y>80</img:y></img:point><img:point><img:x>50</img:x><img:y>30</img:y></img:point></img:polyLine>)
     
@@ -65,7 +65,7 @@
 (:~
  : @return true if the man:draw-poly-line function works.
  :)
-declare %ann:nondeterministic function local:test-draw-poly-line-wide() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-poly-line-wide() as xs:boolean {
      let $draw := paint:paint($local:gif, <img:polyLine><img:strokeWidth>5</img:strokeWidth><img:antiAliasing>true</img:antiAliasing><img:point><img:x>10</img:x><img:y>10</img:y></img:point><img:point><img:x>40</img:x><img:y>80</img:y></img:point><img:point><img:x>50</img:x><img:y>30</img:y></img:point></img:polyLine>)
     
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/polyLineWide.gif"))
@@ -74,7 +74,7 @@
 
 
 
-declare %ann:nondeterministic %ann:sequential function local:main() as xs:string* {
+declare %an:nondeterministic %an:sequential function local:main() as xs:string* {
 
 
   let $a := local:test-draw-poly-line()

=== modified file 'test/Queries/image/paint_3.xq'
--- test/Queries/image/paint_3.xq	2011-08-07 00:38:36 +0000
+++ test/Queries/image/paint_3.xq	2012-04-11 10:11:20 +0000
@@ -8,7 +8,7 @@
 import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
 import schema namespace img = 'http://www.zorba-xquery.com/modules/image/image';
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://www.zorba-xquery.com/annotations";
 
 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
 
@@ -38,7 +38,7 @@
 (:~
  : @return true if the man:draw-stroked-poly-line function works.
  :)
-declare %ann:nondeterministic function local:test-draw-stroked-poly-line() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-stroked-poly-line() as xs:boolean {
     let $draw := paint:paint($local:gif, <img:strokedPolyLine><img:point><img:x>10</img:x><img:y>10</img:y></img:point><img:point><img:x>40</img:x><img:y>80</img:y></img:point><img:point><img:x>50</img:x><img:y>30</img:y></img:point><img:strokeLength>5</img:strokeLength><img:gapLength>2</img:gapLength></img:strokedPolyLine>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/polyLineStroked.gif"))
     return basic:equals($draw, $draw-ref)
@@ -48,7 +48,7 @@
 (:~
  : @return true if the man:draw-stroked-poly-line function works.
  :)
-declare %ann:nondeterministic function local:test-draw-stroked-poly-line-blue() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-stroked-poly-line-blue() as xs:boolean {
     let $draw := paint:paint($local:gif, <img:strokedPolyLine><img:strokeColor>#0000FF</img:strokeColor><img:point><img:x>10</img:x><img:y>10</img:y></img:point><img:point><img:x>40</img:x><img:y>80</img:y></img:point><img:point><img:x>50</img:x><img:y>30</img:y></img:point><img:strokeLength>5</img:strokeLength><img:gapLength>2</img:gapLength></img:strokedPolyLine>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/polyLineStrokedBlue.gif"))
     return basic:equals($draw, $draw-ref)
@@ -57,7 +57,7 @@
 (:~
  : @return true if the man:draw-stroked-poly-line function works.
  :)
-declare %ann:nondeterministic function local:test-draw-stroked-poly-line-wide() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-stroked-poly-line-wide() as xs:boolean {
     let $draw := paint:paint($local:gif, <img:strokedPolyLine><img:strokeWidth>4</img:strokeWidth><img:point><img:x>10</img:x><img:y>10</img:y></img:point><img:point><img:x>40</img:x><img:y>80</img:y></img:point><img:point><img:x>50</img:x><img:y>30</img:y></img:point><img:strokeLength>5</img:strokeLength><img:gapLength>2</img:gapLength></img:strokedPolyLine>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/polyLineStrokedWide.gif"))
     return basic:equals($draw, $draw-ref)
@@ -66,13 +66,13 @@
 (:~
  : @return true if the man:draw-stroked-poly-line function works.
  :)
-declare %ann:nondeterministic function local:test-draw-stroked-poly-line-anti-aliased() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-stroked-poly-line-anti-aliased() as xs:boolean {
     let $draw := paint:paint($local:gif, <img:strokedPolyLine><img:antiAliasing>true</img:antiAliasing><img:point><img:x>10</img:x><img:y>10</img:y></img:point><img:point><img:x>40</img:x><img:y>80</img:y></img:point><img:point><img:x>50</img:x><img:y>30</img:y></img:point><img:strokeLength>5</img:strokeLength><img:gapLength>2</img:gapLength></img:strokedPolyLine>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/polyLineStrokedAntiAliased.gif"))
     return basic:equals($draw, $draw-ref)
 };
 
-declare %ann:nondeterministic %ann:sequential function local:main() as xs:string* {
+declare %an:nondeterministic %an:sequential function local:main() as xs:string* {
 
   let $a := local:test-draw-stroked-poly-line()
   return

=== modified file 'test/Queries/image/paint_4.xq'
--- test/Queries/image/paint_4.xq	2011-08-07 00:38:36 +0000
+++ test/Queries/image/paint_4.xq	2012-04-11 10:11:20 +0000
@@ -8,7 +8,7 @@
 import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://www.zorba-xquery.com/annotations";
 
 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
 
@@ -38,7 +38,7 @@
 (:~
  : @return true if the man:draw-rectangle function works.
  :)
-declare %ann:nondeterministic function local:test-draw-rectangle() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-rectangle() as xs:boolean {
     let $draw := paint:paint($local:gif, <image:rectangle><image:upperLeft><image:x>20</image:x><image:y>20</image:y></image:upperLeft><image:lowerRight><image:x>50</image:x><image:y>50</image:y></image:lowerRight></image:rectangle>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/rectangle.gif"))
     return basic:equals($draw, $draw-ref)
@@ -47,7 +47,7 @@
 (:~
  : @return true if the man:draw-rectangle function works.
  :)
-declare %ann:nondeterministic function local:test-draw-rectangle-green() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-rectangle-green() as xs:boolean {
     let $draw := paint:paint($local:gif, <image:rectangle><image:strokeColor>#00AF00</image:strokeColor><image:upperLeft><image:x>20</image:x><image:y>20</image:y></image:upperLeft><image:lowerRight><image:x>50</image:x><image:y>50</image:y></image:lowerRight></image:rectangle>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/rectangleGreen.gif"))
     return basic:equals($draw, $draw-ref)
@@ -57,7 +57,7 @@
 (:~
  : @return true if the man:draw-rectangle function works.
  :)
-declare %ann:nondeterministic function local:test-draw-rectangle-green-red() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-rectangle-green-red() as xs:boolean {
     let $draw := paint:paint($local:gif, <image:rectangle><image:strokeColor>#00AF00</image:strokeColor><image:fillColor>#A10000</image:fillColor><image:upperLeft><image:x>20</image:x><image:y>20</image:y></image:upperLeft><image:lowerRight><image:x>50</image:x><image:y>50</image:y></image:lowerRight></image:rectangle>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/rectangleGreenRed.gif"))
     return basic:equals($draw, $draw-ref)
@@ -67,7 +67,7 @@
 (:~
  : @return true if the man:draw-rectangle function works.
  :)
-declare %ann:nondeterministic function local:test-draw-rectangle-anti-aliased() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-rectangle-anti-aliased() as xs:boolean {
     let $draw := paint:paint($local:gif, <image:rectangle><image:strokeWidth>5</image:strokeWidth><image:strokeColor>#00AF00</image:strokeColor><image:fillColor>#A10000</image:fillColor><image:antiAliasing>true</image:antiAliasing><image:upperLeft><image:x>20</image:x><image:y>20</image:y></image:upperLeft><image:lowerRight><image:x>50</image:x><image:y>50</image:y></image:lowerRight></image:rectangle>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/rectangleAntiAliased.gif"))
     return basic:equals($draw, $draw-ref)
@@ -76,7 +76,7 @@
 (:~
  : @return true if the man:draw-rounded-rectangle function works.
  :)
-declare %ann:nondeterministic function local:test-draw-rounded-rectangle() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-rounded-rectangle() as xs:boolean {
     let $draw := paint:paint($local:gif, <image:roundedRectangle><image:upperLeft><image:x>20</image:x><image:y>20</image:y></image:upperLeft><image:lowerRight><image:x>50</image:x><image:y>50</image:y></image:lowerRight><image:cornerWidth>10</image:cornerWidth><image:cornerHeight>10</image:cornerHeight></image:roundedRectangle>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/rectangleRounded.gif"))
     return basic:equals($draw, $draw-ref)
@@ -85,7 +85,7 @@
 (:~
  : @return true if the man:draw-rounded-rectangle function works.
  :)
-declare %ann:nondeterministic function local:test-draw-rounded-rectangle-blue() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-rounded-rectangle-blue() as xs:boolean {
     let $draw := paint:paint($local:gif, <image:roundedRectangle><image:strokeColor>#0000FF</image:strokeColor><image:upperLeft><image:x>20</image:x><image:y>20</image:y></image:upperLeft><image:lowerRight><image:x>50</image:x><image:y>50</image:y></image:lowerRight><image:cornerWidth>10</image:cornerWidth><image:cornerHeight>10</image:cornerHeight></image:roundedRectangle>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/rectangleRoundedBlue.gif"))
     return basic:equals($draw, $draw-ref)
@@ -95,7 +95,7 @@
 (:~
  : @return true if the man:draw-rounded-rectangle function works.
  :)
-declare %ann:nondeterministic function local:test-draw-rounded-rectangle-blue-green() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-rounded-rectangle-blue-green() as xs:boolean {
     let $draw := paint:paint($local:gif, <image:roundedRectangle><image:strokeColor>#0000FF</image:strokeColor><image:fillColor>#00FF00</image:fillColor><image:upperLeft><image:x>20</image:x><image:y>20</image:y></image:upperLeft><image:lowerRight><image:x>50</image:x><image:y>50</image:y></image:lowerRight><image:cornerWidth>10</image:cornerWidth><image:cornerHeight>10</image:cornerHeight></image:roundedRectangle>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/rectangleRoundedBlueGreen.gif"))
     return basic:equals($draw, $draw-ref)
@@ -105,14 +105,14 @@
 (:~
  : @return true if the man:draw-rounded-rectangle function works.
  :)
-declare %ann:nondeterministic function local:test-draw-rounded-rectangle-anti-aliased() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-rounded-rectangle-anti-aliased() as xs:boolean {
     let $draw := paint:paint($local:gif, <image:roundedRectangle><image:strokeColor>#0000FF</image:strokeColor><image:fillColor>#00FF00</image:fillColor><image:antiAliasing>true</image:antiAliasing><image:upperLeft><image:x>20</image:x><image:y>20</image:y></image:upperLeft><image:lowerRight><image:x>50</image:x><image:y>50</image:y></image:lowerRight><image:cornerWidth>10</image:cornerWidth><image:cornerHeight>10</image:cornerHeight></image:roundedRectangle>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/rectangleRoundedAntiAliased.gif"))
     return basic:equals($draw, $draw-ref)
 };
 
 
-declare %ann:nondeterministic %ann:sequential function local:main() as xs:string* {
+declare %an:nondeterministic %an:sequential function local:main() as xs:string* {
 
   let $a := local:test-draw-rectangle()
   return

=== modified file 'test/Queries/image/paint_5.xq'
--- test/Queries/image/paint_5.xq	2011-08-07 00:38:36 +0000
+++ test/Queries/image/paint_5.xq	2012-04-11 10:11:20 +0000
@@ -8,7 +8,7 @@
 import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://www.zorba-xquery.com/annotations";
 
 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
 
@@ -39,7 +39,7 @@
 (:~
  : @return true if the man:draw-circle function works.
  :)
-declare %ann:nondeterministic function local:test-draw-circle() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-circle() as xs:boolean {
     let $draw := paint:paint($local:jpg, <image:circle><image:origin><image:x>20</image:x><image:y>20</image:y></image:origin><image:perimeter>5</image:perimeter></image:circle>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/circle.jpg"))
     return basic:equals($draw, $draw-ref)
@@ -49,7 +49,7 @@
 (:~
  : @return true if the man:draw-ellipse function works.
  :)
-declare %ann:nondeterministic function local:test-draw-ellipse() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-ellipse() as xs:boolean {
     let $draw := paint:paint($local:jpg, <image:ellipse><image:origin><image:x>50</image:x><image:y>50</image:y></image:origin><image:perimeterX>30</image:perimeterX><image:perimeterY>20</image:perimeterY></image:ellipse>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/ellipse.jpg"))
     return basic:equals($draw, $draw-ref)
@@ -58,7 +58,7 @@
 (:~
  : @return true if the man:draw-arc function works.
  :)
-declare %ann:nondeterministic function local:test-draw-arc() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-arc() as xs:boolean {
     let $draw := paint:paint($local:jpg, <image:arc><image:origin><image:x>50</image:x><image:y>50</image:y></image:origin><image:perimeterX>10</image:perimeterX><image:perimeterY>20</image:perimeterY><image:startDegrees>180</image:startDegrees><image:endDegrees>270</image:endDegrees></image:arc>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/arc.jpg"))
     return basic:equals($draw, $draw-ref)
@@ -67,7 +67,7 @@
 (:~
  : @return true if the man:draw-arc function works.
  :)
-declare %ann:nondeterministic function local:test-draw-red-arc() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-red-arc() as xs:boolean {
     let $draw := paint:paint($local:jpg, <image:arc><image:strokeColor>#FF0000</image:strokeColor><image:origin><image:x>50</image:x><image:y>50</image:y></image:origin><image:perimeterX>10</image:perimeterX><image:perimeterY>20</image:perimeterY><image:startDegrees>180</image:startDegrees><image:endDegrees>270</image:endDegrees></image:arc>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/arcRed.jpg"))
     return basic:equals($draw, $draw-ref)
@@ -76,7 +76,7 @@
 (:~
  : @return true if the man:draw-arc function works.
  :)
-declare %ann:nondeterministic function local:test-draw-red-green-arc() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-red-green-arc() as xs:boolean {
     let $draw := paint:paint($local:jpg, <image:arc><image:strokeColor>#FF0000</image:strokeColor><image:fillColor>#00AF00</image:fillColor><image:origin><image:x>50</image:x><image:y>50</image:y></image:origin><image:perimeterX>10</image:perimeterX><image:perimeterY>20</image:perimeterY><image:startDegrees>180</image:startDegrees><image:endDegrees>270</image:endDegrees></image:arc>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/arcRedGreen.jpg"))
     return basic:equals($draw, $draw-ref)
@@ -85,7 +85,7 @@
 (:~
  : @return true if the man:draw-arc function works.
  :)
-declare %ann:nondeterministic function local:test-draw-wide-arc() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-wide-arc() as xs:boolean {
     let $draw := paint:paint($local:jpg, <image:arc><image:strokeWidth>5</image:strokeWidth><image:strokeColor>#FF0000</image:strokeColor><image:fillColor>#00AF00</image:fillColor><image:origin><image:x>50</image:x><image:y>50</image:y></image:origin><image:perimeterX>10</image:perimeterX><image:perimeterY>20</image:perimeterY><image:startDegrees>180</image:startDegrees><image:endDegrees>270</image:endDegrees></image:arc>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/arcWide.jpg"))
     return basic:equals($draw, $draw-ref)
@@ -96,7 +96,7 @@
 (:~
  : @return true if the man:draw-arc function works.
  :)
-declare %ann:nondeterministic function local:test-draw-anti-aliased-arc() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-anti-aliased-arc() as xs:boolean {
     let $draw := paint:paint($local:jpg, <image:arc><image:strokeWidth>5</image:strokeWidth><image:strokeColor>#FF0000</image:strokeColor><image:fillColor>#00AF00</image:fillColor><image:antiAliasing>true</image:antiAliasing><image:origin><image:x>50</image:x><image:y>50</image:y></image:origin><image:perimeterX>10</image:perimeterX><image:perimeterY>20</image:perimeterY><image:startDegrees>180</image:startDegrees><image:endDegrees>270</image:endDegrees></image:arc>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/arcAntiAliased.jpg"))
     return basic:equals($draw, $draw-ref)
@@ -106,7 +106,7 @@
 
 
 
-declare %ann:nondeterministic %ann:sequential function local:main() as xs:string* {
+declare %an:nondeterministic %an:sequential function local:main() as xs:string* {
 
   let $a := local:test-draw-circle()
   return

=== modified file 'test/Queries/image/paint_6.xq'
--- test/Queries/image/paint_6.xq	2011-08-07 00:38:36 +0000
+++ test/Queries/image/paint_6.xq	2012-04-11 10:11:20 +0000
@@ -8,7 +8,7 @@
 import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://www.zorba-xquery.com/annotations";
 
 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
 declare variable $local:jpg as xs:base64Binary := basic:create(xs:unsignedInt(100), xs:unsignedInt(100), image:imageFormat("JPEG"));
@@ -36,7 +36,7 @@
 (:~
  : @return true if the man:draw-polygon function works.
  :)
-declare %ann:nondeterministic function local:test-draw-polygon() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-polygon() as xs:boolean {
     let $draw := paint:paint($local:jpg, <image:polygon><image:point><image:x>10</image:x><image:y>10</image:y></image:point><image:point><image:x>40</image:x><image:y>80</image:y></image:point><image:point><image:x>50</image:x><image:y>30</image:y></image:point></image:polygon>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/polygon.jpg"))
     return basic:equals($draw, $draw-ref)
@@ -45,7 +45,7 @@
 (:~
  : @return true if the man:draw-polygon function works.
  :)
-declare %ann:nondeterministic function local:test-draw-polygon-red() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-polygon-red() as xs:boolean {
     let $draw := paint:paint($local:jpg, <image:polygon><image:strokeColor>#FF0000</image:strokeColor><image:point><image:x>10</image:x><image:y>10</image:y></image:point><image:point><image:x>40</image:x><image:y>80</image:y></image:point><image:point><image:x>50</image:x><image:y>30</image:y></image:point></image:polygon>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/polygonRed.jpg"))
     return basic:equals($draw, $draw-ref)
@@ -54,7 +54,7 @@
 (:~
  : @return true if the man:draw-polygon function works.
  :)
-declare %ann:nondeterministic function local:test-draw-polygon-red-green() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-polygon-red-green() as xs:boolean {
     let $draw := paint:paint($local:jpg, <image:polygon><image:strokeColor>#FF0000</image:strokeColor><image:fillColor>#00FF00</image:fillColor><image:point><image:x>10</image:x><image:y>10</image:y></image:point><image:point><image:x>40</image:x><image:y>80</image:y></image:point><image:point><image:x>50</image:x><image:y>30</image:y></image:point></image:polygon>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/polygonRedGreen.jpg"))
     return basic:equals($draw, $draw-ref)
@@ -63,7 +63,7 @@
 (:~
  : @return true if the man:draw-polygon function works.
  :)
-declare %ann:nondeterministic function local:test-draw-polygon-wide() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-polygon-wide() as xs:boolean {
     let $draw := paint:paint($local:jpg, <image:polygon><image:strokeWidth>3</image:strokeWidth><image:strokeColor>#FF0000</image:strokeColor><image:fillColor>#00FF00</image:fillColor><image:point><image:x>10</image:x><image:y>10</image:y></image:point><image:point><image:x>40</image:x><image:y>80</image:y></image:point><image:point><image:x>50</image:x><image:y>30</image:y></image:point></image:polygon>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/polygonWide.jpg"))
     return basic:equals($draw, $draw-ref)
@@ -73,14 +73,14 @@
 (:~
  : @return true if the man:draw-polygon function works.
  :)
-declare %ann:nondeterministic function local:test-draw-polygon-anti-aliased() as xs:boolean {
+declare %an:nondeterministic function local:test-draw-polygon-anti-aliased() as xs:boolean {
     let $draw := paint:paint($local:jpg, <image:polygon><image:strokeWidth>3</image:strokeWidth><image:strokeColor>#FF0000</image:strokeColor><image:fillColor>#00FF00</image:fillColor><image:antiAliasing>true</image:antiAliasing><image:point><image:x>10</image:x><image:y>10</image:y></image:point><image:point><image:x>40</image:x><image:y>80</image:y></image:point><image:point><image:x>50</image:x><image:y>30</image:y></image:point></image:polygon>)
     let $draw-ref := file:read-binary(concat($local:image-dir, "paint/polygonAntiAliased.jpg"))
     return basic:equals($draw, $draw-ref)
 };
 
 
-declare %ann:nondeterministic %ann:sequential function local:main() as xs:string* {
+declare %an:nondeterministic %an:sequential function local:main() as xs:string* {
 
   let $a := local:test-draw-polygon()
   return