Merge branch 'master' into gfxpoly
authorMatthias Kramm <kramm@quiss.org>
Tue, 25 May 2010 17:09:56 +0000 (10:09 -0700)
committerMatthias Kramm <kramm@quiss.org>
Tue, 25 May 2010 17:09:56 +0000 (10:09 -0700)
57 files changed:
Makefile.in
configure.in
installer/installer.c
lib/devices/pdf.c
lib/devices/record.c
lib/devices/record.h
lib/filters/remove_font_transforms.c
lib/gfxfilter.c
lib/gfxfont.c
lib/gfxfont.h
lib/gfximage.c
lib/gfximage.h
lib/gfxtools.c
lib/jpeg.c
lib/jpeg.h
lib/modules/swfbits.c
lib/pdf/BitmapOutputDev.cc
lib/pdf/BitmapOutputDev.h
lib/pdf/GFXOutputDev.cc
lib/pdf/InfoOutputDev.cc
lib/pdf/InfoOutputDev.h
lib/pdf/Makefile.in
lib/pdf/bbox.c
lib/pdf/mk_patch [new file with mode: 0755]
lib/pdf/pdf.cc
lib/pdf/xpdf-changes.patch
lib/ruby/gfx.c
lib/ttf.c
lib/ttf.h
m4/Makefile
release.in
rendertest/athana.py [new file with mode: 0644]
rendertest/testpdfs.py [new file with mode: 0644]
src/pdf2swf.c
src/swfextract.c
wx/Makefile [new file with mode: 0644]
wx/app.py [deleted file]
wx/document.py [deleted file]
wx/gpdf2swf.py
wx/gui/__init__.py
wx/gui/dialogs.py
wx/gui/gmain.py [moved from wx/gui/main.py with 74% similarity]
wx/gui/info.py [new file with mode: 0644]
wx/gui/options/viewer.py
wx/gui/plugin.py
wx/setup.py [new file with mode: 0644]
wx/viewers/flexpaper.py [new file with mode: 0644]
wx/viewers/flexpaper/FlexPaperViewer.html [new file with mode: 0644]
wx/viewers/flexpaper/FlexPaperViewer.swf [new file with mode: 0644]
wx/viewers/flexpaper/js/jquery.js [new file with mode: 0644]
wx/viewers/flexpaper/js/swfobject/expressInstall.swf [new file with mode: 0644]
wx/viewers/flexpaper/js/swfobject/swfobject.js [new file with mode: 0644]
wx/viewers/raw.py
wx/viewers/rfx.py
wx/viewers/simple.py
wx/viewers/technoargia.py [new file with mode: 0644]
wx/viewers/technoargia.swf [new file with mode: 0644]

index 9c0fe46..e1a07f6 100644 (file)
@@ -15,8 +15,6 @@ all install uninstall clean:
        @echo making $@ in lib/python...
        cd lib/python;$(MAKE) $@
        @echo making $@ in lib/ruby...
-       cd lib/ruby;$(MAKE) $@
-       @echo making $@ in src...
        cd src;$(MAKE) $@
        @echo making $@ in avi2swf...
        cd avi2swf;$(MAKE) $@
index 515718a..d26a100 100644 (file)
@@ -34,7 +34,7 @@ if test "x$enable_lame" = "xno";then
 fi,DISABLE_LAME=)
 
 PACKAGE=swftools
-VERSION=2010-02-06-1900
+VERSION=2010-05-20-1815
 
 # ------------------------------------------------------------------
 
index 58c7765..b62721d 100644 (file)
@@ -558,7 +558,7 @@ static HRESULT (WINAPI *f_SHGetSpecialFolderPath)(HWND hwnd, LPTSTR lpszPath, in
 
 BOOL CALLBACK PropertySheetFunc4(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) {
     if(message == WM_INITDIALOG) {
-       pdf2swf_dir = concatPaths(install_path, "gpdf2swf");
+       pdf2swf_dir = install_path; //concatPaths(install_path, "gpdf2swf");
        pdf2swf_path = concatPaths(pdf2swf_dir, "gpdf2swf.exe");
        FILE*fi = fopen(pdf2swf_path, "rb");
        if(fi) {
index 16bb6cf..c1484bb 100644 (file)
@@ -64,6 +64,10 @@ static void restore_matrix(internal_t*i)
     if(i->has_matrix) {
        PDF_restore(i->p);
        i->has_matrix=0;
+       i->m00 = 0;
+       i->m01 = 0;
+       i->m10 = 0;
+       i->m11 = 0;
     }
 }
 static void set_matrix(internal_t*i, double m00, double m01, double m10, double m11)
index 8f7b40a..90fbfbf 100644 (file)
@@ -34,6 +34,7 @@
 #include <assert.h>
 #include "../gfxdevice.h"
 #include "../gfxtools.h"
+#include "../gfxfont.h"
 #include "../types.h"
 #include "../bitio.h"
 #include "../log.h"
@@ -45,7 +46,7 @@
 #include "record.h"
 
 //#define STATS
-#define COMPRESS_IMAGES
+//#define COMPRESS_IMAGES
 //#define FILTER_IMAGES
 
 typedef struct _state {
@@ -452,6 +453,17 @@ static gfxfont_t*readFont(reader_t*r, state_t*state)
 
 /* ----------------- reading/writing of primitives with caching -------------- */
 
+void state_clear(state_t*state)
+{
+    int t;
+    for(t=0;t<sizeof(state->last_string)/sizeof(state->last_string[0]);t++) {
+       if(state->last_string[t]) {
+           free(state->last_string[t]);
+           state->last_string[t] = 0;
+       }
+    }
+}
+
 static char* read_string(reader_t*r, state_t*state, U8 id, U8 flags)
 {
     assert(id>=0 && id<16);
@@ -460,6 +472,9 @@ static char* read_string(reader_t*r, state_t*state, U8 id, U8 flags)
        return strdup(state->last_string[id]);
     }
     char*s = reader_readString(r);
+    if(state->last_string[id]) {
+       free(state->last_string[id]);
+    }
     state->last_string[id] = strdup(s);
     return s;
 }
@@ -592,8 +607,10 @@ static void record_drawchar(struct _gfxdevice*dev, gfxfont_t*font, int glyphnr,
     char same_matrix = (l->m00 == matrix->m00) && (l->m01 == matrix->m01) && (l->m10 == matrix->m10) && (l->m11 == matrix->m11);
     char same_color = !memcmp(color, &i->state.last_color[OP_DRAWCHAR], sizeof(gfxcolor_t));
 
+    /* FIXME
     if(same_font && same_matrix && same_color)
        flags |= FLAG_SAME_AS_LAST;
+    */
 
     writer_writeU8(&i->w, OP_DRAWCHAR|flags);
     writer_writeU32(&i->w, glyphnr);
@@ -606,7 +623,11 @@ static void record_drawchar(struct _gfxdevice*dev, gfxfont_t*font, int glyphnr,
            writer_writeString(&i->w, font_id);
        dumpColor(&i->w, &i->state, color);
        dumpMatrix(&i->w, &i->state, matrix);
+
+       if(i->state.last_string[OP_DRAWCHAR])
+           free(i->state.last_string[OP_DRAWCHAR]);
        i->state.last_string[OP_DRAWCHAR] = strdup(font_id);
+
        i->state.last_color[OP_DRAWCHAR] = *color;
        i->state.last_matrix[OP_DRAWCHAR] = *matrix;
     } else {
@@ -641,18 +662,20 @@ static void record_drawlink(struct _gfxdevice*dev, gfxline_t*line, const char*ac
 
 /* ------------------------------- replaying --------------------------------- */
 
-static void replay(struct _gfxdevice*dev, gfxdevice_t*out, reader_t*r)
+static void replay(struct _gfxdevice*dev, gfxdevice_t*out, reader_t*r, gfxfontlist_t**fontlist)
 {
     internal_t*i = 0;
     if(dev) {
        i = (internal_t*)dev->internal;
     }
+    gfxfontlist_t*_fontlist=0;
+    if(!fontlist) {
+       fontlist = &_fontlist;
+    }
 
     state_t state;
     memset(&state, 0, sizeof(state));
 
-    gfxfontlist_t* fontlist = gfxfontlist_create();
-
     while(1) {
        unsigned char op;
        if(r->read(r, &op, 1)!=1)
@@ -775,8 +798,12 @@ static void replay(struct _gfxdevice*dev, gfxdevice_t*out, reader_t*r)
            case OP_ADDFONT: {
                msg("<trace> replay: ADDFONT out=%08x(%s)", out, out->name);
                gfxfont_t*font = readFont(r, &state);
-               fontlist = gfxfontlist_addfont(fontlist, font);
-               out->addfont(out, font);
+               if(!gfxfontlist_hasfont(*fontlist, font)) {
+                   *fontlist = gfxfontlist_addfont(*fontlist, font);
+                   out->addfont(out, font);
+               } else {
+                   gfxfont_free(font);
+               }
                break;
            }
            case OP_DRAWCHAR: {
@@ -788,7 +815,7 @@ static void replay(struct _gfxdevice*dev, gfxdevice_t*out, reader_t*r)
                gfxcolor_t color = read_color(r, &state, op, flags);
                gfxmatrix_t matrix = read_matrix(r, &state, op, flags);
 
-               gfxfont_t*font = id?gfxfontlist_findfont(fontlist, id):0;
+               gfxfont_t*font = id?gfxfontlist_findfont(*fontlist, id):0;
                if(i && !font) {
                    font = gfxfontlist_findfont(i->fontlist, id);
                }
@@ -801,14 +828,12 @@ static void replay(struct _gfxdevice*dev, gfxdevice_t*out, reader_t*r)
        }
     }
 finish:
+    state_clear(&state);
     r->dealloc(r);
-    /* problem: if we just replayed into a device which stores the
-       font for later use (the record device itself is a nice example),
-       then we can't free it yet */
-    //gfxfontlist_free(fontlist, 1);
-    gfxfontlist_free(fontlist, 0);
+    if(_fontlist)
+       gfxfontlist_free(_fontlist, 0);
 }
-void gfxresult_record_replay(gfxresult_t*result, gfxdevice_t*device)
+void gfxresult_record_replay(gfxresult_t*result, gfxdevice_t*device, gfxfontlist_t**fontlist)
 {
     internal_result_t*i = (internal_result_t*)result->internal;
     
@@ -819,7 +844,7 @@ void gfxresult_record_replay(gfxresult_t*result, gfxdevice_t*device)
        reader_init_memreader(&r, i->data, i->length);
     }
 
-    replay(0, device, &r);
+    replay(0, device, &r, fontlist);
 }
 
 static void record_result_write(gfxresult_t*r, int filedesc)
@@ -894,7 +919,7 @@ static void hexdumpMem(unsigned char*data, int len)
     }
 }
 
-void gfxdevice_record_flush(gfxdevice_t*dev, gfxdevice_t*out)
+void gfxdevice_record_flush(gfxdevice_t*dev, gfxdevice_t*out, gfxfontlist_t**fontlist)
 {
     internal_t*i = (internal_t*)dev->internal;
     if(out) {
@@ -903,7 +928,7 @@ void gfxdevice_record_flush(gfxdevice_t*dev, gfxdevice_t*out)
            void*data = writer_growmemwrite_memptr(&i->w, &len);
            reader_t r;
            reader_init_memreader(&r, data, len);
-           replay(dev, out, &r);
+           replay(dev, out, &r, fontlist);
            writer_growmemwrite_reset(&i->w);
        } else {
            msg("<fatal> Flushing not supported for file based record device");
@@ -921,6 +946,8 @@ static gfxresult_t* record_finish(struct _gfxdevice*dev)
        msg("<error> Warning: unclosed cliplevels");
     }
 
+    state_clear(&i->state);
+
 #ifdef STATS
     int total = i->w.pos;
     if(total && i->use_tempfile) {
index 34fe1e4..d47b0ec 100644 (file)
@@ -23,6 +23,7 @@
 #define __record_h__
 
 #include "../gfxdevice.h"
+#include "../gfxtools.h"
 
 
 #ifdef __cplusplus
@@ -33,9 +34,9 @@ void gfxdevice_record_init(gfxdevice_t*, char use_tempfile);
 
 gfxdevice_t* gfxdevice_record_new(char*filename);
 
-void gfxdevice_record_flush(gfxdevice_t*, gfxdevice_t*);
+void gfxdevice_record_flush(gfxdevice_t*, gfxdevice_t*, gfxfontlist_t**);
 
-void gfxresult_record_replay(gfxresult_t*, gfxdevice_t*);
+void gfxresult_record_replay(gfxresult_t*, gfxdevice_t*, gfxfontlist_t**);
 
 #ifdef __cplusplus
 }
index cdebf67..c04d110 100644 (file)
@@ -95,10 +95,10 @@ typedef struct _internal {
 
 
 #ifdef __GNUC__
-void __attribute__((noinline)) 
+int __attribute__((noinline)) 
      matrix_convert(gfxmatrix_t*in, const char*id, mymatrix_t*out, gfxmatrix_t*scalematrix, unsigned char alpha)
 #else
-void matrix_convert(gfxmatrix_t*in, const char*id, mymatrix_t*out, gfxmatrix_t*scalematrix, unsigned char alpha)
+int matrix_convert(gfxmatrix_t*in, const char*id, mymatrix_t*out, gfxmatrix_t*scalematrix, unsigned char alpha)
 #endif
 {
     double l1 = sqrt(in->m00 * in->m00 + in->m01 * in->m01);
@@ -106,7 +106,7 @@ void matrix_convert(gfxmatrix_t*in, const char*id, mymatrix_t*out, gfxmatrix_t*s
     double l = (l1+l2)/2.0;
     if(l < 1e-10) {
        memset(out, 0, sizeof(*out));
-       return;
+       return 0;
     }
     out->m00 = in->m00 / l;
     out->m10 = in->m10 / l;
@@ -123,6 +123,7 @@ void matrix_convert(gfxmatrix_t*in, const char*id, mymatrix_t*out, gfxmatrix_t*s
        scalematrix->tx = in->tx;
        scalematrix->ty = in->ty;
     }
+    return 1;
 }
 
 typedef struct _matrixdata {
@@ -160,7 +161,8 @@ static void pass1_drawchar(gfxfilter_t*f, gfxfont_t*font, int glyphnr, gfxcolor_
     mymatrix_t m;
     if(!font->id) 
        msg("<error> Font has no ID");
-    matrix_convert(matrix, font->id?font->id:"unknown", &m, 0, color->a);
+    if(!matrix_convert(matrix, font->id?font->id:"unknown", &m, 0, color->a))
+       return;
     transformedfont_t*fd = dict_lookup(i->matrices, &m);
     if(!fd) {
        fd = transformedfont_new(font, &m);
@@ -224,7 +226,7 @@ static gfxresult_t* pass1_finish(gfxfilter_t*f, gfxdevice_t*out)
        if(count) 
            average_xmax /= count;
 
-       fd->dx = -total.xmin;
+       fd->dx = 0;//-total.xmin;
 
        font->ascent = total.ymax;
        font->descent = -total.ymin;
index f1a341a..a7ee6c4 100644 (file)
@@ -305,7 +305,7 @@ static gfxresult_t* twopass_finish(gfxdevice_t*dev)
     }
 
     i->pass++;
-    gfxresult_record_replay(r, dev);
+    gfxresult_record_replay(r, dev, 0);
     r->destroy(r);
 
     return twopass_finish(dev);
index acc8e34..549e50d 100644 (file)
@@ -22,6 +22,8 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <assert.h>
+#include <stdio.h>
+#include <memory.h>
 #include "../config.h"
 #include "gfxdevice.h"
 #include "gfxtools.h"
@@ -143,7 +145,7 @@ static int errorno = 0;
 
 //#define DEBUG 1
 
-gfxfont_t* gfxfont_load(char*id, char*filename, unsigned int flags, double quality)
+gfxfont_t* gfxfont_load(const char*id, const char*filename, unsigned int flags, double quality)
 {
     FT_Face face;
     FT_Error error;
@@ -492,7 +494,7 @@ gfxfont_t* gfxfont_load(char*id, char*filename, unsigned int flags, double quali
 }
 #else
 
-gfxfont_t* gfxfont_load(char*id, char*filename, unsigned int flags, double quality)
+gfxfont_t* gfxfont_load(const char*id, const char*filename, unsigned int flags, double quality)
 {
     fprintf(stderr, "No freetype support compiled in! Not able to load %s\n", filename);
     return 0;
@@ -557,7 +559,22 @@ void gfxfont_fix_unicode(gfxfont_t*font)
            max = u;
     }
     free(used);
-    
+    if(font->unicode2glyph) {
+       free(font->unicode2glyph);
+    }
+    font->unicode2glyph = 0;
+    font->max_unicode = 0;
+}
+
+void gfxfont_add_unicode2glyph(gfxfont_t*font)
+{ 
+    int t;
+    int max = 0;
+    for(t=0;t<font->num_glyphs;t++) {
+       int u = font->glyphs[t].unicode;
+       if(u > max)
+           max = u;
+    }
     if(!font->unicode2glyph) {
        /* (re)generate unicode2glyph-to-glyph mapping table by reverse mapping
           the glyph unicode2glyph's indexes into the mapping table. For collisions,
@@ -593,7 +610,7 @@ void gfxfont_fix_unicode(gfxfont_t*font)
     }
 }
 
-ttf_t* gfxfont_to_ttf(gfxfont_t*font)
+ttf_t* gfxfont_to_ttf(gfxfont_t*font, char eot)
 {
     ttf_t*ttf = ttf_new();
     int num_glyphs = font->num_glyphs;
@@ -665,7 +682,26 @@ ttf_t* gfxfont_to_ttf(gfxfont_t*font)
            }
        }
 
-       dest->bearing = dest->xmin;
+       if(eot) {
+           dest->bearing = dest->xmin;
+           /* for windows font rendering, make sure coordinates are always 
+              to the right of the origin (and use bearing to shift them "back".)
+              Don't do this for non-windows platforms though because e.g. OS X 
+              ignores bearing. */
+           int xshift=0;
+           if(dest->xmin < 0) {
+               xshift = -dest->xmin;
+               for(s=0;s<count;s++) {
+                   dest->points[s].x += xshift;
+               }
+               dest->xmin += xshift;
+               dest->xmax += xshift;
+           }
+       }
+       dest->advance = src->advance*scale;
+
+       //dest->xmin=0; //TODO: might be necessary for some font engines?
+
        dest->advance = src->advance*scale;
 
        int u = font->glyphs[t].unicode;
@@ -722,14 +758,14 @@ ttf_t* gfxfont_to_ttf(gfxfont_t*font)
 
 void gfxfont_save(gfxfont_t*font, const char*filename)
 {
-    ttf_t*ttf = gfxfont_to_ttf(font);
+    ttf_t*ttf = gfxfont_to_ttf(font, 0);
     ttf_save(ttf, filename);
     ttf_destroy(ttf);
 }
 
 void gfxfont_save_eot(gfxfont_t*font, const char*filename)
 {
-    ttf_t*ttf = gfxfont_to_ttf(font);
+    ttf_t*ttf = gfxfont_to_ttf(font, 1);
     ttf_save_eot(ttf, filename);
     ttf_destroy(ttf);
 }
index a553ea4..a3e1acc 100644 (file)
@@ -32,11 +32,12 @@ extern "C" {
 
 /* The quality parameter is given by 1 divided by the zoom factor at which the font
    still looks good. 1=normal, 0.5=double resolution etc. */
-gfxfont_t* gfxfont_load(char*id, char*filename, unsigned int flags, double quality);
+gfxfont_t* gfxfont_load(const char*id, const char*filename, unsigned int flags, double quality);
 void gfxfont_save(gfxfont_t*font, const char*filename);
 void gfxfont_save_eot(gfxfont_t*font, const char*filename);
 void gfxfont_fix_unicode(gfxfont_t*font);
 void gfxfont_free(gfxfont_t*font);
+void gfxfont_add_unicode2glyph(gfxfont_t*font);
 
 #ifdef __cplusplus
 }
index 3e6cfde..661f9cd 100644 (file)
@@ -7,6 +7,15 @@
 #include "gfximage.h"
 #include "types.h"
 
+gfximage_t*gfximage_new(int width, int height)
+{
+    gfximage_t*i = rfx_calloc(sizeof(gfximage_t));
+    i->data = rfx_calloc(width*height*4);
+    i->width = width;
+    i->height = height;
+    return i;
+}
+
 void gfximage_save_jpeg(gfximage_t*img, const char*filename, int quality)
 {
     int x,y;
@@ -254,9 +263,11 @@ gfximage_t* gfximage_rescale(gfximage_t*image, int newwidth, int newheight)
     rgba_int_t*tmpline;
     int monochrome = 0;
     gfxcolor_t monochrome_colors[2];
-    
-    if(newwidth<1 || newheight<1)
-       return 0;
+   
+    if(newwidth<1)
+       newwidth=1;
+    if(newheight<1)
+       newheight=1;
 
     int width = image->width;
     int height = image->height;
index 6520205..5ac8242 100644 (file)
@@ -3,6 +3,7 @@
 
 #include "gfxdevice.h"
 
+gfximage_t*gfximage_new(int width, int height);
 void gfximage_save_jpeg(gfximage_t*image, const char*filename, int quality);
 void gfximage_save_png(gfximage_t*image, const char*filename);
 gfximage_t* gfximage_rescale(gfximage_t*image, int newwidth, int newheight);
index 35d4eff..7160033 100644 (file)
@@ -1054,6 +1054,7 @@ gfxline_t* gfxline_restitch(gfxline_t*line)
                gfxpoint_t xy = {line->x, line->y};
                dict_put(rev, &xy, prev);
                line->next = 0;
+               prev=0;
            }
        }
        line = next;
index f9cdf41..21cc0f7 100644 (file)
@@ -288,12 +288,11 @@ void mem_term_source (j_decompress_ptr cinfo)
     //printf("term %d\n", size - mgr->bytes_in_buffer);
 }
 
-int jpeg_load_from_mem(unsigned char*_data, int _size, unsigned char*dest, int width, int height)
+int jpeg_load_from_mem(unsigned char*_data, int _size, unsigned char**dest, int*width, int*height)
 {
     struct jpeg_decompress_struct cinfo;
     struct jpeg_error_mgr jerr;
     struct jpeg_source_mgr mgr;
-    int y,x;
 
     data = _data;
     size = _size;
@@ -312,12 +311,27 @@ int jpeg_load_from_mem(unsigned char*_data, int _size, unsigned char*dest, int w
     cinfo.src = &mgr;
 
     jpeg_read_header(&cinfo, TRUE);
+    cinfo.out_color_space == JCS_RGB;
     jpeg_start_decompress(&cinfo);
+  
+    *width = cinfo.output_width;
+    *height = cinfo.output_height;
+    *dest = malloc(cinfo.output_width * cinfo.output_height * 4); 
 
-    for(y=0;y<height;y++) {
-       unsigned char*j = &dest[width*y*3];
-       jpeg_read_scanlines(&cinfo,&j,1);
+    unsigned char*scanline = malloc(cinfo.output_width * 4);
+    int y;
+    for(y=0;y<cinfo.output_height;y++) {
+       unsigned char*to = &(*dest)[cinfo.output_width*y*4];
+       jpeg_read_scanlines(&cinfo,&scanline,1);
+       int x;
+       for(x=0;x<cinfo.output_width;x++) {
+           to[x*4 + 0] = 255;
+           to[x*4 + 1] = scanline[x*3 + 0];
+           to[x*4 + 2] = scanline[x*3 + 1];
+           to[x*4 + 3] = scanline[x*3 + 2];
+       }
     }
+    free(scanline);
 
     jpeg_finish_decompress(&cinfo);
     jpeg_destroy_decompress(&cinfo);
@@ -405,6 +419,29 @@ int jpeg_load(const char*filename, unsigned char**dest, int*_width, int*_height)
     return 1;
 }
 
+void jpeg_get_size(const char *filename, int *width, int *height)
+{
+    struct jpeg_decompress_struct cinfo;
+    struct jpeg_error_mgr jerr;
+    FILE *fi;
+    *width = 0;
+    *height = 0;
+    cinfo.err = jpeg_std_error(&jerr);
+    cinfo.image_width = 0;
+    cinfo.image_height = 0;
+    jpeg_create_decompress(&cinfo);
+    if ((fi = fopen(filename, "rb")) == NULL) {
+       fprintf(stderr, "couldn't open %s\n", filename);
+       return;
+    }
+    jpeg_stdio_src(&cinfo, fi);
+    jpeg_read_header(&cinfo, TRUE);
+    *width = cinfo.image_width;
+    *height = cinfo.image_height;
+    jpeg_destroy_decompress(&cinfo);
+    fclose(fi);
+}
+
 #else
 
 int jpeg_save(unsigned char*data, int width, int height, int quality, const char*filename)
@@ -432,5 +469,11 @@ int jpeg_load(const char*filename, unsigned char**dest, int*_width, int*_height)
     fprintf(stderr, "jpeg_load: No JPEG support compiled in\n");
     return 0;
 }
+void jpeg_get_size(const char *fname, int *width, int *height)
+{
+    *width = 0;
+    *height = 0;
+    fprintf(stderr, "jpeg_get_size: No JPEG support compiled in\n");
+}
 
 #endif
index 090d147..90f9fea 100644 (file)
@@ -12,7 +12,8 @@ int jpeg_save_gray(unsigned char*data, int width, int height, int quality, const
 int jpeg_save_to_file(unsigned char*data, int width, int height, int quality, FILE*fi);
 int jpeg_save_to_mem(unsigned char*data, int width, int height, int quality, unsigned char*dest, int destsize);
 int jpeg_load(const char*filename, unsigned char**dest, int*width, int*height);
-int jpeg_load_from_mem(unsigned char*_data, int size, unsigned char*dest, int width, int height);
+int jpeg_load_from_mem(unsigned char*_data, int _size, unsigned char**dest, int*width, int*height);
+void jpeg_get_size(const char *fname, int *width, int *height);
 
 #ifdef __cplusplus
 }
index c2dcf25..84a3b50 100644 (file)
@@ -1152,6 +1152,7 @@ int swf_SetJPEGBits3(TAG * tag, U16 width, U16 height, RGBA * bitmap, int qualit
 #endif
 
 
+#define NO_LOSSLESS
 /* expects mem to be non-premultiplied */
 TAG* swf_AddImage(TAG*tag, int bitid, RGBA*mem, int width, int height, int quality)
 {
index e1cb3d3..7b7b6a5 100644 (file)
@@ -29,6 +29,7 @@
 #include "../log.h"
 #include "../png.h"
 #include "../devices/record.h"
+#include "../gfxtools.h"
 #include "../types.h"
 #include "bbox.h"
 
@@ -80,6 +81,7 @@ BitmapOutputDev::BitmapOutputDev(InfoOutputDev*info, PDFDoc*doc)
     this->gfxdev->setDevice(this->gfxoutput);
     
     this->config_extrafontdata = 0;
+    this->config_optimizeplaincolorfills = 0;
     this->bboxpath = 0;
     //this->clipdev = 0;
     //this->clipstates = 0;
@@ -214,12 +216,26 @@ void BitmapOutputDev::flushBitmap()
        int ymax = b->ymax;
 
        /* clip against (-movex, -movey, -movex+width, -movey+height) */
-       if(xmin < -this->movex) xmin = -this->movex;
-       if(ymin < -this->movey) ymin = -this->movey;
-       if(xmax > -this->movex + width) xmax = -this->movex+this->width;
-       if(ymax > -this->movey + height) ymax = -this->movey+this->height;
 
-       msg("<verbose> Flushing bitmap (bbox: %d,%d,%d,%d)", xmin,ymin,xmax,ymax);
+       msg("<verbose> Flushing bitmap (bbox: %d,%d,%d,%d %dx%d) (clipped against %d,%d,%d,%d)", xmin,ymin,xmax,ymax, xmax-xmin, ymax-ymin,
+               -this->movex, -this->movey, -this->movex+this->width, -this->movey+this->height);
+
+       if(xmin < -this->movex) {
+           xmin = -this->movex;
+           if(xmax < -this->movex) continue;
+       }
+       if(ymin < -this->movey) {
+           ymin = -this->movey;
+           if(ymax < -this->movey) continue;
+       }
+       if(xmax >= -this->movex + this->width) {
+           xmax = -this->movex+this->width;
+           if(xmin >= -this->movex + this->width) continue;
+       }
+       if(ymax >= -this->movey + this->height) {
+           ymax = -this->movey+this->height;
+           if(ymin >= -this->movey + this->height) continue;
+       }
        
        if((xmax-xmin)<=0 || (ymax-ymin)<=0) // no bitmap, nothing to do
            continue;
@@ -297,7 +313,16 @@ void BitmapOutputDev::flushBitmap()
 void BitmapOutputDev::flushText()
 {
     msg("<verbose> Flushing text");
-    gfxdevice_record_flush(this->gfxoutput, this->dev);
+
+    static gfxfontlist_t*output_font_list = 0;
+    static gfxdevice_t*last = 0;
+    if(last != this->dev) {
+       if(output_font_list)
+           gfxfontlist_free(output_font_list, 0);
+       output_font_list = gfxfontlist_create();
+    }
+    gfxdevice_record_flush(this->gfxoutput, this->dev, &output_font_list);
+    last = this->dev;
     
     this->emptypage = 0;
 }
@@ -468,13 +493,35 @@ static void update_bitmap(SplashBitmap*bitmap, SplashBitmap*update, int x1, int
            u += width8;
        }
     } else {
-       int x,y;
-       for(y=0;y<yspan;y++) {
-           for(x=0;x<xspan;x++) {
-               b[x] |= u[x];
+       if(((ptroff_t)b&7)==((ptroff_t)u&7)) {
+           int x,y;
+           for(y=0;y<yspan;y++) {
+               Guchar*e1 = b+xspan-8;
+               Guchar*e2 = b+xspan;
+               while(((ptroff_t)b&7) && b<e1) {
+                   *b |= *u;
+                   b++;u++;
+               }
+               while(b<e1) {
+                   *(long long*)b |= *(long long*)u;
+                   b+=8;u+=8;
+               }
+               while(b<e2) {
+                   *b |= *u;
+                   b++;u++;
+               }
+               b += width8-xspan;
+               u += width8-xspan;
+           }
+       } else {
+           int x,y;
+           for(y=0;y<yspan;y++) {
+               for(x=0;x<xspan;x++) {
+                   b[x] |= u[x];
+               }
+               b += width8;
+               u += width8;
            }
-           b += width8;
-           u += width8;
        }
     }
 }
@@ -822,7 +869,6 @@ void BitmapOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, do
     this->width = (int)(x2-x1);
     this->height = (int)(y2-y1);
 
-    msg("<debug> startPage");
     rgbdev->startPage(pageNum, state, crop_x1, crop_y1, crop_x2, crop_y2);
     boolpolydev->startPage(pageNum, state, crop_x1, crop_y1, crop_x2, crop_y2);
     booltextdev->startPage(pageNum, state, crop_x1, crop_y1, crop_x2, crop_y2);
@@ -837,6 +883,8 @@ void BitmapOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, do
     booltextbitmap = booltextdev->getBitmap();
     staletextbitmap = new SplashBitmap(booltextbitmap->getWidth(), booltextbitmap->getHeight(), 1, booltextbitmap->getMode(), 0);
     assert(staletextbitmap->getRowSize() == booltextbitmap->getRowSize());
+    
+    msg("<debug> startPage %dx%d (%dx%d)", this->width, this->height, booltextbitmap->getWidth(), booltextbitmap->getHeight());
 
     clip0bitmap = clip0dev->getBitmap();
     clip1bitmap = clip1dev->getBitmap();
@@ -866,13 +914,7 @@ void BitmapOutputDev::finishPage()
     msg("<verbose> finishPage (BitmapOutputDev)");
     gfxdev->endPage();
    
-    if(layerstate == STATE_BITMAP_IS_ABOVE) {
-       this->flushText();
-       this->flushBitmap();
-    } else {
-       this->flushBitmap();
-       this->flushText();
-    }
+    flushEverything();
 
     /* splash will now destroy alpha, and paint the 
        background color into the "holes" in the bitmap */
@@ -1298,11 +1340,47 @@ void BitmapOutputDev::stroke(GfxState *state)
     rgbdev->stroke(state);
     dbg_newdata("stroke");
 }
+
+extern gfxcolor_t getFillColor(GfxState * state);
+
+char area_is_plain_colored(GfxState*state, SplashBitmap*boolpoly, SplashBitmap*rgbbitmap, int x1, int y1, int x2, int y2)
+{
+    int width = boolpoly->getWidth();
+    int height = boolpoly->getHeight();
+    if(!fixBBox(&x1, &y1, &x2, &y2, width, height)) {
+       return 0;
+    }
+    gfxcolor_t color = getFillColor(state);
+    SplashColorPtr rgb = rgbbitmap->getDataPtr() 
+                      + (y1*width+x1)*sizeof(SplashColor);
+    int width8 = (width+7)/8;
+    unsigned char*bits = (unsigned char*)boolpoly->getDataPtr() 
+                        + (y1*width8+x1);
+    int x,y;
+    int w = x2-x1;
+    int h = y2-y1;
+    for(y=0;y<h;y++) {
+       for(x=0;x<w;x++) {
+           if(rgb[x*3+0] != color.r ||
+              rgb[x*3+1] != color.g ||
+              rgb[x*3+2] != color.b)
+               return 0;
+       }
+       rgb += width*sizeof(SplashColor);
+    }
+    return 1;
+}
+
 void BitmapOutputDev::fill(GfxState *state)
 {
     msg("<debug> fill");
     boolpolydev->fill(state);
     gfxbbox_t bbox = getBBox(state);
+    if(config_optimizeplaincolorfills) {
+       if(area_is_plain_colored(state, boolpolybitmap, rgbbitmap, bbox.xmin, bbox.ymin, bbox.xmax, bbox.ymax)) {
+           return;
+       }
+    }
     checkNewBitmap(bbox.xmin, bbox.ymin, ceil(bbox.xmax), ceil(bbox.ymax));
     rgbdev->fill(state);
     dbg_newdata("fill");
@@ -1437,6 +1515,10 @@ void BitmapOutputDev::drawChar(GfxState *state, double x, double y,
         boolpolydev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
         booltextdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
         clip1dev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
+    } else if(state->getRender()&RENDER_STROKE) {
+       // we're drawing as stroke
+       boolpolydev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
+       rgbdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
     } else if(rgbbitmap != rgbdev->getBitmap()) {
        // we're doing softmasking or transparency grouping
        boolpolydev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
@@ -1697,8 +1779,19 @@ void BitmapOutputDev::drawForm(Ref id)
 void BitmapOutputDev::processLink(Link *link, Catalog *catalog)
 {
     msg("<debug> processLink");
+    flushEverything();
     gfxdev->processLink(link, catalog);
 }
+void BitmapOutputDev::flushEverything()
+{
+    if(layerstate == STATE_BITMAP_IS_ABOVE) {
+       this->flushText();
+       this->flushBitmap();
+    } else {
+       this->flushBitmap();
+       this->flushText();
+    }
+}
 
 void BitmapOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
                                    GfxColorSpace *blendingColorSpace,
index ac13298..91e110a 100644 (file)
@@ -188,6 +188,7 @@ public:
 
     
 private:
+    void flushEverything();
     void clearClips();
     void clearBoolPolyDev();
     void clearBoolTextDev();
@@ -202,6 +203,7 @@ private:
     virtual gfxbbox_t getBBox(GfxState*state);
 
     char config_extrafontdata;
+    char config_optimizeplaincolorfills;
 
     int layerstate;
     GBool emptypage;
index 1149088..13f7087 100644 (file)
@@ -105,6 +105,7 @@ struct fontentry {
     char*pfb;
     int pfblen;
     char*fullfilename;
+    DisplayFontParam *dfp;
 } pdf2t1map[] ={
 {"Times-Roman",           "n021003l", n021003l_afm, n021003l_afm_len, n021003l_pfb, n021003l_pfb_len},
 {"Times-Italic",          "n021023l", n021023l_afm, n021023l_afm_len, n021023l_pfb, n021023l_pfb_len},
@@ -371,6 +372,11 @@ static char fc_ismatch(FcPattern*match, char*family, char*style)
 }
 #endif
 
+static inline char islowercase(char c) 
+{
+    return (c>='a' && c<='z');
+}
+
 char* fontconfig_searchForFont(char*name)
 {
 #ifdef HAVE_FONTCONFIG
@@ -468,20 +474,36 @@ char* fontconfig_searchForFont(char*name)
     }
 
     char*family = strdup(name);
-    char*style = 0;
-    char*dash = strchr(family, '-');
-    if(!dash) dash = strchr(family, ',');
+    int len = strlen(family);
 
+    char*styles[] = {"Medium", "Regular", "Bold", "Italic", "Black", "Narrow"};
+    char*style = 0;
+    int t;
+    for(t=0;t<sizeof(styles)/sizeof(styles[0]);t++) {
+       int l = strlen(styles[t]);
+       if(len>l+1 && !strcmp(family+len-l, styles[t]) && islowercase(family[len-l-1])) {
+           style = styles[t];
+           family[len-l]=0;
+           break;
+       }
+    }
+    if(!style) {
+       char*dash = strchr(family, '-');
+       if(!dash) dash = strchr(family, ',');
+       if(dash) {
+           *dash = 0;
+           style = dash+1;
+       }
+    }
     FcPattern*pattern = 0;
-    if(dash) {
-       *dash = 0;
-       style = dash+1;
+    if(style) {
        msg("<debug> FontConfig: Looking for font %s (family=%s style=%s)", name, family, style);
        pattern = FcPatternBuild(NULL, FC_OUTLINE, FcTypeBool, FcTrue, FC_SCALABLE, FcTypeBool, FcTrue, FC_FAMILY, FcTypeString, family, FC_STYLE, FcTypeString, style, NULL);
     } else {
        msg("<debug> FontConfig: Looking for font %s (family=%s)", name, family);
        pattern = FcPatternBuild(NULL, FC_OUTLINE, FcTypeBool, FcTrue, FC_SCALABLE, FcTypeBool, FcTrue, FC_FAMILY, FcTypeString, family, NULL);
     }
+    pattern = FcPatternBuild(NULL, FC_OUTLINE, FcTypeBool, FcTrue, FC_SCALABLE, FcTypeBool, FcTrue, FC_FAMILY, FcTypeString, family, NULL);
 
     FcResult result;
     FcConfigSubstitute(0, pattern, FcMatchPattern); 
@@ -543,10 +565,11 @@ DisplayFontParam *GFXGlobalParams::getDisplayFont(GString *fontName)
                } else {
                    msg("<verbose> Storing standard PDF font %s at %s", name, pdf2t1map[t].fullfilename);
                }
+               DisplayFontParam *dfp = new DisplayFontParam(new GString(fontName), displayFontT1);
+               dfp->t1.fileName = new GString(pdf2t1map[t].fullfilename);
+               pdf2t1map[t].dfp = dfp;
            }
-           DisplayFontParam *dfp = new DisplayFontParam(new GString(fontName), displayFontT1);
-           dfp->t1.fileName = new GString(pdf2t1map[t].fullfilename);
-           return dfp;
+           return pdf2t1map[t].dfp;
        }
     }
     
@@ -2731,7 +2754,7 @@ void GFXOutputDev::paintTransparencyGroup(GfxState *state, double *bbox)
        gfxdevice_t ops;
        dbg("this->device=%p, this->device->name=%s\n", this->device, this->device->name);
        gfxdevice_ops_init(&ops, this->device, alpha);
-       gfxresult_record_replay(grouprecording, &ops);
+       gfxresult_record_replay(grouprecording, &ops, 0);
        ops.finish(&ops);
     }
     grouprecording->destroy(grouprecording);
@@ -2803,15 +2826,15 @@ void GFXOutputDev::clearSoftMask(GfxState *state)
     /* get outline of all objects below the soft mask */
     gfxdevice_t uniondev;
     gfxdevice_union_init(&uniondev, 0);
-    gfxresult_record_replay(below, &uniondev);
+    gfxresult_record_replay(below, &uniondev, 0);
     gfxline_t*belowoutline = gfxdevice_union_getunion(&uniondev);
     uniondev.finish(&uniondev);
     gfxbbox_t bbox = gfxline_getbbox(belowoutline);
     gfxline_free(belowoutline);belowoutline=0;
 #if 0 
     this->device->startclip(this->device, belowoutline);
-    gfxresult_record_replay(below, this->device);
-    gfxresult_record_replay(mask, this->device);
+    gfxresult_record_replay(below, this->device, 0);
+    gfxresult_record_replay(mask, this->device, 0);
     this->device->endclip(this->device);
 #endif
     
@@ -2826,7 +2849,7 @@ void GFXOutputDev::clearSoftMask(GfxState *state)
     }
     belowrender.setparameter(&belowrender, "antialize", "2");
     belowrender.startpage(&belowrender, width, height);
-    gfxresult_record_replay(below, &belowrender);
+    gfxresult_record_replay(below, &belowrender, 0);
     belowrender.endpage(&belowrender);
     gfxresult_t* belowresult = belowrender.finish(&belowrender);
     gfximage_t* belowimg = (gfximage_t*)belowresult->get(belowresult,"page0");
@@ -2835,7 +2858,7 @@ void GFXOutputDev::clearSoftMask(GfxState *state)
     gfxdevice_t maskrender;
     gfxdevice_render_init(&maskrender);
     maskrender.startpage(&maskrender, width, height);
-    gfxresult_record_replay(mask, &maskrender);
+    gfxresult_record_replay(mask, &maskrender, 0);
     maskrender.endpage(&maskrender);
     gfxresult_t* maskresult = maskrender.finish(&maskrender);
     gfximage_t* maskimg = (gfximage_t*)maskresult->get(maskresult,"page0");
index 83dd43f..8fb751a 100644 (file)
@@ -544,6 +544,16 @@ void InfoOutputDev::endType3Char(GfxState *state)
     currentglyph->path->lineTo(x1,y2);
     currentglyph->path->close();
 }
+    
+void InfoOutputDev::saveState(GfxState *state)
+{
+    updateAll(state);
+}
+
+void InfoOutputDev::restoreState(GfxState *state)
+{
+    updateAll(state);
+}
 
 void InfoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
                           int width, int height, GBool invert,
index 66958da..4198b7d 100644 (file)
@@ -122,6 +122,9 @@ class InfoOutputDev: public OutputDev
     virtual void drawLink(Link *link, Catalog *catalog);
     virtual double getMaximumFontSize(char*id);
     virtual void updateFont(GfxState *state);
+  
+    virtual void saveState(GfxState *state);
+    virtual void restoreState(GfxState *state);
 
     virtual GBool beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen);
     virtual void type3D0(GfxState *state, double wx, double wy);
index bebd630..64c205d 100644 (file)
@@ -4,7 +4,9 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 include ../../Makefile.common
 
-all: ../libgfxpdf$(A) pdf2swf$(E) pdf2jpeg$(E)
+all-local: ../libgfxpdf$(A) pdf2swf$(E) pdf2jpeg$(E)
+
+all: ../libgfxpdf$(A)
 
 libgfxpdf: ../libgfxpdf$(A)
 
index 62d0839..1f24567 100644 (file)
@@ -118,6 +118,7 @@ static void head_delete(context_t*context, head_t*h)
        assert(!h->prev);
        context->heads = h->next;
     }
+    free(h);
 }
 
 #define POINTS_TO_HEAD(ptr) (((head_t*)(ptr))->magic==HEAD_MAGIC)
@@ -347,17 +348,26 @@ static void fix_small_boxes(context_t*context)
        while(h) {
            head_t*next = h->next;
            if(!h->seen) {
-               if(h->bbox.xmax - h->bbox.ymin < 16
-               && h->bbox.ymax - h->bbox.ymin < 16) {
+               if(h->bbox.xmax - h->bbox.xmin < 32
+               || h->bbox.ymax - h->bbox.ymin < 32) {
                    head_t*other = search_vicinity(context, h, 64, costab, sintab);
                    if(other) {
                        merge(context, h->pos, other->pos);
                        changed = 1;
                        break;
                    } else {
+                       //printf("nothing in the vicinity of %d,%d,%d,%d\n", h->bbox);
                        h->seen = 1;
                    }
-               }
+               } /*else {
+                   printf("area %d,%d,%d,%d is large enough (%dx%d)\n", 
+                           h->bbox.xmin,
+                           h->bbox.ymin,
+                           h->bbox.xmax,
+                           h->bbox.ymax,
+                           h->bbox.xmax - h->bbox.xmin,
+                           h->bbox.ymax - h->bbox.ymin);
+               } */
            }
            h = next;
        }
diff --git a/lib/pdf/mk_patch b/lib/pdf/mk_patch
new file mode 100755 (executable)
index 0000000..3723f8d
--- /dev/null
@@ -0,0 +1,5 @@
+#!/bin/sh
+rm xpdf-changes.patch
+touch xpdf-changes.patch
+for f in xpdf/*.orig;do diff -u $f ${f%.orig} >> xpdf-changes.patch;done
+
index 9324a91..f148424 100644 (file)
@@ -186,6 +186,10 @@ void pdf_doc_destroy(gfxdocument_t*gfx)
 
     delete i->doc; i->doc=0;
     free(i->pages); i->pages = 0;
+   
+    if(i->pagemap) {
+       free(i->pagemap);
+    }
 
     i->docinfo.free();
 
@@ -196,6 +200,10 @@ void pdf_doc_destroy(gfxdocument_t*gfx)
     if(i->info) {
        delete i->info;i->info=0;
     }
+    if(i->parameters) {
+       gfxparams_free(i->parameters);
+       i->parameters=0;
+    }
 
     free(gfx->internal);gfx->internal=0;
     free(gfx);gfx=0;
index 42ff39f..850e72a 100644 (file)
@@ -1,12 +1,98 @@
-Index: Gfx.cc
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Gfx.cc,v
-retrieving revision 1.9
-retrieving revision 1.10
-diff -u -r1.9 -r1.10
---- Gfx.cc     3 Dec 2005 10:11:33 -0000       1.9
-+++ Gfx.cc     3 Dec 2005 10:30:41 -0000       1.10
-@@ -439,7 +439,11 @@
+--- xpdf/Catalog.cc.orig       2010-05-18 11:22:18.000000000 -0700
++++ xpdf/Catalog.cc    2010-05-18 11:22:18.000000000 -0700
+@@ -193,7 +193,7 @@
+   if (!kids.isArray()) {
+     error(-1, "Kids object (page %d) is wrong type (%s)",
+         start+1, kids.getTypeName());
+-    goto err1;
++    return start;
+   }
+   for (i = 0; i < kids.arrayGetLength(); ++i) {
+     kids.arrayGetNF(i, &kidRef);
+--- xpdf/CharCodeToUnicode.cc.orig     2010-05-18 11:22:18.000000000 -0700
++++ xpdf/CharCodeToUnicode.cc  2010-05-18 11:22:18.000000000 -0700
+@@ -208,13 +208,13 @@
+                                  int nBits) {
+   PSTokenizer *pst;
+   char tok1[256], tok2[256], tok3[256];
+-  int nDigits, n1, n2, n3;
++  int maxCode, n1, n2, n3;
+   CharCode i;
+   CharCode code1, code2;
+   GString *name;
+   FILE *f;
+-  nDigits = nBits / 4;
++  maxCode = (nBits == 8) ? 0xff : (nBits == 16) ? 0xffff : 0xffffffff;
+   pst = new PSTokenizer(getCharFunc, data);
+   pst->getToken(tok1, sizeof(tok1), &n1);
+   while (pst->getToken(tok2, sizeof(tok2), &n2)) {
+@@ -241,9 +241,9 @@
+         error(-1, "Illegal entry in bfchar block in ToUnicode CMap");
+         break;
+       }
+-      if (!(n1 == 2 + nDigits && tok1[0] == '<' && tok1[n1 - 1] == '>' &&
++      if (!(tok1[0] == '<' && tok1[n1 - 1] == '>' &&
+             tok2[0] == '<' && tok2[n2 - 1] == '>')) {
+-        error(-1, "Illegal entry in bfchar block in ToUnicode CMap");
++        error(-1, "Illegal entry in bfchar block in ToUnicode CMap.");
+         continue;
+       }
+       tok1[n1 - 1] = tok2[n2 - 1] = '\0';
+@@ -251,6 +251,9 @@
+         error(-1, "Illegal entry in bfchar block in ToUnicode CMap");
+         continue;
+       }
++        if (code1 > maxCode) {
++          error(-1, "Invalid entry in bfchar block in ToUnicode CMap");
++        }
+       addMapping(code1, tok2 + 1, n2 - 2, 0);
+       }
+       pst->getToken(tok1, sizeof(tok1), &n1);
+@@ -266,8 +269,8 @@
+         error(-1, "Illegal entry in bfrange block in ToUnicode CMap");
+         break;
+       }
+-      if (!(n1 == 2 + nDigits && tok1[0] == '<' && tok1[n1 - 1] == '>' &&
+-            n2 == 2 + nDigits && tok2[0] == '<' && tok2[n2 - 1] == '>')) {
++      if (!(tok1[0] == '<' && tok1[n1 - 1] == '>' &&
++            tok2[0] == '<' && tok2[n2 - 1] == '>')) {
+         error(-1, "Illegal entry in bfrange block in ToUnicode CMap");
+         continue;
+       }
+@@ -277,6 +280,10 @@
+         error(-1, "Illegal entry in bfrange block in ToUnicode CMap");
+         continue;
+       }
++        if (code1 > maxCode || code2 > maxCode) {
++          error(-1, "Invalid entry in bfrange block in ToUnicode CMap");
++      }
++
+       if (!strcmp(tok3, "[")) {
+         i = 0;
+         while (pst->getToken(tok1, sizeof(tok1), &n1) &&
+--- xpdf/CoreOutputDev.cc.orig 2010-05-18 11:22:18.000000000 -0700
++++ xpdf/CoreOutputDev.cc      2010-05-18 11:22:18.000000000 -0700
+@@ -57,5 +57,5 @@
+ void CoreOutputDev::clear() {
+   startDoc(NULL);
+-  startPage(0, NULL);
++  startPage(0, NULL, 0,0,0,0);
+ }
+--- xpdf/Decrypt.cc.orig       2010-05-18 11:22:18.000000000 -0700
++++ xpdf/Decrypt.cc    2010-05-18 11:22:18.000000000 -0700
+@@ -596,6 +596,7 @@
+   s->bufIdx = 0;
+   if (last) {
+     n = s->buf[15];
++    if(!n || n>16) n=16;
+     for (i = 15; i >= n; --i) {
+       s->buf[i] = s->buf[i-n];
+     }
+--- xpdf/Gfx.cc.orig   2010-05-18 11:22:18.000000000 -0700
++++ xpdf/Gfx.cc        2010-05-18 11:22:18.000000000 -0700
+@@ -454,7 +454,11 @@
    fontChanged = gFalse;
    clip = clipNone;
    ignoreUndef = 0;
@@ -19,35 +105,112 @@ diff -u -r1.9 -r1.10
    out->setDefaultCTM(state->getCTM());
    out->updateAll(state);
    for (i = 0; i < 6; ++i) {
-@@ -450,7 +450,8 @@
+@@ -465,6 +469,7 @@
    abortCheckCbkData = abortCheckCbkDataA;
  
    // set crop box
--  if (cropBox) {
 +#ifdef XPDFEXE
-+  if (cropBox) {
+   if (cropBox) {
      state->moveTo(cropBox->x1, cropBox->y1);
      state->lineTo(cropBox->x2, cropBox->y1);
-     state->lineTo(cropBox->x2, cropBox->y2);
-@@ -459,7 +460,8 @@
-     state->clip();
+@@ -475,6 +480,7 @@
      out->clip(state);
      state->clearPath();
--  }
-+  }
+   }
 +#endif
  }
  
  Gfx::Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict,
-Index: GfxFont.h
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GfxFont.h,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -r1.6 -r1.7
---- GfxFont.h  3 Dec 2005 10:11:33 -0000       1.6
-+++ GfxFont.h  3 Dec 2005 10:30:41 -0000       1.7
-@@ -207,7 +207,7 @@
+@@ -3182,8 +3188,11 @@
+                           u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
+                           &dx, &dy, &originX, &originY);
+       dx = dx * state->getFontSize() + state->getCharSpace();
+-      if (n == 1 && *p == ' ') {
+-      dx += state->getWordSpace();
++      if (n == 1 && (*p == ' ' || *p == 0)) {
++        double w=state->getWordSpace();
++        if (w==0 && dx==0)
++          w=state->getFontSize()/3; // workaround for zero word space
++        dx += w;
+       }
+       dx *= state->getHorizScaling();
+       dy *= state->getFontSize();
+@@ -3476,11 +3485,13 @@
+       }
+     }
+     if (!obj1.isNull()) {
+-      colorSpace = GfxColorSpace::parse(&obj1);
++      colorSpace = GfxColorSpace::parse(&obj1, csMode);
+     } else if (csMode == streamCSDeviceGray) {
+       colorSpace = new GfxDeviceGrayColorSpace();
+     } else if (csMode == streamCSDeviceRGB) {
+       colorSpace = new GfxDeviceRGBColorSpace();
++    } else if (csMode == streamCSDeviceRGBX) {
++      colorSpace = new GfxDeviceRGBXColorSpace();
+     } else if (csMode == streamCSDeviceCMYK) {
+       colorSpace = new GfxDeviceCMYKColorSpace();
+     } else {
+@@ -3824,6 +3835,7 @@
+     out->beginTransparencyGroup(state, bbox, blendingColorSpace,
+                               isolated, knockout, softMask);
+   }
++  GfxState*old_state = state;
+   // set new base matrix
+   for (i = 0; i < 6; ++i) {
+@@ -3835,6 +3847,9 @@
+   display(str, gFalse);
+   if (softMask || transpGroup) {
++    // restore graphics state
++    while(state != old_state)
++      restoreState();
+     out->endTransparencyGroup(state);
+   }
+--- xpdf/GfxFont.cc.orig       2010-05-18 11:22:18.000000000 -0700
++++ xpdf/GfxFont.cc    2010-05-18 11:22:18.000000000 -0700
+@@ -919,6 +919,10 @@
+   return 1;
+ }
++CharCodeToUnicode* Gfx8BitFont::getCTU() {
++    return ctu;
++}
++
+ CharCodeToUnicode *Gfx8BitFont::getToUnicode() {
+   ctu->incRefCnt();
+   return ctu;
+@@ -1411,6 +1415,10 @@
+   }
+ }
++CharCodeToUnicode* GfxCIDFont::getCTU() {
++    return ctu;
++}
++
+ int GfxCIDFont::getNextChar(char *s, int len, CharCode *code,
+                           Unicode *u, int uSize, int *uLen,
+                           double *dx, double *dy, double *ox, double *oy) {
+--- xpdf/GfxFont.h.orig        2010-05-18 11:22:18.000000000 -0700
++++ xpdf/GfxFont.h     2010-05-18 11:22:18.000000000 -0700
+@@ -164,6 +164,7 @@
+   virtual int getNextChar(char *s, int len, CharCode *code,
+                         Unicode *u, int uSize, int *uLen,
+                         double *dx, double *dy, double *ox, double *oy) = 0;
++  virtual CharCodeToUnicode* getCTU() = 0;
+ protected:
+@@ -204,6 +205,7 @@
+   virtual int getNextChar(char *s, int len, CharCode *code,
+                         Unicode *u, int uSize, int *uLen,
+                         double *dx, double *dy, double *ox, double *oy);
++  virtual CharCodeToUnicode* getCTU();
+   // Return the encoding.
+   char **getEncoding() { return enc; }
+@@ -212,7 +214,7 @@
    CharCodeToUnicode *getToUnicode();
  
    // Return the character name associated with <code>.
@@ -56,14 +219,16 @@ diff -u -r1.6 -r1.7
  
    // Returns true if the PDF font specified an encoding.
    GBool getHasEncoding() { return hasEncoding; }
-Index: GfxState.cc
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GfxState.cc,v
-retrieving revision 1.10
-retrieving revision 1.12
-diff -u -r1.10 -r1.12
---- GfxState.cc        3 Dec 2005 10:11:33 -0000       1.10
-+++ GfxState.cc        3 Dec 2005 12:41:32 -0000       1.12
+@@ -266,6 +268,7 @@
+   virtual int getNextChar(char *s, int len, CharCode *code,
+                         Unicode *u, int uSize, int *uLen,
+                         double *dx, double *dy, double *ox, double *oy);
++  virtual CharCodeToUnicode* getCTU();
+   // Return the writing mode (0=horizontal, 1=vertical).
+   virtual int getWMode();
+--- xpdf/GfxState.cc.orig      2010-05-18 11:22:18.000000000 -0700
++++ xpdf/GfxState.cc   2010-05-18 11:22:18.000000000 -0700
 @@ -21,6 +21,7 @@
  #include "Array.h"
  #include "Page.h"
@@ -72,7 +237,58 @@ diff -u -r1.10 -r1.12
  
  //------------------------------------------------------------------------
  
-@@ -468,6 +469,18 @@
+@@ -92,7 +93,7 @@
+ GfxColorSpace::~GfxColorSpace() {
+ }
+-GfxColorSpace *GfxColorSpace::parse(Object *csObj) {
++GfxColorSpace *GfxColorSpace::parse(Object *csObj, StreamColorSpaceMode csMode) {
+   GfxColorSpace *cs;
+   Object obj1;
+@@ -101,7 +102,10 @@
+     if (csObj->isName("DeviceGray") || csObj->isName("G")) {
+       cs = new GfxDeviceGrayColorSpace();
+     } else if (csObj->isName("DeviceRGB") || csObj->isName("RGB")) {
+-      cs = new GfxDeviceRGBColorSpace();
++      if(csMode == streamCSDeviceRGBX)
++      cs = new GfxDeviceRGBXColorSpace();
++      else
++      cs = new GfxDeviceRGBColorSpace();
+     } else if (csObj->isName("DeviceCMYK") || csObj->isName("CMYK")) {
+       cs = new GfxDeviceCMYKColorSpace();
+     } else if (csObj->isName("Pattern")) {
+@@ -114,7 +118,10 @@
+     if (obj1.isName("DeviceGray") || obj1.isName("G")) {
+       cs = new GfxDeviceGrayColorSpace();
+     } else if (obj1.isName("DeviceRGB") || obj1.isName("RGB")) {
+-      cs = new GfxDeviceRGBColorSpace();
++      if(csMode == streamCSDeviceRGBX)
++        cs = new GfxDeviceRGBColorSpace();
++      else
++      cs = new GfxDeviceRGBColorSpace();
+     } else if (obj1.isName("DeviceCMYK") || obj1.isName("CMYK")) {
+       cs = new GfxDeviceCMYKColorSpace();
+     } else if (obj1.isName("CalGray")) {
+@@ -333,6 +340,17 @@
+ }
+ //------------------------------------------------------------------------
++// GfxDeviceRGBXColorSpace
++//------------------------------------------------------------------------
++
++GfxDeviceRGBXColorSpace::GfxDeviceRGBXColorSpace() {
++}
++
++GfxColorSpace *GfxDeviceRGBXColorSpace::copy() {
++  return new GfxDeviceRGBXColorSpace();
++}
++
++//------------------------------------------------------------------------
+ // GfxCalRGBColorSpace
+ //------------------------------------------------------------------------
+@@ -490,6 +508,18 @@
                                - 0.11 * color->c[2] + 0.5));
  }
  
@@ -91,7 +307,7 @@ diff -u -r1.10 -r1.12
  void GfxDeviceCMYKColorSpace::getRGB(GfxColor *color, GfxRGB *rgb) {
    double c, m, y, k, c1, m1, y1, k1, r, g, b, x;
  
-@@ -3099,6 +3112,7 @@
+@@ -3187,6 +3217,7 @@
    GfxIndexedColorSpace *indexedCS;
    GfxSeparationColorSpace *sepCS;
    int maxPixel, indexHigh;
@@ -99,15 +315,15 @@ diff -u -r1.10 -r1.12
    Guchar *lookup2;
    Function *sepFunc;
    Object obj;
-@@ -3111,6 +3125,7 @@
+@@ -3199,6 +3230,7 @@
    // bits per component and color space
    bits = bitsA;
    maxPixel = (1 << bits) - 1;
 +  maxPixelForAlloc = (1 << (bits>8?bits:8));
    colorSpace = colorSpaceA;
  
-   // get decode map
-@@ -3163,7 +3178,7 @@
+   // initialize
+@@ -3253,7 +3285,7 @@
      lookup2 = indexedCS->getLookup();
      colorSpace2->getDefaultRanges(x, y, indexHigh);
      for (k = 0; k < nComps2; ++k) {
@@ -116,7 +332,7 @@ diff -u -r1.10 -r1.12
                                           sizeof(GfxColorComp));
        for (i = 0; i <= maxPixel; ++i) {
        j = (int)(decodeLow[0] + (i * decodeRange[0]) / maxPixel + 0.5);
-@@ -3182,7 +3197,7 @@
+@@ -3272,7 +3304,7 @@
      nComps2 = colorSpace2->getNComps();
      sepFunc = sepCS->getFunc();
      for (k = 0; k < nComps2; ++k) {
@@ -125,7 +341,7 @@ diff -u -r1.10 -r1.12
                                           sizeof(GfxColorComp));
        for (i = 0; i <= maxPixel; ++i) {
        x[0] = decodeLow[0] + (i * decodeRange[0]) / maxPixel;
-@@ -3192,7 +3207,7 @@
+@@ -3282,7 +3314,7 @@
      }
    } else {
      for (k = 0; k < nComps; ++k) {
@@ -134,7 +350,7 @@ diff -u -r1.10 -r1.12
                                           sizeof(GfxColorComp));
        for (i = 0; i <= maxPixel; ++i) {
        lookup[k][i] = dblToCol(decodeLow[k] +
-@@ -3754,7 +3769,10 @@
+@@ -3754,7 +3786,10 @@
  }
  
  void GfxState::setPath(GfxPath *pathA) {
@@ -144,18 +360,43 @@ diff -u -r1.10 -r1.12
 +  }
    path = pathA;
  }
-
-Index: GlobalParams.cc
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GlobalParams.cc,v
-retrieving revision 1.4
-retrieving revision 1.7
-diff -u -r1.4 -r1.7
---- GlobalParams.cc    3 Dec 2005 10:11:33 -0000       1.4
-+++ GlobalParams.cc    18 Dec 2005 08:31:22 -0000      1.7
-@@ -498,6 +498,29 @@
+--- xpdf/GfxState.h.orig       2010-05-18 11:22:18.000000000 -0700
++++ xpdf/GfxState.h    2010-05-18 11:22:18.000000000 -0700
+@@ -138,7 +138,7 @@
+   virtual GfxColorSpaceMode getMode() = 0;
+   // Construct a color space.  Returns NULL if unsuccessful.
+-  static GfxColorSpace *parse(Object *csObj);
++  static GfxColorSpace *parse(Object *csObj, StreamColorSpaceMode csMode = streamCSNone);
+   // Convert to gray, RGB, or CMYK.
+   virtual void getGray(GfxColor *color, GfxGray *gray) = 0;
+@@ -252,6 +252,19 @@
+ };
+ //------------------------------------------------------------------------
++// GfxDeviceRGBXColorSpace
++//------------------------------------------------------------------------
++
++class GfxDeviceRGBXColorSpace: public GfxDeviceRGBColorSpace {
++public:
++
++  GfxDeviceRGBXColorSpace();
++  virtual GfxColorSpace *copy();
++  virtual int getNComps() { return 4; }
++private:
++};
++
++//------------------------------------------------------------------------
+ // GfxCalRGBColorSpace
+ //------------------------------------------------------------------------
+--- xpdf/GlobalParams.cc.orig  2010-05-18 11:22:18.000000000 -0700
++++ xpdf/GlobalParams.cc       2010-05-18 11:22:18.000000000 -0700
+@@ -914,6 +914,29 @@
+   int line;
    char buf[512];
-   FILE *f2;
  
 +  /* extract path */
 +  if(fileName) {
@@ -182,8 +423,8 @@ diff -u -r1.4 -r1.7
 +  
    line = 1;
    while (getLine(buf, sizeof(buf) - 1, f)) {
-@@ -1142,6 +1165,42 @@
+     parseLine(buf, fileName, line);
+@@ -1114,6 +1137,42 @@
    deleteGList(tokens, GString);
  }
  
@@ -226,7 +467,7 @@ diff -u -r1.4 -r1.7
  void GlobalParams::parseNameToUnicode(GList *tokens, GString *fileName,
                                         int line) {
    GString *name;
-@@ -1156,10 +1215,10 @@
+@@ -1128,10 +1187,10 @@
          fileName->getCString(), line);
      return;
    }
@@ -240,7 +481,7 @@ diff -u -r1.4 -r1.7
      return;
    }
    line2 = 1;
-@@ -705,10 +754,12 @@
+@@ -1160,10 +1219,12 @@
    }
    collection = (GString *)tokens->get(1);
    name = (GString *)tokens->get(2);
@@ -254,7 +495,7 @@ diff -u -r1.4 -r1.7
  }
  
  void GlobalParams::parseUnicodeToUnicode(GList *tokens, GString *fileName,
-@@ -725,7 +776,8 @@
+@@ -1180,7 +1241,8 @@
    if ((old = (GString *)unicodeToUnicodes->remove(font))) {
      delete old;
    }
@@ -264,7 +505,7 @@ diff -u -r1.4 -r1.7
  }
  
  void GlobalParams::parseUnicodeMap(GList *tokens, GString *fileName,
-@@ -742,7 +794,8 @@
+@@ -1197,7 +1259,8 @@
    if ((old = (GString *)unicodeMaps->remove(encodingName))) {
      delete old;
    }
@@ -274,7 +515,7 @@ diff -u -r1.4 -r1.7
  }
  
  void GlobalParams::parseCMapDir(GList *tokens, GString *fileName, int line) {
-@@ -760,23 +813,30 @@
+@@ -1215,23 +1278,30 @@
      list = new GList();
      cMapDirs->add(collection->copy(), list);
    }
@@ -307,7 +548,7 @@ diff -u -r1.4 -r1.7
  
    if (tokens->getLength() < 2) {
      goto err1;
-@@ -788,13 +848,15 @@
+@@ -1243,13 +1313,15 @@
      if (tokens->getLength() != 3) {
        goto err2;
      }
@@ -325,14 +566,111 @@ diff -u -r1.4 -r1.7
      break;
    }
  
-Index: Lexer.cc
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Lexer.cc,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- Lexer.cc   3 Dec 2005 10:11:33 -0000       1.4
-+++ Lexer.cc   14 Mar 2006 12:43:23 -0000      1.5
+--- xpdf/GlobalParams.h.orig   2010-05-18 11:22:18.000000000 -0700
++++ xpdf/GlobalParams.h        2010-05-18 11:22:18.000000000 -0700
+@@ -196,7 +196,7 @@
+   // file.
+   GlobalParams(char *cfgFileName);
+-  ~GlobalParams();
++  virtual ~GlobalParams();
+   void setBaseDir(char *dir);
+   void setupBaseFonts(char *dir);
+@@ -213,8 +213,8 @@
+   FILE *getUnicodeMapFile(GString *encodingName);
+   FILE *findCMapFile(GString *collection, GString *cMapName);
+   FILE *findToUnicodeFile(GString *name);
+-  DisplayFontParam *getDisplayFont(GString *fontName);
+-  DisplayFontParam *getDisplayCIDFont(GString *fontName, GString *collection);
++  virtual DisplayFontParam *getDisplayFont(GString *fontName);
++  virtual DisplayFontParam *getDisplayCIDFont(GString *fontName, GString *collection);
+   GString *getPSFile();
+   int getPSPaperWidth();
+   int getPSPaperHeight();
+@@ -316,7 +316,7 @@
+ private:
+   void createDefaultKeyBindings();
+-  void parseFile(GString *fileName, FILE *f);
++public: void parseFile(GString *fileName, FILE *f); private:
+   void parseNameToUnicode(GList *tokens, GString *fileName, int line);
+   void parseCIDToUnicode(GList *tokens, GString *fileName, int line);
+   void parseUnicodeToUnicode(GList *tokens, GString *fileName, int line);
+@@ -358,6 +358,10 @@
+   GBool loadPlugin(char *type, char *name);
+ #endif
++  //----- config file base path
++
++  GString*path;
++
+   //----- static tables
+   NameToCharCode *            // mapping from char name to
+--- xpdf/JBIG2Stream.cc.orig   2010-05-18 11:22:18.000000000 -0700
++++ xpdf/JBIG2Stream.cc        2010-05-18 11:22:18.000000000 -0700
+@@ -1514,11 +1514,14 @@
+   }
+   // compute symbol code length
+-  symCodeLen = 1;
+-  i = (numInputSyms + numNewSyms) >> 1;
+-  while (i) {
+-    ++symCodeLen;
+-    i >>= 1;
++  symCodeLen = 0;
++  i = 1;
++  while (i < numInputSyms + numNewSyms) {
++   ++symCodeLen;
++   i <<= 1;
++  }
++  if (huff && symCodeLen == 0) {
++   symCodeLen = 1;
+   }
+   // get the input symbol bitmaps
+@@ -1921,6 +1924,9 @@
+     ++symCodeLen;
+     i <<= 1;
+   }
++  if (huff && symCodeLen == 0) {
++    symCodeLen = 1;
++  }
+   // get the symbol bitmaps
+   syms = (JBIG2Bitmap **)gmallocn(numSyms, sizeof(JBIG2Bitmap *));
+--- xpdf/JPXStream.cc.orig     2010-05-18 11:22:18.000000000 -0700
++++ xpdf/JPXStream.cc  2010-05-18 11:22:18.000000000 -0700
+@@ -450,6 +450,7 @@
+   GBool haveBPC, haveCSMode;
+   csPrec = 0; // make gcc happy
++  Guint num_components = 0;
+   haveBPC = haveCSMode = gFalse;
+   str->reset();
+   if (str->lookChar() == 0xff) {
+@@ -463,7 +464,7 @@
+       cover(1);
+       if (readULong(&dummy) &&
+           readULong(&dummy) &&
+-          readUWord(&dummy) &&
++          readUWord(&num_components) &&
+           readUByte(&bpc1) &&
+           readUByte(&dummy) &&
+           readUByte(&dummy) &&
+@@ -519,6 +520,9 @@
+       }
+     }
+   }
++  if(*csMode == streamCSDeviceRGB && num_components == 4) {
++    *csMode = streamCSDeviceRGBX;
++  }
+   str->close();
+ }
+--- xpdf/Lexer.cc.orig 2010-05-18 11:22:18.000000000 -0700
++++ xpdf/Lexer.cc      2010-05-18 11:22:18.000000000 -0700
 @@ -74,6 +74,7 @@
      curStr.streamReset();
    }
@@ -402,14 +740,8 @@ diff -u -r1.4 -r1.5
    return obj;
  }
  
-Index: Link.cc
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Link.cc,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -r1.5 -r1.6
---- Link.cc    3 Dec 2005 10:11:33 -0000       1.5
-+++ Link.cc    26 Mar 2006 08:26:59 -0000      1.6
+--- xpdf/Link.cc.orig  2010-05-18 11:22:18.000000000 -0700
++++ xpdf/Link.cc       2010-05-18 11:22:18.000000000 -0700
 @@ -430,10 +430,9 @@
        delete dest;
        dest = NULL;
@@ -434,252 +766,8 @@ diff -u -r1.5 -r1.6
    }
  }
  
-Index: OutputDev.h
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/OutputDev.h,v
-retrieving revision 1.7
-retrieving revision 1.9
-diff -u -r1.7 -r1.9
---- OutputDev.h        3 Dec 2005 10:11:33 -0000       1.7
-+++ OutputDev.h        3 Dec 2005 10:31:47 -0000       1.9
-@@ -74,7 +74,7 @@
-   virtual void setDefaultCTM(double *ctm);
-   // Start a page.
--  virtual void startPage(int pageNum, GfxState *state) {}
-+  virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) {}
-   // End a page.
-   virtual void endPage() {}
-Index: Stream.cc
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Stream.cc,v
-retrieving revision 1.7
-retrieving revision 1.8
-diff -u -r1.7 -r1.8
---- Stream.cc  3 Dec 2005 10:11:33 -0000       1.7
-+++ Stream.cc  3 Dec 2005 10:30:41 -0000       1.8
-@@ -17,6 +17,8 @@
- #include <stddef.h>
- #ifndef WIN32
- #include <unistd.h>
-+#else
-+extern "C" int unlink(char *filename);
- #endif
- #include <string.h>
- #include <ctype.h>
-Index: gfile.h
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/gfile.h,v
-retrieving revision 1.9
-retrieving revision 1.10
-diff -u -r1.9 -r1.10
---- gfile.h    3 Dec 2005 10:11:33 -0000       1.9
-+++ gfile.h    3 Dec 2005 10:30:41 -0000       1.10
-@@ -58,6 +58,9 @@
- // Get current directory.
- extern GString *getCurrentDir();
-+/* create a temporary filename */
-+char* mktmpname(char*ptr);
-+
- // Append a file name to a path string.  <path> may be an empty
- // string, denoting the current directory).  Returns <path>.
- extern GString *appendToPath(GString *path, char *fileName);
-Index: GlobalParams.h
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GlobalParams.h,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -r1.5 -r1.6
---- GlobalParams.h     2006-10-10 19:54:29.000000000 +0200
-+++ GlobalParams.h     2006-11-12 11:19:40.000000000 +0100
-@@ -213,8 +213,8 @@
-   FILE *getUnicodeMapFile(GString *encodingName);
-   FILE *findCMapFile(GString *collection, GString *cMapName);
-   FILE *findToUnicodeFile(GString *name);
--  DisplayFontParam *getDisplayFont(GString *fontName);
--  DisplayFontParam *getDisplayCIDFont(GString *fontName, GString *collection);
-+  virtual DisplayFontParam *getDisplayFont(GString *fontName);
-+  virtual DisplayFontParam *getDisplayCIDFont(GString *fontName, GString *collection);
-   GString *getPSFile();
-   int getPSPaperWidth();
-   int getPSPaperHeight();
-@@ -218,1 +218,1 @@
--  void parseFile(GString *fileName, FILE *f);
-+public: void parseFile(GString *fileName, FILE *f); private:
-@@ -246,6 +246,10 @@
-   GBool loadPlugin(char *type, char *name);
- #endif
-+  //----- config file base path
-+
-+  GString*path;
-+
-   //----- static tables
-   NameToCharCode *            // mapping from char name to
---- SplashOutputDev.h  2006-11-12 12:07:22.000000000 +0100
-+++ SplashOutputDev.h  2006-11-12 12:08:48.000000000 +0100
-@@ -70,7 +70,7 @@
-   //----- initialization and control
-   // Start a page.
--  virtual void startPage(int pageNum, GfxState *state);
-+  virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2);
-   // End a page.
-   virtual void endPage();
---- TextOutputDev.cc   2006-11-12 12:22:53.000000000 +0100
-+++ TextOutputDev.cc   2006-11-12 12:25:03.000000000 +0100
-@@ -3805,7 +3805,7 @@
-   }
- }
--void TextOutputDev::startPage(int pageNum, GfxState *state) {
-+void TextOutputDev::startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) {
-   text->startPage(state);
- }
---- CoreOutputDev.cc   2006-11-12 12:21:59.000000000 +0100
-+++ CoreOutputDev.cc   2006-11-12 12:23:29.000000000 +0100
-@@ -57,5 +57,5 @@
- void CoreOutputDev::clear() {
-   startDoc(NULL);
--  startPage(0, NULL);
-+  startPage(0, NULL, 0,0,0,0);
- }
---- SplashFTFontEngine.cc      2006-11-19 22:30:44.000000000 +0100
-+++ SplashFTFontEngine.cc      2006-11-19 22:30:56.000000000 +0100
-@@ -13,9 +13,7 @@
- #endif
- #include <stdio.h>
--#ifndef WIN32
- #  include <unistd.h>
--#endif
- #include "gmem.h"
- #include "GString.h"
- #include "gfile.h"
---- SplashOutputDev.cc 2007-09-09 12:29:45.000000000 +0200
-+++ SplashOutputDev.cc 2007-09-09 12:30:02.000000000 +0200
-@@ -13,6 +13,7 @@
- #endif
- #include <string.h>
-+#include <unistd.h>
- #include <math.h>
- #include "gfile.h"
- #include "GlobalParams.h"
-@@ -702,7 +703,7 @@
-   nT3Fonts = 0;
- }
--void SplashOutputDev::startPage(int pageNum, GfxState *state) {
-+void SplashOutputDev::startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) {
-   int w, h;
-   double *ctm;
-   SplashCoord mat[6];
-@@ -2646,9 +2647,9 @@
-   softMask = new SplashBitmap(bitmap->getWidth(), bitmap->getHeight(),
-                             1, splashModeMono8, gFalse);
--  memset(softMask->getDataPtr(), 0,
--       softMask->getRowSize() * softMask->getHeight());
-+  memset(softMask->getDataPtr(), 0x00, softMask->getRowSize()*softMask->getHeight());
-   p = softMask->getDataPtr() + ty * softMask->getRowSize() + tx;
-+  if (tx<softMask->getWidth() && ty<softMask->getHeight())
-   for (y = 0; y < tBitmap->getHeight(); ++y) {
-     for (x = 0; x < tBitmap->getWidth(); ++x) {
-       tBitmap->getPixel(x, y, color);
---- SplashFontFile.cc  2007-09-09 12:33:00.000000000 +0200
-+++ SplashFontFile.cc  2007-09-09 12:33:07.000000000 +0200
-@@ -11,9 +11,7 @@
- #endif
- #include <stdio.h>
--#ifndef WIN32
--#  include <unistd.h>
--#endif
-+#include <unistd.h>
- #include "GString.h"
- #include "SplashFontFile.h"
- #include "SplashFontFileID.h"
---- xpdf/SplashFont.h.orig     2008-09-09 21:31:01.000000000 +0200
-+++ xpdf/SplashFont.h  2008-10-05 17:36:44.000000000 +0200
-@@ -73,6 +73,9 @@
-   virtual GBool makeGlyph(int c, int xFrac, int yFrac,
-                         SplashGlyphBitmap *bitmap) = 0;
-+  // return the number of characters in this font
-+  virtual int getNumChars() = 0;
-+
-   // Return the path for a glyph.
-   virtual SplashPath *getGlyphPath(int c) = 0;
-@@ -83,6 +86,9 @@
-   void getBBox(int *xMinA, int *yMinA, int *xMaxA, int *yMaxA)
-     { *xMinA = xMin; *yMinA = yMin; *xMaxA = xMax; *yMaxA = yMax; }
-+  double ascender;
-+  double descender;
-+  double last_advance; //set after getGlyphPath()
- protected:
-   SplashFontFile *fontFile;
---- orig/GfxFont.h     2007-07-28 00:11:06.000000000 +0200
-+++ GfxFont.h  2007-09-09 18:31:31.000000000 +0200
-@@ -164,6 +164,7 @@
-   virtual int getNextChar(char *s, int len, CharCode *code,
-                         Unicode *u, int uSize, int *uLen,
-                         double *dx, double *dy, double *ox, double *oy) = 0;
-+  virtual CharCodeToUnicode* getCTU() = 0;
- protected:
-@@ -204,6 +205,7 @@
-   virtual int getNextChar(char *s, int len, CharCode *code,
-                         Unicode *u, int uSize, int *uLen,
-                         double *dx, double *dy, double *ox, double *oy);
-+  virtual CharCodeToUnicode* getCTU();
-   // Return the encoding.
-   char **getEncoding() { return enc; }
-@@ -266,6 +268,7 @@
-   virtual int getNextChar(char *s, int len, CharCode *code,
-                         Unicode *u, int uSize, int *uLen,
-                         double *dx, double *dy, double *ox, double *oy);
-+  virtual CharCodeToUnicode* getCTU();
-   // Return the writing mode (0=horizontal, 1=vertical).
-   virtual int getWMode();
---- orig/GfxFont.cc    2007-07-28 00:11:06.000000000 +0200
-+++ GfxFont.cc 2007-09-09 18:33:37.000000000 +0200
-@@ -925,6 +925,10 @@
-   return 1;
- }
-+CharCodeToUnicode* Gfx8BitFont::getCTU() {
-+    return ctu;
-+}
-+
- CharCodeToUnicode *Gfx8BitFont::getToUnicode() {
-   ctu->incRefCnt();
-   return ctu;
-@@ -1417,6 +1421,10 @@
-   }
- }
-+CharCodeToUnicode* GfxCIDFont::getCTU() {
-+    return ctu;
-+}
-+
- int GfxCIDFont::getNextChar(char *s, int len, CharCode *code,
-                           Unicode *u, int uSize, int *uLen,
-                           double *dx, double *dy, double *ox, double *oy) {
---- OutputDev.h        Sat Jul 28 00:11:08 2007
-+++ OutputDev.h        Sun Sep  9 13:50:40 2007
+--- xpdf/OutputDev.h.orig      2010-05-18 11:22:18.000000000 -0700
++++ xpdf/OutputDev.h   2010-05-18 11:22:18.000000000 -0700
 @@ -17,6 +17,7 @@
  
  #include "gtypes.h"
@@ -687,70 +775,18 @@ diff -u -r1.5 -r1.6
 +#include "Object.h"
  
  class GString;
- class Gfx;
---- SplashOutputDev.h  2007-10-20 13:17:02.000000000 +0200
-+++ SplashOutputDev.h  2007-10-20 13:17:23.000000000 +0200
-@@ -206,6 +206,7 @@
-   virtual void setVectorAntialias(GBool vaa);
- #endif
-+  void doUpdateFont(GfxState *state);
- private:
-   void setupScreenParams(double hDPI, double vDPI);
-@@ -215,7 +216,6 @@
-   SplashPattern *getColor(GfxGray gray, GfxRGB *rgb);
- #endif
-   SplashPath *convertPath(GfxState *state, GfxPath *path);
--  void doUpdateFont(GfxState *state);
-   void drawType3Glyph(T3FontCache *t3Font,
-                     T3FontCacheTag *tag, Guchar *data);
-   static GBool imageMaskSrc(void *data, SplashColorPtr line);
---- xpdf/GlobalParams.h 2007-10-20 13:18:03.000000000 +0200
-+++ xpdf/GlobalParams.h        2007-10-20 13:25:52.000000000 +0200
-@@ -196,7 +196,7 @@
-   // file.
-   GlobalParams(char *cfgFileName);
--  ~GlobalParams();
-+  virtual ~GlobalParams();
-   void setBaseDir(char *dir);
-   void setupBaseFonts(char *dir);
---- xpdf/SplashOutputDev.h.orig        2007-10-21 17:43:29.000000000 +0200
-+++ xpdf/SplashOutputDev.h     2007-11-19 10:07:27.000000000 +0100
-@@ -197,6 +197,8 @@
- #endif
-   void doUpdateFont(GfxState *state);
-+  
-+  SplashPath *convertPath(GfxState *state, GfxPath *path);
- private:
+ class GfxState;
+@@ -94,7 +95,7 @@
+     { return gTrue; }
  
-   void setupScreenParams(double hDPI, double vDPI);
-@@ -205,7 +207,6 @@
- #else
-   SplashPattern *getColor(GfxGray gray, GfxRGB *rgb);
- #endif
--  SplashPath *convertPath(GfxState *state, GfxPath *path);
-   void drawType3Glyph(T3FontCache *t3Font,
-                     T3FontCacheTag *tag, Guchar *data);
-   static GBool imageMaskSrc(void *data, SplashColorPtr line);
---- xpdf/SplashFont.cc.orig    2008-09-09 21:31:01.000000000 +0200
-+++ xpdf/SplashFont.cc 2008-10-05 17:37:08.000000000 +0200
-@@ -48,6 +48,10 @@
-   cacheTags = NULL;
-   xMin = yMin = xMax = yMax = 0;
-+
-+  last_advance = -1;
-+  ascender = -1;
-+  descender = -1;
- }
+   // Start a page.
+-  virtual void startPage(int pageNum, GfxState *state) {}
++  virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) {}
  
- void SplashFont::initCache() {
---- xpdf/SplashFTFont.cc.orig  2009-03-08 17:19:08.000000000 +0100
-+++ xpdf/SplashFTFont.cc       2009-03-15 19:18:11.000000000 +0100
+   // End a page.
+   virtual void endPage() {}
+--- xpdf/SplashFTFont.cc.orig  2010-05-18 11:22:18.000000000 -0700
++++ xpdf/SplashFTFont.cc       2010-05-18 11:22:18.000000000 -0700
 @@ -46,6 +46,7 @@
    int x, y;
  
@@ -819,8 +855,8 @@ diff -u -r1.5 -r1.6
    if (path.needClose) {
      path.path->close();
    }
---- xpdf/SplashFTFont.h.orig   2008-09-09 21:31:01.000000000 +0200
-+++ xpdf/SplashFTFont.h        2008-10-04 17:39:57.000000000 +0200
+--- xpdf/SplashFTFont.h.orig   2010-05-18 11:22:18.000000000 -0700
++++ xpdf/SplashFTFont.h        2010-05-18 11:22:18.000000000 -0700
 @@ -42,6 +42,9 @@
    virtual GBool makeGlyph(int c, int xFrac, int yFrac,
                          SplashGlyphBitmap *bitmap);
@@ -831,8 +867,129 @@ diff -u -r1.5 -r1.6
    // Return the path for a glyph.
    virtual SplashPath *getGlyphPath(int c);
  
---- xpdf/SplashScreen.cc.orig  2008-10-06 17:59:44.000000000 +0200
-+++ xpdf/SplashScreen.cc       2008-10-06 18:20:09.000000000 +0200
+--- xpdf/SplashFTFontEngine.cc.orig    2010-05-18 11:22:18.000000000 -0700
++++ xpdf/SplashFTFontEngine.cc 2010-05-18 11:22:18.000000000 -0700
+@@ -13,9 +13,7 @@
+ #endif
+ #include <stdio.h>
+-#ifndef WIN32
+ #  include <unistd.h>
+-#endif
+ #include "gmem.h"
+ #include "GString.h"
+ #include "gfile.h"
+--- xpdf/SplashFont.cc.orig    2010-05-18 11:22:18.000000000 -0700
++++ xpdf/SplashFont.cc 2010-05-18 11:22:18.000000000 -0700
+@@ -48,6 +48,10 @@
+   cacheTags = NULL;
+   xMin = yMin = xMax = yMax = 0;
++
++  last_advance = -1;
++  ascender = -1;
++  descender = -1;
+ }
+ void SplashFont::initCache() {
+--- xpdf/SplashFont.h.orig     2010-05-18 11:22:18.000000000 -0700
++++ xpdf/SplashFont.h  2010-05-18 11:22:18.000000000 -0700
+@@ -73,6 +73,9 @@
+   virtual GBool makeGlyph(int c, int xFrac, int yFrac,
+                         SplashGlyphBitmap *bitmap) = 0;
++  // return the number of characters in this font
++  virtual int getNumChars() = 0;
++
+   // Return the path for a glyph.
+   virtual SplashPath *getGlyphPath(int c) = 0;
+@@ -83,6 +86,9 @@
+   void getBBox(int *xMinA, int *yMinA, int *xMaxA, int *yMaxA)
+     { *xMinA = xMin; *yMinA = yMin; *xMaxA = xMax; *yMaxA = yMax; }
++  double ascender;
++  double descender;
++  double last_advance; //set after getGlyphPath()
+ protected:
+   SplashFontFile *fontFile;
+--- xpdf/SplashFontFile.cc.orig        2010-05-18 11:22:18.000000000 -0700
++++ xpdf/SplashFontFile.cc     2010-05-18 11:22:18.000000000 -0700
+@@ -11,9 +11,7 @@
+ #endif
+ #include <stdio.h>
+-#ifndef WIN32
+-#  include <unistd.h>
+-#endif
++#include <unistd.h>
+ #include "GString.h"
+ #include "SplashFontFile.h"
+ #include "SplashFontFileID.h"
+--- xpdf/SplashOutputDev.cc.orig       2010-05-18 11:22:18.000000000 -0700
++++ xpdf/SplashOutputDev.cc    2010-05-18 11:22:18.000000000 -0700
+@@ -13,6 +13,7 @@
+ #endif
+ #include <string.h>
++#include <unistd.h>
+ #include <math.h>
+ #include "gfile.h"
+ #include "GlobalParams.h"
+@@ -702,7 +703,7 @@
+   nT3Fonts = 0;
+ }
+-void SplashOutputDev::startPage(int pageNum, GfxState *state) {
++void SplashOutputDev::startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) {
+   int w, h;
+   double *ctm;
+   SplashCoord mat[6];
+@@ -2646,9 +2647,9 @@
+   softMask = new SplashBitmap(bitmap->getWidth(), bitmap->getHeight(),
+                             1, splashModeMono8, gFalse);
+-  memset(softMask->getDataPtr(), 0,
+-       softMask->getRowSize() * softMask->getHeight());
++  memset(softMask->getDataPtr(), 0x00, softMask->getRowSize()*softMask->getHeight());
+   p = softMask->getDataPtr() + ty * softMask->getRowSize() + tx;
++  if (tx<softMask->getWidth() && ty<softMask->getHeight())
+   for (y = 0; y < tBitmap->getHeight(); ++y) {
+     for (x = 0; x < tBitmap->getWidth(); ++x) {
+       tBitmap->getPixel(x, y, color);
+--- xpdf/SplashOutputDev.h.orig        2010-05-18 11:22:18.000000000 -0700
++++ xpdf/SplashOutputDev.h     2010-05-18 11:22:18.000000000 -0700
+@@ -70,7 +70,7 @@
+   //----- initialization and control
+   // Start a page.
+-  virtual void startPage(int pageNum, GfxState *state);
++  virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2);
+   // End a page.
+   virtual void endPage();
+@@ -196,6 +196,9 @@
+   virtual void setVectorAntialias(GBool vaa);
+ #endif
++  void doUpdateFont(GfxState *state);
++  
++  SplashPath *convertPath(GfxState *state, GfxPath *path);
+ private:
+   void setupScreenParams(double hDPI, double vDPI);
+@@ -204,8 +207,6 @@
+ #else
+   SplashPattern *getColor(GfxGray gray, GfxRGB *rgb);
+ #endif
+-  SplashPath *convertPath(GfxState *state, GfxPath *path);
+-  void doUpdateFont(GfxState *state);
+   void drawType3Glyph(T3FontCache *t3Font,
+                     T3FontCacheTag *tag, Guchar *data);
+   static GBool imageMaskSrc(void *data, SplashColorPtr line);
+--- xpdf/SplashScreen.cc.orig  2010-05-18 11:22:18.000000000 -0700
++++ xpdf/SplashScreen.cc       2010-05-18 11:22:18.000000000 -0700
 @@ -363,6 +363,8 @@
  int SplashScreen::test(int x, int y, Guchar value) {
    int xx, yy;
@@ -842,8 +999,89 @@ diff -u -r1.5 -r1.6
    if (value < minVal) {
      return 0;
    }
---- xpdf/gfile.cc.orig 2007-02-27 23:05:51.000000000 +0100
-+++ xpdf/gfile.cc      2008-10-12 15:15:22.000000000 +0200
+--- xpdf/SplashXPathScanner.cc.orig    2010-05-18 11:22:18.000000000 -0700
++++ xpdf/SplashXPathScanner.cc 2010-05-18 11:22:18.000000000 -0700
+@@ -394,10 +394,10 @@
+         *p++ &= mask;
+         xx = (xx & ~7) + 8;
+       }
+-      for (; xx + 7 <= xx0; xx += 8) {
++      for (; xx + 7 < xx0; xx += 8) {
+         *p++ = 0x00;
+       }
+-      if (xx <= xx0) {
++      if (xx < xx0) {
+         *p &= 0xff >> (xx0 & 7);
+       }
+       }
+@@ -417,10 +417,10 @@
+       *p++ &= mask;
+       xx = (xx & ~7) + 8;
+       }
+-      for (; xx + 7 <= xx0; xx += 8) {
++      for (; xx + 7 < xx0; xx += 8) {
+       *p++ = 0x00;
+       }
+-      if (xx <= xx0) {
++      if (xx < xx0) {
+       *p &= 0xff >> (xx0 & 7);
+       }
+     }
+--- xpdf/Stream.cc.orig        2010-05-18 11:22:18.000000000 -0700
++++ xpdf/Stream.cc     2010-05-18 11:22:18.000000000 -0700
+@@ -18,6 +18,8 @@
+ #include <limits.h>
+ #ifndef WIN32
+ #include <unistd.h>
++#else
++extern "C" int unlink(char *filename);
+ #endif
+ #include <string.h>
+ #include <ctype.h>
+--- xpdf/Stream.h.orig 2010-05-18 11:22:18.000000000 -0700
++++ xpdf/Stream.h      2010-05-18 11:22:18.000000000 -0700
+@@ -41,7 +41,8 @@
+   streamCSNone,
+   streamCSDeviceGray,
+   streamCSDeviceRGB,
+-  streamCSDeviceCMYK
++  streamCSDeviceCMYK,
++  streamCSDeviceRGBX
+ };
+ //------------------------------------------------------------------------
+--- xpdf/TextOutputDev.cc.orig 2010-05-18 11:22:18.000000000 -0700
++++ xpdf/TextOutputDev.cc      2010-05-18 11:22:18.000000000 -0700
+@@ -3877,7 +3877,7 @@
+   }
+ }
+-void TextOutputDev::startPage(int pageNum, GfxState *state) {
++void TextOutputDev::startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) {
+   text->startPage(state);
+ }
+--- xpdf/TextOutputDev.h.orig  2010-05-18 11:22:18.000000000 -0700
++++ xpdf/TextOutputDev.h       2010-05-18 11:22:18.000000000 -0700
+@@ -170,6 +170,7 @@
+   friend class TextFlow;
+   friend class TextWordList;
+   friend class TextPage;
++  friend class XMLOutputDev;
+ };
+ //------------------------------------------------------------------------
+@@ -578,7 +579,7 @@
+   //----- initialization and control
+   // Start a page.
+-  virtual void startPage(int pageNum, GfxState *state);
++  virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2);
+   // End a page.
+   virtual void endPage();
+--- xpdf/gfile.cc.orig 2010-05-18 11:22:18.000000000 -0700
++++ xpdf/gfile.cc      2010-05-18 11:22:18.000000000 -0700
 @@ -439,6 +439,52 @@
  #endif
  }
@@ -951,218 +1189,15 @@ diff -u -r1.5 -r1.6
        return gFalse;
      }
      *name = new GString(s);
---- xpdf/Gfx.cc.orig   2009-03-08 17:10:40.000000000 +0100
-+++ xpdf/Gfx.cc        2009-03-08 17:18:23.000000000 +0100
-@@ -3188,8 +3188,11 @@
-                           u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
-                           &dx, &dy, &originX, &originY);
-       dx = dx * state->getFontSize() + state->getCharSpace();
--      if (n == 1 && *p == ' ') {
--      dx += state->getWordSpace();
-+      if (n == 1 && (*p == ' ' || *p == 0)) {
-+        double w=state->getWordSpace();
-+        if (w==0 && dx==0)
-+          w=state->getFontSize()/3; // workaround for zero word space
-+        dx += w;
-       }
-       dx *= state->getHorizScaling();
-       dy *= state->getFontSize();
-@@ -3824,6 +3833,7 @@
-     out->beginTransparencyGroup(state, bbox, blendingColorSpace,
-                               isolated, knockout, softMask);
-   }
-+  GfxState*old_state = state;
-   // set new base matrix
-   for (i = 0; i < 6; ++i) {
-@@ -3835,6 +3845,9 @@
-   display(str, gFalse);
-   if (softMask || transpGroup) {
-+    // restore graphics state
-+    while(state != old_state)
-+      restoreState();
-     out->endTransparencyGroup(state);
-   }
---- TextOutputDev.h.orig       2009-10-07 17:00:29.000000000 -0700
-+++ TextOutputDev.h    2009-10-07 17:01:50.000000000 -0700
-@@ -170,6 +170,7 @@
-   friend class TextFlow;
-   friend class TextWordList;
-   friend class TextPage;
-+  friend class XMLOutputDev;
- };
- //------------------------------------------------------------------------
-@@ -578,7 +579,7 @@
-   //----- initialization and control
-   // Start a page.
--  virtual void startPage(int pageNum, GfxState *state);
-+  virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2);
-   // End a page.
-   virtual void endPage();
---- xpdf/JBIG2Stream.cc.orig   2010-01-08 17:17:18.000000000 -0800
-+++ xpdf/JBIG2Stream.cc        2010-01-21 15:28:26.000000000 -0800
-@@ -1514,11 +1514,14 @@
-   }
-   // compute symbol code length
--  symCodeLen = 1;
--  i = (numInputSyms + numNewSyms) >> 1;
--  while (i) {
--    ++symCodeLen;
--    i >>= 1;
-+  symCodeLen = 0;
-+  i = 1;
-+  while (i < numInputSyms + numNewSyms) {
-+   ++symCodeLen;
-+   i <<= 1;
-+  }
-+  if (huff && symCodeLen == 0) {
-+   symCodeLen = 1;
-   }
-   // get the input symbol bitmaps
-@@ -1921,6 +1924,9 @@
-     ++symCodeLen;
-     i <<= 1;
-   }
-+  if (huff && symCodeLen == 0) {
-+    symCodeLen = 1;
-+  }
-   // get the symbol bitmaps
-   syms = (JBIG2Bitmap **)gmallocn(numSyms, sizeof(JBIG2Bitmap *));
---- xpdf/SplashXPathScanner.cc.orig    2010-01-21 16:00:38.000000000 -0800
-+++ xpdf/SplashXPathScanner.cc 2010-01-21 16:10:31.000000000 -0800
-@@ -394,10 +394,10 @@
-         *p++ &= mask;
-         xx = (xx & ~7) + 8;
-       }
--      for (; xx + 7 <= xx0; xx += 8) {
-+      for (; xx + 7 < xx0; xx += 8) {
-         *p++ = 0x00;
-       }
--      if (xx <= xx0) {
-+      if (xx < xx0) {
-         *p &= 0xff >> (xx0 & 7);
-       }
-       }
-@@ -417,10 +417,10 @@
-       *p++ &= mask;
-       xx = (xx & ~7) + 8;
-       }
--      for (; xx + 7 <= xx0; xx += 8) {
-+      for (; xx + 7 < xx0; xx += 8) {
-       *p++ = 0x00;
-       }
--      if (xx <= xx0) {
-+      if (xx < xx0) {
-       *p &= 0xff >> (xx0 & 7);
-       }
-     }
---- xpdf/CharCodeToUnicode.cc.orig     2010-01-25 12:43:00.000000000 -0800
-+++ xpdf/CharCodeToUnicode.cc  2010-01-28 14:14:53.000000000 -0800
-@@ -208,13 +208,13 @@
-                                  int nBits) {
-   PSTokenizer *pst;
-   char tok1[256], tok2[256], tok3[256];
--  int nDigits, n1, n2, n3;
-+  int maxCode, n1, n2, n3;
-   CharCode i;
-   CharCode code1, code2;
-   GString *name;
-   FILE *f;
+--- xpdf/gfile.h.orig  2010-05-18 11:22:18.000000000 -0700
++++ xpdf/gfile.h       2010-05-18 11:22:18.000000000 -0700
+@@ -58,6 +58,9 @@
+ // Get current directory.
+ extern GString *getCurrentDir();
  
--  nDigits = nBits / 4;
-+  maxCode = (nBits == 8) ? 0xff : (nBits == 16) ? 0xffff : 0xffffffff;
-   pst = new PSTokenizer(getCharFunc, data);
-   pst->getToken(tok1, sizeof(tok1), &n1);
-   while (pst->getToken(tok2, sizeof(tok2), &n2)) {
-@@ -241,9 +241,9 @@
-         error(-1, "Illegal entry in bfchar block in ToUnicode CMap");
-         break;
-       }
--      if (!(n1 == 2 + nDigits && tok1[0] == '<' && tok1[n1 - 1] == '>' &&
-+      if (!(tok1[0] == '<' && tok1[n1 - 1] == '>' &&
-             tok2[0] == '<' && tok2[n2 - 1] == '>')) {
--        error(-1, "Illegal entry in bfchar block in ToUnicode CMap");
-+        error(-1, "Illegal entry in bfchar block in ToUnicode CMap.");
-         continue;
-       }
-       tok1[n1 - 1] = tok2[n2 - 1] = '\0';
-@@ -251,6 +251,9 @@
-         error(-1, "Illegal entry in bfchar block in ToUnicode CMap");
-         continue;
-       }
-+        if (code1 > maxCode) {
-+          error(-1, "Invalid entry in bfchar block in ToUnicode CMap");
-+        }
-       addMapping(code1, tok2 + 1, n2 - 2, 0);
-       }
-       pst->getToken(tok1, sizeof(tok1), &n1);
-@@ -266,8 +269,8 @@
-         error(-1, "Illegal entry in bfrange block in ToUnicode CMap");
-         break;
-       }
--      if (!(n1 == 2 + nDigits && tok1[0] == '<' && tok1[n1 - 1] == '>' &&
--            n2 == 2 + nDigits && tok2[0] == '<' && tok2[n2 - 1] == '>')) {
-+      if (!(tok1[0] == '<' && tok1[n1 - 1] == '>' &&
-+            tok2[0] == '<' && tok2[n2 - 1] == '>')) {
-         error(-1, "Illegal entry in bfrange block in ToUnicode CMap");
-         continue;
-       }
-@@ -277,6 +280,10 @@
-         error(-1, "Illegal entry in bfrange block in ToUnicode CMap");
-         continue;
-       }
-+        if (code1 > maxCode || code2 > maxCode) {
-+          error(-1, "Invalid entry in bfrange block in ToUnicode CMap");
-+      }
-+
-       if (!strcmp(tok3, "[")) {
-         i = 0;
-         while (pst->getToken(tok1, sizeof(tok1), &n1) &&
---- xpdf/Decrypt.cc.orig       2010-01-28 14:19:51.000000000 -0800
-+++ xpdf/Decrypt.cc    2010-02-02 16:04:53.000000000 -0800
-@@ -596,6 +596,7 @@
-   s->bufIdx = 0;
-   if (last) {
-     n = s->buf[15];
-+    if(!n || n>16) n=16;
-     for (i = 15; i >= n; --i) {
-       s->buf[i] = s->buf[i-n];
-     }
---- xpdf/Catalog.cc.orig       2010-02-02 16:17:24.000000000 -0800
-+++ xpdf/Catalog.cc    2010-02-02 16:18:48.000000000 -0800
-@@ -193,7 +193,7 @@
-   if (!kids.isArray()) {
-     error(-1, "Kids object (page %d) is wrong type (%s)",
-         start+1, kids.getTypeName());
--    goto err1;
-+    return start;
-   }
-   for (i = 0; i < kids.arrayGetLength(); ++i) {
-     kids.arrayGetNF(i, &kidRef);
---- xpdf/SplashOutputDev.cc.orig       2010-03-25 14:06:37.000000000 -0700
-+++ xpdf/SplashOutputDev.cc    2010-03-25 14:07:23.000000000 -0700
-@@ -13,6 +13,7 @@
-@@ -509,7 +510,14 @@
-   glyphY = glyphYA;
-   glyphW = glyphWA;
-   glyphH = glyphHA;
--  validBBox = validBBoxA;
-+
-+  if(glyphW<=0 || glyphH<=0 || (double)glyphH*(double)glyphW>536870912) {
-+    glyphW = glyphH = 128;
-+    validBBox = gFalse;
-+  } else {
-+    validBBox = validBBoxA;
-+  }
++/* create a temporary filename */
++char* mktmpname(char*ptr);
 +
-   if (aa) {
-     glyphSize = glyphW * glyphH;
-   } else {
+ // Append a file name to a path string.  <path> may be an empty
+ // string, denoting the current directory).  Returns <path>.
+ extern GString *appendToPath(GString *path, char *fileName);
index 3227449..7c48a09 100644 (file)
@@ -1,4 +1,5 @@
 #include <ruby.h>
+#include "../../config.h"
 #include "../gfxdevice.h"
 #include "../gfxsource.h"
 #include "../gfxtools.h"
@@ -765,6 +766,14 @@ VALUE gfx_setparameter(VALUE module, VALUE _key, VALUE _value)
 void Init_gfx()
 {
     initLog(0,0,0,0,0,2);
+#ifdef HAVE_SRAND48
+    srand48(time(0));
+#else
+#ifdef HAVE_SRAND
+    srand(time(0));
+#endif
+#endif
+
     pdfdriver = gfxsource_pdf_create();
     swfdriver = gfxsource_swf_create();
     imagedriver = gfxsource_image_create();
index fbbf200..c1fd06d 100644 (file)
--- a/lib/ttf.c
+++ b/lib/ttf.c
@@ -638,6 +638,7 @@ static table_maxp_t*maxp_new(ttf_t*ttf)
        maxp->maxComponentPoints = 0;
        maxp->maxComponentContours = 0;
     }
+    maxp->maxZones = 2; // we don't use the Z0 zone
     return maxp;
 }
 static table_maxp_t* maxp_parse(ttf_t*ttf, memreader_t*r)
@@ -726,8 +727,8 @@ static table_hea_t*hea_new(ttf_t*ttf)
        for(t=0;t<ttf->num_glyphs;t++) {
            if(ttf->glyphs[t].advance > hea->advanceWidthMax)
                hea->advanceWidthMax = ttf->glyphs[t].advance;
-           if(ttf->glyphs[t].xmin < hea->minLeftSideBearing)
-               hea->minLeftSideBearing = ttf->glyphs[t].xmin;
+           if(ttf->glyphs[t].bearing < hea->minLeftSideBearing)
+               hea->minLeftSideBearing = ttf->glyphs[t].bearing;
            if(ttf->glyphs[t].xmax < hea->minRightSideBearing)
                hea->minRightSideBearing = ttf->glyphs[t].xmax;
            int width = ttf->glyphs[t].xmax - ttf->glyphs[t].xmin;
@@ -1637,15 +1638,15 @@ static table_post_t*post_new(ttf_t*ttf)
 void post_parse(memreader_t*r, ttf_t*ttf)
 {
     table_post_t*post = ttf->post = rfx_calloc(sizeof(table_post_t));
-    U16 format = readU16(r);
-    post->italic_angle = readU16(r);
+    U32 format = readU32(r);
+    post->italic_angle = readU32(r);
     post->underline_position = readU16(r);
     post->underline_thickness = readU16(r);
-    U16 is_monospaced = readU16(r);
-    readU16(r); // min mem 42
-    readU16(r);
-    readU16(r); // min mem 1
-    readU16(r);
+    U16 is_monospaced = readU32(r);
+    readU32(r); // min mem 42
+    readU32(r);
+    readU32(r); // min mem 1
+    readU32(r);
 }
 void post_write(ttf_t*ttf, ttf_table_t*table)
 {
@@ -1719,13 +1720,25 @@ void gasp_parse(memreader_t*r, ttf_t*ttf)
        gasp->records[t].behaviour = readU16(r);
     }
 }
+
+#define GASP_SYMMETRIC_GRIDFIT 0x0008
+#define GASP_SYMMETRIC_SMOOTHING 0x0004
+#define GASP_DOGRAY 0x0002
+#define GASP_GRIDFIT 0x0001
+
 void gasp_write(ttf_t*ttf, ttf_table_t*table)
 {
     table_gasp_t*gasp = ttf->gasp;
-    writeU16(table, 0);
-    writeU16(table, gasp->num);
+    int version = 0;
     int t;
     for(t=0;t<gasp->num;t++) {
+       if(gasp->records[t].behaviour & ~(GASP_GRIDFIT | GASP_DOGRAY)) {
+           version = 1;
+       }
+    }
+    writeU16(table, version);
+    writeU16(table, gasp->num);
+    for(t=0;t<gasp->num;t++) {
        writeU16(table, gasp->records[t].size);
        writeU16(table, gasp->records[t].behaviour);
     }
index e5462e9..0d1ff50 100644 (file)
--- a/lib/ttf.h
+++ b/lib/ttf.h
@@ -140,7 +140,7 @@ typedef struct _table_head {
 } table_head_t;
 
 typedef struct _table_post {
-    U16 italic_angle;
+    U32 italic_angle;
     U16 underline_position;
     U16 underline_thickness;
 } table_post_t;
index ae6dffd..1995f62 100644 (file)
@@ -3,6 +3,7 @@
 all: clear  test.o
 clean: all
 install:
+uninstall:
 
 CC=@echo "*******************************************************";\
     echo "Your make is broken- try to get yourself a working one.";\
index eacce3a..0b8ba1a 100644 (file)
@@ -35,6 +35,7 @@ ${name}/src/gif2swf.c \
 ${name}/src/wav2swf.c \
 ${name}/src/pdf2swf.c \
 ${name}/src/pdf2pdf.c \
+${name}/lib/pdf/pdf2jpeg.c \
 ${name}/src/swfc.c \
 ${name}/src/swfc-feedback.c \
 ${name}/src/swfc-history.c \
@@ -154,6 +155,8 @@ ${name}/lib/wav.h \
 ${name}/lib/mp3.h \
 ${name}/lib/xml.h \
 ${name}/lib/xml.c \
+${name}/lib/ttf.h \
+${name}/lib/ttf.c \
 ${name}/lib/modules/swfdraw.c \
 ${name}/lib/modules/swfaction.c \
 ${name}/lib/as3/assets.c \
@@ -224,6 +227,8 @@ ${name}/lib/gfxsource.h \
 ${name}/lib/gfxtools.h \
 ${name}/lib/gfxpoly.h \
 ${name}/lib/gfxtools.c \
+${name}/lib/gfxfilter.h \
+${name}/lib/gfxfilter.c \
 ${name}/lib/gfxpoly.c \
 ${name}/lib/gfxpoly/active.c \
 ${name}/lib/gfxpoly/active.h \
@@ -268,6 +273,10 @@ ${name}/lib/devices/bbox.c \
 ${name}/lib/devices/bbox.h \
 ${name}/lib/devices/ops.c \
 ${name}/lib/devices/ops.h \
+${name}/lib/filters/alpha.c \
+${name}/lib/filters/one_big_font.c \
+${name}/lib/filters/vectors_to_glyphs.c \
+${name}/lib/filters/remove_font_transforms.c \
 ${name}/lib/pdf/GFXOutputDev.h \
 ${name}/lib/pdf/GFXOutputDev.cc \
 ${name}/lib/pdf/BitmapOutputDev.h \
diff --git a/rendertest/athana.py b/rendertest/athana.py
new file mode 100644 (file)
index 0000000..5edd532
--- /dev/null
@@ -0,0 +1,6845 @@
+#!/usr/bin/python
+"""
+ Athana - standalone web server including the TAL template language
+
+ Copyright (C) 2007 Matthias Kramm <kramm@in.tum.de>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+#===============================================================
+#
+# Athana
+#
+# A standalone webserver based on Medusa and the Zope TAL Parser
+#
+# This file is distributed under the GPL, see file COPYING for details.
+#
+#===============================================================
+"""
+Parse HTML and compile to TALInterpreter intermediate code.
+"""
+
+RCS_ID =  '$Id: athana.py,v 1.15 2007/11/23 10:13:32 kramm Exp $'
+
+import sys
+
+from HTMLParser import HTMLParser, HTMLParseError
+
+BOOLEAN_HTML_ATTRS = [
+    "compact", "nowrap", "ismap", "declare", "noshade", "checked",
+    "disabled", "readonly", "multiple", "selected", "noresize",
+    "defer"
+    ]
+
+EMPTY_HTML_TAGS = [
+    "base", "meta", "link", "hr", "br", "param", "img", "area",
+    "input", "col", "basefont", "isindex", "frame",
+    ]
+
+PARA_LEVEL_HTML_TAGS = [
+    "h1", "h2", "h3", "h4", "h5", "h6", "p",
+    ]
+
+BLOCK_CLOSING_TAG_MAP = {
+    "tr": ("tr", "td", "th"),
+    "td": ("td", "th"),
+    "th": ("td", "th"),
+    "li": ("li",),
+    "dd": ("dd", "dt"),
+    "dt": ("dd", "dt"),
+    }
+
+BLOCK_LEVEL_HTML_TAGS = [
+    "blockquote", "table", "tr", "th", "td", "thead", "tfoot", "tbody",
+    "noframe", "ul", "ol", "li", "dl", "dt", "dd", "div",
+    ]
+
+TIGHTEN_IMPLICIT_CLOSE_TAGS = (PARA_LEVEL_HTML_TAGS
+                               + BLOCK_CLOSING_TAG_MAP.keys())
+
+
+class NestingError(HTMLParseError):
+    """Exception raised when elements aren't properly nested."""
+
+    def __init__(self, tagstack, endtag, position=(None, None)):
+        self.endtag = endtag
+        if tagstack:
+            if len(tagstack) == 1:
+                msg = ('Open tag <%s> does not match close tag </%s>'
+                       % (tagstack[0], endtag))
+            else:
+                msg = ('Open tags <%s> do not match close tag </%s>'
+                       % ('>, <'.join(tagstack), endtag))
+        else:
+            msg = 'No tags are open to match </%s>' % endtag
+        HTMLParseError.__init__(self, msg, position)
+
+class EmptyTagError(NestingError):
+    """Exception raised when empty elements have an end tag."""
+
+    def __init__(self, tag, position=(None, None)):
+        self.tag = tag
+        msg = 'Close tag </%s> should be removed' % tag
+        HTMLParseError.__init__(self, msg, position)
+
+class OpenTagError(NestingError):
+    """Exception raised when a tag is not allowed in another tag."""
+
+    def __init__(self, tagstack, tag, position=(None, None)):
+        self.tag = tag
+        msg = 'Tag <%s> is not allowed in <%s>' % (tag, tagstack[-1])
+        HTMLParseError.__init__(self, msg, position)
+
+class HTMLTALParser(HTMLParser):
+
+
+    def __init__(self, gen=None):
+        HTMLParser.__init__(self)
+        if gen is None:
+            gen = TALGenerator(xml=0)
+        self.gen = gen
+        self.tagstack = []
+        self.nsstack = []
+        self.nsdict = {'tal': ZOPE_TAL_NS,
+                       'metal': ZOPE_METAL_NS,
+                       'i18n': ZOPE_I18N_NS,
+                       }
+
+    def parseFile(self, file):
+        f = open(file)
+        data = f.read()
+        f.close()
+        try:
+            self.parseString(data)
+        except TALError, e:
+            e.setFile(file)
+            raise
+
+    def parseString(self, data):
+        self.feed(data)
+        self.close()
+        while self.tagstack:
+            self.implied_endtag(self.tagstack[-1], 2)
+        assert self.nsstack == [], self.nsstack
+
+    def getCode(self):
+        return self.gen.getCode()
+
+    def getWarnings(self):
+        return ()
+
+
+    def handle_starttag(self, tag, attrs):
+        self.close_para_tags(tag)
+        self.scan_xmlns(attrs)
+        tag, attrlist, taldict, metaldict, i18ndict \
+             = self.process_ns(tag, attrs)
+        if tag in EMPTY_HTML_TAGS and taldict.get("content"):
+            raise TALError(
+                "empty HTML tags cannot use tal:content: %s" % `tag`,
+                self.getpos())
+        self.tagstack.append(tag)
+        self.gen.emitStartElement(tag, attrlist, taldict, metaldict, i18ndict,
+                                  self.getpos())
+        if tag in EMPTY_HTML_TAGS:
+            self.implied_endtag(tag, -1)
+
+    def handle_startendtag(self, tag, attrs):
+        self.close_para_tags(tag)
+        self.scan_xmlns(attrs)
+        tag, attrlist, taldict, metaldict, i18ndict \
+             = self.process_ns(tag, attrs)
+        if taldict.get("content"):
+            if tag in EMPTY_HTML_TAGS:
+                raise TALError(
+                    "empty HTML tags cannot use tal:content: %s" % `tag`,
+                    self.getpos())
+            self.gen.emitStartElement(tag, attrlist, taldict, metaldict,
+                                      i18ndict, self.getpos())
+            self.gen.emitEndElement(tag, implied=-1)
+        else:
+            self.gen.emitStartElement(tag, attrlist, taldict, metaldict,
+                                      i18ndict, self.getpos(), isend=1)
+        self.pop_xmlns()
+
+    def handle_endtag(self, tag):
+        if tag in EMPTY_HTML_TAGS:
+            raise EmptyTagError(tag, self.getpos())
+        self.close_enclosed_tags(tag)
+        self.gen.emitEndElement(tag)
+        self.pop_xmlns()
+        self.tagstack.pop()
+
+    def close_para_tags(self, tag):
+        if tag in EMPTY_HTML_TAGS:
+            return
+        close_to = -1
+        if BLOCK_CLOSING_TAG_MAP.has_key(tag):
+            blocks_to_close = BLOCK_CLOSING_TAG_MAP[tag]
+            for i in range(len(self.tagstack)):
+                t = self.tagstack[i]
+                if t in blocks_to_close:
+                    if close_to == -1:
+                        close_to = i
+                elif t in BLOCK_LEVEL_HTML_TAGS:
+                    close_to = -1
+        elif tag in PARA_LEVEL_HTML_TAGS + BLOCK_LEVEL_HTML_TAGS:
+            i = len(self.tagstack) - 1
+            while i >= 0:
+                closetag = self.tagstack[i]
+                if closetag in BLOCK_LEVEL_HTML_TAGS:
+                    break
+                if closetag in PARA_LEVEL_HTML_TAGS:
+                    if closetag != "p":
+                        raise OpenTagError(self.tagstack, tag, self.getpos())
+                    close_to = i
+                i = i - 1
+        if close_to >= 0:
+            while len(self.tagstack) > close_to:
+                self.implied_endtag(self.tagstack[-1], 1)
+
+    def close_enclosed_tags(self, tag):
+        if tag not in self.tagstack:
+            raise NestingError(self.tagstack, tag, self.getpos())
+        while tag != self.tagstack[-1]:
+            self.implied_endtag(self.tagstack[-1], 1)
+        assert self.tagstack[-1] == tag
+
+    def implied_endtag(self, tag, implied):
+        assert tag == self.tagstack[-1]
+        assert implied in (-1, 1, 2)
+        isend = (implied < 0)
+        if tag in TIGHTEN_IMPLICIT_CLOSE_TAGS:
+            white = self.gen.unEmitWhitespace()
+        else:
+            white = None
+        self.gen.emitEndElement(tag, isend=isend, implied=implied)
+        if white:
+            self.gen.emitRawText(white)
+        self.tagstack.pop()
+        self.pop_xmlns()
+
+    def handle_charref(self, name):
+        self.gen.emitRawText("&#%s;" % name)
+
+    def handle_entityref(self, name):
+        self.gen.emitRawText("&%s;" % name)
+
+    def handle_data(self, data):
+        self.gen.emitRawText(data)
+
+    def handle_comment(self, data):
+        self.gen.emitRawText("<!--%s-->" % data)
+
+    def handle_decl(self, data):
+        self.gen.emitRawText("<!%s>" % data)
+
+    def handle_pi(self, data):
+        self.gen.emitRawText("<?%s>" % data)
+
+
+    def scan_xmlns(self, attrs):
+        nsnew = {}
+        for key, value in attrs:
+            if key.startswith("xmlns:"):
+                nsnew[key[6:]] = value
+        if nsnew:
+            self.nsstack.append(self.nsdict)
+            self.nsdict = self.nsdict.copy()
+            self.nsdict.update(nsnew)
+        else:
+            self.nsstack.append(self.nsdict)
+
+    def pop_xmlns(self):
+        self.nsdict = self.nsstack.pop()
+
+    def fixname(self, name):
+        if ':' in name:
+            prefix, suffix = name.split(':', 1)
+            if prefix == 'xmlns':
+                nsuri = self.nsdict.get(suffix)
+                if nsuri in (ZOPE_TAL_NS, ZOPE_METAL_NS, ZOPE_I18N_NS):
+                    return name, name, prefix
+            else:
+                nsuri = self.nsdict.get(prefix)
+                if nsuri == ZOPE_TAL_NS:
+                    return name, suffix, 'tal'
+                elif nsuri == ZOPE_METAL_NS:
+                    return name, suffix,  'metal'
+                elif nsuri == ZOPE_I18N_NS:
+                    return name, suffix, 'i18n'
+        return name, name, 0
+
+    def process_ns(self, name, attrs):
+        attrlist = []
+        taldict = {}
+        metaldict = {}
+        i18ndict = {}
+        name, namebase, namens = self.fixname(name)
+        for item in attrs:
+            key, value = item
+            key, keybase, keyns = self.fixname(key)
+            ns = keyns or namens # default to tag namespace
+            if ns and ns != 'unknown':
+                item = (key, value, ns)
+            if ns == 'tal':
+                if taldict.has_key(keybase):
+                    raise TALError("duplicate TAL attribute " +
+                                   `keybase`, self.getpos())
+                taldict[keybase] = value
+            elif ns == 'metal':
+                if metaldict.has_key(keybase):
+                    raise METALError("duplicate METAL attribute " +
+                                     `keybase`, self.getpos())
+                metaldict[keybase] = value
+            elif ns == 'i18n':
+                if i18ndict.has_key(keybase):
+                    raise I18NError("duplicate i18n attribute " +
+                                    `keybase`, self.getpos())
+                i18ndict[keybase] = value
+            attrlist.append(item)
+        if namens in ('metal', 'tal'):
+            taldict['tal tag'] = namens
+        return name, attrlist, taldict, metaldict, i18ndict
+"""
+Generic expat-based XML parser base class.
+"""
+
+
+class XMLParser:
+
+    ordered_attributes = 0
+
+    handler_names = [
+        "StartElementHandler",
+        "EndElementHandler",
+        "ProcessingInstructionHandler",
+        "CharacterDataHandler",
+        "UnparsedEntityDeclHandler",
+        "NotationDeclHandler",
+        "StartNamespaceDeclHandler",
+        "EndNamespaceDeclHandler",
+        "CommentHandler",
+        "StartCdataSectionHandler",
+        "EndCdataSectionHandler",
+        "DefaultHandler",
+        "DefaultHandlerExpand",
+        "NotStandaloneHandler",
+        "ExternalEntityRefHandler",
+        "XmlDeclHandler",
+        "StartDoctypeDeclHandler",
+        "EndDoctypeDeclHandler",
+        "ElementDeclHandler",
+        "AttlistDeclHandler"
+        ]
+
+    def __init__(self, encoding=None):
+        self.parser = p = self.createParser()
+        if self.ordered_attributes:
+            try:
+                self.parser.ordered_attributes = self.ordered_attributes
+            except AttributeError:
+                print "Can't set ordered_attributes"
+                self.ordered_attributes = 0
+        for name in self.handler_names:
+            method = getattr(self, name, None)
+            if method is not None:
+                try:
+                    setattr(p, name, method)
+                except AttributeError:
+                    print "Can't set expat handler %s" % name
+
+    def createParser(self, encoding=None):
+        global XMLParseError
+        try:
+            from Products.ParsedXML.Expat import pyexpat
+            XMLParseError = pyexpat.ExpatError
+            return pyexpat.ParserCreate(encoding, ' ')
+        except ImportError:
+            from xml.parsers import expat
+            XMLParseError = expat.ExpatError
+            return expat.ParserCreate(encoding, ' ')
+
+    def parseFile(self, filename):
+        f = open(filename)
+        self.parseStream(f)
+        #self.parseStream(open(filename))
+
+    def parseString(self, s):
+        self.parser.Parse(s, 1)
+
+    def parseURL(self, url):
+        import urllib
+        self.parseStream(urllib.urlopen(url))
+
+    def parseStream(self, stream):
+        self.parser.ParseFile(stream)
+
+    def parseFragment(self, s, end=0):
+        self.parser.Parse(s, end)
+"""Interface that a TALES engine provides to the METAL/TAL implementation."""
+
+try:
+    from Interface import Interface
+    from Interface.Attribute import Attribute
+except:
+    class Interface: pass
+    def Attribute(*args): pass
+
+
+class ITALESCompiler(Interface):
+    """Compile-time interface provided by a TALES implementation.
+
+    The TAL compiler needs an instance of this interface to support
+    compilation of TALES expressions embedded in documents containing
+    TAL and METAL constructs.
+    """
+
+    def getCompilerError():
+        """Return the exception class raised for compilation errors.
+        """
+
+    def compile(expression):
+        """Return a compiled form of 'expression' for later evaluation.
+
+        'expression' is the source text of the expression.
+
+        The return value may be passed to the various evaluate*()
+        methods of the ITALESEngine interface.  No compatibility is
+        required for the values of the compiled expression between
+        different ITALESEngine implementations.
+        """
+
+
+class ITALESEngine(Interface):
+    """Render-time interface provided by a TALES implementation.
+
+    The TAL interpreter uses this interface to TALES to support
+    evaluation of the compiled expressions returned by
+    ITALESCompiler.compile().
+    """
+
+    def getCompiler():
+        """Return an object that supports ITALESCompiler."""
+
+    def getDefault():
+        """Return the value of the 'default' TALES expression.
+
+        Checking a value for a match with 'default' should be done
+        using the 'is' operator in Python.
+        """
+
+    def setPosition((lineno, offset)):
+        """Inform the engine of the current position in the source file.
+
+        This is used to allow the evaluation engine to report
+        execution errors so that site developers can more easily
+        locate the offending expression.
+        """
+
+    def setSourceFile(filename):
+        """Inform the engine of the name of the current source file.
+
+        This is used to allow the evaluation engine to report
+        execution errors so that site developers can more easily
+        locate the offending expression.
+        """
+
+    def beginScope():
+        """Push a new scope onto the stack of open scopes.
+        """
+
+    def endScope():
+        """Pop one scope from the stack of open scopes.
+        """
+
+    def evaluate(compiled_expression):
+        """Evaluate an arbitrary expression.
+
+        No constraints are imposed on the return value.
+        """
+
+    def evaluateBoolean(compiled_expression):
+        """Evaluate an expression that must return a Boolean value.
+        """
+
+    def evaluateMacro(compiled_expression):
+        """Evaluate an expression that must return a macro program.
+        """
+
+    def evaluateStructure(compiled_expression):
+        """Evaluate an expression that must return a structured
+        document fragment.
+
+        The result of evaluating 'compiled_expression' must be a
+        string containing a parsable HTML or XML fragment.  Any TAL
+        markup cnotained in the result string will be interpreted.
+        """
+
+    def evaluateText(compiled_expression):
+        """Evaluate an expression that must return text.
+
+        The returned text should be suitable for direct inclusion in
+        the output: any HTML or XML escaping or quoting is the
+        responsibility of the expression itself.
+        """
+
+    def evaluateValue(compiled_expression):
+        """Evaluate an arbitrary expression.
+
+        No constraints are imposed on the return value.
+        """
+
+    def createErrorInfo(exception, (lineno, offset)):
+        """Returns an ITALESErrorInfo object.
+
+        The returned object is used to provide information about the
+        error condition for the on-error handler.
+        """
+
+    def setGlobal(name, value):
+        """Set a global variable.
+
+        The variable will be named 'name' and have the value 'value'.
+        """
+
+    def setLocal(name, value):
+        """Set a local variable in the current scope.
+
+        The variable will be named 'name' and have the value 'value'.
+        """
+
+    def setRepeat(name, compiled_expression):
+        """
+        """
+
+    def translate(domain, msgid, mapping, default=None):
+        """
+        See ITranslationService.translate()
+        """
+
+
+class ITALESErrorInfo(Interface):
+
+    type = Attribute("type",
+                     "The exception class.")
+
+    value = Attribute("value",
+                      "The exception instance.")
+
+    lineno = Attribute("lineno",
+                       "The line number the error occurred on in the source.")
+
+    offset = Attribute("offset",
+                       "The character offset at which the error occurred.")
+"""
+Common definitions used by TAL and METAL compilation an transformation.
+"""
+
+from types import ListType, TupleType
+
+
+TAL_VERSION = "1.5"
+
+XML_NS = "http://www.w3.org/XML/1998/namespace" # URI for XML namespace
+XMLNS_NS = "http://www.w3.org/2000/xmlns/" # URI for XML NS declarations
+
+ZOPE_TAL_NS = "http://xml.zope.org/namespaces/tal"
+ZOPE_METAL_NS = "http://xml.zope.org/namespaces/metal"
+ZOPE_I18N_NS = "http://xml.zope.org/namespaces/i18n"
+
+NAME_RE = "[a-zA-Z_][-a-zA-Z0-9_]*"
+
+KNOWN_METAL_ATTRIBUTES = [
+    "define-macro",
+    "use-macro",
+    "define-slot",
+    "fill-slot",
+    "slot",
+    ]
+
+KNOWN_TAL_ATTRIBUTES = [
+    "define",
+    "condition",
+    "content",
+    "replace",
+    "repeat",
+    "attributes",
+    "on-error",
+    "omit-tag",
+    "tal tag",
+    ]
+
+KNOWN_I18N_ATTRIBUTES = [
+    "translate",
+    "domain",
+    "target",
+    "source",
+    "attributes",
+    "data",
+    "name",
+    ]
+
+class TALError(Exception):
+
+    def __init__(self, msg, position=(None, None)):
+        assert msg != ""
+        self.msg = msg
+        self.lineno = position[0]
+        self.offset = position[1]
+        self.filename = None
+
+    def setFile(self, filename):
+        self.filename = filename
+
+    def __str__(self):
+        result = self.msg
+        if self.lineno is not None:
+            result = result + ", at line %d" % self.lineno
+        if self.offset is not None:
+            result = result + ", column %d" % (self.offset + 1)
+        if self.filename is not None:
+            result = result + ', in file %s' % self.filename
+        return result
+
+class METALError(TALError):
+    pass
+
+class TALESError(TALError):
+    pass
+
+class I18NError(TALError):
+    pass
+
+
+class ErrorInfo:
+
+    __implements__ = ITALESErrorInfo
+
+    def __init__(self, err, position=(None, None)):
+        if isinstance(err, Exception):
+            self.type = err.__class__
+            self.value = err
+        else:
+            self.type = err
+            self.value = None
+        self.lineno = position[0]
+        self.offset = position[1]
+
+
+
+import re
+_attr_re = re.compile(r"\s*([^\s]+)\s+([^\s].*)\Z", re.S)
+_subst_re = re.compile(r"\s*(?:(text|raw|structure)\s+)?(.*)\Z", re.S)
+del re
+
+def parseAttributeReplacements(arg, xml):
+    dict = {}
+    for part in splitParts(arg):
+        m = _attr_re.match(part)
+        if not m:
+            raise TALError("Bad syntax in attributes: " + `part`)
+        name, expr = m.group(1, 2)
+        if not xml:
+            name = name.lower()
+        if dict.has_key(name):
+            raise TALError("Duplicate attribute name in attributes: " + `part`)
+        dict[name] = expr
+    return dict
+
+def parseSubstitution(arg, position=(None, None)):
+    m = _subst_re.match(arg)
+    if not m:
+        raise TALError("Bad syntax in substitution text: " + `arg`, position)
+    key, expr = m.group(1, 2)
+    if not key:
+        key = "text"
+    return key, expr
+
+def splitParts(arg):
+    arg = arg.replace(";;", "\0")
+    parts = arg.split(';')
+    parts = [p.replace("\0", ";") for p in parts]
+    if len(parts) > 1 and not parts[-1].strip():
+        del parts[-1] # It ended in a semicolon
+    return parts
+
+def isCurrentVersion(program):
+    version = getProgramVersion(program)
+    return version == TAL_VERSION
+
+def getProgramMode(program):
+    version = getProgramVersion(program)
+    if (version == TAL_VERSION and isinstance(program[1], TupleType) and
+        len(program[1]) == 2):
+        opcode, mode = program[1]
+        if opcode == "mode":
+            return mode
+    return None
+
+def getProgramVersion(program):
+    if (len(program) >= 2 and
+        isinstance(program[0], TupleType) and len(program[0]) == 2):
+        opcode, version = program[0]
+        if opcode == "version":
+            return version
+    return None
+
+import re
+_ent1_re = re.compile('&(?![A-Z#])', re.I)
+_entch_re = re.compile('&([A-Z][A-Z0-9]*)(?![A-Z0-9;])', re.I)
+_entn1_re = re.compile('&#(?![0-9X])', re.I)
+_entnx_re = re.compile('&(#X[A-F0-9]*)(?![A-F0-9;])', re.I)
+_entnd_re = re.compile('&(#[0-9][0-9]*)(?![0-9;])')
+del re
+
+def attrEscape(s):
+    """Replace special characters '&<>' by character entities,
+    except when '&' already begins a syntactically valid entity."""
+    s = _ent1_re.sub('&amp;', s)
+    s = _entch_re.sub(r'&amp;\1', s)
+    s = _entn1_re.sub('&amp;#', s)
+    s = _entnx_re.sub(r'&amp;\1', s)
+    s = _entnd_re.sub(r'&amp;\1', s)
+    s = s.replace('<', '&lt;')
+    s = s.replace('>', '&gt;')
+    s = s.replace('"', '&quot;')
+    return s
+"""
+Code generator for TALInterpreter intermediate code.
+"""
+
+import re
+import cgi
+
+
+
+I18N_REPLACE = 1
+I18N_CONTENT = 2
+I18N_EXPRESSION = 3
+
+_name_rx = re.compile(NAME_RE)
+
+
+class TALGenerator:
+
+    inMacroUse = 0
+    inMacroDef = 0
+    source_file = None
+
+    def __init__(self, expressionCompiler=None, xml=1, source_file=None):
+        if not expressionCompiler:
+            expressionCompiler = AthanaTALEngine()
+        self.expressionCompiler = expressionCompiler
+        self.CompilerError = expressionCompiler.getCompilerError()
+        self.program = []
+        self.stack = []
+        self.todoStack = []
+        self.macros = {}
+        self.slots = {}
+        self.slotStack = []
+        self.xml = xml
+        self.emit("version", TAL_VERSION)
+        self.emit("mode", xml and "xml" or "html")
+        if source_file is not None:
+            self.source_file = source_file
+            self.emit("setSourceFile", source_file)
+        self.i18nContext = TranslationContext()
+        self.i18nLevel = 0
+
+    def getCode(self):
+        assert not self.stack
+        assert not self.todoStack
+        return self.optimize(self.program), self.macros
+
+    def optimize(self, program):
+        output = []
+        collect = []
+        cursor = 0
+        if self.xml:
+            endsep = "/>"
+        else:
+            endsep = " />"
+        for cursor in xrange(len(program)+1):
+            try:
+                item = program[cursor]
+            except IndexError:
+                item = (None, None)
+            opcode = item[0]
+            if opcode == "rawtext":
+                collect.append(item[1])
+                continue
+            if opcode == "endTag":
+                collect.append("</%s>" % item[1])
+                continue
+            if opcode == "startTag":
+                if self.optimizeStartTag(collect, item[1], item[2], ">"):
+                    continue
+            if opcode == "startEndTag":
+                if self.optimizeStartTag(collect, item[1], item[2], endsep):
+                    continue
+            if opcode in ("beginScope", "endScope"):
+                output.append(self.optimizeArgsList(item))
+                continue
+            if opcode == 'noop':
+                opcode = None
+                pass
+            text = "".join(collect)
+            if text:
+                i = text.rfind("\n")
+                if i >= 0:
+                    i = len(text) - (i + 1)
+                    output.append(("rawtextColumn", (text, i)))
+                else:
+                    output.append(("rawtextOffset", (text, len(text))))
+            if opcode != None:
+                output.append(self.optimizeArgsList(item))
+            collect = []
+        return self.optimizeCommonTriple(output)
+
+    def optimizeArgsList(self, item):
+        if len(item) == 2:
+            return item
+        else:
+            return item[0], tuple(item[1:])
+
+    def optimizeStartTag(self, collect, name, attrlist, end):
+        if not attrlist:
+            collect.append("<%s%s" % (name, end))
+            return 1
+        opt = 1
+        new = ["<" + name]
+        for i in range(len(attrlist)):
+            item = attrlist[i]
+            if len(item) > 2:
+                opt = 0
+                name, value, action = item[:3]
+                attrlist[i] = (name, value, action) + item[3:]
+            else:
+                if item[1] is None:
+                    s = item[0]
+                else:
+                    s = '%s="%s"' % (item[0], attrEscape(item[1]))
+                attrlist[i] = item[0], s
+                new.append(" " + s)
+        if opt:
+            new.append(end)
+            collect.extend(new)
+        return opt
+
+    def optimizeCommonTriple(self, program):
+        if len(program) < 3:
+            return program
+        output = program[:2]
+        prev2, prev1 = output
+        for item in program[2:]:
+            if ( item[0] == "beginScope"
+                 and prev1[0] == "setPosition"
+                 and prev2[0] == "rawtextColumn"):
+                position = output.pop()[1]
+                text, column = output.pop()[1]
+                prev1 = None, None
+                closeprev = 0
+                if output and output[-1][0] == "endScope":
+                    closeprev = 1
+                    output.pop()
+                item = ("rawtextBeginScope",
+                        (text, column, position, closeprev, item[1]))
+            output.append(item)
+            prev2 = prev1
+            prev1 = item
+        return output
+
+    def todoPush(self, todo):
+        self.todoStack.append(todo)
+
+    def todoPop(self):
+        return self.todoStack.pop()
+
+    def compileExpression(self, expr):
+        try:
+            return self.expressionCompiler.compile(expr)
+        except self.CompilerError, err:
+            raise TALError('%s in expression %s' % (err.args[0], `expr`),
+                           self.position)
+
+    def pushProgram(self):
+        self.stack.append(self.program)
+        self.program = []
+
+    def popProgram(self):
+        program = self.program
+        self.program = self.stack.pop()
+        return self.optimize(program)
+
+    def pushSlots(self):
+        self.slotStack.append(self.slots)
+        self.slots = {}
+
+    def popSlots(self):
+        slots = self.slots
+        self.slots = self.slotStack.pop()
+        return slots
+
+    def emit(self, *instruction):
+        self.program.append(instruction)
+
+    def emitStartTag(self, name, attrlist, isend=0):
+        if isend:
+            opcode = "startEndTag"
+        else:
+            opcode = "startTag"
+        self.emit(opcode, name, attrlist)
+
+    def emitEndTag(self, name):
+        if self.xml and self.program and self.program[-1][0] == "startTag":
+            self.program[-1] = ("startEndTag",) + self.program[-1][1:]
+        else:
+            self.emit("endTag", name)
+
+    def emitOptTag(self, name, optTag, isend):
+        program = self.popProgram() #block
+        start = self.popProgram() #start tag
+        if (isend or not program) and self.xml:
+            start[-1] = ("startEndTag",) + start[-1][1:]
+            isend = 1
+        cexpr = optTag[0]
+        if cexpr:
+            cexpr = self.compileExpression(optTag[0])
+        self.emit("optTag", name, cexpr, optTag[1], isend, start, program)
+
+    def emitRawText(self, text):
+        self.emit("rawtext", text)
+
+    def emitText(self, text):
+        self.emitRawText(cgi.escape(text))
+
+    def emitDefines(self, defines):
+        for part in splitParts(defines):
+            m = re.match(
+                r"(?s)\s*(?:(global|local)\s+)?(%s)\s+(.*)\Z" % NAME_RE, part)
+            if not m:
+                raise TALError("invalid define syntax: " + `part`,
+                               self.position)
+            scope, name, expr = m.group(1, 2, 3)
+            scope = scope or "local"
+            cexpr = self.compileExpression(expr)
+            if scope == "local":
+                self.emit("setLocal", name, cexpr)
+            else:
+                self.emit("setGlobal", name, cexpr)
+
+    def emitOnError(self, name, onError, TALtag, isend):
+        block = self.popProgram()
+        key, expr = parseSubstitution(onError)
+        cexpr = self.compileExpression(expr)
+        if key == "text":
+            self.emit("insertText", cexpr, [])
+        elif key == "raw":
+            self.emit("insertRaw", cexpr, [])
+        else:
+            assert key == "structure"
+            self.emit("insertStructure", cexpr, {}, [])
+        if TALtag:
+            self.emitOptTag(name, (None, 1), isend)
+        else:
+            self.emitEndTag(name)
+        handler = self.popProgram()
+        self.emit("onError", block, handler)
+
+    def emitCondition(self, expr):
+        cexpr = self.compileExpression(expr)
+        program = self.popProgram()
+        self.emit("condition", cexpr, program)
+
+    def emitRepeat(self, arg):
+
+        
+        m = re.match("(?s)\s*(%s)\s+(.*)\Z" % NAME_RE, arg)
+        if not m:
+            raise TALError("invalid repeat syntax: " + `arg`,
+                           self.position)
+        name, expr = m.group(1, 2)
+        cexpr = self.compileExpression(expr)
+        program = self.popProgram()
+        self.emit("loop", name, cexpr, program)
+
+
+    def emitSubstitution(self, arg, attrDict={}):
+        key, expr = parseSubstitution(arg)
+        cexpr = self.compileExpression(expr)
+        program = self.popProgram()
+        if key == "text":
+            self.emit("insertText", cexpr, program)
+        elif key == "raw":
+            self.emit("insertRaw", cexpr, program)
+        else:
+            assert key == "structure"
+            self.emit("insertStructure", cexpr, attrDict, program)
+
+    def emitI18nVariable(self, stuff):
+        varname, action, expression = stuff
+        m = _name_rx.match(varname)
+        if m is None or m.group() != varname:
+            raise TALError("illegal i18n:name: %r" % varname, self.position)
+        key = cexpr = None
+        program = self.popProgram()
+        if action == I18N_REPLACE:
+            program = program[1:-1]
+        elif action == I18N_CONTENT:
+            pass
+        else:
+            assert action == I18N_EXPRESSION
+            key, expr = parseSubstitution(expression)
+            cexpr = self.compileExpression(expr)
+        self.emit('i18nVariable',
+                  varname, program, cexpr, int(key == "structure"))
+
+    def emitTranslation(self, msgid, i18ndata):
+        program = self.popProgram()
+        if i18ndata is None:
+            self.emit('insertTranslation', msgid, program)
+        else:
+            key, expr = parseSubstitution(i18ndata)
+            cexpr = self.compileExpression(expr)
+            assert key == 'text'
+            self.emit('insertTranslation', msgid, program, cexpr)
+
+    def emitDefineMacro(self, macroName):
+        program = self.popProgram()
+        macroName = macroName.strip()
+        if self.macros.has_key(macroName):
+            raise METALError("duplicate macro definition: %s" % `macroName`,
+                             self.position)
+        if not re.match('%s$' % NAME_RE, macroName):
+            raise METALError("invalid macro name: %s" % `macroName`,
+                             self.position)
+        self.macros[macroName] = program
+        self.inMacroDef = self.inMacroDef - 1
+        self.emit("defineMacro", macroName, program)
+
+    def emitUseMacro(self, expr):
+        cexpr = self.compileExpression(expr)
+        program = self.popProgram()
+        self.inMacroUse = 0
+        self.emit("useMacro", expr, cexpr, self.popSlots(), program)
+
+    def emitDefineSlot(self, slotName):
+        program = self.popProgram()
+        slotName = slotName.strip()
+        if not re.match('%s$' % NAME_RE, slotName):
+            raise METALError("invalid slot name: %s" % `slotName`,
+                             self.position)
+        self.emit("defineSlot", slotName, program)
+
+    def emitFillSlot(self, slotName):
+        program = self.popProgram()
+        slotName = slotName.strip()
+        if self.slots.has_key(slotName):
+            raise METALError("duplicate fill-slot name: %s" % `slotName`,
+                             self.position)
+        if not re.match('%s$' % NAME_RE, slotName):
+            raise METALError("invalid slot name: %s" % `slotName`,
+                             self.position)
+        self.slots[slotName] = program
+        self.inMacroUse = 1
+        self.emit("fillSlot", slotName, program)
+
+    def unEmitWhitespace(self):
+        collect = []
+        i = len(self.program) - 1
+        while i >= 0:
+            item = self.program[i]
+            if item[0] != "rawtext":
+                break
+            text = item[1]
+            if not re.match(r"\A\s*\Z", text):
+                break
+            collect.append(text)
+            i = i-1
+        del self.program[i+1:]
+        if i >= 0 and self.program[i][0] == "rawtext":
+            text = self.program[i][1]
+            m = re.search(r"\s+\Z", text)
+            if m:
+                self.program[i] = ("rawtext", text[:m.start()])
+                collect.append(m.group())
+        collect.reverse()
+        return "".join(collect)
+
+    def unEmitNewlineWhitespace(self):
+        collect = []
+        i = len(self.program)
+        while i > 0:
+            i = i-1
+            item = self.program[i]
+            if item[0] != "rawtext":
+                break
+            text = item[1]
+            if re.match(r"\A[ \t]*\Z", text):
+                collect.append(text)
+                continue
+            m = re.match(r"(?s)^(.*)(\n[ \t]*)\Z", text)
+            if not m:
+                break
+            text, rest = m.group(1, 2)
+            collect.reverse()
+            rest = rest + "".join(collect)
+            del self.program[i:]
+            if text:
+                self.emit("rawtext", text)
+            return rest
+        return None
+
+    def replaceAttrs(self, attrlist, repldict):
+        if not repldict:
+            return attrlist
+        newlist = []
+        for item in attrlist:
+            key = item[0]
+            if repldict.has_key(key):
+                expr, xlat, msgid = repldict[key]
+                item = item[:2] + ("replace", expr, xlat, msgid)
+                del repldict[key]
+            newlist.append(item)
+        for key, (expr, xlat, msgid) in repldict.items():
+            newlist.append((key, None, "insert", expr, xlat, msgid))
+        return newlist
+
+    def emitStartElement(self, name, attrlist, taldict, metaldict, i18ndict,
+                         position=(None, None), isend=0):
+        if not taldict and not metaldict and not i18ndict:
+            self.emitStartTag(name, attrlist, isend)
+            self.todoPush({})
+            if isend:
+                self.emitEndElement(name, isend)
+            return
+
+        self.position = position
+        for key, value in taldict.items():
+            if key not in KNOWN_TAL_ATTRIBUTES:
+                raise TALError("bad TAL attribute: " + `key`, position)
+            if not (value or key == 'omit-tag'):
+                raise TALError("missing value for TAL attribute: " +
+                               `key`, position)
+        for key, value in metaldict.items():
+            if key not in KNOWN_METAL_ATTRIBUTES:
+                raise METALError("bad METAL attribute: " + `key`,
+                                 position)
+            if not value:
+                raise TALError("missing value for METAL attribute: " +
+                               `key`, position)
+        for key, value in i18ndict.items():
+            if key not in KNOWN_I18N_ATTRIBUTES:
+                raise I18NError("bad i18n attribute: " + `key`, position)
+            if not value and key in ("attributes", "data", "id"):
+                raise I18NError("missing value for i18n attribute: " +
+                                `key`, position)
+        todo = {}
+        defineMacro = metaldict.get("define-macro")
+        useMacro = metaldict.get("use-macro")
+        defineSlot = metaldict.get("define-slot")
+        fillSlot = metaldict.get("fill-slot")
+        define = taldict.get("define")
+        condition = taldict.get("condition")
+        repeat = taldict.get("repeat")
+        content = taldict.get("content")
+        replace = taldict.get("replace")
+        attrsubst = taldict.get("attributes")
+        onError = taldict.get("on-error")
+        omitTag = taldict.get("omit-tag")
+        TALtag = taldict.get("tal tag")
+        i18nattrs = i18ndict.get("attributes")
+        msgid = i18ndict.get("translate")
+        varname = i18ndict.get('name')
+        i18ndata = i18ndict.get('data')
+
+        if varname and not self.i18nLevel:
+            raise I18NError(
+                "i18n:name can only occur inside a translation unit",
+                position)
+
+        if i18ndata and not msgid:
+            raise I18NError("i18n:data must be accompanied by i18n:translate",
+                            position)
+
+        if len(metaldict) > 1 and (defineMacro or useMacro):
+            raise METALError("define-macro and use-macro cannot be used "
+                             "together or with define-slot or fill-slot",
+                             position)
+        if replace:
+            if content:
+                raise TALError(
+                    "tal:content and tal:replace are mutually exclusive",
+                    position)
+            if msgid is not None:
+                raise I18NError(
+                    "i18n:translate and tal:replace are mutually exclusive",
+                    position)
+
+        repeatWhitespace = None
+        if repeat:
+            repeatWhitespace = self.unEmitNewlineWhitespace()
+        if position != (None, None):
+            self.emit("setPosition", position)
+        if self.inMacroUse:
+            if fillSlot:
+                self.pushProgram()
+                if self.source_file is not None:
+                    self.emit("setSourceFile", self.source_file)
+                todo["fillSlot"] = fillSlot
+                self.inMacroUse = 0
+        else:
+            if fillSlot:
+                raise METALError("fill-slot must be within a use-macro",
+                                 position)
+        if not self.inMacroUse:
+            if defineMacro:
+                self.pushProgram()
+                self.emit("version", TAL_VERSION)
+                self.emit("mode", self.xml and "xml" or "html")
+                if self.source_file is not None:
+                    self.emit("setSourceFile", self.source_file)
+                todo["defineMacro"] = defineMacro
+                self.inMacroDef = self.inMacroDef + 1
+            if useMacro:
+                self.pushSlots()
+                self.pushProgram()
+                todo["useMacro"] = useMacro
+                self.inMacroUse = 1
+            if defineSlot:
+                if not self.inMacroDef:
+                    raise METALError(
+                        "define-slot must be within a define-macro",
+                        position)
+                self.pushProgram()
+                todo["defineSlot"] = defineSlot
+
+        if defineSlot or i18ndict:
+
+            domain = i18ndict.get("domain") or self.i18nContext.domain
+            source = i18ndict.get("source") or self.i18nContext.source
+            target = i18ndict.get("target") or self.i18nContext.target
+            if (  domain != DEFAULT_DOMAIN
+                  or source is not None
+                  or target is not None):
+                self.i18nContext = TranslationContext(self.i18nContext,
+                                                      domain=domain,
+                                                      source=source,
+                                                      target=target)
+                self.emit("beginI18nContext",
+                          {"domain": domain, "source": source,
+                           "target": target})
+                todo["i18ncontext"] = 1
+        if taldict or i18ndict:
+            dict = {}
+            for item in attrlist:
+                key, value = item[:2]
+                dict[key] = value
+            self.emit("beginScope", dict)
+            todo["scope"] = 1
+        if onError:
+            self.pushProgram() # handler
+            if TALtag:
+                self.pushProgram() # start
+            self.emitStartTag(name, list(attrlist)) # Must copy attrlist!
+            if TALtag:
+                self.pushProgram() # start
+            self.pushProgram() # block
+            todo["onError"] = onError
+        if define:
+            self.emitDefines(define)
+            todo["define"] = define
+        if condition:
+            self.pushProgram()
+            todo["condition"] = condition
+        if repeat:
+            todo["repeat"] = repeat
+            self.pushProgram()
+            if repeatWhitespace:
+                self.emitText(repeatWhitespace)
+        if content:
+            if varname:
+                todo['i18nvar'] = (varname, I18N_CONTENT, None)
+                todo["content"] = content
+                self.pushProgram()
+            else:
+                todo["content"] = content
+        elif replace:
+            if varname:
+                todo['i18nvar'] = (varname, I18N_EXPRESSION, replace)
+            else:
+                todo["replace"] = replace
+            self.pushProgram()
+        elif varname:
+            todo['i18nvar'] = (varname, I18N_REPLACE, None)
+            self.pushProgram()
+        if msgid is not None:
+            self.i18nLevel += 1
+            todo['msgid'] = msgid
+        if i18ndata:
+            todo['i18ndata'] = i18ndata
+        optTag = omitTag is not None or TALtag
+        if optTag:
+            todo["optional tag"] = omitTag, TALtag
+            self.pushProgram()
+        if attrsubst or i18nattrs:
+            if attrsubst:
+                repldict = parseAttributeReplacements(attrsubst,
+                                                              self.xml)
+            else:
+                repldict = {}
+            if i18nattrs:
+                i18nattrs = _parseI18nAttributes(i18nattrs, attrlist, repldict,
+                                                 self.position, self.xml,
+                                                 self.source_file)
+            else:
+                i18nattrs = {}
+            for key, value in repldict.items():
+                if i18nattrs.get(key, None):
+                    raise I18NError(
+                      ("attribute [%s] cannot both be part of tal:attributes" +
+                      " and have a msgid in i18n:attributes") % key,
+                    position)
+                ce = self.compileExpression(value)
+                repldict[key] = ce, key in i18nattrs, i18nattrs.get(key)
+            for key in i18nattrs:
+                if not repldict.has_key(key):
+                    repldict[key] = None, 1, i18nattrs.get(key)
+        else:
+            repldict = {}
+        if replace:
+            todo["repldict"] = repldict
+            repldict = {}
+        self.emitStartTag(name, self.replaceAttrs(attrlist, repldict), isend)
+        if optTag:
+            self.pushProgram()
+        if content and not varname:
+            self.pushProgram()
+        if msgid is not None:
+            self.pushProgram()
+        if content and varname:
+            self.pushProgram()
+        if todo and position != (None, None):
+            todo["position"] = position
+        self.todoPush(todo)
+        if isend:
+            self.emitEndElement(name, isend)
+
+    def emitEndElement(self, name, isend=0, implied=0):
+        todo = self.todoPop()
+        if not todo:
+            if not isend:
+                self.emitEndTag(name)
+            return
+
+        self.position = position = todo.get("position", (None, None))
+        defineMacro = todo.get("defineMacro")
+        useMacro = todo.get("useMacro")
+        defineSlot = todo.get("defineSlot")
+        fillSlot = todo.get("fillSlot")
+        repeat = todo.get("repeat")
+        content = todo.get("content")
+        replace = todo.get("replace")
+        condition = todo.get("condition")
+        onError = todo.get("onError")
+        repldict = todo.get("repldict", {})
+        scope = todo.get("scope")
+        optTag = todo.get("optional tag")
+        msgid = todo.get('msgid')
+        i18ncontext = todo.get("i18ncontext")
+        varname = todo.get('i18nvar')
+        i18ndata = todo.get('i18ndata')
+
+        if implied > 0:
+            if defineMacro or useMacro or defineSlot or fillSlot:
+                exc = METALError
+                what = "METAL"
+            else:
+                exc = TALError
+                what = "TAL"
+            raise exc("%s attributes on <%s> require explicit </%s>" %
+                      (what, name, name), position)
+
+        if content:
+            self.emitSubstitution(content, {})
+        if msgid is not None:
+            if (not varname) or (
+                varname and (varname[1] == I18N_CONTENT)):
+                self.emitTranslation(msgid, i18ndata)
+            self.i18nLevel -= 1
+        if optTag:
+            self.emitOptTag(name, optTag, isend)
+        elif not isend:
+            if varname:
+                self.emit('noop')
+            self.emitEndTag(name)
+        if replace:
+            self.emitSubstitution(replace, repldict)
+        elif varname:
+            assert (varname[1]
+                    in [I18N_REPLACE, I18N_CONTENT, I18N_EXPRESSION])
+            self.emitI18nVariable(varname)
+        if msgid is not None: 
+            if varname and (varname[1] <> I18N_CONTENT):
+                self.emitTranslation(msgid, i18ndata)
+        if repeat:
+            self.emitRepeat(repeat)
+        if condition:
+            self.emitCondition(condition)
+        if onError:
+            self.emitOnError(name, onError, optTag and optTag[1], isend)
+        if scope:
+            self.emit("endScope")
+        if i18ncontext:
+            self.emit("endI18nContext")
+            assert self.i18nContext.parent is not None
+            self.i18nContext = self.i18nContext.parent
+        if defineSlot:
+            self.emitDefineSlot(defineSlot)
+        if fillSlot:
+            self.emitFillSlot(fillSlot)
+        if useMacro:
+            self.emitUseMacro(useMacro)
+        if defineMacro:
+            self.emitDefineMacro(defineMacro)
+
+def _parseI18nAttributes(i18nattrs, attrlist, repldict, position,
+                         xml, source_file):
+
+    def addAttribute(dic, attr, msgid, position, xml):
+        if not xml:
+            attr = attr.lower()
+        if attr in dic:
+            raise TALError(
+                "attribute may only be specified once in i18n:attributes: "
+                + attr,
+                position)
+        dic[attr] = msgid
+
+    d = {}
+    if ';' in i18nattrs:
+        i18nattrlist = i18nattrs.split(';')
+        i18nattrlist = [attr.strip().split() 
+                        for attr in i18nattrlist if attr.strip()]
+        for parts in i18nattrlist:
+            if len(parts) > 2:
+                raise TALError("illegal i18n:attributes specification: %r"
+                                % parts, position)
+            if len(parts) == 2:
+                attr, msgid = parts
+            else:
+                attr = parts[0]
+                msgid = None
+            addAttribute(d, attr, msgid, position, xml)
+    else:
+        i18nattrlist = i18nattrs.split()
+        if len(i18nattrlist) == 1:
+            addAttribute(d, i18nattrlist[0], None, position, xml)
+        elif len(i18nattrlist) == 2:
+            staticattrs = [attr[0] for attr in attrlist if len(attr) == 2]
+            if (not i18nattrlist[1] in staticattrs) and (
+                not i18nattrlist[1] in repldict):
+                attr, msgid = i18nattrlist
+                addAttribute(d, attr, msgid, position, xml)    
+            else:
+                import warnings
+                warnings.warn(I18N_ATTRIBUTES_WARNING
+                % (source_file, str(position), i18nattrs)
+                , DeprecationWarning)
+                msgid = None
+                for attr in i18nattrlist:
+                    addAttribute(d, attr, msgid, position, xml)    
+        else:    
+            import warnings
+            warnings.warn(I18N_ATTRIBUTES_WARNING
+            % (source_file, str(position), i18nattrs)
+            , DeprecationWarning)
+            msgid = None
+            for attr in i18nattrlist:
+                addAttribute(d, attr, msgid, position, xml)    
+    return d
+
+I18N_ATTRIBUTES_WARNING = (
+    'Space separated attributes in i18n:attributes'
+    ' are deprecated (i18n:attributes="value title"). Please use'
+    ' semicolon to separate attributes'
+    ' (i18n:attributes="value; title").'
+    '\nFile %s at row, column %s\nAttributes %s')
+
+"""Interpreter for a pre-compiled TAL program.
+
+"""
+import cgi
+import sys
+import getopt
+import re
+from cgi import escape
+
+from StringIO import StringIO
+
+
+
+class ConflictError:
+    pass
+
+class MessageID:
+    pass
+
+
+
+BOOLEAN_HTML_ATTRS = [
+    "compact", "nowrap", "ismap", "declare", "noshade", "checked",
+    "disabled", "readonly", "multiple", "selected", "noresize",
+    "defer"
+]
+
+def _init():
+    d = {}
+    for s in BOOLEAN_HTML_ATTRS:
+        d[s] = 1
+    return d
+
+BOOLEAN_HTML_ATTRS = _init()
+
+_nulljoin = ''.join
+_spacejoin = ' '.join
+
+def normalize(text):
+    return _spacejoin(text.split())
+
+
+NAME_RE = r"[a-zA-Z][a-zA-Z0-9_]*"
+_interp_regex = re.compile(r'(?<!\$)(\$(?:%(n)s|{%(n)s}))' %({'n': NAME_RE}))
+_get_var_regex = re.compile(r'%(n)s' %({'n': NAME_RE}))
+
+def interpolate(text, mapping):
+    """Interpolate ${keyword} substitutions.
+
+    This is called when no translation is provided by the translation
+    service.
+    """
+    if not mapping:
+        return text
+    to_replace = _interp_regex.findall(text)
+    for string in to_replace:
+        var = _get_var_regex.findall(string)[0]
+        if mapping.has_key(var):
+            subst = ustr(mapping[var])
+            try:
+                text = text.replace(string, subst)
+            except UnicodeError:
+                subst = `subst`[1:-1]
+                text = text.replace(string, subst)
+    return text
+
+
+class AltTALGenerator(TALGenerator):
+
+    def __init__(self, repldict, expressionCompiler=None, xml=0):
+        self.repldict = repldict
+        self.enabled = 1
+        TALGenerator.__init__(self, expressionCompiler, xml)
+
+    def enable(self, enabled):
+        self.enabled = enabled
+
+    def emit(self, *args):
+        if self.enabled:
+            TALGenerator.emit(self, *args)
+
+    def emitStartElement(self, name, attrlist, taldict, metaldict, i18ndict,
+                         position=(None, None), isend=0):
+        metaldict = {}
+        taldict = {}
+        i18ndict = {}
+        if self.enabled and self.repldict:
+            taldict["attributes"] = "x x"
+        TALGenerator.emitStartElement(self, name, attrlist,
+                                      taldict, metaldict, i18ndict,
+                                      position, isend)
+
+    def replaceAttrs(self, attrlist, repldict):
+        if self.enabled and self.repldict:
+            repldict = self.repldict
+            self.repldict = None
+        return TALGenerator.replaceAttrs(self, attrlist, repldict)
+
+
+class TALInterpreter:
+
+    def __init__(self, program, macros, engine, stream=None,
+                 debug=0, wrap=60, metal=1, tal=1, showtal=-1,
+                 strictinsert=1, stackLimit=100, i18nInterpolate=1):
+        self.program = program
+        self.macros = macros
+        self.engine = engine # Execution engine (aka context)
+        self.Default = engine.getDefault()
+        self.stream = stream or sys.stdout
+        self._stream_write = self.stream.write
+        self.debug = debug
+        self.wrap = wrap
+        self.metal = metal
+        self.tal = tal
+        if tal:
+            self.dispatch = self.bytecode_handlers_tal
+        else:
+            self.dispatch = self.bytecode_handlers
+        assert showtal in (-1, 0, 1)
+        if showtal == -1:
+            showtal = (not tal)
+        self.showtal = showtal
+        self.strictinsert = strictinsert
+        self.stackLimit = stackLimit
+        self.html = 0
+        self.endsep = "/>"
+        self.endlen = len(self.endsep)
+        self.macroStack = []
+        self.position = None, None  # (lineno, offset)
+        self.col = 0
+        self.level = 0
+        self.scopeLevel = 0
+        self.sourceFile = None
+        self.i18nStack = []
+        self.i18nInterpolate = i18nInterpolate
+        self.i18nContext = TranslationContext()
+
+    def StringIO(self):
+        return FasterStringIO()
+
+    def saveState(self):
+        return (self.position, self.col, self.stream,
+                self.scopeLevel, self.level, self.i18nContext)
+
+    def restoreState(self, state):
+        (self.position, self.col, self.stream,
+         scopeLevel, level, i18n) = state
+        self._stream_write = self.stream.write
+        assert self.level == level
+        while self.scopeLevel > scopeLevel:
+            self.engine.endScope()
+            self.scopeLevel = self.scopeLevel - 1
+        self.engine.setPosition(self.position)
+        self.i18nContext = i18n
+
+    def restoreOutputState(self, state):
+        (dummy, self.col, self.stream,
+         scopeLevel, level, i18n) = state
+        self._stream_write = self.stream.write
+        assert self.level == level
+        assert self.scopeLevel == scopeLevel
+
+    def pushMacro(self, macroName, slots, entering=1):
+        if len(self.macroStack) >= self.stackLimit:
+            raise METALError("macro nesting limit (%d) exceeded "
+                             "by %s" % (self.stackLimit, `macroName`))
+        self.macroStack.append([macroName, slots, entering, self.i18nContext])
+
+    def popMacro(self):
+        return self.macroStack.pop()
+
+    def __call__(self):
+        assert self.level == 0
+        assert self.scopeLevel == 0
+        assert self.i18nContext.parent is None
+        self.interpret(self.program)
+        assert self.level == 0
+        assert self.scopeLevel == 0
+        assert self.i18nContext.parent is None
+        if self.col > 0:
+            self._stream_write("\n")
+            self.col = 0
+
+    def interpretWithStream(self, program, stream):
+        oldstream = self.stream
+        self.stream = stream
+        self._stream_write = stream.write
+        try:
+            self.interpret(program)
+        finally:
+            self.stream = oldstream
+            self._stream_write = oldstream.write
+
+    def stream_write(self, s,
+                     len=len):
+        self._stream_write(s)
+        i = s.rfind('\n')
+        if i < 0:
+            self.col = self.col + len(s)
+        else:
+            self.col = len(s) - (i + 1)
+
+    bytecode_handlers = {}
+
+    def interpret(self, program):
+        oldlevel = self.level
+        self.level = oldlevel + 1
+        handlers = self.dispatch
+        try:
+            if self.debug:
+                for (opcode, args) in program:
+                    s = "%sdo_%s(%s)\n" % ("    "*self.level, opcode,
+                                           repr(args))
+                    if len(s) > 80:
+                        s = s[:76] + "...\n"
+                    sys.stderr.write(s)
+                    handlers[opcode](self, args)
+            else:
+                for (opcode, args) in program:
+                    handlers[opcode](self, args)
+        finally:
+            self.level = oldlevel
+
+    def do_version(self, version):
+        assert version == TAL_VERSION
+    bytecode_handlers["version"] = do_version
+
+    def do_mode(self, mode):
+        assert mode in ("html", "xml")
+        self.html = (mode == "html")
+        if self.html:
+            self.endsep = " />"
+        else:
+            self.endsep = "/>"
+        self.endlen = len(self.endsep)
+    bytecode_handlers["mode"] = do_mode
+
+    def do_setSourceFile(self, source_file):
+        self.sourceFile = source_file
+        self.engine.setSourceFile(source_file)
+    bytecode_handlers["setSourceFile"] = do_setSourceFile
+
+    def do_setPosition(self, position):
+        self.position = position
+        self.engine.setPosition(position)
+    bytecode_handlers["setPosition"] = do_setPosition
+
+    def do_startEndTag(self, stuff):
+        self.do_startTag(stuff, self.endsep, self.endlen)
+    bytecode_handlers["startEndTag"] = do_startEndTag
+
+    def do_startTag(self, (name, attrList),
+                    end=">", endlen=1, _len=len):
+        self._currentTag = name
+        L = ["<", name]
+        append = L.append
+        col = self.col + _len(name) + 1
+        wrap = self.wrap
+        align = col + 1
+        if align >= wrap/2:
+            align = 4  # Avoid a narrow column far to the right
+        attrAction = self.dispatch["<attrAction>"]
+        try:
+            for item in attrList:
+                if _len(item) == 2:
+                    name, s = item
+                else:
+                    if item[2] in ('metal', 'tal', 'xmlns', 'i18n'):
+                        if not self.showtal:
+                            continue
+                        ok, name, s = self.attrAction(item)
+                    else:
+                        ok, name, s = attrAction(self, item)
+                    if not ok:
+                        continue
+                slen = _len(s)
+                if (wrap and
+                    col >= align and
+                    col + 1 + slen > wrap):
+                    append("\n")
+                    append(" "*align)
+                    col = align + slen
+                else:
+                    append(" ")
+                    col = col + 1 + slen
+                append(s)
+            append(end)
+            col = col + endlen
+        finally:
+            self._stream_write(_nulljoin(L))
+            self.col = col
+    bytecode_handlers["startTag"] = do_startTag
+
+    def attrAction(self, item):
+        name, value, action = item[:3]
+        if action == 'insert':
+            return 0, name, value
+        macs = self.macroStack
+        if action == 'metal' and self.metal and macs:
+            if len(macs) > 1 or not macs[-1][2]:
+                return 0, name, value
+            macs[-1][2] = 0
+            i = name.rfind(":") + 1
+            prefix, suffix = name[:i], name[i:]
+            if suffix == "define-macro":
+                name = prefix + "use-macro"
+                value = macs[-1][0] # Macro name
+            elif suffix == "define-slot":
+                name = prefix + "fill-slot"
+            elif suffix == "fill-slot":
+                pass
+            else:
+                return 0, name, value
+
+        if value is None:
+            value = name
+        else:
+            value = '%s="%s"' % (name, attrEscape(value))
+        return 1, name, value
+
+    def attrAction_tal(self, item):
+        name, value, action = item[:3]
+        ok = 1
+        expr, xlat, msgid = item[3:]
+        if self.html and name.lower() in BOOLEAN_HTML_ATTRS:
+            evalue = self.engine.evaluateBoolean(item[3])
+            if evalue is self.Default:
+                if action == 'insert': # Cancelled insert
+                    ok = 0
+            elif evalue:
+                value = None
+            else:
+                ok = 0
+        elif expr is not None:
+            evalue = self.engine.evaluateText(item[3])
+            if evalue is self.Default:
+                if action == 'insert': # Cancelled insert
+                    ok = 0
+            else:
+                if evalue is None:
+                    ok = 0
+                value = evalue
+        else:
+            evalue = None
+
+        if ok:
+            if xlat:
+                translated = self.translate(msgid or value, value, {})
+                if translated is not None:
+                    value = translated
+            if value is None:
+                value = name
+            elif evalue is self.Default:
+                value = attrEscape(value)
+            else:
+                value = escape(value, quote=1)
+            value = '%s="%s"' % (name, value)
+        return ok, name, value
+    bytecode_handlers["<attrAction>"] = attrAction
+
+    def no_tag(self, start, program):
+        state = self.saveState()
+        self.stream = stream = self.StringIO()
+        self._stream_write = stream.write
+        self.interpret(start)
+        self.restoreOutputState(state)
+        self.interpret(program)
+
+    def do_optTag(self, (name, cexpr, tag_ns, isend, start, program),
+                  omit=0):
+        if tag_ns and not self.showtal:
+            return self.no_tag(start, program)
+
+        self.interpret(start)
+        if not isend:
+            self.interpret(program)
+            s = '</%s>' % name
+            self._stream_write(s)
+            self.col = self.col + len(s)
+
+    def do_optTag_tal(self, stuff):
+        cexpr = stuff[1]
+        if cexpr is not None and (cexpr == '' or
+                                  self.engine.evaluateBoolean(cexpr)):
+            self.no_tag(stuff[-2], stuff[-1])
+        else:
+            self.do_optTag(stuff)
+    bytecode_handlers["optTag"] = do_optTag
+
+    def do_rawtextBeginScope(self, (s, col, position, closeprev, dict)):
+        self._stream_write(s)
+        self.col = col
+        self.position = position
+        self.engine.setPosition(position)
+        if closeprev:
+            engine = self.engine
+            engine.endScope()
+            engine.beginScope()
+        else:
+            self.engine.beginScope()
+            self.scopeLevel = self.scopeLevel + 1
+
+    def do_rawtextBeginScope_tal(self, (s, col, position, closeprev, dict)):
+        self._stream_write(s)
+        self.col = col
+        engine = self.engine
+        self.position = position
+        engine.setPosition(position)
+        if closeprev:
+            engine.endScope()
+            engine.beginScope()
+        else:
+            engine.beginScope()
+            self.scopeLevel = self.scopeLevel + 1
+        engine.setLocal("attrs", dict)
+    bytecode_handlers["rawtextBeginScope"] = do_rawtextBeginScope
+
+    def do_beginScope(self, dict):
+        self.engine.beginScope()
+        self.scopeLevel = self.scopeLevel + 1
+
+    def do_beginScope_tal(self, dict):
+        engine = self.engine
+        engine.beginScope()
+        engine.setLocal("attrs", dict)
+        self.scopeLevel = self.scopeLevel + 1
+    bytecode_handlers["beginScope"] = do_beginScope
+
+    def do_endScope(self, notused=None):
+        self.engine.endScope()
+        self.scopeLevel = self.scopeLevel - 1
+    bytecode_handlers["endScope"] = do_endScope
+
+    def do_setLocal(self, notused):
+        pass
+
+    def do_setLocal_tal(self, (name, expr)):
+        self.engine.setLocal(name, self.engine.evaluateValue(expr))
+    bytecode_handlers["setLocal"] = do_setLocal
+
+    def do_setGlobal_tal(self, (name, expr)):
+        self.engine.setGlobal(name, self.engine.evaluateValue(expr))
+    bytecode_handlers["setGlobal"] = do_setLocal
+
+    def do_beginI18nContext(self, settings):
+        get = settings.get
+        self.i18nContext = TranslationContext(self.i18nContext,
+                                              domain=get("domain"),
+                                              source=get("source"),
+                                              target=get("target"))
+    bytecode_handlers["beginI18nContext"] = do_beginI18nContext
+
+    def do_endI18nContext(self, notused=None):
+        self.i18nContext = self.i18nContext.parent
+        assert self.i18nContext is not None
+    bytecode_handlers["endI18nContext"] = do_endI18nContext
+
+    def do_insertText(self, stuff):
+        self.interpret(stuff[1])
+
+    def do_insertText_tal(self, stuff):
+        text = self.engine.evaluateText(stuff[0])
+        if text is None:
+            return
+        if text is self.Default:
+            self.interpret(stuff[1])
+            return
+        if isinstance(text, MessageID):
+            text = self.engine.translate(text.domain, text, text.mapping)
+        s = escape(text)
+        self._stream_write(s)
+        i = s.rfind('\n')
+        if i < 0:
+            self.col = self.col + len(s)
+        else:
+            self.col = len(s) - (i + 1)
+    bytecode_handlers["insertText"] = do_insertText
+    
+    def do_insertRawText_tal(self, stuff):
+        text = self.engine.evaluateText(stuff[0])
+        if text is None:
+            return
+        if text is self.Default:
+            self.interpret(stuff[1])
+            return
+        if isinstance(text, MessageID):
+            text = self.engine.translate(text.domain, text, text.mapping)
+        s = text
+        self._stream_write(s)
+        i = s.rfind('\n')
+        if i < 0:
+            self.col = self.col + len(s)
+        else:
+            self.col = len(s) - (i + 1)
+
+    def do_i18nVariable(self, stuff):
+        varname, program, expression, structure = stuff
+        if expression is None:
+            state = self.saveState()
+            try:
+                tmpstream = self.StringIO()
+                self.interpretWithStream(program, tmpstream)
+                if self.html and self._currentTag == "pre":
+                    value = tmpstream.getvalue()
+                else:
+                    value = normalize(tmpstream.getvalue())
+            finally:
+                self.restoreState(state)
+        else:
+            if structure:
+                value = self.engine.evaluateStructure(expression)
+            else:
+                value = self.engine.evaluate(expression)
+
+            if isinstance(value, MessageID):
+                value = self.engine.translate(value.domain, value,
+                                              value.mapping)
+
+            if not structure:
+                value = cgi.escape(ustr(value))
+
+        i18ndict, srepr = self.i18nStack[-1]
+        i18ndict[varname] = value
+        placeholder = '${%s}' % varname
+        srepr.append(placeholder)
+        self._stream_write(placeholder)
+    bytecode_handlers['i18nVariable'] = do_i18nVariable
+
+    def do_insertTranslation(self, stuff):
+        i18ndict = {}
+        srepr = []
+        obj = None
+        self.i18nStack.append((i18ndict, srepr))
+        msgid = stuff[0]
+        currentTag = self._currentTag
+        tmpstream = self.StringIO()
+        self.interpretWithStream(stuff[1], tmpstream)
+        default = tmpstream.getvalue()
+        if not msgid:
+            if self.html and currentTag == "pre":
+                msgid = default
+            else:
+                msgid = normalize(default)
+        self.i18nStack.pop()
+        if len(stuff) > 2:
+            obj = self.engine.evaluate(stuff[2])
+        xlated_msgid = self.translate(msgid, default, i18ndict, obj)
+        assert xlated_msgid is not None
+        self._stream_write(xlated_msgid)
+    bytecode_handlers['insertTranslation'] = do_insertTranslation
+
+    def do_insertStructure(self, stuff):
+        self.interpret(stuff[2])
+
+    def do_insertStructure_tal(self, (expr, repldict, block)):
+        structure = self.engine.evaluateStructure(expr)
+        if structure is None:
+            return
+        if structure is self.Default:
+            self.interpret(block)
+            return
+        text = ustr(structure)
+        if not (repldict or self.strictinsert):
+            self.stream_write(text)
+            return
+        if self.html:
+            self.insertHTMLStructure(text, repldict)
+        else:
+            self.insertXMLStructure(text, repldict)
+    bytecode_handlers["insertStructure"] = do_insertStructure
+
+    def insertHTMLStructure(self, text, repldict):
+        gen = AltTALGenerator(repldict, self.engine.getCompiler(), 0)
+        p = HTMLTALParser(gen) # Raises an exception if text is invalid
+        p.parseString(text)
+        program, macros = p.getCode()
+        self.interpret(program)
+
+    def insertXMLStructure(self, text, repldict):
+        gen = AltTALGenerator(repldict, self.engine.getCompiler(), 0)
+        p = TALParser(gen)
+        gen.enable(0)
+        p.parseFragment('<!DOCTYPE foo PUBLIC "foo" "bar"><foo>')
+        gen.enable(1)
+        p.parseFragment(text) # Raises an exception if text is invalid
+        gen.enable(0)
+        p.parseFragment('</foo>', 1)
+        program, macros = gen.getCode()
+        self.interpret(program)
+
+    def do_loop(self, (name, expr, block)):
+        self.interpret(block)
+
+    def do_loop_tal(self, (name, expr, block)):
+        iterator = self.engine.setRepeat(name, expr)
+        while iterator.next():
+            self.interpret(block)
+    bytecode_handlers["loop"] = do_loop
+
+    def translate(self, msgid, default, i18ndict, obj=None):
+        if obj:
+            i18ndict.update(obj)
+        if not self.i18nInterpolate:
+            return msgid
+        return self.engine.translate(self.i18nContext.domain,
+                                     msgid, i18ndict, default=default)
+
+    def do_rawtextColumn(self, (s, col)):
+        self._stream_write(s)
+        self.col = col
+    bytecode_handlers["rawtextColumn"] = do_rawtextColumn
+
+    def do_rawtextOffset(self, (s, offset)):
+        self._stream_write(s)
+        self.col = self.col + offset
+    bytecode_handlers["rawtextOffset"] = do_rawtextOffset
+
+    def do_condition(self, (condition, block)):
+        if not self.tal or self.engine.evaluateBoolean(condition):
+            self.interpret(block)
+    bytecode_handlers["condition"] = do_condition
+
+    def do_defineMacro(self, (macroName, macro)):
+        macs = self.macroStack
+        if len(macs) == 1:
+            entering = macs[-1][2]
+            if not entering:
+                macs.append(None)
+                self.interpret(macro)
+                assert macs[-1] is None
+                macs.pop()
+                return
+        self.interpret(macro)
+    bytecode_handlers["defineMacro"] = do_defineMacro
+
+    def do_useMacro(self, (macroName, macroExpr, compiledSlots, block)):
+        if not self.metal:
+            self.interpret(block)
+            return
+        macro = self.engine.evaluateMacro(macroExpr)
+        if macro is self.Default:
+            macro = block
+        else:
+            if not isCurrentVersion(macro):
+                raise METALError("macro %s has incompatible version %s" %
+                                 (`macroName`, `getProgramVersion(macro)`),
+                                 self.position)
+            mode = getProgramMode(macro)
+            #if mode != (self.html and "html" or "xml"):
+            #    raise METALError("macro %s has incompatible mode %s" %
+            #                     (`macroName`, `mode`), self.position)
+
+        self.pushMacro(macroName, compiledSlots)
+        prev_source = self.sourceFile
+        self.interpret(macro)
+        if self.sourceFile != prev_source:
+            self.engine.setSourceFile(prev_source)
+            self.sourceFile = prev_source
+        self.popMacro()
+    bytecode_handlers["useMacro"] = do_useMacro
+
+    def do_fillSlot(self, (slotName, block)):
+        self.interpret(block)
+    bytecode_handlers["fillSlot"] = do_fillSlot
+
+    def do_defineSlot(self, (slotName, block)):
+        if not self.metal:
+            self.interpret(block)
+            return
+        macs = self.macroStack
+        if macs and macs[-1] is not None:
+            macroName, slots = self.popMacro()[:2]
+            slot = slots.get(slotName)
+            if slot is not None:
+                prev_source = self.sourceFile
+                self.interpret(slot)
+                if self.sourceFile != prev_source:
+                    self.engine.setSourceFile(prev_source)
+                    self.sourceFile = prev_source
+                self.pushMacro(macroName, slots, entering=0)
+                return
+            self.pushMacro(macroName, slots)
+        self.interpret(block)
+    bytecode_handlers["defineSlot"] = do_defineSlot
+
+    def do_onError(self, (block, handler)):
+        self.interpret(block)
+
+    def do_onError_tal(self, (block, handler)):
+        state = self.saveState()
+        self.stream = stream = self.StringIO()
+        self._stream_write = stream.write
+        try:
+            self.interpret(block)
+        except ConflictError:
+            raise
+        except:
+            exc = sys.exc_info()[1]
+            self.restoreState(state)
+            engine = self.engine
+            engine.beginScope()
+            error = engine.createErrorInfo(exc, self.position)
+            engine.setLocal('error', error)
+            try:
+                self.interpret(handler)
+            finally:
+                engine.endScope()
+        else:
+            self.restoreOutputState(state)
+            self.stream_write(stream.getvalue())
+    bytecode_handlers["onError"] = do_onError
+
+    bytecode_handlers_tal = bytecode_handlers.copy()
+    bytecode_handlers_tal["rawtextBeginScope"] = do_rawtextBeginScope_tal
+    bytecode_handlers_tal["beginScope"] = do_beginScope_tal
+    bytecode_handlers_tal["setLocal"] = do_setLocal_tal
+    bytecode_handlers_tal["setGlobal"] = do_setGlobal_tal
+    bytecode_handlers_tal["insertStructure"] = do_insertStructure_tal
+    bytecode_handlers_tal["insertText"] = do_insertText_tal
+    bytecode_handlers_tal["insertRaw"] = do_insertRawText_tal
+    bytecode_handlers_tal["loop"] = do_loop_tal
+    bytecode_handlers_tal["onError"] = do_onError_tal
+    bytecode_handlers_tal["<attrAction>"] = attrAction_tal
+    bytecode_handlers_tal["optTag"] = do_optTag_tal
+
+
+class FasterStringIO(StringIO):
+    """Append-only version of StringIO.
+
+    This let's us have a much faster write() method.
+    """
+    def close(self):
+        if not self.closed:
+            self.write = _write_ValueError
+            StringIO.close(self)
+
+    def seek(self, pos, mode=0):
+        raise RuntimeError("FasterStringIO.seek() not allowed")
+
+    def write(self, s):
+        self.buflist.append(s)
+        self.len = self.pos = self.pos + len(s)
+
+
+def _write_ValueError(s):
+    raise ValueError, "I/O operation on closed file"
+"""
+Parse XML and compile to TALInterpreter intermediate code.
+"""
+
+
+class TALParser(XMLParser):
+
+    ordered_attributes = 1
+
+    def __init__(self, gen=None): # Override
+        XMLParser.__init__(self)
+        if gen is None:
+            gen = TALGenerator()
+        self.gen = gen
+        self.nsStack = []
+        self.nsDict = {XML_NS: 'xml'}
+        self.nsNew = []
+
+    def getCode(self):
+        return self.gen.getCode()
+
+    def getWarnings(self):
+        return ()
+
+    def StartNamespaceDeclHandler(self, prefix, uri):
+        self.nsStack.append(self.nsDict.copy())
+        self.nsDict[uri] = prefix
+        self.nsNew.append((prefix, uri))
+
+    def EndNamespaceDeclHandler(self, prefix):
+        self.nsDict = self.nsStack.pop()
+
+    def StartElementHandler(self, name, attrs):
+        if self.ordered_attributes:
+            attrlist = []
+            for i in range(0, len(attrs), 2):
+                key = attrs[i]
+                value = attrs[i+1]
+                attrlist.append((key, value))
+        else:
+            attrlist = attrs.items()
+            attrlist.sort() # For definiteness
+        name, attrlist, taldict, metaldict, i18ndict \
+              = self.process_ns(name, attrlist)
+        attrlist = self.xmlnsattrs() + attrlist
+        self.gen.emitStartElement(name, attrlist, taldict, metaldict, i18ndict)
+
+    def process_ns(self, name, attrlist):
+        taldict = {}
+        metaldict = {}
+        i18ndict = {}
+        fixedattrlist = []
+        name, namebase, namens = self.fixname(name)
+        for key, value in attrlist:
+            key, keybase, keyns = self.fixname(key)
+            ns = keyns or namens # default to tag namespace
+            item = key, value
+            if ns == 'metal':
+                metaldict[keybase] = value
+                item = item + ("metal",)
+            elif ns == 'tal':
+                taldict[keybase] = value
+                item = item + ("tal",)
+            elif ns == 'i18n':
+                i18ndict[keybase] = value
+                item = item + ('i18n',)
+            fixedattrlist.append(item)
+        if namens in ('metal', 'tal', 'i18n'):
+            taldict['tal tag'] = namens
+        return name, fixedattrlist, taldict, metaldict, i18ndict
+
+    def xmlnsattrs(self):
+        newlist = []
+        for prefix, uri in self.nsNew:
+            if prefix:
+                key = "xmlns:" + prefix
+            else:
+                key = "xmlns"
+            if uri in (ZOPE_METAL_NS, ZOPE_TAL_NS, ZOPE_I18N_NS):
+                item = (key, uri, "xmlns")
+            else:
+                item = (key, uri)
+            newlist.append(item)
+        self.nsNew = []
+        return newlist
+
+    def fixname(self, name):
+        if ' ' in name:
+            uri, name = name.split(' ')
+            prefix = self.nsDict[uri]
+            prefixed = name
+            if prefix:
+                prefixed = "%s:%s" % (prefix, name)
+            ns = 'x'
+            if uri == ZOPE_TAL_NS:
+                ns = 'tal'
+            elif uri == ZOPE_METAL_NS:
+                ns = 'metal'
+            elif uri == ZOPE_I18N_NS:
+                ns = 'i18n'
+            return (prefixed, name, ns)
+        return (name, name, None)
+
+    def EndElementHandler(self, name):
+        name = self.fixname(name)[0]
+        self.gen.emitEndElement(name)
+
+    def DefaultHandler(self, text):
+        self.gen.emitRawText(text)
+
+"""Translation context object for the TALInterpreter's I18N support.
+
+The translation context provides a container for the information
+needed to perform translation of a marked string from a page template.
+
+"""
+
+DEFAULT_DOMAIN = "default"
+
+class TranslationContext:
+    """Information about the I18N settings of a TAL processor."""
+
+    def __init__(self, parent=None, domain=None, target=None, source=None):
+        if parent:
+            if not domain:
+                domain = parent.domain
+            if not target:
+                target = parent.target
+            if not source:
+                source = parent.source
+        elif domain is None:
+            domain = DEFAULT_DOMAIN
+
+        self.parent = parent
+        self.domain = domain
+        self.target = target
+        self.source = source
+"""
+Dummy TALES engine so that I can test out the TAL implementation.
+"""
+
+import re
+import sys
+import stat
+import os
+import traceback
+
+class _Default:
+    pass
+Default = _Default()
+
+name_match = re.compile(r"(?s)(%s):(.*)\Z" % NAME_RE).match
+
+class CompilerError(Exception):
+    pass
+
+class AthanaTALEngine:
+
+    position = None
+    source_file = None
+
+    __implements__ = ITALESCompiler, ITALESEngine
+
+    def __init__(self, macros=None, context=None, webcontext=None, language=None, request=None):
+        if macros is None:
+            macros = {}
+        self.macros = macros
+        dict = {'nothing': None, 'default': Default}
+        if context is not None:
+            dict.update(context)
+
+        self.locals = self.globals = dict
+        self.stack = [dict]
+        self.webcontext = webcontext
+        self.language = language
+        self.request = request
+
+    def compilefile(self, file, mode=None):
+        assert mode in ("html", "xml", None)
+        #file =  join_paths(GLOBAL_ROOT_DIR,join_paths(self.webcontext.root, file))
+        if mode is None:
+            ext = os.path.splitext(file)[1]
+            if ext.lower() in (".html", ".htm"):
+                mode = "html"
+            else:
+                mode = "xml"
+        if mode == "html":
+            p = HTMLTALParser(TALGenerator(self))
+        else:
+            p = TALParser(TALGenerator(self))
+        p.parseFile(file)
+        return p.getCode()
+
+    def getCompilerError(self):
+        return CompilerError
+
+    def getCompiler(self):
+        return self
+
+    def setSourceFile(self, source_file):
+        self.source_file = source_file
+
+    def setPosition(self, position):
+        self.position = position
+
+    def compile(self, expr):
+        return "$%s$" % expr
+
+    def uncompile(self, expression):
+        assert (expression.startswith("$") and expression.endswith("$"),
+            expression)
+        return expression[1:-1]
+
+    def beginScope(self):
+        self.stack.append(self.locals)
+
+    def endScope(self):
+        assert len(self.stack) > 1, "more endScope() than beginScope() calls"
+        self.locals = self.stack.pop()
+
+    def setLocal(self, name, value):
+        if self.locals is self.stack[-1]:
+            self.locals = self.locals.copy()
+        self.locals[name] = value
+
+    def setGlobal(self, name, value):
+        self.globals[name] = value
+
+    def evaluate(self, expression):
+        assert (expression.startswith("$") and expression.endswith("$"),
+            expression)
+        expression = expression[1:-1]
+        m = name_match(expression)
+        if m:
+            type, expr = m.group(1, 2)
+        else:
+            type = "path"
+            expr = expression
+        if type in ("string", "str"):
+            return expr
+        if type in ("path", "var", "global", "local"):
+            return self.evaluatePathOrVar(expr)
+        if type == "not":
+            return not self.evaluate(expr)
+        if type == "exists":
+            return self.locals.has_key(expr) or self.globals.has_key(expr)
+        if type == "python":
+            try:
+                return eval(expr, self.globals, self.locals)
+            except:
+                print "Error in python expression"
+                print sys.exc_info()[0], sys.exc_info()[1]
+                traceback.print_tb(sys.exc_info()[2])
+                raise TALESError("evaluation error in %s" % `expr`)
+
+        if type == "position":
+            if self.position:
+                lineno, offset = self.position
+            else:
+                lineno, offset = None, None
+            return '%s (%s,%s)' % (self.source_file, lineno, offset)
+        raise TALESError("unrecognized expression: " + `expression`)
+
+    def evaluatePathOrVar(self, expr):
+        expr = expr.strip()
+        _expr=expr
+        _f=None
+        if expr.rfind("/")>0:
+            pos=expr.rfind("/")
+            _expr = expr[0:pos]
+            _f = expr[pos+1:]
+        if self.locals.has_key(_expr):
+            if _f:
+                return getattr(self.locals[_expr],_f)
+            else:
+                return self.locals[_expr]
+        elif self.globals.has_key(_expr):
+            if _f:
+                return getattr(self.globals[_expr], _f)
+            else:
+                return self.globals[_expr]
+        else:
+            raise TALESError("unknown variable: %s" % `_expr`)
+
+    def evaluateValue(self, expr):
+        return self.evaluate(expr)
+
+    def evaluateBoolean(self, expr):
+        return self.evaluate(expr)
+
+    def evaluateText(self, expr):
+        text = self.evaluate(expr)
+        if text is not None and text is not Default:
+            text = ustr(text)
+        return text
+
+    def evaluateStructure(self, expr):
+        return self.evaluate(expr)
+
+    def evaluateSequence(self, expr):
+        return self.evaluate(expr)
+
+    def evaluateMacro(self, macroName):
+        assert (macroName.startswith("$") and macroName.endswith("$"),
+            macroName)
+        macroName = macroName[1:-1]
+        file, localName = self.findMacroFile(macroName)
+        if not file:
+            macro = self.macros[localName]
+        else:
+            program, macros = self.compilefile(file)
+            macro = macros.get(localName)
+            if not macro:
+                raise TALESError("macro %s not found in file %s" %
+                                 (localName, file))
+        return macro
+
+    def findMacroDocument(self, macroName):
+        file, localName = self.findMacroFile(macroName)
+        if not file:
+            return file, localName
+        doc = parsefile(file)
+        return doc, localName
+
+    def findMacroFile(self, macroName):
+        if not macroName:
+            raise TALESError("empty macro name")
+        i = macroName.rfind('/')
+        if i < 0:
+            print "NO Macro"
+            return None, macroName
+        else:
+            fileName = getMacroFile(macroName[:i])
+            localName = macroName[i+1:]
+            return fileName, localName
+
+    def setRepeat(self, name, expr):
+        seq = self.evaluateSequence(expr)
+        self.locals[name] = Iterator(name, seq, self)
+        return self.locals[name]
+
+    def createErrorInfo(self, err, position):
+        return ErrorInfo(err, position)
+
+    def getDefault(self):
+        return Default
+
+    def translate(self, domain, msgid, mapping, default=None):
+        global translators
+        text = default or msgid
+        for f in translators:
+            text = f(msgid, language=self.language, request=self.request)
+            try:
+                text = f(msgid, language=self.language, request=self.request)
+                if text and text!=msgid:
+                    break
+            except: 
+                pass
+        def repl(m, mapping=mapping):
+            return ustr(mapping[m.group(m.lastindex).lower()])
+        return VARIABLE.sub(repl, text)
+
+
+class Iterator:
+   
+    def __init__(self, name, seq, engine):
+        self.name = name
+        self.seq = seq
+        self.engine = engine
+        self.nextIndex = 0
+
+    def next(self):
+        self.index = i = self.nextIndex
+        try:
+            item = self.seq[i]
+        except IndexError:
+            return 0
+        self.nextIndex = i+1
+        self.engine.setLocal(self.name, item)
+        return 1
+
+    def even(self):
+        print "-even-"
+        return not self.index % 2
+
+    def odd(self):
+        print "-odd-"
+        return self.index % 2
+
+    def number(self):
+        return self.nextIndex
+
+    def parity(self):
+        if self.index % 2:
+            return 'odd'
+        return 'even'
+
+    def first(self, name=None):
+        if self.start: return 1
+        return not self.same_part(name, self._last, self.item)
+
+    def last(self, name=None):
+        if self.end: return 1
+        return not self.same_part(name, self.item, self._next)
+
+    def length(self):
+        return len(self.seq)
+    
+
+VARIABLE = re.compile(r'\$(?:(%s)|\{(%s)\})' % (NAME_RE, NAME_RE))
+
+parsed_files = {}
+parsed_strings = {}
+
+def runTAL(writer, context=None, string=None, file=None, macro=None, language=None, request=None):
+
+    if file:
+        file = getMacroFile(file)
+
+    if context is None:
+        context = {}
+
+    if string and not file:
+        if string in parsed_strings:
+            program,macros = parsed_strings[string]
+        else:
+            program,macros = None,None
+    elif file and not string:
+        if file in parsed_files:
+            (program,macros,mtime) = parsed_files[file]
+            mtime_file = os.stat(file)[stat.ST_MTIME]
+            if mtime != mtime_file:
+                program,macros = None,None
+                mtime = mtime_file
+        else:
+            program,macros,mtime = None,None,None
+   
+    if not (program and macros):
+        if file and file.endswith("xml"):
+            talparser = TALParser(TALGenerator(AthanaTALEngine()))
+        else:
+            talparser = HTMLTALParser(TALGenerator(AthanaTALEngine()))
+        if string:
+            talparser.parseString(string)
+            (program, macros) = talparser.getCode()
+            parsed_strings[string] = (program,macros)
+        else:
+            talparser.parseFile(file)
+            (program, macros) = talparser.getCode()
+            parsed_files[file] = (program,macros,mtime)
+
+    if macro and macro in macros:
+        program = macros[macro]
+    engine = AthanaTALEngine(macros, context, language=language, request=request)
+    TALInterpreter(program, macros, engine, writer, wrap=0)()
+
+def processTAL(context=None, string=None, file=None, macro=None, language=None, request=None):
+    class STRWriter:
+        def __init__(self):
+            self.string = ""
+        def write(self,text):
+            if type(text) == type(u''):
+                self.string += text.encode("utf-8")
+            else:
+                self.string += text
+        def getvalue(self):
+            return self.string
+    wr = STRWriter()
+    runTAL(wr, context, string=string, file=file, macro=macro, language=language, request=request)
+    return wr.getvalue()
+
+
+class MyWriter:
+    def write(self,s):
+        sys.stdout.write(s)
+
+def test():
+    p = TALParser(TALGenerator(AthanaTALEngine()))
+    file = "test.xml"
+    if sys.argv[1:]:
+        file = sys.argv[1]
+    p.parseFile(file)
+    program, macros = p.getCode()
+
+    class Node:
+        def getText(self):
+            return "TEST"
+
+    engine = AthanaTALEngine(macros, {'node': Node()})
+    TALInterpreter(program, macros, engine, MyWriter(), wrap=0)()
+
+
+def ustr(v):
+    """Convert any object to a plain string or unicode string,
+    minimising the chance of raising a UnicodeError. This
+    even works with uncooperative objects like Exceptions
+    """
+    if type(v) == type(""): #isinstance(v, basestring):
+        return v
+    else:
+        fn = getattr(v,'__str__',None)
+        if fn is not None:
+            v = fn()
+            if isinstance(v, basestring):
+                return v
+            else:
+                raise ValueError('__str__ returned wrong type')
+        return str(v)
+
+
+# ================ MEDUSA ===============
+
+# python modules
+import os
+import re
+import select
+import socket
+import string
+import sys
+import time
+import stat
+import string
+import mimetypes
+import glob
+from cgi import escape
+from urllib import unquote, splitquery
+
+# async modules
+import asyncore
+import socket
+
+class async_chat (asyncore.dispatcher):
+    """This is an abstract class.  You must derive from this class, and add
+    the two methods collect_incoming_data() and found_terminator()"""
+
+    # these are overridable defaults
+
+    ac_in_buffer_size       = 4096
+    ac_out_buffer_size      = 4096
+
+    def __init__ (self, conn=None):
+        self.ac_in_buffer = ''
+        self.ac_out_buffer = ''
+        self.producer_fifo = fifo()
+        asyncore.dispatcher.__init__ (self, conn)
+
+    def collect_incoming_data(self, data):
+        raise NotImplementedError, "must be implemented in subclass"
+
+    def found_terminator(self):
+        raise NotImplementedError, "must be implemented in subclass"
+
+    def set_terminator (self, term):
+        "Set the input delimiter.  Can be a fixed string of any length, an integer, or None"
+        self.terminator = term
+
+    def get_terminator (self):
+        return self.terminator
+
+    # grab some more data from the socket,
+    # throw it to the collector method,
+    # check for the terminator,
+    # if found, transition to the next state.
+
+    def handle_read (self):
+
+        try:
+            data = self.recv (self.ac_in_buffer_size)
+        except socket.error, why:
+            self.handle_error()
+            return
+
+        self.ac_in_buffer = self.ac_in_buffer + data
+
+        # Continue to search for self.terminator in self.ac_in_buffer,
+        # while calling self.collect_incoming_data.  The while loop
+        # is necessary because we might read several data+terminator
+        # combos with a single recv(1024).
+
+        while self.ac_in_buffer:
+            lb = len(self.ac_in_buffer)
+            terminator = self.get_terminator()
+            if terminator is None or terminator == '':
+                # no terminator, collect it all
+                self.collect_incoming_data (self.ac_in_buffer)
+                self.ac_in_buffer = ''
+            elif isinstance(terminator, int):
+                # numeric terminator
+                n = terminator
+                if lb < n:
+                    self.collect_incoming_data (self.ac_in_buffer)
+                    self.ac_in_buffer = ''
+                    self.terminator = self.terminator - lb
+                else:
+                    self.collect_incoming_data (self.ac_in_buffer[:n])
+                    self.ac_in_buffer = self.ac_in_buffer[n:]
+                    self.terminator = 0
+                    self.found_terminator()
+            else:
+                # 3 cases:
+                # 1) end of buffer matches terminator exactly:
+                #    collect data, transition
+                # 2) end of buffer matches some prefix:
+                #    collect data to the prefix
+                # 3) end of buffer does not match any prefix:
+                #    collect data
+                terminator_len = len(terminator)
+                index = self.ac_in_buffer.find(terminator)
+                if index != -1:
+                    # we found the terminator
+                    if index > 0:
+                        # don't bother reporting the empty string (source of subtle bugs)
+                        self.collect_incoming_data (self.ac_in_buffer[:index])
+                    self.ac_in_buffer = self.ac_in_buffer[index+terminator_len:]
+                    # This does the Right Thing if the terminator is changed here.
+                    self.found_terminator()
+                else:
+                    # check for a prefix of the terminator
+                    index = find_prefix_at_end (self.ac_in_buffer, terminator)
+                    if index:
+                        if index != lb:
+                            # we found a prefix, collect up to the prefix
+                            self.collect_incoming_data (self.ac_in_buffer[:-index])
+                            self.ac_in_buffer = self.ac_in_buffer[-index:]
+                        break
+                    else:
+                        # no prefix, collect it all
+                        self.collect_incoming_data (self.ac_in_buffer)
+                        self.ac_in_buffer = ''
+
+    def handle_write (self):
+        self.initiate_send ()
+
+    def handle_close (self):
+        self.close()
+
+    def push (self, data):
+        self.producer_fifo.push (simple_producer (data))
+        self.initiate_send()
+
+    def push_with_producer (self, producer):
+        self.producer_fifo.push (producer)
+        self.initiate_send()
+
+    def readable (self):
+        "predicate for inclusion in the readable for select()"
+        return (len(self.ac_in_buffer) <= self.ac_in_buffer_size)
+
+    def writable (self):
+        "predicate for inclusion in the writable for select()"
+        # return len(self.ac_out_buffer) or len(self.producer_fifo) or (not self.connected)
+        # this is about twice as fast, though not as clear.
+        return not (
+                (self.ac_out_buffer == '') and
+                self.producer_fifo.is_empty() and
+                self.connected
+                )
+
+    def close_when_done (self):
+        "automatically close this channel once the outgoing queue is empty"
+        self.producer_fifo.push (None)
+
+    # refill the outgoing buffer by calling the more() method
+    # of the first producer in the queue
+    def refill_buffer (self):
+        while 1:
+            if len(self.producer_fifo):
+                p = self.producer_fifo.first()
+                # a 'None' in the producer fifo is a sentinel,
+                # telling us to close the channel.
+                if p is None:
+                    if not self.ac_out_buffer:
+                        self.producer_fifo.pop()
+                        self.close()
+                    return
+                elif isinstance(p, str):
+                    self.producer_fifo.pop()
+                    self.ac_out_buffer = self.ac_out_buffer + p
+                    return
+                data = p.more()
+                if data:
+                    self.ac_out_buffer = self.ac_out_buffer + data
+                    return
+                else:
+                    self.producer_fifo.pop()
+            else:
+                return
+
+    def initiate_send (self):
+        obs = self.ac_out_buffer_size
+        # try to refill the buffer
+        if (len (self.ac_out_buffer) < obs):
+            self.refill_buffer()
+
+        if self.ac_out_buffer and self.connected:
+            # try to send the buffer
+            try:
+                num_sent = self.send (self.ac_out_buffer[:obs])
+                if num_sent:
+                    self.ac_out_buffer = self.ac_out_buffer[num_sent:]
+
+            except socket.error, why:
+                self.handle_error()
+                return
+
+    def discard_buffers (self):
+        # Emergencies only!
+        self.ac_in_buffer = ''
+        self.ac_out_buffer = ''
+        while self.producer_fifo:
+            self.producer_fifo.pop()
+
+
+class simple_producer:
+
+    def __init__ (self, data, buffer_size=512):
+        self.data = data
+        self.buffer_size = buffer_size
+
+    def more (self):
+        if len (self.data) > self.buffer_size:
+            result = self.data[:self.buffer_size]
+            self.data = self.data[self.buffer_size:]
+            return result
+        else:
+            result = self.data
+            self.data = ''
+            return result
+
+class fifo:
+    def __init__ (self, list=None):
+        if not list:
+            self.list = []
+        else:
+            self.list = list
+
+    def __len__ (self):
+        return len(self.list)
+
+    def is_empty (self):
+        return self.list == []
+
+    def first (self):
+        return self.list[0]
+
+    def push (self, data):
+        self.list.append (data)
+
+    def pop (self):
+        if self.list:
+            return (1, self.list.pop(0))
+        else:
+            return (0, None)
+
+# Given 'haystack', see if any prefix of 'needle' is at its end.  This
+# assumes an exact match has already been checked.  Return the number of
+# characters matched.
+# for example:
+# f_p_a_e ("qwerty\r", "\r\n") => 1
+# f_p_a_e ("qwertydkjf", "\r\n") => 0
+# f_p_a_e ("qwerty\r\n", "\r\n") => <undefined>
+
+# this could maybe be made faster with a computed regex?
+# [answer: no; circa Python-2.0, Jan 2001]
+# new python:   28961/s
+# old python:   18307/s
+# re:        12820/s
+# regex:     14035/s
+
+def find_prefix_at_end (haystack, needle):
+    l = len(needle) - 1
+    while l and not haystack.endswith(needle[:l]):
+        l -= 1
+    return l
+
+class counter:
+    "general-purpose counter"
+
+    def __init__ (self, initial_value=0):
+        self.value = initial_value
+
+    def increment (self, delta=1):
+        result = self.value
+        try:
+            self.value = self.value + delta
+        except OverflowError:
+            self.value = long(self.value) + delta
+        return result
+
+    def decrement (self, delta=1):
+        result = self.value
+        try:
+            self.value = self.value - delta
+        except OverflowError:
+            self.value = long(self.value) - delta
+        return result
+
+    def as_long (self):
+        return long(self.value)
+
+    def __nonzero__ (self):
+        return self.value != 0
+
+    def __repr__ (self):
+        return '<counter value=%s at %x>' % (self.value, id(self))
+
+    def __str__ (self):
+        s = str(long(self.value))
+        if s[-1:] == 'L':
+            s = s[:-1]
+        return s
+
+
+# http_date
+def concat (*args):
+    return ''.join (args)
+
+def join (seq, field=' '):
+    return field.join (seq)
+
+def group (s):
+    return '(' + s + ')'
+
+short_days = ['sun','mon','tue','wed','thu','fri','sat']
+long_days = ['sunday','monday','tuesday','wednesday','thursday','friday','saturday']
+
+short_day_reg = group (join (short_days, '|'))
+long_day_reg = group (join (long_days, '|'))
+
+daymap = {}
+for i in range(7):
+    daymap[short_days[i]] = i
+    daymap[long_days[i]] = i
+
+hms_reg = join (3 * [group('[0-9][0-9]')], ':')
+
+months = ['jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec']
+
+monmap = {}
+for i in range(12):
+    monmap[months[i]] = i+1
+
+months_reg = group (join (months, '|'))
+
+# From draft-ietf-http-v11-spec-07.txt/3.3.1
+#       Sun, 06 Nov 1994 08:49:37 GMT  ; RFC 822, updated by RFC 1123
+#       Sunday, 06-Nov-94 08:49:37 GMT ; RFC 850, obsoleted by RFC 1036
+#       Sun Nov  6 08:49:37 1994       ; ANSI C's asctime() format
+
+# rfc822 format
+rfc822_date = join (
+        [concat (short_day_reg,','),    # day
+         group('[0-9][0-9]?'),                  # date
+         months_reg,                                    # month
+         group('[0-9]+'),                               # year
+         hms_reg,                                               # hour minute second
+         'gmt'
+         ],
+        ' '
+        )
+
+rfc822_reg = re.compile (rfc822_date)
+
+def unpack_rfc822 (m):
+    g = m.group
+    a = string.atoi
+    return (
+            a(g(4)),                # year
+            monmap[g(3)],   # month
+            a(g(2)),                # day
+            a(g(5)),                # hour
+            a(g(6)),                # minute
+            a(g(7)),                # second
+            0,
+            0,
+            0
+            )
+
+# rfc850 format
+rfc850_date = join (
+        [concat (long_day_reg,','),
+         join (
+                 [group ('[0-9][0-9]?'),
+                  months_reg,
+                  group ('[0-9]+')
+                  ],
+                 '-'
+                 ),
+         hms_reg,
+         'gmt'
+         ],
+        ' '
+        )
+
+rfc850_reg = re.compile (rfc850_date)
+# they actually unpack the same way
+def unpack_rfc850 (m):
+    g = m.group
+    a = string.atoi
+    return (
+            a(g(4)),                # year
+            monmap[g(3)],   # month
+            a(g(2)),                # day
+            a(g(5)),                # hour
+            a(g(6)),                # minute
+            a(g(7)),                # second
+            0,
+            0,
+            0
+            )
+
+# parsdate.parsedate    - ~700/sec.
+# parse_http_date       - ~1333/sec.
+
+def build_http_date (when):
+    return time.strftime ('%a, %d %b %Y %H:%M:%S GMT', time.gmtime(when))
+
+time_offset = 0
+
+def parse_http_date (d):
+    global time_offset
+    d = string.lower (d)
+    tz = time.timezone
+    m = rfc850_reg.match (d)
+    if m and m.end() == len(d):
+        retval = int (time.mktime (unpack_rfc850(m)) - tz)
+    else:
+        m = rfc822_reg.match (d)
+        if m and m.end() == len(d):
+            try:
+                retval = int (time.mktime (unpack_rfc822(m)) - tz)
+            except OverflowError:
+                return 0
+        else:
+            return 0
+    # Thanks to Craig Silverstein <csilvers@google.com> for pointing
+    # out the DST discrepancy
+    if time.daylight and time.localtime(retval)[-1] == 1: # DST correction
+        retval = retval + (tz - time.altzone)
+    return retval - time_offset
+
+def check_date():
+    global time_offset
+    tmpfile = join_paths(GLOBAL_TEMP_DIR, "datetest"+str(random.random())+".tmp")
+    open(tmpfile,"wb").close()
+    time1 = os.stat(tmpfile)[stat.ST_MTIME]
+    os.unlink(tmpfile)
+    time2 = parse_http_date(build_http_date(time.time()))
+    time_offset = time2-time1
+    print time_offset
+
+# producers
+
+class simple_producer:
+    "producer for a string"
+    def __init__ (self, data, buffer_size=1024):
+        self.data = data
+        self.buffer_size = buffer_size
+
+    def more (self):
+        if len (self.data) > self.buffer_size:
+            result = self.data[:self.buffer_size]
+            self.data = self.data[self.buffer_size:]
+            return result
+        else:
+            result = self.data
+            self.data = ''
+            return result
+
+class file_producer:
+    "producer wrapper for file[-like] objects"
+
+    # match http_channel's outgoing buffer size
+    out_buffer_size = 1<<16
+
+    def __init__ (self, file):
+        self.done = 0
+        self.file = file
+
+    def more (self):
+        if self.done:
+            return ''
+        else:
+            data = self.file.read (self.out_buffer_size)
+            if not data:
+                self.file.close()
+                del self.file
+                self.done = 1
+                return ''
+            else:
+                return data
+
+# A simple output producer.  This one does not [yet] have
+# the safety feature builtin to the monitor channel:  runaway
+# output will not be caught.
+
+# don't try to print from within any of the methods
+# of this object.
+
+class output_producer:
+    "Acts like an output file; suitable for capturing sys.stdout"
+    def __init__ (self):
+        self.data = ''
+
+    def write (self, data):
+        lines = string.splitfields (data, '\n')
+        data = string.join (lines, '\r\n')
+        self.data = self.data + data
+
+    def writeline (self, line):
+        self.data = self.data + line + '\r\n'
+
+    def writelines (self, lines):
+        self.data = self.data + string.joinfields (
+                lines,
+                '\r\n'
+                ) + '\r\n'
+
+    def flush (self):
+        pass
+
+    def softspace (self, *args):
+        pass
+
+    def more (self):
+        if self.data:
+            result = self.data[:512]
+            self.data = self.data[512:]
+            return result
+        else:
+            return ''
+
+class composite_producer:
+    "combine a fifo of producers into one"
+    def __init__ (self, producers):
+        self.producers = producers
+
+    def more (self):
+        while len(self.producers):
+            p = self.producers[0]
+            d = p.more()
+            if d:
+                return d
+            else:
+                self.producers.pop(0)
+        else:
+            return ''
+
+
+class globbing_producer:
+    """
+    'glob' the output from a producer into a particular buffer size.
+    helps reduce the number of calls to send().  [this appears to
+    gain about 30% performance on requests to a single channel]
+    """
+
+    def __init__ (self, producer, buffer_size=1<<16):
+        self.producer = producer
+        self.buffer = ''
+        self.buffer_size = buffer_size
+
+    def more (self):
+        while len(self.buffer) < self.buffer_size:
+            data = self.producer.more()
+            if data:
+                self.buffer = self.buffer + data
+            else:
+                break
+        r = self.buffer
+        self.buffer = ''
+        return r
+
+
+class hooked_producer:
+    """
+    A producer that will call <function> when it empties,.
+    with an argument of the number of bytes produced.  Useful
+    for logging/instrumentation purposes.
+    """
+
+    def __init__ (self, producer, function):
+        self.producer = producer
+        self.function = function
+        self.bytes = 0
+
+    def more (self):
+        if self.producer:
+            result = self.producer.more()
+            if not result:
+                self.producer = None
+                self.function (self.bytes)
+            else:
+                self.bytes = self.bytes + len(result)
+            return result
+        else:
+            return ''
+
+# HTTP 1.1 emphasizes that an advertised Content-Length header MUST be
+# correct.  In the face of Strange Files, it is conceivable that
+# reading a 'file' may produce an amount of data not matching that
+# reported by os.stat() [text/binary mode issues, perhaps the file is
+# being appended to, etc..]  This makes the chunked encoding a True
+# Blessing, and it really ought to be used even with normal files.
+# How beautifully it blends with the concept of the producer.
+
+class chunked_producer:
+    """A producer that implements the 'chunked' transfer coding for HTTP/1.1.
+    Here is a sample usage:
+            request['Transfer-Encoding'] = 'chunked'
+            request.push (
+                    producers.chunked_producer (your_producer)
+                    )
+            request.done()
+    """
+
+    def __init__ (self, producer, footers=None):
+        self.producer = producer
+        self.footers = footers
+
+    def more (self):
+        if self.producer:
+            data = self.producer.more()
+            if data:
+                return '%x\r\n%s\r\n' % (len(data), data)
+            else:
+                self.producer = None
+                if self.footers:
+                    return string.join (
+                            ['0'] + self.footers,
+                            '\r\n'
+                            ) + '\r\n\r\n'
+                else:
+                    return '0\r\n\r\n'
+        else:
+            return ''
+
+class escaping_producer:
+
+    "A producer that escapes a sequence of characters"
+    " Common usage: escaping the CRLF.CRLF sequence in SMTP, NNTP, etc..."
+
+    def __init__ (self, producer, esc_from='\r\n.', esc_to='\r\n..'):
+        self.producer = producer
+        self.esc_from = esc_from
+        self.esc_to = esc_to
+        self.buffer = ''
+        self.find_prefix_at_end = find_prefix_at_end
+
+    def more (self):
+        esc_from = self.esc_from
+        esc_to   = self.esc_to
+
+        buffer = self.buffer + self.producer.more()
+
+        if buffer:
+            buffer = string.replace (buffer, esc_from, esc_to)
+            i = self.find_prefix_at_end (buffer, esc_from)
+            if i:
+                # we found a prefix
+                self.buffer = buffer[-i:]
+                return buffer[:-i]
+            else:
+                # no prefix, return it all
+                self.buffer = ''
+                return buffer
+        else:
+            return buffer
+
+class tail_logger:
+    "Keep track of the last <size> log messages"
+    def __init__ (self, logger, size=500):
+        self.size = size
+        self.logger = logger
+        self.messages = []
+
+    def log (self, message):
+        self.messages.append (strip_eol (message))
+        if len (self.messages) > self.size:
+            del self.messages[0]
+        self.logger.log (message)
+
+
+def html_repr (object):
+    so = escape (repr (object))
+    if hasattr (object, 'hyper_respond'):
+        return '<a href="/status/object/%d/">%s</a>' % (id (object), so)
+    else:
+        return so
+
+def html_reprs (list, front='', back=''):
+    reprs = map (
+            lambda x,f=front,b=back: '%s%s%s' % (f,x,b),
+            map (lambda x: escape (html_repr(x)), list)
+            )
+    reprs.sort()
+    return reprs
+
+# for example, tera, giga, mega, kilo
+# p_d (n, (1024, 1024, 1024, 1024))
+# smallest divider goes first - for example
+# minutes, hours, days
+# p_d (n, (60, 60, 24))
+
+def progressive_divide (n, parts):
+    result = []
+    for part in parts:
+        n, rem = divmod (n, part)
+        result.append (rem)
+    result.append (n)
+    return result
+
+# b,k,m,g,t
+def split_by_units (n, units, dividers, format_string):
+    divs = progressive_divide (n, dividers)
+    result = []
+    for i in range(len(units)):
+        if divs[i]:
+            result.append (format_string % (divs[i], units[i]))
+    result.reverse()
+    if not result:
+        return [format_string % (0, units[0])]
+    else:
+        return result
+
+def english_bytes (n):
+    return split_by_units (
+            n,
+            ('','K','M','G','T'),
+            (1024, 1024, 1024, 1024, 1024),
+            '%d %sB'
+            )
+
+def english_time (n):
+    return split_by_units (
+            n,
+            ('secs', 'mins', 'hours', 'days', 'weeks', 'years'),
+            (         60,     60,      24,     7,       52),
+            '%d %s'
+            )
+
+class file_logger:
+
+    # pass this either a path or a file object.
+    def __init__ (self, file, flush=1, mode='a'):
+        if type(file) == type(''):
+            if (file == '-'):
+                self.file = sys.stdout
+            else:
+                self.file = open (file, mode)
+        else:
+            self.file = file
+        self.do_flush = flush
+
+    def __repr__ (self):
+        return '<file logger: %s>' % self.file
+
+    def write (self, data):
+        self.file.write (data)
+        self.maybe_flush()
+
+    def writeline (self, line):
+        self.file.writeline (line)
+        self.maybe_flush()
+
+    def writelines (self, lines):
+        self.file.writelines (lines)
+        self.maybe_flush()
+
+    def maybe_flush (self):
+        if self.do_flush:
+            self.file.flush()
+
+    def flush (self):
+        self.file.flush()
+
+    def softspace (self, *args):
+        pass
+
+    def log (self, message):
+        if message[-1] not in ('\r', '\n'):
+            self.write (message + '\n')
+        else:
+            self.write (message)
+
+    def debug(self, message):
+        self.log(message)
+
+class unresolving_logger:
+    "Just in case you don't want to resolve"
+    def __init__ (self, logger):
+        self.logger = logger
+
+    def log (self, ip, message):
+        self.logger.log ('%s:%s' % (ip, message))
+
+
+def strip_eol (line):
+    while line and line[-1] in '\r\n':
+        line = line[:-1]
+    return line
+
+VERSION_STRING = string.split(RCS_ID)[2]
+ATHANA_VERSION = "0.2.1"
+
+# ===========================================================================
+#                                                       Request Object
+# ===========================================================================
+
+class http_request:
+
+    # default reply code
+    reply_code = 200
+
+    request_counter = counter()
+
+    # Whether to automatically use chunked encoding when
+    #
+    #   HTTP version is 1.1
+    #   Content-Length is not set
+    #   Chunked encoding is not already in effect
+    #
+    # If your clients are having trouble, you might want to disable this.
+    use_chunked = 1
+
+    # by default, this request object ignores user data.
+    collector = None
+
+    def __init__ (self, *args):
+        # unpack information about the request
+        (self.channel, self.request,
+         self.command, self.uri, self.version,
+         self.header) = args
+
+        self.outgoing = []
+        self.reply_headers = {
+                'Server'        : 'Athana/%s' % ATHANA_VERSION,
+                'Date'          : build_http_date (time.time()),
+                'Expires'       : build_http_date (time.time())
+                }
+        self.request_number = http_request.request_counter.increment()
+        self._split_uri = None
+        self._header_cache = {}
+
+    # --------------------------------------------------
+    # reply header management
+    # --------------------------------------------------
+    def __setitem__ (self, key, value):
+        try:
+            if key=='Set-Cookie':
+                self.reply_headers[key] += [value]
+            else:
+                self.reply_headers[key] = [value]
+        except:
+            self.reply_headers[key] = [value]
+
+    def __getitem__ (self, key):
+        return self.reply_headers[key][0]
+
+    def has_key (self, key):
+        return self.reply_headers.has_key(key)
+
+    def build_reply_header (self):
+        h = []
+        for k,vv in self.reply_headers.items():
+            if type(vv) != type([]):
+                h += ["%s: %s" % (k,vv)]
+            else:
+                for v in vv:
+                    h += ["%s: %s" % (k,v)]
+        return string.join([self.response(self.reply_code)] + h, '\r\n') + '\r\n\r\n'
+
+    # --------------------------------------------------
+    # split a uri
+    # --------------------------------------------------
+
+    # <path>;<params>?<query>#<fragment>
+    path_regex = re.compile (
+    #      path      params    query   fragment
+            r'([^;?#]*)(;[^?#]*)?(\?[^#]*)?(#.*)?'
+            )
+
+    def split_uri (self):
+        if self._split_uri is None:
+            m = self.path_regex.match (self.uri)
+            if m.end() != len(self.uri):
+                raise ValueError, "Broken URI"
+            else:
+                self._split_uri = m.groups()
+        return self._split_uri
+
+    def get_header_with_regex (self, head_reg, group):
+        for line in self.header:
+            m = head_reg.match (line)
+            if m.end() == len(line):
+                return m.group (group)
+        return ''
+
+    def get_header (self, header):
+        header = string.lower (header)
+        hc = self._header_cache
+        if not hc.has_key (header):
+            h = header + ': '
+            hl = len(h)
+            for line in self.header:
+                if string.lower (line[:hl]) == h:
+                    r = line[hl:]
+                    hc[header] = r
+                    return r
+            hc[header] = None
+            return None
+        else:
+            return hc[header]
+
+    # --------------------------------------------------
+    # user data
+    # --------------------------------------------------
+
+    def collect_incoming_data (self, data):
+        if self.collector:
+            self.collector.collect_incoming_data (data)
+        else:
+            self.log_info(
+                    'Dropping %d bytes of incoming request data' % len(data),
+                    'warning'
+                    )
+
+    def found_terminator (self):
+        if self.collector:
+            self.collector.found_terminator()
+        else:
+            self.log_info (
+                    'Unexpected end-of-record for incoming request',
+                    'warning'
+                    )
+
+    def push (self, thing):
+        if type(thing) == type(''):
+            self.outgoing.append(simple_producer (thing))
+        else:
+            thing.more
+            self.outgoing.append(thing)
+
+    def response (self, code=200):
+        message = self.responses[code]
+        self.reply_code = code
+        return 'HTTP/%s %d %s' % (self.version, code, message)
+
+    def error (self, code, s=None):
+        self.reply_code = code
+        self.outgoing = []
+        message = self.responses[code]
+        if s is None:
+            s = self.DEFAULT_ERROR_MESSAGE % {
+                    'code': code,
+                    'message': message,
+                    }
+        self['Content-Length'] = len(s)
+        self['Content-Type'] = 'text/html'
+        # make an error reply
+        self.push (s)
+        self.done()
+
+    # can also be used for empty replies
+    reply_now = error
+
+    def done (self):
+        "finalize this transaction - send output to the http channel"
+       
+        if hasattr(self,"tempfiles"):
+            for f in self.tempfiles:
+                os.unlink(f)
+
+        # ----------------------------------------
+        # persistent connection management
+        # ----------------------------------------
+
+        #  --- BUCKLE UP! ----
+
+        connection = string.lower (get_header (CONNECTION, self.header))
+
+        close_it = 0
+        wrap_in_chunking = 0
+
+        if self.version == '1.0':
+            if connection == 'keep-alive':
+                if not self.has_key ('Content-Length'):
+                    close_it = 1
+                else:
+                    self['Connection'] = 'Keep-Alive'
+            else:
+                close_it = 1
+        elif self.version == '1.1':
+            if connection == 'close':
+                close_it = 1
+            elif not self.has_key ('Content-Length'):
+                if self.has_key ('Transfer-Encoding'):
+                    if not self['Transfer-Encoding'] == 'chunked':
+                        close_it = 1
+                elif self.use_chunked:
+                    self['Transfer-Encoding'] = 'chunked'
+                    wrap_in_chunking = 1
+                else:
+                    close_it = 1
+        elif self.version is None:
+            # Although we don't *really* support http/0.9 (because we'd have to
+            # use \r\n as a terminator, and it would just yuck up a lot of stuff)
+            # it's very common for developers to not want to type a version number
+            # when using telnet to debug a server.
+            close_it = 1
+
+        outgoing_header = simple_producer (self.build_reply_header())
+
+        if close_it:
+            self['Connection'] = 'close'
+
+        if wrap_in_chunking:
+            outgoing_producer = chunked_producer (
+                    composite_producer (list(self.outgoing))
+                    )
+            # prepend the header
+            outgoing_producer = composite_producer(
+                [outgoing_header, outgoing_producer]
+                )
+        else:
+            # prepend the header
+            self.outgoing.insert(0, outgoing_header)
+            outgoing_producer = composite_producer (list(self.outgoing))
+
+        # actually, this is already set to None by the handler:
+        self.channel.current_request = None
+
+        # apply a few final transformations to the output
+        self.channel.push_with_producer (
+                # globbing gives us large packets
+                globbing_producer (
+                            outgoing_producer
+                        )
+                )
+
+        if close_it:
+            self.channel.close_when_done()
+
+    def log_date_string (self, when):
+        t = time.localtime(when)
+        return time.strftime ( '%d/%b/%Y:%H:%M:%S ', t)
+
+    def log (self):
+        self.channel.server.logger.log (
+                self.channel.addr[0],
+                '%d - - [%s] "%s"\n' % (
+                        self.channel.addr[1],
+                        self.log_date_string (time.time()),
+                        self.request,
+                        )
+                )
+
+    def write(self,text):
+        if type(text) == type(''):
+            self.push(text)
+        elif type(text) == type(u''):
+            self.push(text.encode("utf-8"))
+        else:
+            text.more
+            self.push(text)
+
+    def setStatus(self,status):
+        self.reply_code = status
+
+    def makeLink(self,page,params=None):
+        query = ""
+        if params is not None:
+            first = 1
+            for k,v in params.items():
+                if first:
+                    query += "?"
+                else:
+                    query += "&"
+                query += urllib.quote(k)+"="+urllib.quote(v)
+                first = 0
+        return page+";"+self.sessionid+query
+
+    def sendFile(self,path,content_type,force=0):
+
+        try:
+            file_length = os.stat(path)[stat.ST_SIZE]
+        except OSError:
+            self.error (404)
+            return
+
+        ims = get_header_match (IF_MODIFIED_SINCE, self.header)
+        length_match = 1
+        if ims:
+            length = ims.group (4)
+            if length:
+                try:
+                    length = string.atoi (length)
+                    if length != file_length:
+                        length_match = 0
+                except:
+                    pass
+        ims_date = 0
+        if ims:
+            ims_date = parse_http_date (ims.group (1))
+
+        try:
+            mtime = os.stat (path)[stat.ST_MTIME]
+        except:
+            self.error (404)
+            return
+        if length_match and ims_date:
+            if mtime <= ims_date and not force:
+                print "File "+path+" was not modified since "+str(ims_date)+" (current filedate is "+str(mtime)+")-> 304"
+                self.reply_code = 304
+                return
+        try:
+            file = open (path, 'rb')
+        except IOError:
+            self.error (404)
+            print "404"
+            return
+
+        self.reply_headers['Last-Modified'] = build_http_date (mtime)
+        self.reply_headers['Content-Length'] = file_length
+        self.reply_headers['Content-Type'] = content_type
+        self.reply_headers['Connection'] = 'close';
+        if self.command == 'GET':
+            self.push(file_producer(file))
+        return
+
+    def setCookie(self, name, value, expire=None):
+        if expire is None:
+            s = name+'='+value;
+        else:
+            datestr = time.strftime("%a, %d-%b-%Y %H:%M:%S GMT", time.gmtime(expire))
+            s = name+'='+value+'; expires='+datestr; #+'; path=PATH; domain=DOMAIN_NAME; secure';
+
+        if 'Set-Cookie' not in self.reply_headers:
+            self.reply_headers['Set-Cookie'] = [s]
+        else:
+            self.reply_headers['Set-Cookie'] += [s]
+
+    def makeSelfLink(self,params):
+        params2 = self.params.copy()
+        for k,v in params.items():
+            if v is not None:
+                params2[k] = v
+            else:
+                try: del params2[k]
+                except: pass
+        ret = self.makeLink(self.fullpath, params2)
+        return ret
+        
+    def writeTAL(self,page,context,macro=None):
+        runTAL(self, context, file=page, macro=macro, request=self)
+    
+    def writeTALstr(self,string,context,macro=None):
+        runTAL(self, context, string=string, macro=macro, request=self)
+
+    def getTAL(self,page,context,macro=None):
+        return processTAL(context,file=page, macro=macro, request=self)
+
+    def getTALstr(self,string,context,macro=None):
+        return processTAL(context,string=string, macro=macro, request=self)
+
+
+    responses = {
+            100: "Continue",
+            101: "Switching Protocols",
+            200: "OK",
+            201: "Created",
+            202: "Accepted",
+            203: "Non-Authoritative Information",
+            204: "No Content",
+            205: "Reset Content",
+            206: "Partial Content",
+            300: "Multiple Choices",
+            301: "Moved Permanently",
+            302: "Moved Temporarily",
+            303: "See Other",
+            304: "Not Modified",
+            305: "Use Proxy",
+            400: "Bad Request",
+            401: "Unauthorized",
+            402: "Payment Required",
+            403: "Forbidden",
+            404: "Not Found",
+            405: "Method Not Allowed",
+            406: "Not Acceptable",
+            407: "Proxy Authentication Required",
+            408: "Request Time-out",
+            409: "Conflict",
+            410: "Gone",
+            411: "Length Required",
+            412: "Precondition Failed",
+            413: "Request Entity Too Large",
+            414: "Request-URI Too Large",
+            415: "Unsupported Media Type",
+            500: "Internal Server Error",
+            501: "Not Implemented",
+            502: "Bad Gateway",
+            503: "Service Unavailable",
+            504: "Gateway Time-out",
+            505: "HTTP Version not supported"
+            }
+
+    # Default error message
+    DEFAULT_ERROR_MESSAGE = string.join (
+            ['<html><head>',
+             '<title>Error response</title>',
+             '</head>',
+             '<body>',
+             '<h1>Error response</h1>',
+             '<p>Error code %(code)d.</p>',
+             '<p>Message: %(message)s.</p>',
+             '</body></html>',
+             ''
+             ],
+            '\r\n'
+            )
+
+def getTAL(page,context,macro=None,language=None):
+    return processTAL(context,file=page, macro=macro, language=language)
+
+def getTALstr(string,context,macro=None,language=None):
+    return processTAL(context,string=string, macro=macro, language=language)
+
+# ===========================================================================
+#                                                HTTP Channel Object
+# ===========================================================================
+
+class http_channel (async_chat):
+
+    # use a larger default output buffer
+    ac_out_buffer_size = 1<<16
+
+    current_request = None
+    channel_counter = counter()
+
+    def __init__ (self, server, conn, addr):
+        self.channel_number = http_channel.channel_counter.increment()
+        self.request_counter = counter()
+        async_chat.__init__ (self, conn)
+        self.server = server
+        self.addr = addr
+        self.set_terminator ('\r\n\r\n')
+        self.in_buffer = ''
+        self.creation_time = int (time.time())
+        self.check_maintenance()
+        self.producer_lock = thread.allocate_lock()
+
+    def initiate_send (self):
+        self.producer_lock.acquire()
+        try:
+            async_chat.initiate_send(self)
+        finally:
+            self.producer_lock.release()
+
+    def push (self, data):
+        data.more
+        self.producer_lock.acquire()
+        try:
+            self.producer_fifo.push (simple_producer (data))
+        finally:
+            self.producer_lock.release()
+        self.initiate_send()
+
+    def push_with_producer (self, producer):
+        self.producer_lock.acquire()
+        try:
+            self.producer_fifo.push (producer)
+        finally:
+            self.producer_lock.release()
+        self.initiate_send()
+    
+    def close_when_done (self):
+        self.producer_lock.acquire()
+        try:
+            self.producer_fifo.push (None)
+        finally:
+            self.producer_lock.release()
+        
+        #results in select.error: (9, 'Bad file descriptor') if the socket map is poll'ed 
+        #while this socket is being closed
+        #we do it anyway, and catch the select.error in the main loop
+
+        #XXX on Ubuntu's 2.6.10-5-386, the socket won't be closed until the select finishes (or
+        #times out). We probably need to send a SIGINT signal or something. For now, we just
+        #set a very small timeout (0.01) in the main loop, so that select() will be called often
+        #enough.
+
+        #it also results in a "NoneType has no attribute more" error if refill_buffer tries
+        #to run data = p.more() on the None terminator (which we catch)
+        try:
+            self.initiate_send()
+        except AttributeError:
+            pass
+
+    def __repr__ (self):
+        ar = async_chat.__repr__(self)[1:-1]
+        return '<%s channel#: %s requests:%s>' % (
+                ar,
+                self.channel_number,
+                self.request_counter
+                )
+
+    # Channel Counter, Maintenance Interval...
+    maintenance_interval = 500
+
+    def check_maintenance (self):
+        if not self.channel_number % self.maintenance_interval:
+            self.maintenance()
+
+    def maintenance (self):
+        self.kill_zombies()
+
+    # 30-minute zombie timeout.  status_handler also knows how to kill zombies.
+    zombie_timeout = 30 * 60
+
+    def kill_zombies (self):
+        now = int (time.time())
+        for channel in asyncore.socket_map.values():
+            if channel.__class__ == self.__class__:
+                if (now - channel.creation_time) > channel.zombie_timeout:
+                    channel.close()
+
+    # --------------------------------------------------
+    # send/recv overrides, good place for instrumentation.
+    # --------------------------------------------------
+
+    # this information needs to get into the request object,
+    # so that it may log correctly.
+    def send (self, data):
+        result = async_chat.send (self, data)
+        self.server.bytes_out.increment (len(data))
+        return result
+
+    def recv (self, buffer_size):
+        try:
+            result = async_chat.recv (self, buffer_size)
+            self.server.bytes_in.increment (len(result))
+            return result
+        except MemoryError:
+            # --- Save a Trip to Your Service Provider ---
+            # It's possible for a process to eat up all the memory of
+            # the machine, and put it in an extremely wedged state,
+            # where medusa keeps running and can't be shut down.  This
+            # is where MemoryError tends to get thrown, though of
+            # course it could get thrown elsewhere.
+            sys.exit ("Out of Memory!")
+
+    def handle_error (self):
+        t, v = sys.exc_info()[:2]
+        if t is SystemExit:
+            raise t, v
+        else:
+            async_chat.handle_error (self)
+
+    def log (self, *args):
+        pass
+
+    # --------------------------------------------------
+    # async_chat methods
+    # --------------------------------------------------
+
+    def collect_incoming_data (self, data):
+        if self.current_request:
+            # we are receiving data (probably POST data) for a request
+            self.current_request.collect_incoming_data (data)
+        else:
+            # we are receiving header (request) data
+            self.in_buffer = self.in_buffer + data
+
+    def found_terminator (self):
+        if self.current_request:
+            self.current_request.found_terminator()
+        else:
+            header = self.in_buffer
+            self.in_buffer = ''
+            lines = string.split (header, '\r\n')
+
+            # --------------------------------------------------
+            # crack the request header
+            # --------------------------------------------------
+
+            while lines and not lines[0]:
+                # as per the suggestion of http-1.1 section 4.1, (and
+                # Eric Parker <eparker@zyvex.com>), ignore a leading
+                # blank lines (buggy browsers tack it onto the end of
+                # POST requests)
+                lines = lines[1:]
+
+            if not lines:
+                self.close_when_done()
+                return
+
+            request = lines[0]
+
+            command, uri, version = crack_request (request)
+            header = join_headers (lines[1:])
+
+            # unquote path if necessary (thanks to Skip Montanaro for pointing
+            # out that we must unquote in piecemeal fashion).
+            rpath, rquery = splitquery(uri)
+            if '%' in rpath:
+                if rquery:
+                    uri = unquote (rpath) + '?' + rquery
+                else:
+                    uri = unquote (rpath)
+
+            r = http_request (self, request, command, uri, version, header)
+            self.request_counter.increment()
+            self.server.total_requests.increment()
+
+            if command is None:
+                self.log_info ('Bad HTTP request: %s' % repr(request), 'error')
+                r.error (400)
+                return
+
+            # --------------------------------------------------
+            # handler selection and dispatch
+            # --------------------------------------------------
+            for h in self.server.handlers:
+                if h.match (r):
+                    try:
+                        self.current_request = r
+                        # This isn't used anywhere.
+                        # r.handler = h # CYCLE
+                        h.handle_request (r)
+                    except:
+                        self.server.exceptions.increment()
+                        (file, fun, line), t, v, tbinfo = asyncore.compact_traceback()
+                        self.log_info(
+                                        'Server Error: %s, %s: file: %s line: %s' % (t,v,file,line),
+                                        'error')
+                        try:
+                            r.error (500)
+                        except:
+                            pass
+                    return
+
+            # no handlers, so complain
+            r.error (404)
+
+# ===========================================================================
+#                                                HTTP Server Object
+# ===========================================================================
+
+class http_server (asyncore.dispatcher):
+
+    SERVER_IDENT = 'HTTP Server (V%s)' % VERSION_STRING
+
+    channel_class = http_channel
+
+    def __init__ (self, ip, port, resolver=None, logger_object=None):
+        self.ip = ip
+        self.port = port
+        asyncore.dispatcher.__init__ (self)
+        self.create_socket (socket.AF_INET, socket.SOCK_STREAM)
+
+        self.handlers = []
+
+        if not logger_object:
+            logger_object = file_logger (sys.stdout)
+
+        self.set_reuse_addr()
+        self.bind ((ip, port))
+
+        # lower this to 5 if your OS complains
+        self.listen (1024)
+
+        host, port = self.socket.getsockname()
+        if not ip:
+            self.log_info('Computing default hostname', 'warning')
+            ip = socket.gethostbyname (socket.gethostname())
+        try:
+            self.server_name = socket.gethostbyaddr (ip)[0]
+        except socket.error:
+            self.log_info('Cannot do reverse lookup', 'warning')
+            self.server_name = ip       # use the IP address as the "hostname"
+
+        self.server_port = port
+        self.total_clients = counter()
+        self.total_requests = counter()
+        self.exceptions = counter()
+        self.bytes_out = counter()
+        self.bytes_in  = counter()
+
+        if not logger_object:
+            logger_object = file_logger (sys.stdout)
+
+        self.logger = unresolving_logger (logger_object)
+
+        self.log_info (
+                'Athana (%s) started at %s'
+                '\n\n'
+                'The server is running! You can now direct your browser to:\n'
+                '\thttp://%s:%d/'
+                '\n' % (
+                        ATHANA_VERSION,
+                        time.ctime(time.time()),
+                        self.server_name,
+                        port,
+                        )
+                )
+
+    def writable (self):
+        return 0
+
+    def handle_read (self):
+        pass
+
+    def readable (self):
+        return self.accepting
+
+    def handle_connect (self):
+        pass
+
+    def handle_accept (self):
+        self.total_clients.increment()
+        try:
+            conn, addr = self.accept()
+        except socket.error:
+            # linux: on rare occasions we get a bogus socket back from
+            # accept.  socketmodule.c:makesockaddr complains that the
+            # address family is unknown.  We don't want the whole server
+            # to shut down because of this.
+            self.log_info ('warning: server accept() threw an exception', 'warning')
+            return
+        except TypeError:
+            # unpack non-sequence.  this can happen when a read event
+            # fires on a listening socket, but when we call accept()
+            # we get EWOULDBLOCK, so dispatcher.accept() returns None.
+            # Seen on FreeBSD3.
+            self.log_info ('warning: server accept() threw EWOULDBLOCK', 'warning')
+            return
+
+        self.channel_class (self, conn, addr)
+
+    def install_handler (self, handler, back=0):
+        if back:
+            self.handlers.append (handler)
+        else:
+            self.handlers.insert (0, handler)
+
+    def remove_handler (self, handler):
+        self.handlers.remove (handler)
+
+
+CONNECTION = re.compile ('Connection: (.*)', re.IGNORECASE)
+
+# merge multi-line headers
+# [486dx2: ~500/sec]
+def join_headers (headers):
+    r = []
+    for i in range(len(headers)):
+        if headers[i][0] in ' \t':
+            r[-1] = r[-1] + headers[i][1:]
+        else:
+            r.append (headers[i])
+    return r
+
+def get_header (head_reg, lines, group=1):
+    for line in lines:
+        m = head_reg.match (line)
+        if m and m.end() == len(line):
+            return m.group (group)
+    return ''
+
+def get_header_match (head_reg, lines):
+    for line in lines:
+        m = head_reg.match (line)
+        if m and m.end() == len(line):
+            return m
+    return ''
+
+REQUEST = re.compile ('([^ ]+) ([^ ]+)(( HTTP/([0-9.]+))$|$)')
+
+def crack_request (r):
+    m = REQUEST.match (r)
+    if m and m.end() == len(r):
+        if m.group(3):
+            version = m.group(5)
+        else:
+            version = None
+        return m.group(1), m.group(2), version
+    else:
+        return None, None, None
+
+
+# This is the 'default' handler.  it implements the base set of
+# features expected of a simple file-delivering HTTP server.  file
+# services are provided through a 'filesystem' object, the very same
+# one used by the FTP server.
+#
+# You can replace or modify this handler if you want a non-standard
+# HTTP server.  You can also derive your own handler classes from
+# it.
+#
+# support for handling POST requests is available in the derived
+# class <default_with_post_handler>, defined below.
+#
+
+class default_handler:
+
+    valid_commands = ['GET', 'HEAD']
+
+    IDENT = 'Default HTTP Request Handler'
+
+    # Pathnames that are tried when a URI resolves to a directory name
+    directory_defaults = [
+            'index.html',
+            'default.html'
+            ]
+
+    default_file_producer = file_producer
+
+    def __init__ (self, filesystem):
+        self.filesystem = filesystem
+        # count total hits
+        self.hit_counter = counter()
+        # count file deliveries
+        self.file_counter = counter()
+        # count cache hits
+        self.cache_counter = counter()
+
+    hit_counter = 0
+
+    def __repr__ (self):
+        return '<%s (%s hits) at %x>' % (
+                self.IDENT,
+                self.hit_counter,
+                id (self)
+                )
+
+    # always match, since this is a default
+    def match (self, request):
+        return 1
+
+    def can_handle(self, request):
+        path, params, query, fragment = request.split_uri()
+        if '%' in path:
+            path = unquote (path)
+        while path and path[0] == '/':
+            path = path[1:]
+        if self.filesystem.isdir (path):
+            if path and path[-1] != '/':
+                return 0
+            found = 0
+            if path and path[-1] != '/':
+                path = path + '/'
+            for default in self.directory_defaults:
+                p = path + default
+                if self.filesystem.isfile (p):
+                    path = p
+                    found = 1
+                    break
+            if not found:
+                return 0
+        elif not self.filesystem.isfile (path):
+            return 0
+        return 1
+
+    # handle a file request, with caching.
+
+    def handle_request (self, request):
+
+        if request.command not in self.valid_commands:
+            request.error (400) # bad request
+            return
+
+        self.hit_counter.increment()
+
+        path, params, query, fragment = request.split_uri()
+
+        if '%' in path:
+            path = unquote (path)
+        
+        # strip off all leading slashes
+        while path and path[0] == '/':
+            path = path[1:]
+
+        if self.filesystem.isdir (path):
+            if path and path[-1] != '/':
+                request['Location'] = 'http://%s/%s/' % (
+                        request.channel.server.server_name,
+                        path
+                        )
+                request.error (301)
+                return
+
+            # we could also generate a directory listing here,
+            # may want to move this into another method for that
+            # purpose
+            found = 0
+            if path and path[-1] != '/':
+                path = path + '/'
+            for default in self.directory_defaults:
+                p = path + default
+                if self.filesystem.isfile (p):
+                    path = p
+                    found = 1
+                    break
+            if not found:
+                request.error (404) # Not Found
+                return
+
+        elif not self.filesystem.isfile (path):
+            request.error (404) # Not Found
+            return
+
+        file_length = self.filesystem.stat (path)[stat.ST_SIZE]
+
+        ims = get_header_match (IF_MODIFIED_SINCE, request.header)
+        
+        length_match = 1
+        if ims:
+            length = ims.group (4)
+            if length:
+                try:
+                    length = string.atoi (length)
+                    if length != file_length:
+                        length_match = 0
+                except:
+                    pass
+
+        ims_date = 0
+
+        if ims:
+            ims_date = parse_http_date (ims.group (1))
+
+        try:
+            mtime = self.filesystem.stat (path)[stat.ST_MTIME]
+        except:
+            request.error (404)
+            return
+        
+        if length_match and ims_date:
+            if mtime <= ims_date:
+                request.reply_code = 304
+                request.done()
+                self.cache_counter.increment()
+                print "File "+path+" was not modified since "+str(ims_date)+" (current filedate is "+str(mtime)+")"
+                return
+        try:
+            file = self.filesystem.open (path, 'rb')
+        except IOError:
+            request.error (404)
+            return
+
+        request['Last-Modified'] = build_http_date (mtime)
+        request['Content-Length'] = file_length
+        self.set_content_type (path, request)
+
+        if request.command == 'GET':
+            request.push (self.default_file_producer (file))
+
+        self.file_counter.increment()
+        request.done()
+
+    def set_content_type (self, path, request):
+        ext = string.lower (get_extension (path))
+        typ, encoding = mimetypes.guess_type(path)
+        if typ is not None:
+            request['Content-Type'] = typ
+        else:
+            # TODO: test a chunk off the front of the file for 8-bit
+            # characters, and use application/octet-stream instead.
+            request['Content-Type'] = 'text/plain'
+
+    def status (self):
+        return simple_producer (
+                '<li>%s' % html_repr (self)
+                + '<ul>'
+                + '  <li><b>Total Hits:</b> %s'                 % self.hit_counter
+                + '  <li><b>Files Delivered:</b> %s'    % self.file_counter
+                + '  <li><b>Cache Hits:</b> %s'                 % self.cache_counter
+                + '</ul>'
+                )
+
+# HTTP/1.0 doesn't say anything about the "; length=nnnn" addition
+# to this header.  I suppose its purpose is to avoid the overhead
+# of parsing dates...
+IF_MODIFIED_SINCE = re.compile (
+        'If-Modified-Since: ([^;]+)((; length=([0-9]+)$)|$)',
+        re.IGNORECASE
+        )
+
+USER_AGENT = re.compile ('User-Agent: (.*)', re.IGNORECASE)
+
+CONTENT_TYPE = re.compile (
+        r'Content-Type: ([^;]+)((; boundary=([A-Za-z0-9\'\(\)+_,./:=?-]+)$)|$)',
+        re.IGNORECASE
+        )
+
+get_header = get_header
+get_header_match = get_header_match
+
+def get_extension (path):
+    dirsep = string.rfind (path, '/')
+    dotsep = string.rfind (path, '.')
+    if dotsep > dirsep:
+        return path[dotsep+1:]
+    else:
+        return ''
+
+class abstract_filesystem:
+    def __init__ (self):
+        pass
+
+    def current_directory (self):
+        "Return a string representing the current directory."
+        pass
+
+    def listdir (self, path, long=0):
+        """Return a listing of the directory at 'path' The empty string
+        indicates the current directory.  If 'long' is set, instead
+        return a list of (name, stat_info) tuples
+        """
+        pass
+
+    def open (self, path, mode):
+        "Return an open file object"
+        pass
+
+    def stat (self, path):
+        "Return the equivalent of os.stat() on the given path."
+        pass
+
+    def isdir (self, path):
+        "Does the path represent a directory?"
+        pass
+
+    def isfile (self, path):
+        "Does the path represent a plain file?"
+        pass
+
+    def cwd (self, path):
+        "Change the working directory."
+        pass
+
+    def cdup (self):
+        "Change to the parent of the current directory."
+        pass
+
+
+    def longify (self, path):
+        """Return a 'long' representation of the filename
+        [for the output of the LIST command]"""
+        pass
+
+# standard wrapper around a unix-like filesystem, with a 'false root'
+# capability.
+
+# security considerations: can symbolic links be used to 'escape' the
+# root?  should we allow it?  if not, then we could scan the
+# filesystem on startup, but that would not help if they were added
+# later.  We will probably need to check for symlinks in the cwd method.
+
+# what to do if wd is an invalid directory?
+
+def safe_stat (path):
+    try:
+        return (path, os.stat (path))
+    except:
+        return None
+
+class os_filesystem:
+    path_module = os.path
+
+    # set this to zero if you want to disable pathname globbing.
+    # [we currently don't glob, anyway]
+    do_globbing = 1
+
+    def __init__ (self, root, wd='/'):
+        self.root = root
+        self.wd = wd
+
+    def current_directory (self):
+        return self.wd
+
+    def isfile (self, path):
+        p = self.normalize (self.path_module.join (self.wd, path))
+        return self.path_module.isfile (self.translate(p))
+
+    def isdir (self, path):
+        p = self.normalize (self.path_module.join (self.wd, path))
+        return self.path_module.isdir (self.translate(p))
+
+    def cwd (self, path):
+        p = self.normalize (self.path_module.join (self.wd, path))
+        translated_path = self.translate(p)
+        if not self.path_module.isdir (translated_path):
+            return 0
+        else:
+            old_dir = os.getcwd()
+            # temporarily change to that directory, in order
+            # to see if we have permission to do so.
+            try:
+                can = 0
+                try:
+                    os.chdir (translated_path)
+                    can = 1
+                    self.wd = p
+                except:
+                    pass
+            finally:
+                if can:
+                    os.chdir (old_dir)
+            return can
+
+    def cdup (self):
+        return self.cwd ('..')
+
+    def listdir (self, path, long=0):
+        p = self.translate (path)
+        # I think we should glob, but limit it to the current
+        # directory only.
+        ld = os.listdir (p)
+        if not long:
+            return list_producer (ld, None)
+        else:
+            old_dir = os.getcwd()
+            try:
+                os.chdir (p)
+                # if os.stat fails we ignore that file.
+                result = filter (None, map (safe_stat, ld))
+            finally:
+                os.chdir (old_dir)
+            return list_producer (result, self.longify)
+
+    # TODO: implement a cache w/timeout for stat()
+    def stat (self, path):
+        p = self.translate (path)
+        return os.stat (p)
+
+    def open (self, path, mode):
+        p = self.translate (path)
+        return open (p, mode)
+
+    def unlink (self, path):
+        p = self.translate (path)
+        return os.unlink (p)
+
+    def mkdir (self, path):
+        p = self.translate (path)
+        return os.mkdir (p)
+
+    def rmdir (self, path):
+        p = self.translate (path)
+        return os.rmdir (p)
+
+    # utility methods
+    def normalize (self, path):
+        # watch for the ever-sneaky '/+' path element
+        path = re.sub('/+', '/', path)
+        p = self.path_module.normpath (path)
+        # remove 'dangling' cdup's.
+        if len(p) > 2 and p[:3] == '/..':
+            p = '/'
+        return p
+
+    def translate (self, path):
+        # we need to join together three separate
+        # path components, and do it safely.
+        # <real_root>/<current_directory>/<path>
+        # use the operating system's path separator.
+        path = string.join (string.split (path, '/'), os.sep)
+        p = self.normalize (self.path_module.join (self.wd, path))
+        p = self.normalize (self.path_module.join (self.root, p[1:]))
+        return p
+
+    def longify (self, (path, stat_info)):
+        return unix_longify (path, stat_info)
+
+    def __repr__ (self):
+        return '<unix-style fs root:%s wd:%s>' % (
+                self.root,
+                self.wd
+                )
+
+# this matches the output of NT's ftp server (when in
+# MSDOS mode) exactly.
+
+def msdos_longify (file, stat_info):
+    if stat.S_ISDIR (stat_info[stat.ST_MODE]):
+        dir = '<DIR>'
+    else:
+        dir = '     '
+    date = msdos_date (stat_info[stat.ST_MTIME])
+    return '%s       %s %8d %s' % (
+            date,
+            dir,
+            stat_info[stat.ST_SIZE],
+            file
+            )
+
+def msdos_date (t):
+    try:
+        info = time.gmtime (t)
+    except:
+        info = time.gmtime (0)
+    # year, month, day, hour, minute, second, ...
+    if info[3] > 11:
+        merid = 'PM'
+        info[3] = info[3] - 12
+    else:
+        merid = 'AM'
+    return '%02d-%02d-%02d  %02d:%02d%s' % (
+            info[1],
+            info[2],
+            info[0]%100,
+            info[3],
+            info[4],
+            merid
+            )
+
+months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+                  'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+
+mode_table = {
+        '0':'---',
+        '1':'--x',
+        '2':'-w-',
+        '3':'-wx',
+        '4':'r--',
+        '5':'r-x',
+        '6':'rw-',
+        '7':'rwx'
+        }
+
+def unix_longify (file, stat_info):
+    # for now, only pay attention to the lower bits
+    mode = ('%o' % stat_info[stat.ST_MODE])[-3:]
+    mode = string.join (map (lambda x: mode_table[x], mode), '')
+    if stat.S_ISDIR (stat_info[stat.ST_MODE]):
+        dirchar = 'd'
+    else:
+        dirchar = '-'
+    date = ls_date (long(time.time()), stat_info[stat.ST_MTIME])
+    return '%s%s %3d %-8d %-8d %8d %s %s' % (
+            dirchar,
+            mode,
+            stat_info[stat.ST_NLINK],
+            stat_info[stat.ST_UID],
+            stat_info[stat.ST_GID],
+            stat_info[stat.ST_SIZE],
+            date,
+            file
+            )
+
+# Emulate the unix 'ls' command's date field.
+# it has two formats - if the date is more than 180
+# days in the past, then it's like this:
+# Oct 19  1995
+# otherwise, it looks like this:
+# Oct 19 17:33
+
+def ls_date (now, t):
+    try:
+        info = time.gmtime (t)
+    except:
+        info = time.gmtime (0)
+    # 15,600,000 == 86,400 * 180
+    if (now - t) > 15600000:
+        return '%s %2d  %d' % (
+                months[info[1]-1],
+                info[2],
+                info[0]
+                )
+    else:
+        return '%s %2d %02d:%02d' % (
+                months[info[1]-1],
+                info[2],
+                info[3],
+                info[4]
+                )
+
+class list_producer:
+    def __init__ (self, list, func=None):
+        self.list = list
+        self.func = func
+
+    # this should do a pushd/popd
+    def more (self):
+        if not self.list:
+            return ''
+        else:
+            # do a few at a time
+            bunch = self.list[:50]
+            if self.func is not None:
+                bunch = map (self.func, bunch)
+            self.list = self.list[50:]
+            return string.joinfields (bunch, '\r\n') + '\r\n'
+
+class hooked_callback:
+    def __init__ (self, hook, callback):
+        self.hook, self.callback = hook, callback
+
+    def __call__ (self, *args):
+        apply (self.hook, args)
+        apply (self.callback, args)
+
+# An extensible, configurable, asynchronous FTP server.
+#
+# All socket I/O is non-blocking, however file I/O is currently
+# blocking.  Eventually file I/O may be made non-blocking, too, if it
+# seems necessary.  Currently the only CPU-intensive operation is
+# getting and formatting a directory listing.  [this could be moved
+# into another process/directory server, or another thread?]
+#
+# Only a subset of RFC 959 is implemented, but much of that RFC is
+# vestigial anyway.  I've attempted to include the most commonly-used
+# commands, using the feature set of wu-ftpd as a guide.
+
+
+# TODO: implement a directory listing cache.  On very-high-load
+# servers this could save a lot of disk abuse, and possibly the
+# work of computing emulated unix ls output.
+
+# Potential security problem with the FTP protocol?  I don't think
+# there's any verification of the origin of a data connection.  Not
+# really a problem for the server (since it doesn't send the port
+# command, except when in PASV mode) But I think a data connection
+# could be spoofed by a program with access to a sniffer - it could
+# watch for a PORT command to go over a command channel, and then
+# connect to that port before the server does.
+
+# Unix user id's:
+# In order to support assuming the id of a particular user,
+# it seems there are two options:
+# 1) fork, and seteuid in the child
+# 2) carefully control the effective uid around filesystem accessing
+#    methods, using try/finally. [this seems to work]
+
+VERSION = string.split(RCS_ID)[2]
+
+class ftp_channel (async_chat):
+
+    # defaults for a reliable __repr__
+    addr = ('unknown','0')
+
+    # unset this in a derived class in order
+    # to enable the commands in 'self.write_commands'
+    read_only = 1
+    write_commands = ['appe','dele','mkd','rmd','rnfr','rnto','stor','stou']
+
+    restart_position = 0
+
+    # comply with (possibly troublesome) RFC959 requirements
+    # This is necessary to correctly run an active data connection
+    # through a firewall that triggers on the source port (expected
+    # to be 'L-1', or 20 in the normal case).
+    bind_local_minus_one = 0
+
+    def __init__ (self, server, conn, addr):
+        self.server = server
+        self.current_mode = 'a'
+        self.addr = addr
+        async_chat.__init__ (self, conn)
+        self.set_terminator ('\r\n')
+
+        # client data port.  Defaults to 'the same as the control connection'.
+        self.client_addr = (addr[0], 21)
+
+        self.client_dc = None
+        self.in_buffer = ''
+        self.closing = 0
+        self.passive_acceptor = None
+        self.passive_connection = None
+        self.filesystem = None
+        self.authorized = 0
+        # send the greeting
+        self.respond (
+                '220 %s FTP server (Medusa Async V%s [experimental]) ready.' % (
+                        self.server.hostname,
+                        VERSION
+                        )
+                )
+
+#       def __del__ (self):
+#               print 'ftp_channel.__del__()'
+
+    # --------------------------------------------------
+    # async-library methods
+    # --------------------------------------------------
+
+    def handle_expt (self):
+        # this is handled below.  not sure what I could
+        # do here to make that code less kludgish.
+        pass
+
+    def collect_incoming_data (self, data):
+        self.in_buffer = self.in_buffer + data
+        if len(self.in_buffer) > 4096:
+            # silently truncate really long lines
+            # (possible denial-of-service attack)
+            self.in_buffer = ''
+
+    def found_terminator (self):
+
+        line = self.in_buffer
+
+        if not len(line):
+            return
+
+        sp = string.find (line, ' ')
+        if sp != -1:
+            line = [line[:sp], line[sp+1:]]
+        else:
+            line = [line]
+
+        command = string.lower (line[0])
+        # watch especially for 'urgent' abort commands.
+        if string.find (command, 'abor') != -1:
+            # strip off telnet sync chars and the like...
+            while command and command[0] not in string.letters:
+                command = command[1:]
+        fun_name = 'cmd_%s' % command
+        if command != 'pass':
+            self.log ('<== %s' % repr(self.in_buffer)[1:-1])
+        else:
+            self.log ('<== %s' % line[0]+' <password>')
+        self.in_buffer = ''
+        if not hasattr (self, fun_name):
+            self.command_not_understood (line[0])
+            return
+        fun = getattr (self, fun_name)
+        if (not self.authorized) and (command not in ('user', 'pass', 'help', 'quit')):
+            self.respond ('530 Please log in with USER and PASS')
+        elif (not self.check_command_authorization (command)):
+            self.command_not_authorized (command)
+        else:
+            try:
+                result = apply (fun, (line,))
+            except:
+                self.server.total_exceptions.increment()
+                (file, fun, line), t,v, tbinfo = asyncore.compact_traceback()
+                if self.client_dc:
+                    try:
+                        self.client_dc.close()
+                    except:
+                        pass
+                self.respond (
+                        '451 Server Error: %s, %s: file: %s line: %s' % (
+                                t,v,file,line,
+                                )
+                        )
+
+    closed = 0
+    def close (self):
+        if not self.closed:
+            self.closed = 1
+            if self.passive_acceptor:
+                self.passive_acceptor.close()
+            if self.client_dc:
+                self.client_dc.close()
+            self.server.closed_sessions.increment()
+            async_chat.close (self)
+
+    # --------------------------------------------------
+    # filesystem interface functions.
+    # override these to provide access control or perform
+    # other functions.
+    # --------------------------------------------------
+
+    def cwd (self, line):
+        return self.filesystem.cwd (line[1])
+
+    def cdup (self, line):
+        return self.filesystem.cdup()
+
+    def open (self, path, mode):
+        return self.filesystem.open (path, mode)
+
+    # returns a producer
+    def listdir (self, path, long=0):
+        return self.filesystem.listdir (path, long)
+
+    def get_dir_list (self, line, long=0):
+        # we need to scan the command line for arguments to '/bin/ls'...
+        args = line[1:]
+        path_args = []
+        for arg in args:
+            if arg[0] != '-':
+                path_args.append (arg)
+            else:
+                # ignore arguments
+                pass
+        if len(path_args) < 1:
+            dir = '.'
+        else:
+            dir = path_args[0]
+        return self.listdir (dir, long)
+
+    # --------------------------------------------------
+    # authorization methods
+    # --------------------------------------------------
+
+    def check_command_authorization (self, command):
+        if command in self.write_commands and self.read_only:
+            return 0
+        else:
+            return 1
+
+    # --------------------------------------------------
+    # utility methods
+    # --------------------------------------------------
+
+    def log (self, message):
+        self.server.logger.log (
+                self.addr[0],
+                '%d %s' % (
+                        self.addr[1], message
+                        )
+                )
+
+    def respond (self, resp):
+        self.log ('==> %s' % resp)
+        self.push (resp + '\r\n')
+
+    def command_not_understood (self, command):
+        self.respond ("500 '%s': command not understood." % command)
+
+    def command_not_authorized (self, command):
+        self.respond (
+                "530 You are not authorized to perform the '%s' command" % (
+                        command
+                        )
+                )
+
+    def make_xmit_channel (self):
+        # In PASV mode, the connection may or may _not_ have been made
+        # yet.  [although in most cases it is... FTP Explorer being
+        # the only exception I've yet seen].  This gets somewhat confusing
+        # because things may happen in any order...
+        pa = self.passive_acceptor
+        if pa:
+            if pa.ready:
+                # a connection has already been made.
+                conn, addr = self.passive_acceptor.ready
+                cdc = xmit_channel (self, addr)
+                cdc.set_socket (conn)
+                cdc.connected = 1
+                self.passive_acceptor.close()
+                self.passive_acceptor = None
+            else:
+                # we're still waiting for a connect to the PASV port.
+                cdc = xmit_channel (self)
+        else:
+            # not in PASV mode.
+            ip, port = self.client_addr
+            cdc = xmit_channel (self, self.client_addr)
+            cdc.create_socket (socket.AF_INET, socket.SOCK_STREAM)
+            if self.bind_local_minus_one:
+                cdc.bind (('', self.server.port - 1))
+            try:
+                cdc.connect ((ip, port))
+            except socket.error, why:
+                self.respond ("425 Can't build data connection")
+        self.client_dc = cdc
+
+    # pretty much the same as xmit, but only right on the verge of
+    # being worth a merge.
+    def make_recv_channel (self, fd):
+        pa = self.passive_acceptor
+        if pa:
+            if pa.ready:
+                # a connection has already been made.
+                conn, addr = pa.ready
+                cdc = recv_channel (self, addr, fd)
+                cdc.set_socket (conn)
+                cdc.connected = 1
+                self.passive_acceptor.close()
+                self.passive_acceptor = None
+            else:
+                # we're still waiting for a connect to the PASV port.
+                cdc = recv_channel (self, None, fd)
+        else:
+            # not in PASV mode.
+            ip, port = self.client_addr
+            cdc = recv_channel (self, self.client_addr, fd)
+            cdc.create_socket (socket.AF_INET, socket.SOCK_STREAM)
+            try:
+                cdc.connect ((ip, port))
+            except socket.error, why:
+                self.respond ("425 Can't build data connection")
+        self.client_dc = cdc
+
+    type_map = {
+            'a':'ASCII',
+            'i':'Binary',
+            'e':'EBCDIC',
+            'l':'Binary'
+            }
+
+    type_mode_map = {
+            'a':'t',
+            'i':'b',
+            'e':'b',
+            'l':'b'
+            }
+
+    # --------------------------------------------------
+    # command methods
+    # --------------------------------------------------
+
+    def cmd_type (self, line):
+        'specify data transfer type'
+        # ascii, ebcdic, image, local <byte size>
+        t = string.lower (line[1])
+        # no support for EBCDIC
+        # if t not in ['a','e','i','l']:
+        if t not in ['a','i','l']:
+            self.command_not_understood (string.join (line))
+        elif t == 'l' and (len(line) > 2 and line[2] != '8'):
+            self.respond ('504 Byte size must be 8')
+        else:
+            self.current_mode = t
+            self.respond ('200 Type set to %s.' % self.type_map[t])
+
+
+    def cmd_quit (self, line):
+        'terminate session'
+        self.respond ('221 Goodbye.')
+        self.close_when_done()
+
+    def cmd_port (self, line):
+        'specify data connection port'
+        info = string.split (line[1], ',')
+        ip = string.join (info[:4], '.')
+        port = string.atoi(info[4])*256 + string.atoi(info[5])
+        # how many data connections at a time?
+        # I'm assuming one for now...
+        # TODO: we should (optionally) verify that the
+        # ip number belongs to the client.  [wu-ftpd does this?]
+        self.client_addr = (ip, port)
+        self.respond ('200 PORT command successful.')
+
+    def new_passive_acceptor (self):
+        # ensure that only one of these exists at a time.
+        if self.passive_acceptor is not None:
+            self.passive_acceptor.close()
+            self.passive_acceptor = None
+        self.passive_acceptor = passive_acceptor (self)
+        return self.passive_acceptor
+
+    def cmd_pasv (self, line):
+        'prepare for server-to-server transfer'
+        pc = self.new_passive_acceptor()
+        port = pc.addr[1]
+        ip_addr = pc.control_channel.getsockname()[0]
+        self.respond (
+                '227 Entering Passive Mode (%s,%d,%d)' % (
+                        string.replace(ip_addr, '.', ','),
+                        port/256,
+                        port%256
+                        )
+                )
+        self.client_dc = None
+
+    def cmd_nlst (self, line):
+        'give name list of files in directory'
+        # ncftp adds the -FC argument for the user-visible 'nlist'
+        # command.  We could try to emulate ls flags, but not just yet.
+        if '-FC' in line:
+            line.remove ('-FC')
+        try:
+            dir_list_producer = self.get_dir_list (line, 0)
+        except os.error, why:
+            self.respond ('550 Could not list directory: %s' % why)
+            return
+        self.respond (
+                '150 Opening %s mode data connection for file list' % (
+                        self.type_map[self.current_mode]
+                        )
+                )
+        self.make_xmit_channel()
+        self.client_dc.push_with_producer (dir_list_producer)
+        self.client_dc.close_when_done()
+
+    def cmd_list (self, line):
+        'give a list of files in a directory'
+        try:
+            dir_list_producer = self.get_dir_list (line, 1)
+        except os.error, why:
+            self.respond ('550 Could not list directory: %s' % why)
+            return
+        self.respond (
+                '150 Opening %s mode data connection for file list' % (
+                        self.type_map[self.current_mode]
+                        )
+                )
+        self.make_xmit_channel()
+        self.client_dc.push_with_producer (dir_list_producer)
+        self.client_dc.close_when_done()
+
+    def cmd_cwd (self, line):
+        'change working directory'
+        if self.cwd (line):
+            self.respond ('250 CWD command successful.')
+        else:
+            self.respond ('550 No such directory.')
+
+    def cmd_cdup (self, line):
+        'change to parent of current working directory'
+        if self.cdup(line):
+            self.respond ('250 CDUP command successful.')
+        else:
+            self.respond ('550 No such directory.')
+
+    def cmd_pwd (self, line):
+        'print the current working directory'
+        self.respond (
+                '257 "%s" is the current directory.' % (
+                        self.filesystem.current_directory()
+                        )
+                )
+
+    # modification time
+    # example output:
+    # 213 19960301204320
+    def cmd_mdtm (self, line):
+        'show last modification time of file'
+        filename = line[1]
+        if not self.filesystem.isfile (filename):
+            self.respond ('550 "%s" is not a file' % filename)
+        else:
+            mtime = time.gmtime(self.filesystem.stat(filename)[stat.ST_MTIME])
+            self.respond (
+                    '213 %4d%02d%02d%02d%02d%02d' % (
+                            mtime[0],
+                            mtime[1],
+                            mtime[2],
+                            mtime[3],
+                            mtime[4],
+                            mtime[5]
+                            )
+                    )
+
+    def cmd_noop (self, line):
+        'do nothing'
+        self.respond ('200 NOOP command successful.')
+
+    def cmd_size (self, line):
+        'return size of file'
+        filename = line[1]
+        if not self.filesystem.isfile (filename):
+            self.respond ('550 "%s" is not a file' % filename)
+        else:
+            self.respond (
+                    '213 %d' % (self.filesystem.stat(filename)[stat.ST_SIZE])
+                    )
+
+    def cmd_retr (self, line):
+        'retrieve a file'
+        if len(line) < 2:
+            self.command_not_understood (string.join (line))
+        else:
+            file = line[1]
+            if not self.filesystem.isfile (file):
+                self.log_info ('checking %s' % file)
+                self.respond ('550 No such file')
+            else:
+                try:
+                    # FIXME: for some reason, 'rt' isn't working on win95
+                    mode = 'r'+self.type_mode_map[self.current_mode]
+                    fd = self.open (file, mode)
+                except IOError, why:
+                    self.respond ('553 could not open file for reading: %s' % (repr(why)))
+                    return
+                self.respond (
+                        "150 Opening %s mode data connection for file '%s'" % (
+                                self.type_map[self.current_mode],
+                                file
+                                )
+                        )
+                self.make_xmit_channel()
+
+                if self.restart_position:
+                    # try to position the file as requested, but
+                    # give up silently on failure (the 'file object'
+                    # may not support seek())
+                    try:
+                        fd.seek (self.restart_position)
+                    except:
+                        pass
+                    self.restart_position = 0
+
+                self.client_dc.push_with_producer (
+                        file_producer (fd)
+                        )
+                self.client_dc.close_when_done()
+
+    def cmd_stor (self, line, mode='wb'):
+        'store a file'
+        if len (line) < 2:
+            self.command_not_understood (string.join (line))
+        else:
+            if self.restart_position:
+                restart_position = 0
+                self.respond ('553 restart on STOR not yet supported')
+                return
+            file = line[1]
+            # todo: handle that type flag
+            try:
+                fd = self.open (file, mode)
+            except IOError, why:
+                self.respond ('553 could not open file for writing: %s' % (repr(why)))
+                return
+            self.respond (
+                    '150 Opening %s connection for %s' % (
+                            self.type_map[self.current_mode],
+                            file
+                            )
+                    )
+            self.make_recv_channel (fd)
+
+    def cmd_abor (self, line):
+        'abort operation'
+        if self.client_dc:
+            self.client_dc.close()
+        self.respond ('226 ABOR command successful.')
+
+    def cmd_appe (self, line):
+        'append to a file'
+        return self.cmd_stor (line, 'ab')
+
+    def cmd_dele (self, line):
+        if len (line) != 2:
+            self.command_not_understood (string.join (line))
+        else:
+            file = line[1]
+            if self.filesystem.isfile (file):
+                try:
+                    self.filesystem.unlink (file)
+                    self.respond ('250 DELE command successful.')
+                except:
+                    self.respond ('550 error deleting file.')
+            else:
+                self.respond ('550 %s: No such file.' % file)
+
+    def cmd_mkd (self, line):
+        if len (line) != 2:
+            self.command_not_understood (string.join (line))
+        else:
+            path = line[1]
+            try:
+                self.filesystem.mkdir (path)
+                self.respond ('257 MKD command successful.')
+            except:
+                self.respond ('550 error creating directory.')
+
+    def cmd_rmd (self, line):
+        if len (line) != 2:
+            self.command_not_understood (string.join (line))
+        else:
+            path = line[1]
+            try:
+                self.filesystem.rmdir (path)
+                self.respond ('250 RMD command successful.')
+            except:
+                self.respond ('550 error removing directory.')
+
+    def cmd_user (self, line):
+        'specify user name'
+        if len(line) > 1:
+            self.user = line[1]
+            self.respond ('331 Password required.')
+        else:
+            self.command_not_understood (string.join (line))
+
+    def cmd_pass (self, line):
+        'specify password'
+        if len(line) < 2:
+            pw = ''
+        else:
+            pw = line[1]
+        result, message, fs = self.server.authorizer.authorize (self, self.user, pw)
+        if result:
+            self.respond ('230 %s' % message)
+            self.filesystem = fs
+            self.authorized = 1
+            self.log_info('Successful login: Filesystem=%s' % repr(fs))
+        else:
+            self.respond ('530 %s' % message)
+
+    def cmd_rest (self, line):
+        'restart incomplete transfer'
+        try:
+            pos = string.atoi (line[1])
+        except ValueError:
+            self.command_not_understood (string.join (line))
+        self.restart_position = pos
+        self.respond (
+                '350 Restarting at %d. Send STORE or RETRIEVE to initiate transfer.' % pos
+                )
+
+    def cmd_stru (self, line):
+        'obsolete - set file transfer structure'
+        if line[1] in 'fF':
+            # f == 'file'
+            self.respond ('200 STRU F Ok')
+        else:
+            self.respond ('504 Unimplemented STRU type')
+
+    def cmd_mode (self, line):
+        'obsolete - set file transfer mode'
+        if line[1] in 'sS':
+            # f == 'file'
+            self.respond ('200 MODE S Ok')
+        else:
+            self.respond ('502 Unimplemented MODE type')
+
+# The stat command has two personalities.  Normally it returns status
+# information about the current connection.  But if given an argument,
+# it is equivalent to the LIST command, with the data sent over the
+# control connection.  Strange.  But wuftpd, ftpd, and nt's ftp server
+# all support it.
+#
+##      def cmd_stat (self, line):
+##              'return status of server'
+##              pass
+
+    def cmd_syst (self, line):
+        'show operating system type of server system'
+        # Replying to this command is of questionable utility, because
+        # this server does not behave in a predictable way w.r.t. the
+        # output of the LIST command.  We emulate Unix ls output, but
+        # on win32 the pathname can contain drive information at the front
+        # Currently, the combination of ensuring that os.sep == '/'
+        # and removing the leading slash when necessary seems to work.
+        # [cd'ing to another drive also works]
+        #
+        # This is how wuftpd responds, and is probably
+        # the most expected.  The main purpose of this reply is so that
+        # the client knows to expect Unix ls-style LIST output.
+        self.respond ('215 UNIX Type: L8')
+        # one disadvantage to this is that some client programs
+        # assume they can pass args to /bin/ls.
+        # a few typical responses:
+        # 215 UNIX Type: L8 (wuftpd)
+        # 215 Windows_NT version 3.51
+        # 215 VMS MultiNet V3.3
+        # 500 'SYST': command not understood. (SVR4)
+
+    def cmd_help (self, line):
+        'give help information'
+        # find all the methods that match 'cmd_xxxx',
+        # use their docstrings for the help response.
+        attrs = dir(self.__class__)
+        help_lines = []
+        for attr in attrs:
+            if attr[:4] == 'cmd_':
+                x = getattr (self, attr)
+                if type(x) == type(self.cmd_help):
+                    if x.__doc__:
+                        help_lines.append ('\t%s\t%s' % (attr[4:], x.__doc__))
+        if help_lines:
+            self.push ('214-The following commands are recognized\r\n')
+            self.push_with_producer (lines_producer (help_lines))
+            self.push ('214\r\n')
+        else:
+            self.push ('214-\r\n\tHelp Unavailable\r\n214\r\n')
+
+class ftp_server (asyncore.dispatcher):
+    # override this to spawn a different FTP channel class.
+    ftp_channel_class = ftp_channel
+
+    SERVER_IDENT = 'FTP Server (V%s)' % VERSION
+
+    def __init__ (
+            self,
+            authorizer,
+            hostname        =None,
+            ip              ='',
+            port            =21,
+            logger_object=file_logger (sys.stdout)
+            ):
+        self.ip = ip
+        self.port = port
+        self.authorizer = authorizer
+
+        if hostname is None:
+            self.hostname = socket.gethostname()
+        else:
+            self.hostname = hostname
+
+        # statistics
+        self.total_sessions = counter()
+        self.closed_sessions = counter()
+        self.total_files_out = counter()
+        self.total_files_in = counter()
+        self.total_bytes_out = counter()
+        self.total_bytes_in = counter()
+        self.total_exceptions = counter()
+        #
+        asyncore.dispatcher.__init__ (self)
+        self.create_socket (socket.AF_INET, socket.SOCK_STREAM)
+
+        self.set_reuse_addr()
+        self.bind ((self.ip, self.port))
+        self.listen (5)
+
+        if not logger_object:
+            logger_object = sys.stdout
+
+        self.logger = unresolving_logger (logger_object)
+
+        self.log_info('FTP server started at %s\n\tAuthorizer:%s\n\tHostname: %s\n\tPort: %d' % (
+                time.ctime(time.time()),
+                repr (self.authorizer),
+                self.hostname,
+                self.port)
+                )
+
+    def writable (self):
+        return 0
+
+    def handle_read (self):
+        pass
+
+    def handle_connect (self):
+        pass
+
+    def handle_accept (self):
+        conn, addr = self.accept()
+        self.total_sessions.increment()
+        self.log_info('Incoming connection from %s:%d' % (addr[0], addr[1]))
+        self.ftp_channel_class (self, conn, addr)
+
+    # return a producer describing the state of the server
+    def status (self):
+
+        def nice_bytes (n):
+            return string.join (english_bytes (n))
+
+        return lines_producer (
+                ['<h2>%s</h2>'                          % self.SERVER_IDENT,
+                 '<br>Listening on <b>Host:</b> %s' % self.hostname,
+                 '<b>Port:</b> %d'                      % self.port,
+                 '<br>Sessions',
+                 '<b>Total:</b> %s'                     % self.total_sessions,
+                 '<b>Current:</b> %d'           % (self.total_sessions.as_long() - self.closed_sessions.as_long()),
+                 '<br>Files',
+                 '<b>Sent:</b> %s'                      % self.total_files_out,
+                 '<b>Received:</b> %s'          % self.total_files_in,
+                 '<br>Bytes',
+                 '<b>Sent:</b> %s'                      % nice_bytes (self.total_bytes_out.as_long()),
+                 '<b>Received:</b> %s'          % nice_bytes (self.total_bytes_in.as_long()),
+                 '<br>Exceptions: %s'           % self.total_exceptions,
+                 ]
+                )
+
+# ======================================================================
+#                                                Data Channel Classes
+# ======================================================================
+
+# This socket accepts a data connection, used when the server has been
+# placed in passive mode.  Although the RFC implies that we ought to
+# be able to use the same acceptor over and over again, this presents
+# a problem: how do we shut it off, so that we are accepting
+# connections only when we expect them?  [we can't]
+#
+# wuftpd, and probably all the other servers, solve this by allowing
+# only one connection to hit this acceptor.  They then close it.  Any
+# subsequent data-connection command will then try for the default
+# port on the client side [which is of course never there].  So the
+# 'always-send-PORT/PASV' behavior seems required.
+#
+# Another note: wuftpd will also be listening on the channel as soon
+# as the PASV command is sent.  It does not wait for a data command
+# first.
+
+# --- we need to queue up a particular behavior:
+#  1) xmit : queue up producer[s]
+#  2) recv : the file object
+#
+# It would be nice if we could make both channels the same.  Hmmm..
+#
+
+class passive_acceptor (asyncore.dispatcher):
+    ready = None
+
+    def __init__ (self, control_channel):
+        # connect_fun (conn, addr)
+        asyncore.dispatcher.__init__ (self)
+        self.control_channel = control_channel
+        self.create_socket (socket.AF_INET, socket.SOCK_STREAM)
+        # bind to an address on the interface that the
+        # control connection is coming from.
+        self.bind ((
+                self.control_channel.getsockname()[0],
+                0
+                ))
+        self.addr = self.getsockname()
+        self.listen (1)
+
+#       def __del__ (self):
+#               print 'passive_acceptor.__del__()'
+
+    def log (self, *ignore):
+        pass
+
+    def handle_accept (self):
+        conn, addr = self.accept()
+        dc = self.control_channel.client_dc
+        if dc is not None:
+            dc.set_socket (conn)
+            dc.addr = addr
+            dc.connected = 1
+            self.control_channel.passive_acceptor = None
+        else:
+            self.ready = conn, addr
+        self.close()
+
+
+class xmit_channel (async_chat):
+
+    # for an ethernet, you want this to be fairly large, in fact, it
+    # _must_ be large for performance comparable to an ftpd.  [64k] we
+    # ought to investigate automatically-sized buffers...
+
+    ac_out_buffer_size = 16384
+    bytes_out = 0
+
+    def __init__ (self, channel, client_addr=None):
+        self.channel = channel
+        self.client_addr = client_addr
+        async_chat.__init__ (self)
+
+#       def __del__ (self):
+#               print 'xmit_channel.__del__()'
+
+    def log (self, *args):
+        pass
+
+    def readable (self):
+        return not self.connected
+
+    def writable (self):
+        return 1
+
+    def send (self, data):
+        result = async_chat.send (self, data)
+        self.bytes_out = self.bytes_out + result
+        return result
+
+    def handle_error (self):
+        # usually this is to catch an unexpected disconnect.
+        self.log_info ('unexpected disconnect on data xmit channel', 'error')
+        try:
+            self.close()
+        except:
+            pass
+
+    # TODO: there's a better way to do this.  we need to be able to
+    # put 'events' in the producer fifo.  to do this cleanly we need
+    # to reposition the 'producer' fifo as an 'event' fifo.
+
+    def close (self):
+        c = self.channel
+        s = c.server
+        c.client_dc = None
+        s.total_files_out.increment()
+        s.total_bytes_out.increment (self.bytes_out)
+        if not len(self.producer_fifo):
+            c.respond ('226 Transfer complete')
+        elif not c.closed:
+            c.respond ('426 Connection closed; transfer aborted')
+        del c
+        del s
+        del self.channel
+        async_chat.close (self)
+
+class recv_channel (asyncore.dispatcher):
+    def __init__ (self, channel, client_addr, fd):
+        self.channel = channel
+        self.client_addr = client_addr
+        self.fd = fd
+        asyncore.dispatcher.__init__ (self)
+        self.bytes_in = counter()
+
+    def log (self, *ignore):
+        pass
+
+    def handle_connect (self):
+        pass
+
+    def writable (self):
+        return 0
+
+    def recv (*args):
+        result = apply (asyncore.dispatcher.recv, args)
+        self = args[0]
+        self.bytes_in.increment(len(result))
+        return result
+
+    buffer_size = 8192
+
+    def handle_read (self):
+        block = self.recv (self.buffer_size)
+        if block:
+            try:
+                self.fd.write (block)
+            except IOError:
+                self.log_info ('got exception writing block...', 'error')
+
+    def handle_close (self):
+        s = self.channel.server
+        s.total_files_in.increment()
+        s.total_bytes_in.increment(self.bytes_in.as_long())
+        self.fd.close()
+        self.channel.respond ('226 Transfer complete.')
+        self.close()
+
+
+import getopt
+import re, sys
+import asyncore
+import os
+import random
+import imp
+import time
+import thread
+import stat
+import urllib
+import traceback
+import logging
+import zipfile
+
+HTTP_CONTINUE                     = 100
+HTTP_SWITCHING_PROTOCOLS          = 101
+HTTP_PROCESSING                   = 102
+HTTP_OK                           = 200
+HTTP_CREATED                      = 201
+HTTP_ACCEPTED                     = 202
+HTTP_NON_AUTHORITATIVE            = 203
+HTTP_NO_CONTENT                   = 204
+HTTP_RESET_CONTENT                = 205
+HTTP_PARTIAL_CONTENT              = 206
+HTTP_MULTI_STATUS                 = 207
+HTTP_MULTIPLE_CHOICES             = 300
+HTTP_MOVED_PERMANENTLY            = 301
+HTTP_MOVED_TEMPORARILY            = 302
+HTTP_SEE_OTHER                    = 303
+HTTP_NOT_MODIFIED                 = 304
+HTTP_USE_PROXY                    = 305
+HTTP_TEMPORARY_REDIRECT           = 307
+HTTP_BAD_REQUEST                  = 400
+HTTP_UNAUTHORIZED                 = 401
+HTTP_PAYMENT_REQUIRED             = 402
+HTTP_FORBIDDEN                    = 403
+HTTP_NOT_FOUND                    = 404
+HTTP_METHOD_NOT_ALLOWED           = 405
+HTTP_NOT_ACCEPTABLE               = 406
+HTTP_PROXY_AUTHENTICATION_REQUIRED= 407
+HTTP_REQUEST_TIME_OUT             = 408
+HTTP_CONFLICT                     = 409
+HTTP_GONE                         = 410
+HTTP_LENGTH_REQUIRED              = 411
+HTTP_PRECONDITION_FAILED          = 412
+HTTP_REQUEST_ENTITY_TOO_LARGE     = 413
+HTTP_REQUEST_URI_TOO_LARGE        = 414
+HTTP_UNSUPPORTED_MEDIA_TYPE       = 415
+HTTP_RANGE_NOT_SATISFIABLE        = 416
+HTTP_EXPECTATION_FAILED           = 417
+HTTP_UNPROCESSABLE_ENTITY         = 422
+HTTP_LOCKED                       = 423
+HTTP_FAILED_DEPENDENCY            = 424
+HTTP_INTERNAL_SERVER_ERROR        = 500
+HTTP_NOT_IMPLEMENTED              = 501
+HTTP_BAD_GATEWAY                  = 502
+HTTP_SERVICE_UNAVAILABLE          = 503
+HTTP_GATEWAY_TIME_OUT             = 504
+HTTP_VERSION_NOT_SUPPORTED        = 505
+HTTP_VARIANT_ALSO_VARIES          = 506
+HTTP_INSUFFICIENT_STORAGE         = 507
+HTTP_NOT_EXTENDED                 = 510
+
+GLOBAL_TEMP_DIR="/tmp/"
+GLOBAL_ROOT_DIR="no-root-dir-set"
+verbose = 0
+multithreading_enabled = 0
+number_of_threads = 32
+
+def qualify_path(p):
+    if p[-1] != '/':
+        return p + "/"
+    return p
+
+def join_paths(p1,p2):
+    if p1.endswith("/"):
+        if p2.startswith("/"):
+            return p1[:-1] + p2
+        else:
+            return p1 + p2
+    else:
+        if p2.startswith("/"):
+            return p1 + p2
+        else:
+            return p1 + "/" + p2
+
+
+translators = []
+macroresolvers = []
+ftphandlers = []
+contexts = []
+
+def getMacroFile(filename):
+    global macrofile_callback
+    for r in macroresolvers:
+        try:
+            f = r(filename)
+            if f is not None and os.path.isfile(f):
+                return f
+        except: 
+            pass
+    if os.path.isfile(filename):
+        return filename
+    filename2 =  join_paths(GLOBAL_ROOT_DIR,filename)
+    if os.path.isfile(filename2):
+        return filename2
+    raise IOError("No such file: "+filename2)
+   
+
+global_modules={}
+
+def _make_inifiles(root, path):
+    dirs = path.split("/")
+    path = root
+    for dir in dirs:
+        path = join_paths(path, dir)
+        inifile = join_paths(path, "__init__.py")
+        # create missing __init__.py
+        if not os.path.isfile(inifile):
+            if lg:
+                lg.log("creating file "+inifile)
+            open(inifile, "wb").close()
+
+def _load_module(filename):
+    global global_modules
+    b = BASENAME.match(filename)
+    # filename e.g. /my/modules/test.py
+    # b.group(1) = /my/modules/
+    # b.group(2) = test.py
+    if b is None:
+        raise "Internal error with filename "+filename
+    module = b.group(2)
+    if module is None:
+        raise "Internal error with filename "+filename
+            
+    while filename.startswith("./"):
+        filename = filename[2:]
+
+    if filename in global_modules:
+        return global_modules[filename]
+
+    dir = os.path.dirname(filename)
+    path = dir.replace("/",".")
+
+    _make_inifiles(GLOBAL_ROOT_DIR, dir)
+
+    # strip tailing/leading dots
+    while len(path) and path[0] == '.':
+        path = path[1:]
+    while len(path) and path[-1] != '.':
+        path = path + "."
+   
+    module2 = (path + module)
+    if lg:
+        lg.log("Loading module "+module2)
+
+    m = __import__(module2)
+    try:
+        i = module2.index(".")
+        m = eval("m."+module2[i+1:])
+        global_modules[filename] = m
+    except:
+        pass
+    return m
+
+system_modules = sys.modules.copy()
+stdlib, x = os.path.split(os.__file__)
+def _purge_all_modules():
+    for m,mod in sys.modules.items():
+        if m not in system_modules:
+            if hasattr(mod, "__file__"):
+                f = mod.__file__
+                path, x = os.path.split(f)
+                if not path.startswith(stdlib):
+                    del sys.modules[m]
+
+class WebContext:
+    def __init__(self, name, root=None):
+        self.name = name
+        self.files = []
+        self.startupfile = None
+        if root:
+            self.root = qualify_path(root)
+        self.pattern_to_function = {}
+        self.id_to_function = {}
+
+    def addFile(self, filename):
+        file = WebFile(self, filename)
+        self.files += [file]
+        return file
+
+    def setRoot(self, root):
+        self.root = qualify_path(root)
+        while self.root.startswith("./"):
+            self.root = self.root[2:]
+
+    def setStartupFile(self, startupfile):
+        self.startupfile = startupfile
+        lg.log("  executing startupfile")
+        self._load_module(self.startupfile)
+
+    def getStartupFile(self):
+        return self.startupfile
+
+    def match(self, path):
+        function = None
+        for pattern,call in self.pattern_to_function.items():
+            if pattern.match(path):
+                function,desc = call
+                if verbose:
+                    lg.log("Request %s matches (%s)" % (req.path, desc))
+        if function is None:
+            for id,call in self.id_to_function.items():
+                if path == id:
+                    function,desc = call
+                    if verbose:
+                        lg.log("Request %s matches handler (%s)" % (req.path, desc))
+        if not function:
+            return None
+        def call_and_close(f,req):
+            status = f(req)
+            if status is not None and type(1)==type(status) and status>10:
+                req.reply_code = status
+                if status == 404:
+                    return req.error(status, "not found")
+                elif(status >= 400 and status <= 500):
+                    return req.error(status)
+            return req.done()
+        return lambda req: call_and_close(function,req)
+
+class FileStore:
+    def __init__(self, name, root=None):
+        self.name = name
+        self.handlers = []
+        if type(root) == type(""):
+            self.addRoot(root)
+        elif type(root) == type([]):
+            for dir in root:
+                self.addRoot(dir)
+
+    def match(self, path):
+        return lambda req: self.findfile(req)
+
+    def findfile(self, request):
+        for handler in self.handlers:
+            if handler.can_handle(request):
+                return handler.handle_request(request)
+        return request.error(404, "File "+request.path+" not found")
+
+    def addRoot(self, dir):
+        dir = qualify_path(dir)
+        while dir.startswith("./"):
+            dir = dir[2:]
+        if zipfile.is_zipfile(GLOBAL_ROOT_DIR + dir[:-1]) and dir.lower().endswith("zip/"):
+            self.handlers += [default_handler (zip_filesystem (GLOBAL_ROOT_DIR + dir[:-1]))]
+        else:
+            self.handlers += [default_handler (os_filesystem (GLOBAL_ROOT_DIR + dir))]
+
+class WebFile:
+    def __init__(self, context, filename):
+        self.context = context
+        if filename[0] == '/':
+            filename = filename[1:]
+        self.filename = filename
+        self.m = _load_module(filename)
+        self.handlers = []
+
+    def addHandler(self, function):
+        handler = WebHandler(self, function)
+        self.handlers += [handler]
+        return handler
+
+    def addFTPHandler(self, ftpclass):
+        global ftphandlers
+        m = self.m
+        try:
+            c = eval("m."+ftpclass)
+            if c is None:
+                raise
+            ftphandlers += [c]
+        except:
+            lgerr.log("Error in FTP Handler:" + str(sys.exc_info()[0]) + " " + str(sys.exc_info()[1]))
+            traceback.print_tb(sys.exc_info()[2],None,lgerr)
+            raise "No such function "+ftpclass+" in file "+self.filename
+
+    def addMacroResolver(self, macroresolver):
+        global macroresolvers
+        m = self.m
+        try:
+            f = eval("m."+macroresolver)
+            if f is None: 
+                raise
+            macroresolvers += [f]
+        except:
+            lgerr.log("Error in Macro Resolver:" + str(sys.exc_info()[0]) + " " + str(sys.exc_info()[1]))
+            traceback.print_tb(sys.exc_info()[2],None,lgerr)
+            raise "No such function "+macroresolver+" in file "+self.filename
+
+    def addTranslator(self, handler):
+        global translators
+        m = self.m
+        try:
+            f = eval("m."+translator)
+            if f is None: 
+                raise
+            translators += [f]
+        except:
+            lgerr.log("Error in Macro Resolver:" + str(sys.exc_info()[0]) + " " + str(sys.exc_info()[1]))
+            traceback.print_tb(sys.exc_info()[2],None,lgerr)
+            raise "No such function "+translator+" in file "+self.filename
+
+    def getFileName(self):
+        return self.context.root + self.filename
+
+class WebHandler:
+    def __init__(self, file, function):
+        self.file = file
+        self.function = function
+        m = file.m
+        try:
+            self.f = eval("m."+function)
+            if self.f is None: 
+                raise
+        except:
+            lgerr.log("Error in Handler:" + str(sys.exc_info()[0]) + " " + str(sys.exc_info()[1]))
+            traceback.print_tb(sys.exc_info()[2],None,lgerr)
+            raise "No such function "+function+" in file "+self.file.filename
+
+    def addPattern(self, pattern):
+        p = WebPattern(self,pattern)
+        desc = "pattern %s, file %s, function %s" % (pattern,self.file.filename,self.function)
+        desc2 = "file %s, function %s" % (self.file.filename,self.function)
+        self.file.context.pattern_to_function[p.getPattern()] = (self.f,desc)
+        self.file.context.id_to_function["/"+self.function] = (self.f,desc2)
+        return p
+
+class WebPattern:
+    def __init__(self, handler, pattern):
+        self.handler = handler 
+        self.pattern = pattern 
+        if not pattern.endswith('$'):
+            pattern = pattern + "$"
+        self.compiled = re.compile(pattern)
+    def getPattern(self):
+        return self.compiled
+    def getPatternString(self):
+        return self.pattern
+
+def read_ini_file(filename):
+    global GLOBAL_TEMP_DIR,GLOBAL_ROOT_DIR,number_of_threads,multithreading_enabled,contexts
+    lineno = 0
+    fi = open(filename, "rb")
+    file = None
+    function = None
+    context = None
+    GLOBAL_ROOT_DIR = '/'
+    for line in fi.readlines():
+        lineno=lineno+1
+        hashpos = line.find("#")
+        if hashpos>=0:
+            line = line[0:hashpos]
+        line = line.strip()
+        
+        if line == "":
+            continue #skip empty line
+
+        equals = line.find(":")
+        if equals<0:
+            continue
+        key = line[0:equals].strip()
+        value = line[equals+1:].strip()
+        if key == "tempdir":
+            GLOBAL_TEMP_DIR = qualify_path(value)
+        elif key == "threads":
+            number_of_threads = int(value)
+            multithreading_enabled = 1
+        elif key == "base":
+            GLOBAL_ROOT_DIR = qualify_path(value)
+            sys.path += [GLOBAL_ROOT_DIR]
+        elif key == "filestore":
+            if len(value) and value[0] != '/':
+                value = "/" + value 
+            filestore = FileStore(value)
+            contexts += [filestore]
+            context = None
+        elif key == "context":
+            if len(value) and value[0] != '/':
+                value = "/" + value 
+            contextname = value
+            context = WebContext(contextname)
+            contexts += [context]
+            filestore = None
+        elif key == "startupfile":
+            if context is not None:
+                context.setStartupFile(value)
+            else:
+                raise "Error: startupfile must be below a context"
+        elif key == "root":
+            if value.startswith('/'):
+                value = value[1:]
+            if context:
+                context.setRoot(value)
+            if filestore:
+                filestore.addRoot(value)
+        elif key == "file":
+            filename = value
+            context.addFile(filename)
+        elif key == "ftphandler":
+            file.addFTPHandler(value)
+        elif key == "handler":
+            function = value
+            file.addHandler(function)
+        elif key == "macroresolver":
+            file.addMacroResolver(value)
+        elif key == "translator":
+            file.addTranslator(value)
+        elif key == "pattern":
+            handler.addPattern(value)
+        else:
+            raise "Syntax error in line "+str(lineno)+" of file "+filename+":\n"+line
+    fi.close()
+
+def headers_to_map(mylist):
+    headers={}
+    for h in mylist:
+        try:
+            i = h.index(':')
+        except:
+            i = -1
+        if i >= 0:
+            key = h[0:i].lower()
+            value = h[i+1:]
+            if len(value)>0 and value[0] == ' ':
+                value = value[1:]
+            headers[key] = value
+        else:
+            if len(h.strip())>0:
+                lg.log("invalid header: "+str(h))
+    return headers
+                    
+class AthanaFile:
+    def __init__(self,fieldname, parammap,filename,content_type):
+        self.fieldname = fieldname
+        self.parammap = parammap
+        self.filename = filename
+        self.content_type = content_type
+        self.tempname = GLOBAL_TEMP_DIR+str(int(random.random()*999999))+os.path.splitext(filename)[1]
+        self.filesize = 0
+        self.fi = open(self.tempname, "wb")
+    def adddata(self,data):
+        self.filesize += len(data)
+        self.fi.write(data)
+    def close(self):
+        self.fi.close()
+        # only append file to parameters if it contains some data
+        if self.filename or self.filesize:
+            self.parammap[self.fieldname] = self
+        del self.fieldname
+        del self.parammap
+        del self.fi
+    def __str__(self):
+        return "file %s (%s), %d bytes, content-type: %s" % (self.filename, self.tempname, self.filesize, self.content_type)
+
+class AthanaField:
+    def __init__(self,fieldname,parammap):
+        self.fieldname = fieldname
+        self.data = ""
+        self.parammap = parammap
+    def adddata(self,data):
+        self.data += data
+    def close(self):
+        try:
+            oldvalue = self.parammap[self.fieldname] + ";"
+        except KeyError:
+            oldvalue = ""
+        self.parammap[self.fieldname] = oldvalue + self.data
+        del self.data
+        del self.parammap
+
+class simple_input_collector:
+    def __init__ (self, handler, request, length):
+        self.request = request
+        self.length = length
+        self.handler = handler
+        request.channel.set_terminator(length)
+        self.data = ""
+
+    def collect_incoming_data (self, data):
+        self.data += data
+
+    def found_terminator(self):
+        self.request.channel.set_terminator('\r\n\r\n')
+        self.request.collector = None
+        d=self.data;del self.data
+        r=self.request;del self.request
+        parameters={}
+        data = d.split('&')
+        for e in data:
+            if '=' in e:
+                key,value = e.split('=')
+                key = urllib.unquote_plus(key)
+                try:
+                    oldvalue = parameters[key]+";"
+                except KeyError:
+                    oldvalue = ""
+                parameters[key] = oldvalue + urllib.unquote_plus(value)
+            else:
+                if len(e.strip())>0:
+                    lg.log("Unknown parameter: "+e)
+        self.handler.continue_request(r,parameters)
+
+class upload_input_collector:
+    def __init__ (self, handler, request, length, boundary):
+        self.request = request
+        self.length = length
+        self.handler = handler
+        self.boundary = boundary
+        request.channel.set_terminator(length)
+        self.data = ""
+        self.pos = 0
+        self.start_marker = "--"+boundary+"\r\n"
+        self.end_marker = "--"+boundary+"--\r\n"
+        self.prefix = "--"+boundary
+        self.marker = "\r\n--"+boundary
+        self.header_end_marker = "\r\n\r\n"
+        self.current_file = None
+        self.boundary = boundary
+        self.file = None
+        self.parameters = {}
+        self.files = []
+
+    def parse_semicolon_parameters(self,params):
+        params = params.split("; ")
+        parmap = {}
+        for a in params:
+            if '=' in a:
+                key,value = a.split('=')
+                if value.startswith('"') and value.endswith('"'):
+                    value = value[1:-1]
+                parmap[key] = value
+        return parmap
+
+    def startFile(self,headers):
+        fieldname = None
+        filename = None
+        if self.file is not None:
+            raise "Illegal state"
+        if "content-disposition" in headers:
+            cd = headers["content-disposition"]
+            l = self.parse_semicolon_parameters(cd)
+            if "name" in l:
+                fieldname = l["name"]
+            if "filename" in l:
+                filename = l["filename"]
+        if "content-type" in headers:
+            content_type = headers["content-type"]
+            self.file = AthanaFile(fieldname,self.parameters,filename,content_type)
+            self.files += [self.file]
+        else:
+            self.file = AthanaField(fieldname,self.parameters)
+
+    def split_headers(self,string):
+        return string.split("\r\n")
+
+    def collect_incoming_data (self, newdata):
+        self.pos += len(newdata)
+        self.data += newdata
+       
+        while len(self.data)>0:
+            if self.data.startswith(self.end_marker):
+                self.data = self.data[len(self.end_marker):]
+                if self.file is not None:
+                    self.file.close()
+                    self.file = None
+                return
+            elif self.data.startswith(self.start_marker):
+                try:
+                    i = self.data.index(self.header_end_marker, len(self.start_marker))
+                except:
+                    i = -1
+                if i>=0:
+                    headerstr = self.data[len(self.start_marker):i+2]
+                    headers = headers_to_map(self.split_headers(headerstr))
+                    self.startFile(headers)
+                    self.data = self.data[i+len(self.header_end_marker):]
+                else:
+                    return # wait for more data (inside headers)
+            elif self.data.startswith(self.prefix):
+                return
+            else:
+                try:
+                    bindex = self.data.index(self.marker)
+                    self.file.adddata(self.data[0:bindex])
+                    self.file.close()
+                    self.file = None
+                    self.data = self.data[bindex+2:] # cut to position after \r\n
+                except ValueError: #not found
+                    if(len(self.data) <= len(self.marker)):
+                        return #wait for more data before we make a decision or pass through data
+                    else:
+                        self.file.adddata(self.data[0:-len(self.marker)])
+                        self.data = self.data[-len(self.marker):]
+
+    def found_terminator(self):
+        if len(self.data)>0:# and self.file is not None:
+            if self.file is not None:
+                self.file.close()
+                self.file = None
+            raise "Unfinished/malformed multipart request"
+        if self.file is not None:
+            self.file.close()
+            self.file = None
+            
+        self.request.collector = None
+        self.request.channel.set_terminator('\r\n\r\n')
+        d=self.data;del self.data
+        r=self.request;del self.request
+        r.tempfiles = [f.tempname for f in self.files]
+        self.handler.continue_request(r,self.parameters)
+
+class Session(dict):
+    def __init__(self, id):
+        self.id = id
+    def use(self):
+        self.lastuse = time.time()
+
+def exception_string():
+    s = "Exception "+str(sys.exc_info()[0])
+    info = sys.exc_info()[1]
+    if info:
+        s += " "+str(info)
+    s += "\n"
+    for l in traceback.extract_tb(sys.exc_info()[2]):
+        s += "  File \"%s\", line %d, in %s\n" % (l[0],l[1],l[2])
+    s += "    %s\n" % l[3]
+    return s
+
+BASENAME = re.compile("([^/]*/)*([^/.]*)(.py)?")
+MULTIPART = re.compile ('multipart/form-data.*boundary=([^ ]*)', re.IGNORECASE)
+SESSION_PATTERN = re.compile("^;[a-z0-9]{6}-[a-z0-9]{6}-[a-z0-9]{6}$")
+
+use_cookies = 1
+
+class AthanaHandler:
+    def __init__(self):
+        self.sessions = {}
+        self.queue = []
+        self.queuelock = thread.allocate_lock()
+
+    def match(self, request):
+        path, params, query, fragment = request.split_uri()
+        #lg.log("===== request:"+path+"=====")
+        return 1
+    
+    def handle_request (self, request):
+        headers = headers_to_map(request.header)
+        request.request_headers = headers
+
+        size=headers.get("content-length",None)
+
+        if size and size != '0':
+            size=int(size)
+            ctype=headers.get("content-type",None)
+            b = MULTIPART.match(ctype)
+            if b is not None:
+                request.type = "MULTIPART"
+                boundary = b.group(1)
+                request.collector = upload_input_collector(self,request,size,boundary)
+            else:
+                request.type = "POST"
+                request.collector = simple_input_collector(self,request,size)
+        else:
+            request.type = "GET"
+            self.continue_request(request, {})
+
+    def create_session_id(self):
+        pid = abs((str(random.random())).__hash__())
+        now = abs((str(time.time())).__hash__())
+        rand = abs((str(random.random())).__hash__())
+        x = "abcdefghijklmnopqrstuvwxyz0123456789"
+        result = ""
+        for a in range(0,6):
+            result += x[pid%36]
+            pid = pid / 36
+        result += "-"
+        for a in range(0,6):
+            result += x[now%36]
+            now = now / 36
+        result += "-"
+        for a in range(0,6):
+            result += x[rand%36]
+            rand = rand / 36
+        return result
+
+    def continue_request(self, request, parameters):
+
+        path, params, query, fragment = request.split_uri()
+        
+        ip = request.request_headers.get("x-forwarded-for",None)
+        if ip is None:
+            try: ip = request.channel.addr[0]
+            except: pass
+        if ip:
+            request.channel.addr = (ip,request.channel.addr[1])
+
+        request.log()
+
+        if query is not None:
+            if query[0] == '?':
+                query=query[1:]
+            query = query.split('&')
+            for e in query:
+                key,value = e.split('=')
+                key = urllib.unquote_plus(key)
+                try:
+                    oldvalue = parameters[key]+";"
+                except KeyError:
+                    oldvalue = ""
+                parameters[key] = oldvalue + urllib.unquote_plus(value) #_plus?
+
+        cookies = {}
+        if "cookie" in request.request_headers:
+            cookiestr = request.request_headers["cookie"]
+            if cookiestr.rfind(";") == len(cookiestr)-1:
+                cookiestr = cookiestr[:-1]
+            items = cookiestr.split(';')
+            for a in items:
+                key,value = a.strip().split('=')
+                cookies[key] = value
+
+        request.Cookies = cookies
+
+        sessionid = None
+        if params is not None and SESSION_PATTERN.match(params):
+            sessionid = params
+            if sessionid[0] == ';':
+                sessionid = sessionid[1:]
+        elif use_cookies and "PSESSION" in cookies:
+            sessionid = cookies["PSESSION"]
+
+        if sessionid is not None:
+            if sessionid in self.sessions:
+                session = self.sessions[sessionid]
+                session.use()
+            else:
+                session = Session(sessionid)
+                self.sessions[sessionid] = session
+        else:
+            sessionid = self.create_session_id()
+            session = Session(sessionid)
+            self.sessions[sessionid] = session
+
+
+        request['Connection'] = 'close';
+        request['Content-Type'] = 'text/html; encoding=utf-8; charset=utf-8';
+
+        maxlen = -1
+        context = None
+        global contexts
+        for c in contexts:
+            #lg.debug("Compare context "+c.name+" with request "+path)
+            if path.startswith(c.name) and len(c.name)>maxlen:
+                context = c
+                maxlen = len(context.name)
+        if context is None:
+            request.error (404)
+            return
+
+        #print "Request ",'"'+path+'"',"maps to context",context.name
+        fullpath = path
+        path = path[len(context.name):]
+        if len(path)==0 or path[0] != '/':
+            path = "/" + path
+
+        request.session = session
+        request.sessionid = sessionid
+        request.context = context
+        request.path = path
+        request.fullpath = fullpath
+        request.paramstring = params
+        request.query = query
+        request.fragment = fragment
+        request.params = parameters
+        request.request = request
+        request.ip = ip
+        request.uri = request.uri.replace(context.name, "/")
+        request._split_uri = None
+
+        if use_cookies:
+            request.setCookie('PSESSION', sessionid, time.time()+3600*2)
+
+        request.channel.current_request = None
+
+        function = context.match(path)
+       
+        if function is not None:
+            if not multithreading_enabled:
+                self.callhandler(function, request)
+            else:
+                self.queuelock.acquire()
+                self.queue += [(function,request)]
+                self.queuelock.release()
+            return
+        else:
+            lg.log("Request %s matches no pattern (context: %s)" % (request.path,context.name))
+            return request.error(404, "File %s not found" % request.path)
+        
+    def callhandler(self, function, req):
+        request = req.request
+        s = None
+        try:
+            status = function(req)
+        except:
+            lgerr.log("Error in page :" + str(sys.exc_info()[0]) + " " + str(sys.exc_info()[1]))
+            traceback.print_tb(sys.exc_info()[2],None,lgerr)
+            s = "<pre>"+exception_string()+"</pre>"
+            return request.error(500,s)
+
+def worker_thread(server):
+    while 1:
+        server.queuelock.acquire()
+        if len(server.queue) == 0:
+            server.queuelock.release()
+            time.sleep(0.01)
+        else:
+            function,req = server.queue.pop()
+            server.queuelock.release()
+            try:
+                server.callhandler(function,req)
+            except:
+                lgerr.log("Error while processing request:" + str(sys.exc_info()[0]) + " " + str(sys.exc_info()[1]))
+                traceback.print_tb(sys.exc_info()[2],None,lgerr)
+
+class fs:
+    pass
+
+class virtual_authorizer:
+    def __init__ (self):
+        pass
+    def authorize (self, channel, username, password):
+        channel.persona = -1, -1
+        channel.read_only = 1
+        #return 1, 'Ok.', fs()
+        return 1, 'Ok.', os_filesystem("/home/kramm")
+
+    def __repr__(self):
+        return 'virtual'
+
+class logging_logger:
+    def __init__(self,name="athana"):
+        self.logger = logging.getLogger(name)
+    def log (self, message):
+        self.logger.info(message.rstrip())
+    def debug (self, message):
+        self.logger.debug(message.rstrip())
+    def write (self, message):
+        self.logger.info(message.rstrip())
+    def error (self, message):
+        self.logger.error(message.rstrip())
+
+lg = logging_logger()
+lgerr = logging_logger("errors")
+
+class zip_filesystem:
+    def __init__(self, filename):
+        self.filename = filename
+        self.wd = '/'
+        self.m = {}
+        self.z = zipfile.ZipFile(filename)
+        self.lock = thread.allocate_lock()
+        for f in self.z.filelist:
+            self.m['/' + f.filename] = f
+
+    def current_directory(self):
+        return self.wd
+
+    def isfile(self, path):
+        if len(path) and path[-1]=='/':
+            return 0
+        return (self.wd + path) in self.m
+
+    def isdir (self, path):
+        if not (len(path) and path[-1]=='/'):
+            path += '/'
+        return path in self.m
+
+    def cwd (self, path):
+        path = join_paths(self.wd, path)
+        if not self.isdir (path):
+            return 0
+        else:
+            self.wd = path
+            return 1
+
+    def cdup (self):
+        try:
+            i = self.wd[:-1].rindex('/')
+            self.wd = self.wd[0:i+1]
+        except ValueError:
+            self.wd = '/'
+        return 1
+
+    def listdir (self, path, long=0):
+        raise "Not implemented"
+
+    # TODO: implement a cache w/timeout for stat()
+    def stat (self, path):
+        fullpath = join_paths(self.wd, path)
+        if self.isfile(path):
+            size = self.m[fullpath].file_size
+            return (33188, 77396L, 10L, 1, 1000, 1000, size, 0,0,0)
+        elif self.isdir(path):
+            return (16895, 117481L, 10L, 20, 1000, 1000, 4096L, 0,0,0)
+        else:
+            raise "No such file or directory "+path
+
+    def open (self, path, mode):
+        class zFile:
+            def __init__(self, content):
+                self.content = content
+                self.pos = 0
+                self.len = len(content)
+            def read(self,l=None):
+                if l is None:
+                    l = self.len - self.pos
+                if self.len < self.pos + l:
+                    l = self.len - self.pos
+                s = self.content[self.pos : self.pos + l]
+                self.pos += l
+                return s
+            def close(self):
+                del self.content
+                del self.len
+                del self.pos
+        self.lock.acquire()
+        try:
+            data = self.z.read(path)
+        finally:
+            self.lock.release()
+        return zFile(data)
+
+    def unlink (self, path):
+        raise "Not implemented"
+    def mkdir (self, path):
+        raise "Not implemented"
+    def rmdir (self, path):
+        raise "Not implemented"
+
+    def longify (self, (path, stat_info)):
+        return unix_longify (path, stat_info)
+
+    def __repr__ (self):
+        return '<zipfile fs root:%s wd:%s>' % (self.filename, self.wd)
+
+
+def setBase(base):
+    global GLOBAL_ROOT_DIR
+    GLOBAL_ROOT_DIR = qualify_path(base)
+   
+def setTempDir(tempdir):
+    global GLOBAL_TEMP_DIR
+    GLOBAL_TEMP_DIR = qualify_path(tempdir)
+    
+def addMacroResolver(m):
+    global macroresolvers
+    macroresolvers += [m]
+
+def addTranslator(m):
+    global translators
+    translators += [m]
+
+def addFTPHandler(m):
+    global ftphandlers
+    ftphandlers += [m]
+
+def addContext(webpath, localpath):
+    global contexts
+    c = WebContext(webpath, localpath)
+    contexts += [c]
+    return c
+
+def flush():
+    global contexts,translators,ftphandlers,macroresolvers,global_modules
+    contexts[:] = []
+    translators[:] = []
+    ftphandlers[:] = []
+    macroresolvers[:] = []
+    global_modules.clear()
+    _purge_all_modules()
+
+def addFileStore(webpath, localpaths):
+    global contexts
+    if len(webpath) and webpath[0] != '/':
+        webpath = "/" + webpath 
+    c = FileStore(webpath, localpaths)
+    contexts += [c]
+    return c
+
+def setThreads(number):
+    global number_of_threads
+    global multithreading_enabled
+    if number>1:
+        multithreading_enabled=1
+        number_of_threads=number
+    else:
+        multithreading_enabled=0
+        number_of_threads=1
+        
+def run(port=8081):
+    check_date()
+    ph = AthanaHandler()
+    hs = http_server ('', port, logger_object = lg)
+    hs.install_handler (ph)
+
+    if len(ftphandlers) > 0:
+        ftp = ftp_server (virtual_authorizer(), port=8021, logger_object=lg)
+
+    if multithreading_enabled: 
+        threadlist = []
+        for i in range(number_of_threads):
+            threadlist += [thread.start_new_thread(worker_thread, (ph,))]
+
+    while 1:
+        try:
+            asyncore.loop(timeout=0.01)
+        except select.error:
+            continue
+
+"""
+TODO: 
+    * session clearup
+    * temp directory in .cfg file
+"""
+
+def setTempDir(path):
+    global GLOBAL_TEMP_DIR
+    GLOBAL_TEMP_DIR = path
+
+def mainfunction():
+    global verbose,port,init_file,log_file,temp_path,multithreading_enabled,number_of_threads,GLOBAL_TEMP_DIR,contexts,lg,lgerr
+    os.putenv('ATHANA_VERSION',ATHANA_VERSION)
+
+    from optparse import OptionParser
+
+    parser = OptionParser()
+
+    parser.add_option("-v", "--verbose", dest="verbose", help="Be more verbose", action="store_true")
+    parser.add_option("-q", "--quiet", dest="quiet", help="Be quiet", action="store_true")
+    parser.add_option("-d", "--debug", dest="debug", help="Turn on debugging", action="store_true")
+    parser.add_option("-p", "--port", dest="port", help="Set the port number", action="store",type="string")
+    parser.add_option("-i", "--init-file", dest="init", help="Set the init file to use",action="store",type="string")
+    parser.add_option("-l", "--log-file", dest="log", help="Set the logging file to use",action="store",type="string")
+    parser.add_option("-t", "--temp-path", dest="temp", help="Set the temporary directory (default: /tmp/)",action="store",type="string")
+    parser.add_option("-m", "--multithread", dest="multithreading_enabled", help="Enable multithreading",action="store_true")
+    parser.add_option("-n", "--number-of-threads", dest="threads", help="Number of threads",action="store",type="int")
+    parser.add_option("-T", "--talfile", dest="talfile", help="execute TAL File",action="store",type="string")
+
+    (options, args) = parser.parse_args()
+
+    verbose = 0
+    init_file="web.cfg"
+    log_file=None
+    temp_path="/tmp/"
+    port=8081
+    
+    if options.verbose != None : verbose = 2
+    if options.quiet != None : verbose = 0
+    if options.debug != None : verbose = 3
+    if options.port != None : port = int(options.port)
+    if options.init != None : init_file = options.init
+    if options.log != None : log_file = options.log
+    if options.temp != None : GLOBAL_TEMP_DIR = options.temp
+    if options.multithreading_enabled : multithreading_enabled = 1
+    if options.threads != None : number_of_threads = options.threads
+
+    if options.talfile:
+        print getTAL(options.talfile, {"mynone":None})
+        sys.exit(0)
+
+    if inifile:
+        contexts += read_ini_file(inifile)
+    
+    if logfile is not None:
+        fi = open(logfile, "wb")
+        lg = file_logger (fi)
+        lgerr = lg
+
+    print "-"*72
+    if multithreading_enabled:
+        print "Starting Athana (%d threads)..." % number_of_threads
+    else:
+        print "Starting Athana..."
+    print "Init-File:",init_file
+    print "Log-File:",log_file
+    print "Temp-Path:",GLOBAL_TEMP_DIR
+    print "-"*72
+
+    run(port)
+
+if __name__ == '__main__':
+    import athana
+    athana.mainfunction()
diff --git a/rendertest/testpdfs.py b/rendertest/testpdfs.py
new file mode 100644 (file)
index 0000000..48c17c5
--- /dev/null
@@ -0,0 +1,353 @@
+import Image
+import ImageChops
+import ImageFilter
+import sys
+import os
+import traceback
+from athana import getTALstr
+import random
+import md5
+
+filenames = []
+directories = ["pdfs"]
+
+SWFRENDER="swfrender"
+PDFTOPPM="./pdftoppm"
+CONVERT="convert"
+PDF2SWF="pdf2swf"
+
+COMPARE=["xpdf", "xpdf -C"]
+OUTPUTDIR = "results.clip/"
+
+#COMPARE=["xpdf", PDF2SWF+" -s convertgradients"]
+#OUTPUTDIR = "results.pdf2swf/"
+
+#COMPARE=[PDF2SWF, PDF2SWF+" --flatten"]
+#OUTPUTDIR = "results.flatten/"
+
+counter = 1
+
+def randstr():
+    return md5.md5(str(random.random())).hexdigest()[0:8]
+
+def unlink(file):
+    try:
+        os.unlink(file)
+    except:
+        pass
+
+def system(command):
+    if ">" not in command:
+        if os.system(command + " > /tmp/log.txt 2>&1") & 0xff00:
+            error = open("/tmp/log.txt", "rb").read()
+            print error
+            return error
+    else:
+        if os.system(command) & 0xff00:
+            return "Unknown error in "+command
+
+class ConversionError:
+    def __init__(self, msg):
+        self.msg = msg
+    def __str__(self):
+        return self.msg
+
+class TooComplexError:
+    def __init__(self, msg):
+        self.msg = msg
+    def __str__(self):
+        return self.msg
+
+class BadMatch:
+    def __init__(self, msg):
+        self.msg = msg
+    def __str__(self):
+        return self.msg
+
+def formatException():
+    s = "Exception "+str(sys.exc_info()[0])
+    info = sys.exc_info()[1]
+    if info:
+        s += " "+str(info)
+    s += "\n"
+    for l in traceback.extract_tb(sys.exc_info()[2]):
+        s += "  File \"%s\", line %d, in %s\n" % (l[0],l[1],l[2])
+        s += "    %s\n" % l[3]
+    return s
+
+
+class PDFPage:
+    def __init__(self, filename, page, width, height):
+        self.filename = filename
+        self.page = page
+        self.rating = None
+        self.message = None
+        self.htmlmessage = None
+        self.file1 = None
+        self.file2 = None
+        self.file12 = None
+        self.html12 = None
+        self.htmldiff = None
+        self.width,self.height = width,height
+
+    def runtool(self, cmd, filename, page, file):
+        if cmd.startswith("xpdf"):
+            unlink("/tmp/test-%06d.ppm" % page)
+            args = cmd[4:]
+            error = system(PDFTOPPM + "%s -r 72 -f %d -l %d '%s' /tmp/test" % (args, page, page, filename))
+            if error:
+                raise ConversionError(error)
+            unlink(file)
+            error = system(CONVERT + " /tmp/test-%06d.ppm  %s" % (page, file))
+            if error:
+                raise ConversionError(error)
+            unlink("/tmp/test-%06d.ppm" % page)
+        else:
+            unlink("/tmp/test.swf")
+            unlink("svp.ps")
+            error = system(COMPARE[0]+ " -Q 300 -p%d '%s' -o /tmp/test.swf" % (page, filename))
+            #system("mv svp.ps %s.ps" % randstr())
+            if error and "supports 65536" in error:
+                raise TooComplexError(error)
+            if error:
+                raise ConversionError(error)
+            unlink(file)
+            error = system(SWFRENDER + " /tmp/test.swf -o %s" % file)
+            if error:
+                raise ConversionError(error)
+            unlink("/tmp/test.swf")
+        
+    def runtools(self, filename, page, file1, file2, file12):
+
+        badness = 0.0
+
+        self.runtool(COMPARE[0], filename, page, file2)
+        self.runtool(COMPARE[1], filename, page, file1)
+
+        unlink(file12)
+
+        pic1 = Image.open(file1)
+        pic1.load()
+        self.width1 = pic1.size[0]
+        self.height1 = pic1.size[1]
+        
+        pic2 = Image.open(file2)
+        pic2.load()
+        self.width2 = pic2.size[0]
+        self.height2 = pic2.size[1]
+
+        if abs(self.width1-self.width2)>5 or abs(self.height1!=self.height2)>5:
+            badness += 65536*abs(self.width2-self.width1)*max(self.height1,self.height2)+65536*abs(self.height2-self.height1)*max(self.width1,self.width2)
+
+        minx = min(self.width1,self.width2)
+        miny = min(self.height1,self.height2)
+
+        pic1 = pic1.crop((0,0,minx,miny))
+        pic1 = pic1.convert("RGB")
+        pic1 = pic1.filter(ImageFilter.BLUR)
+        pic2 = pic2.crop((0,0,minx,miny))
+        pic2 = pic2.convert("RGB")
+        pic2 = pic2.filter(ImageFilter.BLUR)
+
+        diffimage = ImageChops.difference(pic1,pic2)
+        diffimage.save(file12, "PNG")
+        
+        # compute quadratical difference
+        diff = diffimage.histogram()
+        for i in range(1,128):
+            badness += (diff[i] + diff[256-i])*float(i*i)
+            badness += (diff[256+i] + diff[256+256-i])*float(i*i)
+            badness += (diff[512+i] + diff[512+256-i])*float(i*i)
+
+        badness /= (minx*miny)*3
+
+        return badness
+
+    def compare(self):
+        try:
+            global counter
+            self.file1 = str(counter) + ".png"
+            counter = counter + 1
+            self.file2 = str(counter) + ".png"
+            counter = counter + 1
+            self.file12 = str(counter) + ".png"
+            counter = counter + 1
+            self.rating = self.runtools(self.filename, self.page, OUTPUTDIR + self.file1, OUTPUTDIR + self.file2, OUTPUTDIR + self.file12)
+        except BadMatch:
+            self.rating = 65534.0
+            self.message = formatException()
+            print self.message
+        except ConversionError:
+            self.rating = 65535.0
+            self.message = formatException()
+            print self.message
+        except TooComplexError:
+            self.rating = 65536.0
+            self.message = formatException()
+            print self.message
+        except:
+            self.rating = 65537.0
+            self.message = formatException()
+            print self.message
+
+    def getsizes(self):
+        if self.message:
+            return ""
+        if abs(self.width1 - self.width2) > 5 or \
+           abs(self.height1 - self.height2) > 5:
+               return '<font color="red">%dx%d <-> %dx%d</font>' % (self.width1, self.height1, self.width2, self.height2)
+        else:
+               return '%dx%d,%dx%d' % (self.width1, self.height1, self.width2, self.height2)
+
+    def generatehtml(self):
+        global OUTPUTDIR
+        global counter
+        self.html12 = str(counter) + ".html"
+        counter = counter + 1
+        self.htmldiff = str(counter) + ".html"
+        counter = counter + 1
+        fi = open(OUTPUTDIR + self.html12, "wb")
+        fi.write(getTALstr("""
+<html><head></head>
+<body>
+<tal:block tal:replace="python:'File: '+self.filename"/><br>
+<tal:block tal:replace="python:'Page: '+str(self.page)"/><br>
+<tal:block tal:replace="python:'Rating: '+str(self.rating)"/><br>
+<pre tal:condition="python:self.message" tal:replace="python:'Message: '+str(self.message)"/><br>
+<hr>
+<table cellspacing="0" cellpadding="0">
+<tr><td><img tal:attributes="src python:self.file1"/></td><td><img tal:attributes="src python:self.file2"/></td></tr>
+<tr><td>pdf2swf Version</td><td>pdftoppm Version</td></tr>
+</table>
+<hr>
+</body>
+</html>""", {"self": self}))
+        fi.close()
+        
+        fi = open(OUTPUTDIR + self.htmldiff, "wb")
+        fi.write(getTALstr("""
+<html><head></head>
+<body>
+<tal:block tal:replace="python:'File: '+self.filename"/><br>
+<tal:block tal:replace="python:'Page: '+str(self.page)"/><br>
+<tal:block tal:replace="python:'Rating: '+str(self.rating)"/><br>
+<pre tal:condition="python:self.message" tal:replace="python:'Message: '+str(self.message)"/><br>
+<hr>
+<img tal:attributes="src python:self.file12"/>
+<hr>
+</body>
+</html>""", {"self": self}))
+        fi.close()
+        
+        if self.message:
+            self.htmlmessage = str(counter) + ".html"
+            counter = counter + 1
+            fi = open(OUTPUTDIR + self.htmlmessage, "wb")
+            fi.write(getTALstr("""
+<html><head></head>
+<body>
+<pre tal:content="raw python:self.message">
+</pre>
+</body>
+</html>""", {"self": self}))
+            fi.close()
+        
+
+
+def compare_pages(page1,page2):
+    if page1.rating < page2.rating:
+        return 1
+    elif page1.rating > page2.rating:
+        return -1
+    else:
+        return 0
+
+
+def add_directory(directory):
+    if not os.path.isdir(directory):
+        print "bad directory:",directory
+        return
+    for file in os.listdir(directory):
+        global filenames
+        filename = os.path.join(directory, file)
+        if file.lower().endswith(".pdf"):
+            filenames += [filename]
+            print "+",filename
+        elif os.path.isdir(filename):
+            add_directory(filename)
+
+pages = []
+try:
+    os.mkdir(OUTPUTDIR)
+except: pass
+
+for file in filenames:
+    print "+",file
+
+for dir in directories:
+    add_directory(dir)
+
+for filename in filenames:
+    try:
+        unlink("/tmp/test.txt")
+        error = system(PDF2SWF + " -I %s -o /tmp/test.txt" % filename)
+        if error:
+            raise ConversionError(error)
+        fi = open("/tmp/test.txt", "rb")
+        for line in fi.readlines():
+            p = {}
+            for param in line.split(" "):
+                key,value = param.split("=")
+                p[key] = value
+            page = int(p["page"])
+            width = int(float(p["width"]))
+            height = int(float(p["height"]))
+            print filename, page, "%dx%d" % (width, height)
+            pdfpage = PDFPage(filename, page, width, height)
+            pdfpage.compare()
+
+            if width < 2000 and height < 2000:
+                pages += [pdfpage]
+
+            # only consider the first 3 pages
+            if page > 3:
+                break
+        fi.close()
+    except KeyboardInterrupt:
+        break
+    except:
+        pdfpage = PDFPage(filename, -1, -1, -1)
+        pdfpage.rating = 65536.0
+        pdfpage.message = formatException()
+        pages += [pdfpage]
+
+pages.sort(compare_pages)
+
+position = 1
+for page in pages:
+    page.generatehtml()
+    page.position = position
+    position = position + 1
+
+fi = open(OUTPUTDIR + "index.html", "wb")
+fi.write(getTALstr("""<html>
+<head></head>
+<body>
+<table border="1"><tr><th>Position</th><th>Rating</th><th>File</th><th>Size</th><th>Page</th><th>Images</th><th>Diff</th><th>Further Info</th></tr>
+<tal:block tal:repeat="page pages">
+<tr>
+<td tal:content="python:page.position"/>
+<td tal:content="python:page.rating"/>
+<td tal:content="python:page.filename"/>
+<td tal:content="raw python:page.getsizes()"/>
+<td tal:content="python:page.page"/>
+<td><a tal:attributes="href python:page.html12">Side by Side</a></td>
+<td><a tal:attributes="href python:page.htmldiff">Difference</a></td>
+<td><a tal:condition="python:page.message" tal:attributes="href python:page.htmlmessage">Error message</a></td>
+</tr>
+</tal:block>
+</table>
+</body>
+</html>""", {"pages": pages}))
+fi.close()
+
index e333eb3..3b67bcc 100644 (file)
@@ -260,7 +260,7 @@ int args_callback_option(char*name,char*val) {
     }
     else if (!strcmp(name, "s"))
     {
-       char*s = strdup(val);
+       char*s = val;
        char*c = strchr(s, '=');
        if(c && *c && c[1])  {
            *c = 0;
index a162e45..47bcbe7 100644 (file)
@@ -25,6 +25,8 @@
 #include "../lib/rfxswf.h"
 #include "../lib/args.h"
 #include "../lib/log.h"
+#include "../lib/jpeg.h"
+#include "../lib/png.h"
 #ifdef HAVE_ZLIB_H
 #ifdef HAVE_LIBZ
 #include "zlib.h"
@@ -682,13 +684,23 @@ int handlejpeg(TAG*tag)
     char name[80];
     char*filename = name;
     FILE*fi;
-    
-    prepare_name(name, sizeof(name), "pic", "jpg", GET16(tag->data));
-    if(numextracts==1) {
-       filename = destfilename;
-       if(!strcmp(filename,"output.swf"))
-           filename = "output.jpg";
+   
+    if(tag->id != ST_DEFINEBITSJPEG3) {
+       prepare_name(name, sizeof(name), "pic", "jpg", GET16(tag->data));
+       if(numextracts==1) {
+           filename = destfilename;
+           if(!strcmp(filename,"output.swf"))
+               filename = "output.jpg";
+       }
+    } else {
+       prepare_name(name, sizeof(name), "pic", "png", GET16(tag->data));
+       if(numextracts==1) {
+           filename = destfilename;
+           if(!strcmp(filename,"output.swf"))
+               filename = "output.png";
+       }
     }
+
     /* swf jpeg images have two streams, which both start with ff d8 and
        end with ff d9. The following code handles sorting the middle
        <ff d9 ff d8> bytes out, so that one stream remains */
@@ -719,18 +731,34 @@ int handlejpeg(TAG*tag)
     }
     else if(tag->id == ST_DEFINEBITSJPEG3 && tag->len>6) {
        U32 end = GET32(&tag->data[2])+6;
-       int pos = findjpegboundary(&tag->data[6], tag->len-6);
-       if(pos<0) {
-            fi = save_fopen(filename, "wb");
-            fwrite(&tag->data[6], end-6, 1, fi);
-            fclose(fi);
-        } else {
-            pos+=6;
-            fi = save_fopen(filename, "wb");
-            fwrite(&tag->data[6], pos-6, 1, fi);
-            fwrite(&tag->data[pos+4], end-(pos+4), 1, fi);
-            fclose(fi);
-        }
+       int pos = findjpegboundary(&tag->data[6], end);
+       if(end >= tag->len) {
+           msg("<error> zlib data out of bounds in definebitsjpeg3");
+           return 0;
+       }
+        if(pos) {
+           /* TODO: do we actually need this? */
+           memmove(&tag->data[pos], &tag->data[pos+4], end-(pos+4));
+       }
+       unsigned char*image;
+       int width=0, height=0;
+       jpeg_load_from_mem(&tag->data[6], end-6, &image, &width, &height);
+
+       uLongf datalen = width*height;
+       Bytef *data = malloc(datalen);
+
+       int error = uncompress(data, &datalen, &tag->data[end], (uLong)(tag->len - end));
+       if(error != Z_OK) {
+         fprintf(stderr, "Zlib error %d\n", error);
+         return 0;
+       }
+       int t, size = width*height;
+       for(t=0;t<size;t++) {
+           image[t*4+0] = data[t];
+       }
+       free(data);
+       writePNG(filename, image, width, height);
+       free(image);
     }
     else {
        int id = GET16(tag->data);
diff --git a/wx/Makefile b/wx/Makefile
new file mode 100644 (file)
index 0000000..3ed15ef
--- /dev/null
@@ -0,0 +1,18 @@
+top_builddir = ../..
+srcdir = .
+top_srcdir = ..
+include ../Makefile.common
+
+all: pdf2swf_gui.exe
+
+pdf2swf_gui.exe: gpdf2swf.py gui/*.py viewers/*.py
+       cp gpdf2swf.py /xpython/main.py
+       cp -R viewers gui lib /xpython/
+       cd /xpython/swftools;git pull
+       cd /xpython;make xpython.exe
+       ln -f /xpython/xpython.exe ./gpdf2swf.exe
+       #ln -f gpdf2swf.exe ../win32_gui/
+       ln -f gpdf2swf.exe ../win32/
+       cp -R viewers/* ../win32/viewers/
+
+.PHONY: exe
diff --git a/wx/app.py b/wx/app.py
deleted file mode 100644 (file)
index bb250cd..0000000
--- a/wx/app.py
+++ /dev/null
@@ -1,413 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: UTF-8 -*-
-#
-# gpdf2swf.py
-# graphical user interface for pdf2swf
-#
-# Part of the swftools package.
-# 
-# Copyright (c) 2008,2009 Matthias Kramm <kramm@quiss.org> 
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-from __future__ import division
-import os
-import wx
-import time
-import pickle
-
-from wx.lib.wordwrap import wordwrap
-from wx.lib.pubsub import Publisher
-
-from document import Document
-from gui import (PdfFrame, ProgressDialog, OptionsDialog, AboutDialog,
-                 ID_INVERT_SELECTION, ID_SELECT_ODD, ID_SELECT_EVEN)
-
-
-def GetDataDir():
-    """
-    Return the standard location on this platform for application data
-    """
-    sp = wx.StandardPaths.Get()
-    return sp.GetUserDataDir()
-
-def GetConfig():
-    if not os.path.exists(GetDataDir()):
-        os.makedirs(GetDataDir())
-
-    config = wx.FileConfig(
-        localFilename=os.path.join(GetDataDir(), "options"))
-    return config
-
-
-class Pdf2Swf:
-    def __init__(self):
-        self.__doc = Document()
-
-        self.__threads = {}
-
-        self.__busy = None
-        self.__progress = None
-
-        self.__can_save = False
-
-        self.view = PdfFrame()
-        wx.GetApp().SetTopWindow(self.view)
-        # Call Show after the current and pending event
-        # handlers have been completed. Otherwise on MSW
-        # we see the frame been draw and after that we saw
-        # the menubar appear
-        wx.CallAfter(self.view.Show)
-
-        self.options = OptionsDialog(self.view)
-        self.__ReadConfigurationFile()
-
-        Publisher.subscribe(self.OnPageChanged, "PAGE_CHANGED")
-        Publisher.subscribe(self.OnFileLoaded, "FILE_LOADED")
-        Publisher.subscribe(self.OnDiffSizes, "DIFF_SIZES")
-        Publisher.subscribe(self.OnThumbnailAdded, "THUMBNAIL_ADDED")
-        Publisher.subscribe(self.OnThumbnailDone, "THUMBNAIL_DONE")
-        Publisher.subscribe(self.OnProgressBegin, "SWF_BEGIN_SAVE")
-        Publisher.subscribe(self.OnProgressUpdate, "SWF_PAGE_SAVED")
-        Publisher.subscribe(self.OnProgressDone, "SWF_FILE_SAVED")
-        Publisher.subscribe(self.OnCombineError, "SWF_COMBINE_ERROR")
-        Publisher.subscribe(self.OnFileDroped, "FILE_DROPED")
-        Publisher.subscribe(self.OnFilesDroped, "FILES_DROPED")
-
-        self.view.Bind(wx.EVT_MENU, self.OnMenuOpen, id=wx.ID_OPEN)
-        self.view.Bind(wx.EVT_MENU, self.OnMenuSave, id=wx.ID_SAVE)
-        self.view.Bind(wx.EVT_MENU, self.OnMenuSaveSelected, id=wx.ID_SAVEAS)
-        self.view.Bind(wx.EVT_MENU, self.OnMenuExit, id=wx.ID_EXIT)
-        self.view.Bind(wx.EVT_MENU_RANGE, self.OnFileHistory,
-                       id=wx.ID_FILE1, id2=wx.ID_FILE9)
-
-        self.view.Bind(wx.EVT_UPDATE_UI, self.OnUpdateUI, id=wx.ID_SAVE)
-        self.view.Bind(wx.EVT_UPDATE_UI, self.OnUpdateUI, id=wx.ID_SAVEAS)
-
-        self.view.Bind(wx.EVT_MENU, self.OnMenuSelectAll, id=wx.ID_SELECTALL)
-        self.view.Bind(wx.EVT_MENU,
-                       self.OnMenuInvertSelection, id=ID_INVERT_SELECTION)
-        self.view.Bind(wx.EVT_MENU, self.OnMenuSelectOdd, id=ID_SELECT_ODD)
-        self.view.Bind(wx.EVT_MENU, self.OnMenuSelectEven, id=ID_SELECT_EVEN)
-        self.view.Bind(wx.EVT_MENU, self.OnMenuOptions, id=wx.ID_PREFERENCES)
-
-        self.view.Bind(wx.EVT_UPDATE_UI, self.OnUpdateUI, id=wx.ID_SELECTALL)
-        self.view.Bind(wx.EVT_UPDATE_UI, self.OnUpdateUI, id=ID_INVERT_SELECTION)
-        self.view.Bind(wx.EVT_UPDATE_UI, self.OnUpdateUI, id=ID_SELECT_ODD)
-        self.view.Bind(wx.EVT_UPDATE_UI, self.OnUpdateUI, id=ID_SELECT_EVEN)
-
-        self.view.Bind(wx.EVT_MENU, self.OnAbout, id=wx.ID_ABOUT)
-
-        self.view.Bind(wx.EVT_MENU, self.OnZoom, id=wx.ID_ZOOM_IN)
-        self.view.Bind(wx.EVT_MENU, self.OnZoom, id=wx.ID_ZOOM_OUT)
-        self.view.Bind(wx.EVT_MENU, self.OnZoom, id=wx.ID_ZOOM_100)
-        self.view.Bind(wx.EVT_MENU, self.OnFit, id=wx.ID_ZOOM_FIT)
-
-        self.view.Bind(wx.EVT_UPDATE_UI, self.OnUpdateUI, id=wx.ID_ZOOM_IN)
-        self.view.Bind(wx.EVT_UPDATE_UI, self.OnUpdateUI, id=wx.ID_ZOOM_OUT)
-        self.view.Bind(wx.EVT_UPDATE_UI, self.OnUpdateUI, id=wx.ID_ZOOM_100)
-        self.view.Bind(wx.EVT_UPDATE_UI, self.OnUpdateUI, id=wx.ID_ZOOM_FIT)
-
-        self.view.page_list.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnSelectItem)
-        self.view.Bind(wx.EVT_CLOSE, self.OnMenuExit)
-
-        # statusbar cancel thumbanails generation button
-        self.view.statusbar.btn_cancel.Bind(wx.EVT_BUTTON,
-                                            self.OnThumbnailCancel)
-
-    def OnFilesDroped(self, evt):
-        dlg = wx.MessageDialog(self.view,
-                      u"You must drop only one file.",
-                      u"Notice",
-                      style=wx.OK, pos=wx.DefaultPosition)
-        dlg.ShowModal()
-        dlg.Destroy()
-
-    def OnFileDroped(self, message):
-        self.__Load(message.data["filename"])
-
-    def OnFileHistory(self, evt):
-        # get the file based on the menu ID
-        fileNum = evt.GetId() - wx.ID_FILE1
-        filename = self.view.filehistory.GetHistoryFile(fileNum)
-
-        self.__Load(filename)
-
-    def OnProgressBegin(self, message):
-        if self.__progress:
-            self.__progress.Destroy()
-        pages = message.data["pages"]
-        style = (
-                 wx.PD_APP_MODAL|wx.PD_ELAPSED_TIME|
-                 wx.PD_REMAINING_TIME|wx.PD_CAN_ABORT|
-                 wx.PD_AUTO_HIDE
-                )
-        self.__progress = ProgressDialog(u"Saving...",
-                                       u"Start saving SWF pages",
-                                       maximum=pages-1,
-                                       parent=self.view, style=style)
-        self.__progress.Show()
-        self.view.SetStatusText(u"Saving document...")
-
-    def OnProgressUpdate(self, message):
-        pagenr = message.data["pagenr"]
-        pagenr0 = pagenr - 1 # 0 based
-        pages = message.data["pages"]
-
-        keep_running, skip = self.__progress.Update(
-                                 pagenr0,
-                                 u"Saving SWF page %d of %d" % (pagenr, pages)
-                             )
-        if not keep_running and self.__threads.has_key("progress"):
-            self.view.SetStatusText(u"Cancelling...")
-            self.__threads.pop("progress").Stop()
-
-        # Send size events to resize the progress dialog,
-        # this will allow the progress message label to resize accordingly.
-        # Here we minimize that events every 10 times.
-        if pagenr0 % 10 == 0:
-            self.__progress.SendSizeEvent()
-
-    def OnProgressDone(self, message):
-        self.__progress.Hide()
-        if self.__threads.has_key("progress"): # it goes all the way?
-            self.__threads.pop("progress")
-            self.view.SetStatusText(u"SWF document saved successfully.")
-        else:
-            self.view.SetStatusText(u"")
-
-    def OnCombineError(self, message):
-        from wx.lib.dialogs import ScrolledMessageDialog
-        ScrolledMessageDialog(self.view, message.data, u"Notice").ShowModal()
-
-
-    def OnThumbnailAdded(self, message):
-        self.view.statusbar.SetGaugeValue(message.data['pagenr'])
-        tot = self.view.page_list.GetItemCount()
-        self.view.SetStatusText(u"Generating thumbnails %s/%d" %
-                                (message.data['pagenr'], tot), 0)
-
-    def OnThumbnailDone(self, message):
-        self.view.statusbar.SetGaugeValue(0)
-        self.view.SetStatusText(u"", 0)
-        if self.__threads.has_key("thumbnails"):
-            self.__threads.pop("thumbnails")
-
-    def OnThumbnailCancel(self, event):
-        if self.__threads.has_key("thumbnails"):
-            self.__threads["thumbnails"].Stop()
-
-    def OnSelectItem(self, event):
-        self.__doc.ChangePage(event.GetIndex() + 1)
-
-    def OnPageChanged(self, message):
-        # ignore if we have more than one item selected
-        if self.view.page_list.GetSelectedItemCount() > 1:
-            return
-
-        self.view.page_preview.DisplayPage(message.data)
-
-    def OnFileLoaded(self, message):
-        if self.__progress:
-            self.__progress.Destroy()
-            self.__progress = None
-
-        self.view.SetStatusText(u"Document loaded successfully.")
-        self.view.page_list.DisplayEmptyThumbnails(message.data["pages"])
-        thumbs = self.__doc.GetThumbnails()
-        t = self.view.page_list.DisplayThumbnails(thumbs)
-        self.__threads["thumbnails"] = t
-        self.view.statusbar.SetGaugeRange(message.data["pages"])
-        del self.__busy
-
-    def OnDiffSizes(self, message):
-        # just let the user know- for now, we can't handle this properly
-        self.Message(
-                    u"In this PDF, width or height are not the same for "
-                    u"each page. This might cause problems if you export "
-                    u"pages of different dimensions into the same SWF file."
-                    )
-
-    def OnMenuOpen(self, event):
-        dlg = wx.FileDialog(self.view, u"Choose PDF File:",
-                     style = wx.FD_CHANGE_DIR|wx.FD_OPEN,
-                     wildcard = u"PDF files (*.pdf)|*.pdf|all files (*.*)|*.*")
-
-        if dlg.ShowModal() == wx.ID_OK:
-            filename = dlg.GetPath()
-            self.__Load(filename)
-
-    def OnMenuSave(self, event, pages=None):
-        defaultFile = self.__doc.lastsavefile
-        allFiles = "*.*" if "wxMSW" in wx.PlatformInfo else "*"
-        self.view.SetStatusText(u"")
-        dlg = wx.FileDialog(self.view, u"Choose Save Filename:",
-                       style = wx.SAVE | wx.OVERWRITE_PROMPT,
-                       defaultFile=defaultFile,
-                       wildcard=u"SWF files (*.swf)|*.swf"
-                                 "|all files (%s)|%s" % (allFiles, allFiles))
-
-        if dlg.ShowModal() == wx.ID_OK:
-            self.__threads["progress"] = self.__doc.SaveSWF(dlg.GetPath(),
-                                                         pages, self.options)
-
-    def OnUpdateUI(self, event):
-        menubar = self.view.GetMenuBar()
-        menubar.Enable(event.GetId(), self.__can_save)
-
-        self.view.GetToolBar().EnableTool(event.GetId(), self.__can_save)
-
-    def OnMenuSaveSelected(self, event):
-        pages = []
-        page = self.view.page_list.GetFirstSelected()
-        pages.append(page+1)
-
-        while True:
-            page = self.view.page_list.GetNextSelected(page)
-            if page == -1:
-                break
-            pages.append(page+1)
-
-        self.OnMenuSave(event, pages)
-
-    def OnMenuExit(self, event):
-        self.view.SetStatusText(u"Cleaning up...")
-
-        # Stop any running thread
-        self.__StopThreads()
-
-        config = GetConfig()
-        self.view.filehistory.Save(config)
-        config.Flush()
-        # A little extra cleanup is required for the FileHistory control
-        del self.view.filehistory
-
-        # Save quality options
-        dirpath = GetDataDir()
-        data = self.options.quality_panel.pickle()
-        try:
-            f = file(os.path.join(dirpath, 'quality.pkl'), 'wb')
-            pickle.dump(data, f)
-            f.close()
-        except IOError:
-            pass
-
-        # Save viewer options
-        try:
-            f = file(os.path.join(dirpath, 'viewers.pkl'), 'wb')
-            data = self.options.viewers_panel.pickle()
-            pickle.dump(data, f)
-            f.close()
-        except Exception, e:
-            pass
-
-        self.view.Destroy()
-
-    def OnMenuSelectAll(self, event):
-        for i in range(0, self.view.page_list.GetItemCount()):
-            self.view.page_list.Select(i, True)
-
-    def OnMenuInvertSelection(self, event):
-        for i in range(0, self.view.page_list.GetItemCount()):
-            self.view.page_list.Select(i, not self.view.page_list.IsSelected(i))
-
-    def OnMenuSelectOdd(self, event):
-        for i in range(0, self.view.page_list.GetItemCount()):
-            self.view.page_list.Select(i, not bool(i%2))
-
-    def OnMenuSelectEven(self, event):
-        for i in range(0, self.view.page_list.GetItemCount()):
-            self.view.page_list.Select(i, bool(i%2))
-
-    def OnMenuOptions(self, event):
-        self.options.ShowModal()
-
-    def OnFit(self, event):
-        self.__doc.Fit(self.view.page_preview.GetClientSize())
-
-    def OnZoom(self, event):
-        zoom = {
-              wx.ID_ZOOM_IN: .1,
-              wx.ID_ZOOM_OUT: -.1,
-              wx.ID_ZOOM_100: 1,
-        }
-        self.__doc.Zoom(zoom[event.GetId()])
-
-    def OnAbout(self, evt):
-        AboutDialog(self.view)
-
-    def __Load(self, filename):
-        self.__can_save = True
-        self.__StopThreads()
-        self.view.SetStatusText(u"Loading document...")
-        self.__busy = wx.BusyInfo(u"One moment please, "
-                                  u"opening pdf document...")
-
-        self.view.filehistory.AddFileToHistory(filename)
-
-        # Need to delay the file load a little bit
-        # for the BusyInfo get a change to repaint itself
-        wx.FutureCall(150, self.__doc.Load, filename)
-
-    def __StopThreads(self):
-        for n, t in self.__threads.items():
-            t.Stop()
-
-        running = True
-        while running:
-            running = False
-            for n, t in self.__threads.items():
-                running = running + t.IsRunning()
-            time.sleep(0.1)
-
-    def __ReadConfigurationFile(self):
-        config = GetConfig()
-        self.view.filehistory.Load(config)
-
-        dirpath = GetDataDir()
-        try:
-            f = file(os.path.join(dirpath, 'quality.pkl'), 'rb')
-            try:
-                data = pickle.load(f)
-                self.options.quality_panel.unpickle(data)
-            except:
-                self.Message(
-                      u"Error loading quality settings. "
-                      u"They will be reset to defaults. ")
-            f.close()
-        except IOError:
-            pass
-
-        try:
-            f = file(os.path.join(dirpath, 'viewers.pkl'), 'rb')
-            try:
-                data = pickle.load(f)
-                self.options.viewers_panel.unpickle(data)
-            except:
-                self.Message(
-                      u"Error loading viewers settings. "
-                      u"They will be reset to defaults. ")
-            f.close()
-        except IOError:
-            pass
-        #d = pickle.load(f)
-
-    def Message(self, message):
-        dlg = wx.MessageDialog(self.view,
-                      message,
-                      style=wx.OK, pos=wx.DefaultPosition)
-        dlg.ShowModal()
-        dlg.Destroy()
-
diff --git a/wx/document.py b/wx/document.py
deleted file mode 100644 (file)
index 70cbb82..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: UTF-8 -*-
-#
-# gpdf2swf.py
-# graphical user interface for pdf2swf
-#
-# Part of the swftools package.
-# 
-# Copyright (c) 2008,2009 Matthias Kramm <kramm@quiss.org> 
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-from __future__ import division
-import os
-import time
-import thread
-import gfx
-import wx
-from wx.lib.pubsub import Publisher
-from subprocess import Popen, PIPE
-
-class _SaveSWFThread:
-    def __init__(self, filename, doc, pages, options):
-        self.__doc = doc
-        self.__filename = filename
-        self.__pages = pages or range(1, doc.pages+1)
-        self.__options = options
-
-    def Start(self):
-        self.__keep_running = self.__running = True
-        thread.start_new_thread(self.Run, ())
-        #self.Run()
-
-    def Stop(self):
-        self.__keep_running = False
-
-    def IsRunning(self):
-        return self.__running
-
-    def Run(self):
-        pages = len(self.__pages)
-        wx.CallAfter(Publisher.sendMessage, "SWF_BEGIN_SAVE",
-                                            {'pages': pages,})
-
-        time.sleep(0.05)
-
-        swf = gfx.SWF()
-        self.set_swf_parameters(swf)
-
-        plugin = self.__options.viewers.init(swf, self.__filename)
-
-        plugin.before_render()
-        for i, pagenr in enumerate(self.__pages):
-            page = self.__doc.getPage(pagenr)
-            swf.startpage(page.width, page.height)
-            page.render(swf)
-            swf.endpage()
-            wx.CallAfter(Publisher.sendMessage, "SWF_PAGE_SAVED",
-                                                {'pagenr': i+1,
-                                                 'pages': pages,})
-            time.sleep(0.05)
-            if not self.__keep_running:
-                break
-        else:
-            # This will not run if we break the for loop
-            plugin.before_save(page)
-            swf.save(self.__filename)
-            plugin.after_save(page)
-
-        # No need. But to be sure that it's clean up
-        # as soon as possible
-        del swf
-
-        wx.CallAfter(Publisher.sendMessage, "SWF_FILE_SAVED")
-        time.sleep(0.05)
-
-        self.__running = False
-
-    def set_swf_parameters(self, swf):
-        for opt in self.__options.quality:
-            if type(opt.name) in (tuple, list):
-                for name, value in (
-                    # Example to better understand the list comprehension:
-                    # opt.name = ['a', 'b', 'c']
-                    # opt.value = [1, 2, 3]
-                    # zip them = [('a',1), ('b', 2), ('c', 3)]
-                    # pair will be in this example ('a', 1) due to
-                    # the if pair[1] condition
-                    pair for pair in zip(opt.name, opt.value) if pair[1] == 1
-                ):
-                    #print "1.swf.setparameter(%s, %s)" % (name, value)
-                    swf.setparameter(str(name), str(value))
-            else:
-                #print "2.swf.setparameter(%s, %s)" % (opt.name, str(opt.value))
-                swf.setparameter(opt.name, str(opt.value))
-
-
-class Document:
-    def __init__(self):
-        self.__page = None
-        self.__zoom = 1
-        self.__lastsavefile = "output.swf"
-
-    def __get_lastsavefile(self):
-        return self.__lastsavefile
-    def __set_lastsavefile(self, lastsavefile):
-        self.__lastsavefile = lastsavefile
-    lastsavefile = property(__get_lastsavefile, __set_lastsavefile)
-
-    def __SwapExtension(self, filename, newext):
-        basename, ext = os.path.splitext(filename)
-        return "%s.%s" % (basename, newext)
-
-    def __Reload(self):
-        Publisher.sendMessage("PAGE_CHANGED",
-                              {'page': self.__page,
-                               'width': int(self.__page.width * self.__zoom),
-                               'height': int(self.__page.height * self.__zoom)})
-
-    def Load(self, filename):
-        self.__lastsavefile = self.__SwapExtension(filename, "swf")
-        #self.__htmlfilename = self.__SwapExtension(filename, "html")
-        self.__pdf = gfx.open("pdf", filename)
-        Publisher.sendMessage("FILE_LOADED", {'pages': self.__pdf.pages})
-
-    def ChangePage(self, pagenr=1, size=None):
-        self.__page = page = self.__pdf.getPage(pagenr)
-        self.__Reload()
-
-    def Fit(self, size):
-        w = size[0] / self.__page.width
-        h = size[1] / self.__page.height
-        self.__zoom = min(w, h)
-        self.__Reload()
-
-    def Zoom(self, zoom):
-        self.__zoom = 1 if zoom == 1 else self.__zoom + zoom
-        self.__Reload()
-
-    def GetThumbnails(self):
-        for pagenr in range(1, self.__pdf.pages + 1):
-            page = self.__pdf.getPage(pagenr)
-            yield page
-
-    def SaveSWF(self, filename, pages, options):
-        self.__lastsavefile = filename
-        t = _SaveSWFThread(filename, self.__pdf, pages, options)
-        t.Start()
-        return t
-        
-
index 3fd12c6..e6941c2 100644 (file)
@@ -23,6 +23,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 from __future__ import division
+import __builtin__
 import os
 import sys
 import imp
@@ -32,13 +33,31 @@ def main_is_frozen():
             hasattr(sys, "importers") # old py2exe
             or imp.is_frozen("__main__")) # tools/freeze
 
+#if not main_is_frozen():
+#    try:
+#        import wxversion
+#        wxversion.select("2.6")
+#    except:
+#        wxversion.select("2.8")
+
+def get_main_dir():
+    if main_is_frozen():
+        return os.path.dirname(sys.executable)
+    return os.path.dirname(os.path.abspath(__file__))
+__builtin__.get_main_dir = get_main_dir
+__builtin__.GPDF2SWF_BASEDIR = get_main_dir()
+
+pyver = "".join(map(str, sys.version_info[0:2]))
+#print >>sys.stderr, pyver
 if main_is_frozen():
-    sys.path.insert(0, os.path.join("..", "python25"))
+    sys.path.insert(0, os.path.join("..", "python%s" % pyver))
 else:
     sys.path.insert(0, os.path.join("..", "lib", "python"))
+    sys.path.insert(1, os.path.join("..", "python%s" % pyver))
 
 import wx
-from app import Pdf2Swf
+#print >>sys.stderr, wx.VERSION
+from lib.app import Pdf2Swf
 
 if __name__ == "__main__":
     app = wx.App(False)
index a12f187..25f7df3 100644 (file)
@@ -22,5 +22,3 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-from main import *
-from dialogs import *
index 0d76613..b5387c1 100644 (file)
@@ -26,7 +26,7 @@ from __future__ import division
 import os
 
 import wx
-from wx.lib.wordwrap import wordwrap
+from lib.wordwrap import wordwrap
 
 from gui.options import Quality, ViewerBook
 
@@ -51,11 +51,13 @@ class OptionsDialog(wx.Dialog):
         p.AddPage(self.__viewers, u"Viewer")
 
         sizer = wx.BoxSizer(wx.VERTICAL)
-        btnsizer = wx.BoxSizer(wx.HORIZONTAL)
+        btnsizer = wx.StdDialogButtonSizer()
+
+        btn = wx.Button(self, wx.ID_OK)
+        btn.SetDefault()
+        btnsizer.AddButton(btn)
+        btnsizer.Realize()
 
-        btn = wx.Button(self, wx.ID_CLOSE)
-        self.SetAffirmativeId(wx.ID_CLOSE)
-        btnsizer.Add(btn)
 
         sizer.Add(p, 0, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
         sizer.Add(btnsizer, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
@@ -80,44 +82,52 @@ class OptionsDialog(wx.Dialog):
     viewers = property(__get_viewers_options)
 
 
+from gui.info import InfoList
+class InfoDialog(wx.Dialog):
+    def __init__(self, parent):
+        wx.Dialog.__init__(self, parent,
+                           style=wx.DEFAULT_DIALOG_STYLE
+                                |wx.RESIZE_BORDER
+                          )
+
+        app_name = wx.GetApp().GetAppName()
+        self.SetTitle(u"Document info - %s" % app_name)
+
+        self.info = InfoList(self)
+
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(self.info, 1, wx.EXPAND, 0)
+
+
+        btnsizer = wx.BoxSizer(wx.HORIZONTAL)
+
+        btn = wx.Button(self, wx.ID_OK)
+        btn.SetDefault()
+        #self.SetAffirmativeId(wx.ID_CLOSE)
+        btnsizer.Add(btn)
+        sizer.Add(btnsizer, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
+
+        self.SetSizer(sizer)
+
+
 class AboutDialog:
     def __init__(self, parent):
-        info = wx.AboutDialogInfo()
-        # no need to get app name
-        #info.Name = wx.GetApp().GetAppName()
-        info.Version = u"0.9.0"
-        info.Copyright = (u"Copyright (c) 2008,2009 "
-                          u"Matthias Kramm <kramm@quiss.org>")
-        info.Description = u"graphical user interface for pdf2swf"
-        info.Developers = [
-                           u"Matthias Kramm <kramm@quiss.org>",
-                           u"Ricardo Pedroso <rmdpedroso@gmail.com>",
-                          ]
-
-        if 'wxGTK' in wx.PlatformInfo:
-            info.WebSite = (u"http://www.swftools.org/", u"swftools home page")
-            licenseText = [
-                u"%(name)s is free software; you can redistribute "
-                u"it and/or modify it under the terms of the GNU General "
-                u"Public License as published by the Free Software "
-                u"Foundation; either version 2 of the License, or (at "
-                u"your option) any later version."
-            ]
-            licenseText.append(
-                u"%(name)s is distributed in the hope that it will "
-                u"be useful, but WITHOUT ANY WARRANTY; without even the "
-                u"implied warranty of MERCHANTABILITY or FITNESS FOR A "
-                u"PARTICULAR PURPOSE. See the GNU General Public License "
-                u"for more details."
-            )
-            licenseText.append(
-                u"You should have received a copy of the GNU General "
-                u"Public License along with %(name)s; if not, "
-                u"write to the Free Software Foundation, Inc., 51 "
-                u"Franklin St, Fifth Floor, Boston, MA  02110-1301 USA"
-            )
-            lic = (os.linesep*2).join(licenseText) % {'name': info.Name}
-            info.License = wordwrap(lic, 350, wx.ClientDC(parent))
-
-        wx.AboutBox(info)
+        appname = wx.GetApp().GetAppName()
+        version = u"0.9.0"
+        copyright = (u"Copyright (c) 2008,2009,2010\n"
+                     u"Matthias Kramm <kramm@quiss.org>")
+        description = u"A graphical user interface for pdf2swf"
+        developers = (u"Developers:\nMatthias Kramm <kramm@quiss.org>\n"
+                      u"Ricardo Pedroso <rmdpedroso@gmail.com>")
+
+
+        message = ("%(appname)s %(version)s\n\n"
+                   "%(description)s\n\n"
+                   "%(developers)s\n\n"
+                   "%(copyright)s" % locals())
+        caption = "About %s" % appname
+
+        #wx.MessageBox(message, caption)
+
+        wx.MessageDialog(parent, message, caption, style=wx.OK | wx.CENTRE).ShowModal()
 
similarity index 74%
rename from wx/gui/main.py
rename to wx/gui/gmain.py
index 1aa686c..85aa2d6 100644 (file)
@@ -26,30 +26,20 @@ from __future__ import division
 import os
 import wx
 from wx.lib.pubsub import Publisher
-from wx.lib.embeddedimage import PyEmbeddedImage
+from lib.embeddedimage import PyEmbeddedImage
 import thread
 import time
+import lib.images as images
 
 ICON_SIZE = 64
 
 ID_INVERT_SELECTION = wx.NewId()
 ID_SELECT_ODD = wx.NewId()
 ID_SELECT_EVEN = wx.NewId()
+ID_ONE_PAGE_PER_FILE = wx.NewId()
 
-# TODO: move into images.py
-blank = PyEmbeddedImage(
-    "iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAAZiS0dE"
-    "AP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9kHDAscKjCK/4UAAABo"
-    "SURBVHja7dABAcBAEAIgXf/Ofo8dRKDblqPa5stxAgQIECBAgAABAgQIECBAgAABAgQIECBA"
-    "gAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEPALTbLLAQ8OIAV9"
-    "8WNeKwAAAABJRU5ErkJggg==")
-getblankData = blank.GetData
-getblankImage = blank.GetImage
-getblankBitmap = blank.GetBitmap
-
-stop_width=8
-stop_height=8
-stop_data="""\xd5\x07\x07\xd5\x08\x08\xd5\x09\x09\xd4\x0a\x0a\xd4\x0a\x0a\xd5\x09\x09\xd5\x08\x08\xd5\x07\x07\xd5\x08\x08\xd4\x12\x12\xd4<<\xd1--\xd1,-\xd4;;\xd5\x12\x12\xd6\x08\x08\xd5\x0a\x0a\xd2@@\xd4\xc6\xc7\xd5kk\xd2gi\xd2\xc4\xc6\xd4<<\xd6\x0a\x0a\xd4\x0c\x0c\xcb66\xd6gi\xe3\xeb\xed\xe1\xeb\xed\xd4bc\xd3++\xd5\x0c\x0c\xd4\x0b\x0b\xd0--\xd3hi\xe2\xeb\xed\xe2\xed\xee\xd5cd\xd3++\xd5\x0c\x0c\xd5\x09\x09\xd4:;\xd3\xc5\xc7\xd3ij\xd3jj\xd3\xc5\xc7\xd4<<\xd6\x0a\x0a\xd5\x08\x08\xd4\x12\x12\xd5<=\xd2..\xd1,,\xd4;;\xd5\x12\x12\xd6\x08\x08\xd5\x07\x07\xd6\x08\x08\xd6\x0a\x0a\xd5\x0b\x0b\xd4\x0b\x0b\xd5\x09\x09\xd5\x08\x08\xd5\x07\x07"""
+ID_DOC_INFO = wx.NewId()
+ID_PREVIEW_TYPE = wx.NewId()
 
 
 class _AppendThumbnailThread:
@@ -74,22 +64,20 @@ class _AppendThumbnailThread:
             if pos == 0:
                 width, height = thumb.width, thumb.height
             else:
-                if abs(width - thumb.width) > 2 or \
-                   abs(height - thumb.height) > 2:
-                       different_sizes = True
+                if not different_sizes:
+                    if abs(width - thumb.width) > 2 or \
+                       abs(height - thumb.height) > 2:
+                           different_sizes = True
+                           wx.CallAfter(Publisher.sendMessage, "DIFF_SIZES")
 
             wx.CallAfter(self.__win.AppendThumbnail, pos,
-                         thumb.asImage(ICON_SIZE, ICON_SIZE))
+                         thumb.asImage(ICON_SIZE, ICON_SIZE), thumb)
             wx.CallAfter(Publisher.sendMessage, "THUMBNAIL_ADDED",
                                                 {'pagenr':pos+1,})
-            time.sleep(.05)
+            time.sleep(.01)
             if not self.__keep_running:
                 break
 
-        else:
-            if different_sizes:
-                wx.CallAfter(Publisher.sendMessage, "DIFF_SIZES")
-                time.sleep(.10)
         wx.CallAfter(Publisher.sendMessage, "THUMBNAIL_DONE")
         time.sleep(.10)
 
@@ -123,6 +111,10 @@ class PagePreviewWindow(wx.ScrolledWindow):
     def DisplayPage(self, page):
         thread.start_new_thread(self.__DisplayPageThread, (page,))
 
+    def Clear(self):
+        self.__buffer = wx.EmptyBitmap(1, 1)
+        self.Refresh()
+
     def __OnPaint(self, event):
         dc = wx.BufferedPaintDC(self, self.__buffer, wx.BUFFER_VIRTUAL_AREA)
 
@@ -132,7 +124,10 @@ class PagePreviewWindow(wx.ScrolledWindow):
         dc = wx.BufferedDC(None, self.__buffer)
         dc.Clear()
         dc.DrawRectangle(0, 0, w+2, h+2)
-        dc.DrawBitmap(wx.BitmapFromBuffer(w, h, page), 1, 1, True)
+        #dc.DrawBitmap(wx.BitmapFromBuffer(w, h, page), 1, 1, True)
+        dc.DrawBitmap(wx.BitmapFromImage(
+                       wx.ImageFromData(w, h, page)), 1, 1, True)
+
         self.Refresh()
 
     def __DisplayPageThread(self, page):
@@ -149,19 +144,20 @@ class PageListCtrl(wx.ListView):
         self.Bind(wx.EVT_CONTEXT_MENU, self.OnContextMenu)
 
     def OnContextMenu(self, event):
-        menu = wx.Menu()
-        menu.Append(wx.ID_SELECTALL, u"Select All\tCTRL-A")
-        menu.AppendSeparator()
-        menu.Append(wx.ID_SAVE, u"Save SWF (all pages)\tCTRL-W")
-        menu.Append(wx.ID_SAVEAS, u"Save SWF (selected pages)\tCTRL-S")
-        self.PopupMenu(menu)
-        menu.Destroy()
+        if self.GetItemCount():
+            menu = wx.Menu()
+            menu.Append(wx.ID_SELECTALL, u"Select All\tCTRL-A")
+            menu.AppendSeparator()
+            menu.Append(wx.ID_SAVE, u"Save SWF (all pages)\tCTRL-W")
+            menu.Append(wx.ID_SAVEAS, u"Save SWF (selected pages)\tCTRL-S")
+            self.PopupMenu(menu)
+            menu.Destroy()
 
     def DisplayEmptyThumbnails(self, pages):
         self.DeleteAllItems()
         self.imglist = wx.ImageList(ICON_SIZE, ICON_SIZE, mask=True)
         self.AssignImageList(self.imglist, wx.IMAGE_LIST_NORMAL)
-        bmp = getblankBitmap()
+        bmp = images.getblankBitmap()
         for pos in range(pages):
             self.imglist.Add(bmp)
             self.InsertImageStringItem(pos, u"Page %s" % (pos+1), pos)
@@ -171,12 +167,17 @@ class PageListCtrl(wx.ListView):
         t.Start()
         return t
 
-    def AppendThumbnail(self, pos, thumb):
-        bmp = wx.BitmapFromBuffer(ICON_SIZE, ICON_SIZE, thumb)
+    def AppendThumbnail(self, pos, thumb, page):
+        #bmp = wx.BitmapFromBuffer(ICON_SIZE, ICON_SIZE, thumb)
+        bmp = wx.BitmapFromImage(
+                       wx.ImageFromData(ICON_SIZE, ICON_SIZE,
+                                        thumb))
         self.imglist.Replace(pos, bmp)
+        self.SetItemText(pos, u"Page %s\n(%sx%s)" % (pos+1,
+                                   page.width, page.height))
         if pos == 0:
             wx.CallAfter(self.Select, 0)
-        self.Refresh()
+        self.RefreshItem(pos)
 
 
 class StatusBar(wx.StatusBar):
@@ -189,7 +190,7 @@ class StatusBar(wx.StatusBar):
 
         self.gauge = wx.Gauge(self)
 
-        bmp = wx.BitmapFromImage(wx.ImageFromData(stop_width,stop_height,stop_data))
+        bmp = images.getstopBitmap()
         self.btn_cancel = wx.BitmapButton(self, bitmap=bmp,
                                        style = wx.NO_BORDER)
         self.gauge.Hide()
@@ -230,7 +231,7 @@ class PdfFrame(wx.Frame):
     def __init__(self):
         wx.Frame.__init__(self, None, size=(750,550), title=u"gpdf2swf")
 
-        icon = self.__MakeIcon(os.path.join("images", "pdf2swf_gui.ico"))
+        icon = self.__MakeIcon()
         self.SetIcon(icon)
         self.__CreateMenu()
         self.__CreateToolbar()
@@ -247,9 +248,8 @@ class PdfFrame(wx.Frame):
                                sashPosition=ICON_SIZE*2)
         hsplit.SetMinimumPaneSize(ICON_SIZE*2)
 
-    def __MakeIcon(self, filename):
-        # TODO: Probably include the icon on a .py file
-        img = wx.Bitmap(filename).ConvertToImage()
+    def __MakeIcon(self):
+        img = images.getgpdf2swfImage()
         if "wxMSW" in wx.PlatformInfo:
             img = img.Scale(16, 16)
         #elif "wxGTK" in wx.PlatformInfo:
@@ -262,19 +262,26 @@ class PdfFrame(wx.Frame):
     def __CreateMenu(self):
         menubar = wx.MenuBar()
 
+        menu_recent = wx.Menu()
+        menu_save = wx.Menu()
+        menu_save.AppendCheckItem(ID_ONE_PAGE_PER_FILE, u"One Page Per File")
+        menu_save.AppendSeparator()
+        menu_save.Append(wx.ID_SAVE, u"All Pages\tCTRL-W",
+                                u"Save all pages")
+        menu_save.Append(wx.ID_SAVEAS, u"Selected Pages\tCTRL-S",
+                                  u"Save selected pages")
+
         menu = wx.Menu()
         menu.Append(wx.ID_OPEN, u"Open PDF\tCTRL-O", u"Open a PDF document")
+        menu.AppendMenu(wx.ID_ANY, u"Save SWF", menu_save)
         menu.AppendSeparator()
-        menu.Append(wx.ID_SAVE, u"Save SWF (all pages)\tCTRL-W",
-                                u"Save all pages")
-        menu.Append(wx.ID_SAVEAS, u"Save SWF (selected pages)\tCTRL-S",
-                                  u"Save selected pages")
+        menu.AppendMenu(wx.ID_ANY, u"Recent", menu_recent)
         menu.AppendSeparator()
         menu.Append(wx.ID_EXIT, u"Exit\tCTRL-Q")
         menubar.Append(menu, u"&File")
 
         self.filehistory = wx.FileHistory()
-        self.filehistory.UseMenu(menu)
+        self.filehistory.UseMenu(menu_recent)
 
         menu = wx.Menu()
         menu.Append(wx.ID_SELECTALL, u"Select All\tCTRL-A",
@@ -295,6 +302,8 @@ class PdfFrame(wx.Frame):
         menu.Append(wx.ID_ZOOM_OUT, u"Zoom Out\tCTRL--")
         menu.Append(wx.ID_ZOOM_100, u"Normal Size\tCTRL-0")
         menu.Append(wx.ID_ZOOM_FIT, u"Fit\tCTRL-1")
+        menu.AppendSeparator()
+        menu.Append(ID_DOC_INFO, u"Document Info\tCTRL-I")
         menubar.Append(menu, u"&View")
 
         menu = wx.Menu()
@@ -315,9 +324,31 @@ class PdfFrame(wx.Frame):
                                    wxart(wx.ART_FILE_SAVE,
                                          wx.ART_TOOLBAR, tsize),
                                    u"Save SWF (all pages)")
+        self.toolbar.AddSeparator()
+
         self.toolbar.AddSimpleTool(wx.ID_PREFERENCES,
                                    wxart(wx.ART_LIST_VIEW,
                                          wx.ART_TOOLBAR, tsize),
                                    u"Options")
+        self.toolbar.AddSeparator()
+
+        self.toolbar.AddSimpleTool(ID_DOC_INFO,
+                                   wxart(wx.ART_TIP,
+                                         wx.ART_TOOLBAR, tsize),
+                                   u"Document Info")
+
+        self.toolbar.AddSeparator()
+
+        self.toolbar_preview_type = wx.Choice(
+                self.toolbar, ID_PREVIEW_TYPE,
+                choices=["everything to bitmaps",
+                         "fonts to fonts, everything else to bitmaps",
+                         "polygons to polygons and fonts to fonts"],
+                size=(350,-1), style=wx.CB_DROPDOWN
+                )
+        # I'm not sure about the utility of this, so Show False
+        self.toolbar_preview_type.Show(False)
+        self.toolbar.AddControl(self.toolbar_preview_type)
+
         self.toolbar.Realize()
 
diff --git a/wx/gui/info.py b/wx/gui/info.py
new file mode 100644 (file)
index 0000000..69707fc
--- /dev/null
@@ -0,0 +1,55 @@
+import wx
+from lib.document import PDF_INFO
+import lib.utils as utils
+#from wx.lib.mixins import listctrl as listmix
+
+#class InfoList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin):
+class InfoList(wx.ListCtrl):
+    def __init__(self, parent):
+        wx.ListCtrl.__init__(self, parent,
+                                 style=wx.LC_REPORT
+                                 | wx.LC_VIRTUAL
+                                 | wx.BORDER_SUNKEN
+                                 #| wx.BORDER_NONE
+                                 #| wx.LC_EDIT_LABELS
+                                 #| wx.LC_SORT_ASCENDING
+                                 #| wx.LC_NO_HEADER
+                                 | wx.LC_VRULES
+                                 | wx.LC_HRULES
+                                 | wx.LC_SINGLE_SEL
+                             )
+        #listmix.ListCtrlAutoWidthMixin.__init__(self)
+        #self.setResizeColumn("LAST")
+
+        self.InsertColumn(0, "Property")
+        self.InsertColumn(1, "Value", wx.LIST_FORMAT_LEFT)
+        self.SetColumnWidth(0, 120)
+        self.SetColumnWidth(1, 400)
+
+        self.__data = []
+
+    def append(self, data):
+        self.__data.append(data)
+        self.SetItemCount(len(self.__data))
+        self.RefreshItem(len(self.__data)-1)
+
+    def OnGetItemText(self, item, col):
+        data_row = self.__data[item]
+        return data_row[col]
+
+    def display(self, doc):
+        self.__data = []
+        for item in PDF_INFO:
+            val = getattr(doc, item)
+            # This will be the fallback value
+            sane_val = repr(val)[1:-1]
+            # Maybe more enconding, which ones?
+            for encoding in ["utf-8", "iso-8859-15",]:
+                try:
+                    sane_val = utils.force_unicode(val, encoding)
+                    break
+                except utils.GPdf2SwfUnicodeDecodeError:
+                    pass
+
+            self.append([item, sane_val])
+
index 18c70af..b0e69ac 100644 (file)
 import os
 import wx
 import operator
-import imp
-from wx.lib.wordwrap import wordwrap
+#import imp
+from lib.wordwrap import wordwrap
 from gui.boldstatictext import BoldStaticText
 import viewers
 import gui.fields
 
+import viewers.raw
+import viewers.simple
+import viewers.rfx
+import viewers.flexpaper
+import viewers.technoargia
+
 class Viewers:
     def __init__(self):
-        self.viewers = []
-        self.modules = []
-        self.list_viewers()
-        self.import_viewers()
-
-    def list_viewers(self):
-        for file in os.listdir('viewers'):
-            if (file.startswith('.') or file.startswith('_')
-                or file.endswith(".pyc") or not file.endswith('.py')):
-                continue
-            self.viewers.append(os.path.splitext(file)[0])
-
-    def import_viewers(self):
-        for file in self.viewers:
-            _temp = imp.load_source("viewers.%s" % file, os.path.join(os.getcwdu(), "viewers/%s.py" % file))
-            self.modules.append(_temp)
+        self.viewers = [
+            'raw',
+            'simple',
+            'rfx',
+            'flexpaper',
+            'technoargia',
+        ]
+        self.modules = [
+            viewers.raw,
+            viewers.simple,
+            viewers.rfx,
+            viewers.flexpaper,
+            viewers.technoargia,
+        ]
+        #self.list_viewers()
+        #self.import_viewers()
+
+    #def list_viewers(self):
+    #    for file in os.listdir('viewers'):
+    #        if (file.startswith('.') or file.startswith('_')
+    #            or file.endswith(".pyc") or not file.endswith('.py')):
+    #            continue
+    #        self.viewers.append(os.path.splitext(file)[0])
+
+    #def import_viewers(self):
+    #    for file in self.viewers:
+    #        try:
+    #            _temp = imp.load_source("viewers.%s" % file, os.path.join(os.getcwdu(), "viewers/%s.py" % file))
+    #            self.modules.append(_temp)
+    #        except:
+    #            print "Could not load %s" % file
 
 
 
 class ViewerBook(wx.Listbook):
     def __init__(self, parent):
         wx.Listbook.__init__(self, parent, wx.ID_ANY, style=
-                            wx.BK_DEFAULT
+                            wx.LB_DEFAULT
                             )
 
         self.__mod = []
@@ -77,10 +99,6 @@ class ViewerBook(wx.Listbook):
             win = self.makePanel(mod)
             self.AddPage(win, mod, imageId=idx)
 
-        # A hack to avoid having the scrollbar be on bottom
-        # the first time the control is created
-        self.ListView.Select(self.ListView.GetItemCount()-1)
-        self.ListView.Select(0)
 
     def makePanel(self, mod):
         p = wx.Panel(self)
index 5cdc2a6..f58cc50 100644 (file)
@@ -29,6 +29,8 @@ from wx.lib.pubsub import Publisher
 from subprocess import Popen, PIPE
 
 class Plugin:
+    one_page_per_file = False
+
     def before_render(self):
         pass
 
@@ -44,11 +46,16 @@ class Plugin:
 
     def __find_swfcombine(self):
         found = False
-        prog = "swfcombine.exe" if "wxMSW" in wx.PlatformInfo else "swfcombine"
-        basedir = os.path.dirname(__file__)
+        if "wxMSW" in wx.PlatformInfo:
+            prog = "swfcombine.exe"
+        else:
+            prog = "swfcombine"
+        #basedir = os.path.dirname(__file__)
+        basedir = GPDF2SWF_BASEDIR
+        #print 'basedir', basedir
 
         opj = os.path.join
-        locations = [opj(basedir, prog)]
+        locations = [os.path.normpath(opj(basedir, '..', prog))]
         if "wxMSW" in wx.PlatformInfo:
             locations.extend([
                               opj("c:", "swftools", prog),
@@ -56,16 +63,20 @@ class Plugin:
                              ])
         else:
             locations.extend([
-                              opj(os.sep, "usr", "local", "bin", prog),
-                              opj(os.sep, "usr", "bin", prog),
+                              opj("/usr", "local", "bin", prog),
+                              opj("/usr", "bin", prog),
+                              opj(basedir, '..', 'src', prog),
                              ])
+        #print locations
 
         exe = prog
         for e in locations:
+            #print e
             if os.path.isfile(e):
                 exe = e
                 found = True
                 break
+        #print exe, found
         return exe, found
 
     def swfcombine(self, *args):
@@ -88,7 +99,17 @@ class Plugin:
         cmd = [exe,]
         cmd.extend(args)
 
-        output = Popen(cmd, stdout=PIPE).communicate()[0]
+        if "wxMSW" in wx.PlatformInfo:
+            try:
+                import win32process
+                # To avoid an ugly "DOS Window" to show up
+                flags = win32process.CREATE_NO_WINDOW
+            except ImportError:
+                flags = 0
+        else:
+            flags = 0
+        output = Popen(cmd, stdin=PIPE, stdout=PIPE,
+                       stderr=PIPE, creationflags=flags).communicate()[0]
 
         # Check the process output
         if output:
diff --git a/wx/setup.py b/wx/setup.py
new file mode 100644 (file)
index 0000000..42bb831
--- /dev/null
@@ -0,0 +1,163 @@
+
+# ======================================================#
+# File automagically generated by GUI2Exe version 0.3
+# Andrea Gavana, 01 April 2007
+# ======================================================#
+
+# Let's start with some default (for me) imports...
+
+from distutils.core import setup
+import py2exe
+import glob
+import os
+import zlib
+import shutil
+
+from distutils.core import setup
+import py2exe,sys,os
+
+# Overriding Criteria for Including DLLs, see:
+# http://www.py2exe.org/index.cgi/OverridingCriteraForIncludingDlls
+# XXX: Check the permission to redistribute msvcp71.dll
+origIsSystemDLL = py2exe.build_exe.isSystemDLL
+def isSystemDLL(pathname):
+        if os.path.basename(pathname).lower() in ("msvcp71.dll",):
+                return 0
+        return origIsSystemDLL(pathname)
+py2exe.build_exe.isSystemDLL = isSystemDLL
+
+
+# Remove the build folder
+shutil.rmtree("build", ignore_errors=True)
+
+
+manifest_template = """
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="5.0.0.0"
+    processorArchitecture="x86"
+    name="gpdf2swf"
+    type="win32"
+/>
+<description>gpdf2swf Program</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="X86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
+"""
+
+class Target(object):
+    """ A simple class that holds information on our executable file. """
+    def __init__(self, **kw):
+        """ Default class constructor. Update as you need. """
+        self.__dict__.update(kw)
+        
+
+# Ok, let's explain why I am doing that.
+# Often, data_files, excludes and dll_excludes (but also resources)
+# can be very long list of things, and this will clutter too much
+# the setup call at the end of this file. So, I put all the big lists
+# here and I wrap them using the textwrap module.
+
+data_files = [('viewers', ['viewers/__init__.py',
+                           'viewers/raw.py',
+                           'viewers/rfx.py',
+                           'viewers/rfx7.swf',
+                           'viewers/rfx8.swf',
+                           'viewers/simple.py']),
+              #('.', ['dll/msvcp71.dll',
+              #      ]),
+              #('images', ['images/stop.png',
+              #            'images/pdf2swf_gui.ico'])
+             ]
+
+includes = []
+excludes = ['_gtkagg', '_tkagg', 'bsddb', 'curses', 'email', 'pywin.debugger',
+            'pywin.debugger.dbgcon', 'pywin.dialogs', 'tcl',
+            'Tkconstants', 'Tkinter']
+packages = ['viewers']
+dll_excludes = ['libgdk-win32-2.0-0.dll', 'libgobject-2.0-0.dll', 'tcl84.dll',
+                'tk84.dll']
+icon_resources = [(1, 'gpdf2swf.ico')]
+bitmap_resources = []
+other_resources = [(24, 1, manifest_template)]
+
+
+# This is a place where the user custom code may go. You can do almost
+# whatever you want, even modify the data_files, includes and friends
+# here as long as they have the same variable name that the setup call
+# below is expecting.
+
+# No custom code added
+
+
+# Ok, now we are going to build our target class.
+# I chose this building strategy as it works perfectly for me :-D
+
+
+GUI2Exe_Target_1 = Target(
+    # what to build
+    script = "gpdf2swf.py",
+    icon_resources = icon_resources,
+    bitmap_resources = bitmap_resources,
+    other_resources = other_resources,
+    dest_base = "gpdf2swf",    
+    version = "0.9.0",
+    company_name = "swftools",
+    copyright = "swftools",
+    name = "gpdf2exe"
+    )
+
+
+
+# That's serious now: we have all (or almost all) the options py2exe
+# supports. I put them all even if some of them are usually defaulted
+# and not used. Some of them I didn't even know about.
+
+setup(
+
+    data_files = data_files,
+
+    options = {"py2exe": {"compressed": 0, 
+                          "optimize": 2,
+                          "includes": includes,
+                          "excludes": excludes,
+                          "packages": packages,
+                          "dll_excludes": dll_excludes,
+                          "bundle_files": 3,
+                          "dist_dir": "dist",
+                          "xref": False,
+                          "skip_archive": False,
+                          "ascii": False,
+                          "custom_boot_script": '',
+                         }
+              },
+
+    zipfile = None,
+    console = [],
+    windows = [GUI2Exe_Target_1]
+    )
+
+# This is a place where any post-compile code may go.
+# You can add as much code as you want, which can be used, for example,
+# to clean up your folders or to do some particular post-compilation
+# actions.
+
+# No post-compilation code added
+
+
+# And we are done. That's a setup script :-D
+
+# Run setup standalone...
+if __name__ == "__main__":
+    setup()
diff --git a/wx/viewers/flexpaper.py b/wx/viewers/flexpaper.py
new file mode 100644 (file)
index 0000000..bc55b20
--- /dev/null
@@ -0,0 +1,254 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# gpdf2swf.py
+# graphical user interface for pdf2swf
+#
+# Part of the swftools package.
+# 
+# Copyright (c) 2008,2009 Matthias Kramm <kramm@quiss.org> 
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+from gui.fields import Choose, ChooseAndInt
+
+order = 3
+type = "custom"
+name = u"Flex Paper Viewer"
+desc = u"""Provides a light weight document viewer with:
+    Printing, Searching, Fit width, Fit height, Flowbox mode
+    Zooming, Scrolling with Page Up/Down, Arrows, Drag,
+    Full screen mode, Navigation buttons (next/prev),
+    Print range. See http://flexpaper.devaldi.com/"""
+
+swf_options = [
+    Choose("flashversion", u"Flash version:",
+           (u"9", 9,), 0),
+]
+
+viewer_options = [
+    Choose("scale", u"Scale:",
+           (u"0.1", 0.1,
+            u"0.2", 0.2,
+            u"0.3", 0.3,
+            u"0.4", 0.4,
+            u"0.5", 0.5,
+            u"0.6", 0.6,
+            u"0.7", 0.7,
+            u"0.8", 0.8,
+            u"0.9", 0.9,
+            u"1.0", 1.0,
+           ), 5),
+    Choose("zoomtransition", u"Zoom transition:",
+           ('easenone', 'easenone',
+            'easeout', 'easeout',
+            'linear', 'linear',
+            'easeoutquad', 'easeoutquad',
+           ), 1),
+    Choose("zoomtime", u"Zoom time:",
+           (u"0.0", '0.0',
+            u"0.1", '0.1',
+            u"0.2", '0.2',
+            u"0.3", '0.3',
+            u"0.4", '0.4',
+            u"0.5", '0.5',
+            u"0.6", '0.6',
+            u"0.7", '0.7',
+            u"0.8", '0.8',
+            u"0.9", '0.9',
+            u"1.0", '1.0',
+           ), 5),
+    Choose("zoominterval", u"Zoom interval:",
+           (u"0.1", '0.1',
+            u"0.2", '0.2',
+            u"0.3", '0.3',
+            u"0.4", '0.4',
+            u"0.5", '0.5',
+            u"0.6", '0.6',
+            u"0.7", '0.7',
+            u"0.8", '0.8',
+            u"0.9", '0.9',
+            u"1.0", '1.0',
+           ), 0),
+    Choose("fitpageonload", u"Fit page on load:",
+           (u"no", 'false', u"yes", 'true', ), 0),
+    Choose("localechain", u"Locale chain:",
+           (
+            'English',             'en_US',
+            'French',              'fr_FR',
+            'Chinese, Simple',     'zh_CN',
+            'Spanish',             'es_ES',
+            'Brazilian Portugese', 'pt_BR',
+            'Russian',             'ru_RU',
+            'Finnish',             'fi_FN',
+            'German',              'de_DE',
+            'Netherlands',         'nl_NL',
+            'Turkish',             'tr_TR',
+            'Swedish',             'se_SE',
+            'Portugese',           'pt_PT',
+            'Greek',               'el_EL',
+            'Danish',              'da_DN',
+            'Czech',               'cz_CS',
+            'Italian',             'it_IT',
+            'Polish',              'pl_PL',
+            'Finnish',             'pv_FN',
+            'Hungarian',           'hu_HU',
+           ), 0),
+]
+
+
+html_template = open('viewers/flexpaper/FlexPaperViewer.html').read()
+
+from gui.plugin import Plugin
+import os
+
+class FlexPaper(Plugin):
+    def __init__(self, swf, filename):
+        self.__swf = swf
+        self.__filename = filename
+
+        for opt in swf_options:
+            setattr(self, "_%s" % opt.name, opt.value)
+
+        for opt in viewer_options:
+            setattr(self, "_%s" % opt.name, opt.value)
+
+    def after_save(self, page):
+        template_vars = {
+                         'swffilename': os.path.basename(self.__filename),
+                         'scale': self._scale,
+                         'zoomtransition': self._zoomtransition,
+                         'zoomtime': self._zoomtime,
+                         'zoominterval': self._zoominterval,
+                         'fitpageonload': self._fitpageonload,
+                         'localechain': self._localechain,
+                        }
+
+        htmlfilename = self._swap_extension(self.__filename, "html")
+        f = open(htmlfilename, "wb")
+        try:
+            f.write(html_template % template_vars)
+        except Exception, e:
+            print e
+        f.close()
+
+
+        import shutil
+        opj = os.path.join
+        src = opj(os.path.dirname(__file__), 'flexpaper')
+        dst = os.path.dirname(self.__filename)
+        shutil.copy(opj(src, 'FlexPaperViewer.swf'), dst)
+
+        try:
+            os.mkdir(opj(dst, 'js'))
+        except OSError:
+            pass
+        shutil.copy(opj(src, 'js', 'jquery.js'), opj(dst,'js'))
+
+        try:
+            os.mkdir(opj(dst, 'js', 'swfobject'))
+        except OSError:
+            pass
+        shutil.copy(opj(src, 'js', 'swfobject', 'expressInstall.swf'), opj(dst,'js', 'swfobject'))
+        shutil.copy(opj(src, 'js', 'swfobject', 'swfobject.js'), opj(dst,'js', 'swfobject'))
+
+        #shutil.copytree(src+'/js', dst+'/js')
+
+def init(swf, filename):
+    return FlexPaper(swf, filename)
+
+from lib.embeddedimage import PyEmbeddedImage
+
+preview = PyEmbeddedImage(
+    "iVBORw0KGgoAAAANSUhEUgAAAGYAAABmCAYAAAA53+RiAAAAAXNSR0IArs4c6QAAAAZiS0dE"
+    "AP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9oFDwEgKE4B7KAAAA9D"
+    "SURBVHja7V1pbxtHmn6qu/pi8xAvURxLlpzYSWTHQZANgmQXAdYY7C/JL8wf2PmYYNcDGN4Y"
+    "iZRk5Imow5Ilka1ms8+q/cCuUvPQsU520AVMAQJkmqSquqre533ek7x69YoTQgAAmqbB9324"
+    "rgvOOQCAEDLzOwBwzuXvQRDMvP+PGEmS4OTkRP4NMTjnaLZacCuVmb8XxzEMw5DvZ4zh9PQU"
+    "WZYtfLfrumg0GrfOgTEGzjk8z0MQBAtzmR+cc3RXV2EahnxW4/EYlUrlnZ4BpZTKibRaLXDO"
+    "Ua/XYVmWXHCWZTg8PESn04HjOPA8D2EYglKKSqWCTqeDLMtgGMYfskFJkuDp06eI0xRZxgAA"
+    "jmUCAE5P3yKOI/i+jyzL0G63MZlMUKlUwBgDYwymaeLhow9AqQ5t7oGOx2NMJhMkSYooSWBb"
+    "JnRNAyEEhBBcXFyg0WiAMYYkSbC+fh+NRu1O837z5gSj0RCEELTb7elmdbt3eiZJkiAMQxBC"
+    "UK1WQTnn0DQNlFJkWQZd1zEYDLCxsYFffvkFT58+lf9HCIGu6/B9H7u7u3BdFw8fPkSSphgc"
+    "HCCO49+9MVTX8fC995FmGf77f14hyxiOTt/ii6eP8WD9HgDg4uIClFIMh0M0Gg1QSmEYBn74"
+    "4Qe4rosHD94DYxle/PgrPnv84dxN4DAMirfDEX47Osa91S6SLMODe3+Cruv4/vvv8eWXX6LZ"
+    "bIJzDsayO89d13Xs/LSLv+39im+++QaUUlBK7/RMDg4O8Pz5c/R6PXz99dfTGxOGITjnaLVa"
+    "oJSi2+1C13W4rgvDMOD7PgaDARhj2N7eRhRFiKIIuq7DMAwcHh5ipdEA0TRUXRf4HZtDCIGm"
+    "T09wr90GwLHZXwOlulx8p9PBt99+C845PvroI8RxDEop7t+/DwAwDIo0SVGvuksenobLcYT+"
+    "ahdJmsEwTazYNiil0HUdW1tbaLfb0DRNive7Dk3T8K//9hU2Ntbh+758PnfZmNXVVXz66afY"
+    "3NwEpRRkf3+fr66uQtyco6Mj2LYN3/fBOcf6+jqGwyHG4zF0XUev18P5+TnCMIRlWfJzb05O"
+    "8PGTJ2CM/W5RNplMQHNZPT/CMES9NitaPM+D67ryITLGEMWJ3MziSNMUjm3fOocsy5CmKcIo"
+    "hus6t541QgjiOEbFceQmHR8fo9frvZMUIf/5l7/wtACSGiHgBaBnjEn5C87BcuAvKgViIsvA"
+    "9p1uDYD5pTRzwJ7/u9e9Jjc5DBFG0Y3ffdsDv+uDnf/u/8tnwTls24ZBKbKMgQZxjMswBEF5"
+    "B9E0/Mef/wwAGI1Gt4oXzjlc14Wu6/hhZwevdnZQ9sEYw79sPUC308Z4HIASQhY0l9JtTOH3"
+    "vb09bG9v33g74ziG53kSwEnJ1ycOHyHAX58/x/37m6AQYqrEY/7gWJZ1q3Y0Ho/lpqqwMRoh"
+    "ODg4RG9tDWfn59CKp7KsP7jmwXLO5U+RFM6BROnXR3KMaTZXsLW5BYCDihNV/jM1K4/fvn0L"
+    "TdOQpqnkYZPJBO12e+GGKLE+zuE4Dmq1Kur1Bqh8vcTXfV6UCQ0wyzIMh0Poug7bttFoNKBp"
+    "2lJNiJddnBU0uCzLphsjrlKZJz0/+v0+PM9DmqZI0xSUUlSrVei6jqigHiuxPqFqF0QzBSGQ"
+    "PwpoZUV8MU0ThBCYpgnLsqDr+iLHERtb9huT4yPnHIyzK1GmEsYI3LBtG5ZlwbZt1Gq1G8lc"
+    "2dc3vdX5oWNF8CdEmQ3hnGN/fx+GYaDf78/8n7hNRTGowvrEujhnuSgriIYyT1qMDz74AJxz"
+    "rKysXGsBME0Twp2hwvrkHMHBGL/aGBVOU1FV1jQN9Xr9ziJCFWkwdTMwMJbl4K8Qxuzs7MB1"
+    "XdRqNfi+L2+IYRjQNA1nZ2dYW1uDpmlotVrKYAwvaGWMqUIwCyde0zS8//77mEwmWFlZwdnZ"
+    "GVZWVsA5l5sz/1kVCObUAkBwcXEOzpgaBJMsYf66riNJEjSbTSRJAp6bzXu9HqIokrYyZQgm"
+    "5yAawd///hsYY/mNKTkBm8eIIAhkwEWtVgMhZOocy4llu93GvA0QCoA/YwydTgfHb07UIJjL"
+    "tK6joyM4joMkSaDrOhhjyLJMBpTMiEFFCCbLGPr9Po7fvMlFWcllMFmivYioGDt3E8dxLAMz"
+    "RLTJDM6UHfwJAUdukmFs6igru0o5PzMR52UYBhhjcF1XblAYhgtxByqozKTgumBMEYJZFEMi"
+    "Zusm93KSJFKVVolgSpMMFCGYRbP/2dkZXr9+faOZJQxD1Go1NJtNtQhmvjOccTUIJgcQJwkA"
+    "4NmzZ7eHSOV2pyRJwER4b+kxZrpQnkciyRtT9o35rxcv3gmbJlFU+mCTKcbgCvx5zvxVIJjv"
+    "bW4CnN855FQs8PDNGxydnChBB2YdZSoQTE3Dn1ZXAQA///yzjACdxxkh4jjnaLfbqNVq8Hxf"
+    "GYJJCJkqNSp6MMfjMR49eiR/393dhWlOMwGePHkiOY3UyjhXgmBqAAYHh5gEAbxLTw2t7Lrh"
+    "ui4++eSTheC/ZSG0ZR+apuHnX35F0F9Df613hTEqbQ5jDJ7nwTAMhGEIx3HAOcfl5eWin0Zo"
+    "nQqsr1qrYX19HY1aTT0PJjCN2A/DEJPJBAAQRREsy0Kj0YCu64jjeCmwlh1fkAdizKrLJT1R"
+    "y2KPRcRllmWwbRtJkiDLMoxGI1BKpXmmuDYlvLSFKUqCWVatZdnjtG1bWpYBSFEWBAF6vd7y"
+    "gPOya2UzB0dBD6YYwg8jzP7itWV5Oqp4MItDOQ+mwAqxGbdF/quwPnF4+PzGqOTBNE0TaZri"
+    "xYsXsG0bH3/88Y1Ar4oHcx4Daa5EK6Emc84lifz888+vfY9t2zMKgBIeTEKu8gQ5ckfZH5DQ"
+    "+o84TYQQHB0dyehL4RRL0xSEEJkgm6YpkiSB4zhX3kulwB9XrmVVJl3cGN/3MZlMMJlMYFkW"
+    "qtWq5DmTyQSO49yY+FRqUXZb1lbZwL/ouRTVJ0RKu4j/LS6SK7C+G7UylUYYhgiCAJqmIQgC"
+    "UEoRBAFardaCSUZNKyBXIzmWLLn2xRIrhmGgWq0iDENZxkSuKQd+opC45sUboxLBNAwDJycn"
+    "snpFt9uFaZpgjC0tEaIEwZybI5U5JQrdmDAM4bqu1L6AaZkTYTcTjrTiZ7kCUmGWYHKuxGkq"
+    "Dtu2ZYEF4SQTo1KpII5jBEEgb5syBJPnqgpHwYOpyI0RdjBRByxN04X3p2m6PExWKR5DiIwC"
+    "VGHSFcfB6ckJyC0Bf67rqm2SUYKAEYKz4RDgHP2NDfBbLBWGZYEDOB8OMYkiNQLmF/wxUMPt"
+    "+vLHH/+w01h+BYerQTAJgH//6qt3+uze/j5eDwZKpZlcYYxCk3758iW63S48z5OmGGAasiRy"
+    "/kXB1ZWVlauieGVfozZHMAUwqkIwsyxDv98HIQRBEMjqGDwvktPv95FlmYwrk1FAZQd/fo11"
+    "udQEcy4NAwDW1tZmHWIFA2bRtcwVWJ+cf+F60FlyowbzH41GsoqtqP8sioXGcYxqtQpDFKaG"
+    "GobMGZWeF/0xCuGM2BBgajdL0xRRFME0TXQ6HYzHY7kxyqxvjpfJVD+VspZt20a9XgdjDJZl"
+    "IYqiqTvZsuBWq3AcB5eXl2qZZOaELb3OJFDmcX5+Pq3NnFcrF2GyA3+MemMFrm3OiDI11rYE"
+    "/EutLi+JxHRdF+PxWKYtiKp+nXYLLGNw3QqiKJ69MQqELxGlCOaSB+q6Lu7fv3+VTzI3piXu"
+    "Y6g6uIoEs91uI01TmRfz8OHDpaev6A5QgWAuN2KWHRwLk7537x40TcPjx4+vfbthGLMYowLB"
+    "lDnLBYzhJZfBxdP0008/4fHjxxgMBjg7O5OlryzLwmg0QrPZRL1ex2QymTbwyW9L2Qnm1MPK"
+    "1SWYIvelXq+jUqkgDENZIWNtbU26movsXwVBrYHM+JaVrCLr+z58359JkhVxZa1Wa6a8rzJV"
+    "ZOf9MaphDABUq1VpWW42mzOa2bLMMVWylhfAv+wYgyX1yi4vL2GaJpIkmfb0onSpdlP6tV0j"
+    "FdQgmHMvZVmG8XiMJElQr9dvnL8KIcBXezBvXUaJ48quySYTeZeEkJn6ZE7eikrlwYvgrwrF"
+    "FBsggN+2bdmuS5o25kgzUTF8SYnwnsKkh8MhTk9P5b9FSnkR/KMoWsAcokDThVmMIUSJ/EQx"
+    "vvjiC+kYu1YUMAYtz9EkihDMYpsS6ShTIdFvcHz8Tp8TRX6UzVouuwy+GI3kDbjz6eccSZ4G"
+    "qAR+zosyFSb+9MMPJcbI0lGGAc7YVdYYgIwxQLRbpBQHJyc4OD5Wqn/BLMFUxLX8+vVrbG9v"
+    "AwC+++47GfEvGhZsbW0hyzJ4l5fTdouFGmYqKcxTjFEofEmoygDw6NEjWddfNJGrVCpIkuSq"
+    "hLwiEmF5nr8iZgsxhM8/yzJZsZznZRk9z0O3212U28qFyIpTpdCkW60WBoMBCCGypkyz2ZS5"
+    "mQvN4xQhmDOOMhXCl+YfapIkMlPZNE1EUYTj42Pouj7TGmvmKxQhmKTIY6AYxhiGgUqlAl3X"
+    "ZZtF27avr0umCMFc9GBCrXz4IAjgeR4cx5HtSizLAmNsoXOs7F3wT4L5/z9p27ahaZrMULYs"
+    "S3owRf7/TTdOCfAnioUviaj+8/NzOI6DVquFZrM5855lCbNEKX+Mou0WCSHY3NyEpmmSXM7X"
+    "NFOx3eKCKFOx3WKtVrvbbfgnwfzHjJ2dHXz22WfY29tDFEVgjME0TcRxjCRJ0Ol00O12cXl5"
+    "edWrTDGM4QJjVCKYolBcq9WC53my81IcxzI4IwxDGTmjis//WnVZJYJZtI2JRgu2bSOOY7iu"
+    "u1R0ESXaxl9dGSUJpshQLt4gwWOCIEC325URmVDIgzlbfUlBginKkQguQymVYUzVanWmhLwq"
+    "61vq81cRILMsg2EY2N/fx8bGhuQv4/F4gccQVUqWqKYuzw/x4CmlWF9fn8EZz/OQpulCfJla"
+    "VQyLrbAUIZiC+YsCC8IPEwQBwjBElmVwXXdhPeoRTFU6ReTj/Pwc+/v7N87Z8zzZblFFgjlT"
+    "E7P04is3TD579mxa0vc21TPHIZVuim3bMkWR/PXlS24qEO/r3LG5wvxI0lRuaulHFCOKQmhE"
+    "u7Iulx1jurkFWdf1O3ESnjf/Gfk+RnPtfcuqlWm6BgIOwzTUMWLW8/Lwu7u7MvjiuiEcZvVa"
+    "DZM4VqZ53N/29tBf7WH/t338LwV6X2bsIwn7AAAAAElFTkSuQmCC")
+getpreviewData = preview.GetData
+getpreviewImage = preview.GetImage
+getpreviewBitmap = preview.GetBitmap
+getpreviewIcon = preview.GetIcon
+
diff --git a/wx/viewers/flexpaper/FlexPaperViewer.html b/wx/viewers/flexpaper/FlexPaperViewer.html
new file mode 100644 (file)
index 0000000..264a406
--- /dev/null
@@ -0,0 +1,96 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> \r
+<!-- saved from url=(0014)about:internet --> \r
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">    \r
+    <head> \r
+        <title></title>         \r
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> \r
+        <style type="text/css" media="screen"> \r
+                       html, body      { height:100%%; }\r
+                       body { margin:0; padding:0; overflow:auto; }   \r
+                       #flashContent { display:none; }\r
+        </style> \r
+               \r
+               <script type="text/javascript" src="js/swfobject/swfobject.js"></script>\r
+               \r
+               <script type="text/javascript">\r
+                       if(window.addEventListener)\r
+                       window.addEventListener('DOMMouseScroll', handleWheel, false);\r
+                       window.onmousewheel = document.onmousewheel = handleWheel;\r
+                       \r
+                       if (window.attachEvent) \r
+                       window.attachEvent("onmousewheel", handleWheel);\r
+                       \r
+                       function handleWheel(event){\r
+                               try{\r
+                                       if(!window.document.FlexPaperViewer.hasFocus()){return true;}\r
+                                       window.document.FlexPaperViewer.setViewerFocus(true);\r
+                                       window.document.FlexPaperViewer.focus();\r
+                                       \r
+                                       if(navigator.appName == "Netscape"){\r
+                                               if (event.detail)\r
+                                                       delta = 0;\r
+                                               if (event.preventDefault){\r
+                                                       event.preventDefault();\r
+                                                       event.returnValue = false;\r
+                                                       }\r
+                                       }\r
+                                       return false;   \r
+                               }catch(err){return true;}               \r
+                       }\r
+               </script>\r
+               \r
+        <script type="text/javascript"> \r
+            <!-- For version detection, set to min. required Flash Player version, or 0 (or 0.0.0), for no version detection. --> \r
+            var swfVersionStr = "9.0.124";\r
+            <!-- To use express install, set to playerProductInstall.swf, otherwise the empty string. -->\r
+            var xiSwfUrlStr = "${expressInstallSwf}";\r
+            var flashvars = { \r
+                  SwfFile : escape("%(swffilename)s"),\r
+                                 Scale : %(scale)s, \r
+                                 ZoomTransition : "%(zoomtransition)s",\r
+                                 ZoomTime : %(zoomtime)s,\r
+                                 ZoomInterval : %(zoominterval)s,\r
+                                 FitPageOnLoad : %(fitpageonload)s,\r
+                                 FitWidthOnLoad : true,\r
+                                 PrintEnabled : true,\r
+                                 FullScreenAsMaxWindow : true,\r
+                                 localeChain: "%(localechain)s"\r
+                                 };\r
+                        var params = {\r
+                               \r
+                           }\r
+            params.quality = "high";\r
+            params.bgcolor = "#ffffff";\r
+            params.allowscriptaccess = "sameDomain";\r
+            params.allowfullscreen = "true";\r
+            var attributes = {};\r
+            attributes.id = "FlexPaperViewer";\r
+            attributes.name = "FlexPaperViewer";\r
+            swfobject.embedSWF(\r
+                "FlexPaperViewer.swf", "flashContent", \r
+                "600", "500", \r
+                swfVersionStr, xiSwfUrlStr, \r
+                flashvars, params, attributes);\r
+                       swfobject.createCSS("#flashContent", "display:block;text-align:left;");\r
+        </script> \r
+        \r
+    </head> \r
+    <body> \r
+       <div style="position:absolute;left:10px;top:10px;">\r
+               <div id="flashContent"> \r
+                       <p> \r
+                               To view this page ensure that Adobe Flash Player version \r
+                                       9.0.124 or greater is installed. \r
+                               </p> \r
+                               <script type="text/javascript"> \r
+                                       var pageHost = ((document.location.protocol == "https:") ? "https://" : "http://"); \r
+                                       document.write("<a href='http://www.adobe.com/go/getflashplayer'><img src='" \r
+                                                                       + pageHost + "www.adobe.com/images/shared/download_buttons/get_flash_player.gif' alt='Get Adobe Flash player' /></a>" ); \r
+                               </script> \r
+               </div>\r
+               <div id="errNoDocument" style="padding-top:10px;">\r
+                       Can't see the document? Running FlexPaper from your local directory? Make sure you have added FlexPaper as trusted. You can do that at <a href="http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04a.html#119065">Adobe's website</a>.  \r
+               </div> \r
+        </div>\r
+   </body> \r
+</html> \r
diff --git a/wx/viewers/flexpaper/FlexPaperViewer.swf b/wx/viewers/flexpaper/FlexPaperViewer.swf
new file mode 100644 (file)
index 0000000..fb35453
Binary files /dev/null and b/wx/viewers/flexpaper/FlexPaperViewer.swf differ
diff --git a/wx/viewers/flexpaper/js/jquery.js b/wx/viewers/flexpaper/js/jquery.js
new file mode 100644 (file)
index 0000000..a448490
--- /dev/null
@@ -0,0 +1,5999 @@
+/*!
+ * jQuery JavaScript Library v1.4
+ * http://jquery.com/
+ *
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://docs.jquery.com/License
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2010, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Wed Jan 13 15:23:05 2010 -0500
+ */
+(function( window, undefined ) {
+
+// Define a local copy of jQuery
+var jQuery = function( selector, context ) {
+               // The jQuery object is actually just the init constructor 'enhanced'
+               return new jQuery.fn.init( selector, context );
+       },
+
+       // Map over jQuery in case of overwrite
+       _jQuery = window.jQuery,
+
+       // Map over the $ in case of overwrite
+       _$ = window.$,
+
+       // Use the correct document accordingly with window argument (sandbox)
+       document = window.document,
+
+       // A central reference to the root jQuery(document)
+       rootjQuery,
+
+       // A simple way to check for HTML strings or ID strings
+       // (both of which we optimize for)
+       quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,
+
+       // Is it a simple selector
+       isSimple = /^.[^:#\[\.,]*$/,
+
+       // Check if a string has a non-whitespace character in it
+       rnotwhite = /\S/,
+
+       // Used for trimming whitespace
+       rtrim = /^(\s|\u00A0)+|(\s|\u00A0)+$/g,
+
+       // Match a standalone tag
+       rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+
+       // Keep a UserAgent string for use with jQuery.browser
+       userAgent = navigator.userAgent,
+
+       // For matching the engine and version of the browser
+       browserMatch,
+       
+       // Has the ready events already been bound?
+       readyBound = false,
+       
+       // The functions to execute on DOM ready
+       readyList = [],
+
+       // The ready event handler
+       DOMContentLoaded,
+
+       // Save a reference to some core methods
+       toString = Object.prototype.toString,
+       hasOwnProperty = Object.prototype.hasOwnProperty,
+       push = Array.prototype.push,
+       slice = Array.prototype.slice,
+       indexOf = Array.prototype.indexOf;
+
+jQuery.fn = jQuery.prototype = {
+       init: function( selector, context ) {
+               var match, elem, ret, doc;
+
+               // Handle $(""), $(null), or $(undefined)
+               if ( !selector ) {
+                       return this;
+               }
+
+               // Handle $(DOMElement)
+               if ( selector.nodeType ) {
+                       this.context = this[0] = selector;
+                       this.length = 1;
+                       return this;
+               }
+
+               // Handle HTML strings
+               if ( typeof selector === "string" ) {
+                       // Are we dealing with HTML string or an ID?
+                       match = quickExpr.exec( selector );
+
+                       // Verify a match, and that no context was specified for #id
+                       if ( match && (match[1] || !context) ) {
+
+                               // HANDLE: $(html) -> $(array)
+                               if ( match[1] ) {
+                                       doc = (context ? context.ownerDocument || context : document);
+
+                                       // If a single string is passed in and it's a single tag
+                                       // just do a createElement and skip the rest
+                                       ret = rsingleTag.exec( selector );
+
+                                       if ( ret ) {
+                                               if ( jQuery.isPlainObject( context ) ) {
+                                                       selector = [ document.createElement( ret[1] ) ];
+                                                       jQuery.fn.attr.call( selector, context, true );
+
+                                               } else {
+                                                       selector = [ doc.createElement( ret[1] ) ];
+                                               }
+
+                                       } else {
+                                               ret = buildFragment( [ match[1] ], [ doc ] );
+                                               selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
+                                       }
+
+                               // HANDLE: $("#id")
+                               } else {
+                                       elem = document.getElementById( match[2] );
+
+                                       if ( elem ) {
+                                               // Handle the case where IE and Opera return items
+                                               // by name instead of ID
+                                               if ( elem.id !== match[2] ) {
+                                                       return rootjQuery.find( selector );
+                                               }
+
+                                               // Otherwise, we inject the element directly into the jQuery object
+                                               this.length = 1;
+                                               this[0] = elem;
+                                       }
+
+                                       this.context = document;
+                                       this.selector = selector;
+                                       return this;
+                               }
+
+                       // HANDLE: $("TAG")
+                       } else if ( !context && /^\w+$/.test( selector ) ) {
+                               this.selector = selector;
+                               this.context = document;
+                               selector = document.getElementsByTagName( selector );
+
+                       // HANDLE: $(expr, $(...))
+                       } else if ( !context || context.jquery ) {
+                               return (context || rootjQuery).find( selector );
+
+                       // HANDLE: $(expr, context)
+                       // (which is just equivalent to: $(context).find(expr)
+                       } else {
+                               return jQuery( context ).find( selector );
+                       }
+
+               // HANDLE: $(function)
+               // Shortcut for document ready
+               } else if ( jQuery.isFunction( selector ) ) {
+                       return rootjQuery.ready( selector );
+               }
+
+               if (selector.selector !== undefined) {
+                       this.selector = selector.selector;
+                       this.context = selector.context;
+               }
+
+               return jQuery.isArray( selector ) ?
+                       this.setArray( selector ) :
+                       jQuery.makeArray( selector, this );
+       },
+
+       // Start with an empty selector
+       selector: "",
+
+       // The current version of jQuery being used
+       jquery: "1.4",
+
+       // The default length of a jQuery object is 0
+       length: 0,
+
+       // The number of elements contained in the matched element set
+       size: function() {
+               return this.length;
+       },
+
+       toArray: function() {
+               return slice.call( this, 0 );
+       },
+
+       // Get the Nth element in the matched element set OR
+       // Get the whole matched element set as a clean array
+       get: function( num ) {
+               return num == null ?
+
+                       // Return a 'clean' array
+                       this.toArray() :
+
+                       // Return just the object
+                       ( num < 0 ? this.slice(num)[ 0 ] : this[ num ] );
+       },
+
+       // Take an array of elements and push it onto the stack
+       // (returning the new matched element set)
+       pushStack: function( elems, name, selector ) {
+               // Build a new jQuery matched element set
+               var ret = jQuery( elems || null );
+
+               // Add the old object onto the stack (as a reference)
+               ret.prevObject = this;
+
+               ret.context = this.context;
+
+               if ( name === "find" ) {
+                       ret.selector = this.selector + (this.selector ? " " : "") + selector;
+               } else if ( name ) {
+                       ret.selector = this.selector + "." + name + "(" + selector + ")";
+               }
+
+               // Return the newly-formed element set
+               return ret;
+       },
+
+       // Force the current matched set of elements to become
+       // the specified array of elements (destroying the stack in the process)
+       // You should use pushStack() in order to do this, but maintain the stack
+       setArray: function( elems ) {
+               // Resetting the length to 0, then using the native Array push
+               // is a super-fast way to populate an object with array-like properties
+               this.length = 0;
+               push.apply( this, elems );
+
+               return this;
+       },
+
+       // Execute a callback for every element in the matched set.
+       // (You can seed the arguments with an array of args, but this is
+       // only used internally.)
+       each: function( callback, args ) {
+               return jQuery.each( this, callback, args );
+       },
+       
+       ready: function( fn ) {
+               // Attach the listeners
+               jQuery.bindReady();
+
+               // If the DOM is already ready
+               if ( jQuery.isReady ) {
+                       // Execute the function immediately
+                       fn.call( document, jQuery );
+
+               // Otherwise, remember the function for later
+               } else if ( readyList ) {
+                       // Add the function to the wait list
+                       readyList.push( fn );
+               }
+
+               return this;
+       },
+       
+       eq: function( i ) {
+               return i === -1 ?
+                       this.slice( i ) :
+                       this.slice( i, +i + 1 );
+       },
+
+       first: function() {
+               return this.eq( 0 );
+       },
+
+       last: function() {
+               return this.eq( -1 );
+       },
+
+       slice: function() {
+               return this.pushStack( slice.apply( this, arguments ),
+                       "slice", slice.call(arguments).join(",") );
+       },
+
+       map: function( callback ) {
+               return this.pushStack( jQuery.map(this, function( elem, i ) {
+                       return callback.call( elem, i, elem );
+               }));
+       },
+       
+       end: function() {
+               return this.prevObject || jQuery(null);
+       },
+
+       // For internal use only.
+       // Behaves like an Array's method, not like a jQuery method.
+       push: push,
+       sort: [].sort,
+       splice: [].splice
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.extend = jQuery.fn.extend = function() {
+       // copy reference to target object
+       var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy;
+
+       // Handle a deep copy situation
+       if ( typeof target === "boolean" ) {
+               deep = target;
+               target = arguments[1] || {};
+               // skip the boolean and the target
+               i = 2;
+       }
+
+       // Handle case when target is a string or something (possible in deep copy)
+       if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+               target = {};
+       }
+
+       // extend jQuery itself if only one argument is passed
+       if ( length === i ) {
+               target = this;
+               --i;
+       }
+
+       for ( ; i < length; i++ ) {
+               // Only deal with non-null/undefined values
+               if ( (options = arguments[ i ]) != null ) {
+                       // Extend the base object
+                       for ( name in options ) {
+                               src = target[ name ];
+                               copy = options[ name ];
+
+                               // Prevent never-ending loop
+                               if ( target === copy ) {
+                                       continue;
+                               }
+
+                               // Recurse if we're merging object literal values or arrays
+                               if ( deep && copy && ( jQuery.isPlainObject(copy) || jQuery.isArray(copy) ) ) {
+                                       var clone = src && ( jQuery.isPlainObject(src) || jQuery.isArray(src) ) ? src
+                                               : jQuery.isArray(copy) ? [] : {};
+
+                                       // Never move original objects, clone them
+                                       target[ name ] = jQuery.extend( deep, clone, copy );
+
+                               // Don't bring in undefined values
+                               } else if ( copy !== undefined ) {
+                                       target[ name ] = copy;
+                               }
+                       }
+               }
+       }
+
+       // Return the modified object
+       return target;
+};
+
+jQuery.extend({
+       noConflict: function( deep ) {
+               window.$ = _$;
+
+               if ( deep ) {
+                       window.jQuery = _jQuery;
+               }
+
+               return jQuery;
+       },
+       
+       // Is the DOM ready to be used? Set to true once it occurs.
+       isReady: false,
+       
+       // Handle when the DOM is ready
+       ready: function() {
+               // Make sure that the DOM is not already loaded
+               if ( !jQuery.isReady ) {
+                       // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+                       if ( !document.body ) {
+                               return setTimeout( jQuery.ready, 13 );
+                       }
+
+                       // Remember that the DOM is ready
+                       jQuery.isReady = true;
+
+                       // If there are functions bound, to execute
+                       if ( readyList ) {
+                               // Execute all of them
+                               var fn, i = 0;
+                               while ( (fn = readyList[ i++ ]) ) {
+                                       fn.call( document, jQuery );
+                               }
+
+                               // Reset the list of functions
+                               readyList = null;
+                       }
+
+                       // Trigger any bound ready events
+                       if ( jQuery.fn.triggerHandler ) {
+                               jQuery( document ).triggerHandler( "ready" );
+                       }
+               }
+       },
+       
+       bindReady: function() {
+               if ( readyBound ) {
+                       return;
+               }
+
+               readyBound = true;
+
+               // Catch cases where $(document).ready() is called after the
+               // browser event has already occurred.
+               if ( document.readyState === "complete" ) {
+                       return jQuery.ready();
+               }
+
+               // Mozilla, Opera and webkit nightlies currently support this event
+               if ( document.addEventListener ) {
+                       // Use the handy event callback
+                       document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+                       
+                       // A fallback to window.onload, that will always work
+                       window.addEventListener( "load", jQuery.ready, false );
+
+               // If IE event model is used
+               } else if ( document.attachEvent ) {
+                       // ensure firing before onload,
+                       // maybe late but safe also for iframes
+                       document.attachEvent("onreadystatechange", DOMContentLoaded);
+                       
+                       // A fallback to window.onload, that will always work
+                       window.attachEvent( "onload", jQuery.ready );
+
+                       // If IE and not a frame
+                       // continually check to see if the document is ready
+                       var toplevel = false;
+
+                       try {
+                               toplevel = window.frameElement == null;
+                       } catch(e) {}
+
+                       if ( document.documentElement.doScroll && toplevel ) {
+                               doScrollCheck();
+                       }
+               }
+       },
+
+       // See test/unit/core.js for details concerning isFunction.
+       // Since version 1.3, DOM methods and functions like alert
+       // aren't supported. They return false on IE (#2968).
+       isFunction: function( obj ) {
+               return toString.call(obj) === "[object Function]";
+       },
+
+       isArray: function( obj ) {
+               return toString.call(obj) === "[object Array]";
+       },
+
+       isPlainObject: function( obj ) {
+               // Must be an Object.
+               // Because of IE, we also have to check the presence of the constructor property.
+               // Make sure that DOM nodes and window objects don't pass through, as well
+               if ( !obj || toString.call(obj) !== "[object Object]" || obj.nodeType || obj.setInterval ) {
+                       return false;
+               }
+               
+               // Not own constructor property must be Object
+               if ( obj.constructor
+                       && !hasOwnProperty.call(obj, "constructor")
+                       && !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
+                       return false;
+               }
+               
+               // Own properties are enumerated firstly, so to speed up,
+               // if last one is own, then all properties are own.
+       
+               var key;
+               for ( key in obj ) {}
+               
+               return key === undefined || hasOwnProperty.call( obj, key );
+       },
+
+       isEmptyObject: function( obj ) {
+               for ( var name in obj ) {
+                       return false;
+               }
+               return true;
+       },
+
+       noop: function() {},
+
+       // Evalulates a script in a global context
+       globalEval: function( data ) {
+               if ( data && rnotwhite.test(data) ) {
+                       // Inspired by code by Andrea Giammarchi
+                       // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
+                       var head = document.getElementsByTagName("head")[0] || document.documentElement,
+                               script = document.createElement("script");
+
+                       script.type = "text/javascript";
+
+                       if ( jQuery.support.scriptEval ) {
+                               script.appendChild( document.createTextNode( data ) );
+                       } else {
+                               script.text = data;
+                       }
+
+                       // Use insertBefore instead of appendChild to circumvent an IE6 bug.
+                       // This arises when a base node is used (#2709).
+                       head.insertBefore( script, head.firstChild );
+                       head.removeChild( script );
+               }
+       },
+
+       nodeName: function( elem, name ) {
+               return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
+       },
+
+       // args is for internal usage only
+       each: function( object, callback, args ) {
+               var name, i = 0,
+                       length = object.length,
+                       isObj = length === undefined || jQuery.isFunction(object);
+
+               if ( args ) {
+                       if ( isObj ) {
+                               for ( name in object ) {
+                                       if ( callback.apply( object[ name ], args ) === false ) {
+                                               break;
+                                       }
+                               }
+                       } else {
+                               for ( ; i < length; ) {
+                                       if ( callback.apply( object[ i++ ], args ) === false ) {
+                                               break;
+                                       }
+                               }
+                       }
+
+               // A special, fast, case for the most common use of each
+               } else {
+                       if ( isObj ) {
+                               for ( name in object ) {
+                                       if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
+                                               break;
+                                       }
+                               }
+                       } else {
+                               for ( var value = object[0];
+                                       i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {}
+                       }
+               }
+
+               return object;
+       },
+
+       trim: function( text ) {
+               return (text || "").replace( rtrim, "" );
+       },
+
+       // results is for internal usage only
+       makeArray: function( array, results ) {
+               var ret = results || [];
+
+               if ( array != null ) {
+                       // The window, strings (and functions) also have 'length'
+                       // The extra typeof function check is to prevent crashes
+                       // in Safari 2 (See: #3039)
+                       if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || (typeof array !== "function" && array.setInterval) ) {
+                               push.call( ret, array );
+                       } else {
+                               jQuery.merge( ret, array );
+                       }
+               }
+
+               return ret;
+       },
+
+       inArray: function( elem, array ) {
+               if ( array.indexOf ) {
+                       return array.indexOf( elem );
+               }
+
+               for ( var i = 0, length = array.length; i < length; i++ ) {
+                       if ( array[ i ] === elem ) {
+                               return i;
+                       }
+               }
+
+               return -1;
+       },
+
+       merge: function( first, second ) {
+               var i = first.length, j = 0;
+
+               if ( typeof second.length === "number" ) {
+                       for ( var l = second.length; j < l; j++ ) {
+                               first[ i++ ] = second[ j ];
+                       }
+               } else {
+                       while ( second[j] !== undefined ) {
+                               first[ i++ ] = second[ j++ ];
+                       }
+               }
+
+               first.length = i;
+
+               return first;
+       },
+
+       grep: function( elems, callback, inv ) {
+               var ret = [];
+
+               // Go through the array, only saving the items
+               // that pass the validator function
+               for ( var i = 0, length = elems.length; i < length; i++ ) {
+                       if ( !inv !== !callback( elems[ i ], i ) ) {
+                               ret.push( elems[ i ] );
+                       }
+               }
+
+               return ret;
+       },
+
+       // arg is for internal usage only
+       map: function( elems, callback, arg ) {
+               var ret = [], value;
+
+               // Go through the array, translating each of the items to their
+               // new value (or values).
+               for ( var i = 0, length = elems.length; i < length; i++ ) {
+                       value = callback( elems[ i ], i, arg );
+
+                       if ( value != null ) {
+                               ret[ ret.length ] = value;
+                       }
+               }
+
+               return ret.concat.apply( [], ret );
+       },
+
+       // A global GUID counter for objects
+       guid: 1,
+
+       proxy: function( fn, proxy, thisObject ) {
+               if ( arguments.length === 2 ) {
+                       if ( typeof proxy === "string" ) {
+                               thisObject = fn;
+                               fn = thisObject[ proxy ];
+                               proxy = undefined;
+
+                       } else if ( proxy && !jQuery.isFunction( proxy ) ) {
+                               thisObject = proxy;
+                               proxy = undefined;
+                       }
+               }
+
+               if ( !proxy && fn ) {
+                       proxy = function() {
+                               return fn.apply( thisObject || this, arguments );
+                       };
+               }
+
+               // Set the guid of unique handler to the same of original handler, so it can be removed
+               if ( fn ) {
+                       proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+               }
+
+               // So proxy can be declared as an argument
+               return proxy;
+       },
+
+       // Use of jQuery.browser is frowned upon.
+       // More details: http://docs.jquery.com/Utilities/jQuery.browser
+       uaMatch: function( ua ) {
+               var ret = { browser: "" };
+
+               ua = ua.toLowerCase();
+
+               if ( /webkit/.test( ua ) ) {
+                       ret = { browser: "webkit", version: /webkit[\/ ]([\w.]+)/ };
+
+               } else if ( /opera/.test( ua ) ) {
+                       ret = { browser: "opera", version:  /version/.test( ua ) ? /version[\/ ]([\w.]+)/ : /opera[\/ ]([\w.]+)/ };
+                       
+               } else if ( /msie/.test( ua ) ) {
+                       ret = { browser: "msie", version: /msie ([\w.]+)/ };
+
+               } else if ( /mozilla/.test( ua ) && !/compatible/.test( ua ) ) {
+                       ret = { browser: "mozilla", version: /rv:([\w.]+)/ };
+               }
+
+               ret.version = (ret.version && ret.version.exec( ua ) || [0, "0"])[1];
+
+               return ret;
+       },
+
+       browser: {}
+});
+
+browserMatch = jQuery.uaMatch( userAgent );
+if ( browserMatch.browser ) {
+       jQuery.browser[ browserMatch.browser ] = true;
+       jQuery.browser.version = browserMatch.version;
+}
+
+// Deprecated, use jQuery.browser.webkit instead
+if ( jQuery.browser.webkit ) {
+       jQuery.browser.safari = true;
+}
+
+if ( indexOf ) {
+       jQuery.inArray = function( elem, array ) {
+               return indexOf.call( array, elem );
+       };
+}
+
+// All jQuery objects should point back to these
+rootjQuery = jQuery(document);
+
+// Cleanup functions for the document ready method
+if ( document.addEventListener ) {
+       DOMContentLoaded = function() {
+               document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+               jQuery.ready();
+       };
+
+} else if ( document.attachEvent ) {
+       DOMContentLoaded = function() {
+               // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+               if ( document.readyState === "complete" ) {
+                       document.detachEvent( "onreadystatechange", DOMContentLoaded );
+                       jQuery.ready();
+               }
+       };
+}
+
+// The DOM ready check for Internet Explorer
+function doScrollCheck() {
+       if ( jQuery.isReady ) {
+               return;
+       }
+
+       try {
+               // If IE is used, use the trick by Diego Perini
+               // http://javascript.nwbox.com/IEContentLoaded/
+               document.documentElement.doScroll("left");
+       } catch( error ) {
+               setTimeout( doScrollCheck, 1 );
+               return;
+       }
+
+       // and execute any waiting functions
+       jQuery.ready();
+}
+
+if ( indexOf ) {
+       jQuery.inArray = function( elem, array ) {
+               return indexOf.call( array, elem );
+       };
+}
+
+function evalScript( i, elem ) {
+       if ( elem.src ) {
+               jQuery.ajax({
+                       url: elem.src,
+                       async: false,
+                       dataType: "script"
+               });
+       } else {
+               jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+       }
+
+       if ( elem.parentNode ) {
+               elem.parentNode.removeChild( elem );
+       }
+}
+
+// Mutifunctional method to get and set values to a collection
+// The value/s can be optionally by executed if its a function
+function access( elems, key, value, exec, fn, pass ) {
+       var length = elems.length;
+       
+       // Setting many attributes
+       if ( typeof key === "object" ) {
+               for ( var k in key ) {
+                       access( elems, k, key[k], exec, fn, value );
+               }
+               return elems;
+       }
+       
+       // Setting one attribute
+       if ( value !== undefined ) {
+               // Optionally, function values get executed if exec is true
+               exec = !pass && exec && jQuery.isFunction(value);
+               
+               for ( var i = 0; i < length; i++ ) {
+                       fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+               }
+               
+               return elems;
+       }
+       
+       // Getting an attribute
+       return length ? fn( elems[0], key ) : null;
+}
+
+function now() {
+       return (new Date).getTime();
+}
+(function() {
+
+       jQuery.support = {};
+
+       var root = document.documentElement,
+               script = document.createElement("script"),
+               div = document.createElement("div"),
+               id = "script" + now();
+
+       div.style.display = "none";
+       div.innerHTML = "   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+
+       var all = div.getElementsByTagName("*"),
+               a = div.getElementsByTagName("a")[0];
+
+       // Can't get basic test support
+       if ( !all || !all.length || !a ) {
+               return;
+       }
+
+       jQuery.support = {
+               // IE strips leading whitespace when .innerHTML is used
+               leadingWhitespace: div.firstChild.nodeType === 3,
+
+               // Make sure that tbody elements aren't automatically inserted
+               // IE will insert them into empty tables
+               tbody: !div.getElementsByTagName("tbody").length,
+
+               // Make sure that link elements get serialized correctly by innerHTML
+               // This requires a wrapper element in IE
+               htmlSerialize: !!div.getElementsByTagName("link").length,
+
+               // Get the style information from getAttribute
+               // (IE uses .cssText insted)
+               style: /red/.test( a.getAttribute("style") ),
+
+               // Make sure that URLs aren't manipulated
+               // (IE normalizes it by default)
+               hrefNormalized: a.getAttribute("href") === "/a",
+
+               // Make sure that element opacity exists
+               // (IE uses filter instead)
+               // Use a regex to work around a WebKit issue. See #5145
+               opacity: /^0.55$/.test( a.style.opacity ),
+
+               // Verify style float existence
+               // (IE uses styleFloat instead of cssFloat)
+               cssFloat: !!a.style.cssFloat,
+
+               // Make sure that if no value is specified for a checkbox
+               // that it defaults to "on".
+               // (WebKit defaults to "" instead)
+               checkOn: div.getElementsByTagName("input")[0].value === "on",
+
+               // Make sure that a selected-by-default option has a working selected property.
+               // (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+               optSelected: document.createElement("select").appendChild( document.createElement("option") ).selected,
+
+               // Will be defined later
+               scriptEval: false,
+               noCloneEvent: true,
+               boxModel: null
+       };
+
+       script.type = "text/javascript";
+       try {
+               script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
+       } catch(e) {}
+
+       root.insertBefore( script, root.firstChild );
+
+       // Make sure that the execution of code works by injecting a script
+       // tag with appendChild/createTextNode
+       // (IE doesn't support this, fails, and uses .text instead)
+       if ( window[ id ] ) {
+               jQuery.support.scriptEval = true;
+               delete window[ id ];
+       }
+
+       root.removeChild( script );
+
+       if ( div.attachEvent && div.fireEvent ) {
+               div.attachEvent("onclick", function click() {
+                       // Cloning a node shouldn't copy over any
+                       // bound event handlers (IE does this)
+                       jQuery.support.noCloneEvent = false;
+                       div.detachEvent("onclick", click);
+               });
+               div.cloneNode(true).fireEvent("onclick");
+       }
+
+       // Figure out if the W3C box model works as expected
+       // document.body must exist before we can do this
+       // TODO: This timeout is temporary until I move ready into core.js.
+       jQuery(function() {
+               var div = document.createElement("div");
+               div.style.width = div.style.paddingLeft = "1px";
+
+               document.body.appendChild( div );
+               jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
+               document.body.removeChild( div ).style.display = 'none';
+               div = null;
+       });
+
+       // Technique from Juriy Zaytsev
+       // http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
+       var eventSupported = function( eventName ) { 
+               var el = document.createElement("div"); 
+               eventName = "on" + eventName; 
+
+               var isSupported = (eventName in el); 
+               if ( !isSupported ) { 
+                       el.setAttribute(eventName, "return;"); 
+                       isSupported = typeof el[eventName] === "function"; 
+               } 
+               el = null; 
+
+               return isSupported; 
+       };
+       
+       jQuery.support.submitBubbles = eventSupported("submit");
+       jQuery.support.changeBubbles = eventSupported("change");
+
+       // release memory in IE
+       root = script = div = all = a = null;
+})();
+
+jQuery.props = {
+       "for": "htmlFor",
+       "class": "className",
+       readonly: "readOnly",
+       maxlength: "maxLength",
+       cellspacing: "cellSpacing",
+       rowspan: "rowSpan",
+       colspan: "colSpan",
+       tabindex: "tabIndex",
+       usemap: "useMap",
+       frameborder: "frameBorder"
+};
+var expando = "jQuery" + now(), uuid = 0, windowData = {};
+var emptyObject = {};
+
+jQuery.extend({
+       cache: {},
+       
+       expando:expando,
+
+       // The following elements throw uncatchable exceptions if you
+       // attempt to add expando properties to them.
+       noData: {
+               "embed": true,
+               "object": true,
+               "applet": true
+       },
+
+       data: function( elem, name, data ) {
+               if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+                       return;
+               }
+
+               elem = elem == window ?
+                       windowData :
+                       elem;
+
+               var id = elem[ expando ], cache = jQuery.cache, thisCache;
+
+               // Handle the case where there's no name immediately
+               if ( !name && !id ) {
+                       return null;
+               }
+
+               // Compute a unique ID for the element
+               if ( !id ) { 
+                       id = ++uuid;
+               }
+
+               // Avoid generating a new cache unless none exists and we
+               // want to manipulate it.
+               if ( typeof name === "object" ) {
+                       elem[ expando ] = id;
+                       thisCache = cache[ id ] = jQuery.extend(true, {}, name);
+               } else if ( cache[ id ] ) {
+                       thisCache = cache[ id ];
+               } else if ( typeof data === "undefined" ) {
+                       thisCache = emptyObject;
+               } else {
+                       thisCache = cache[ id ] = {};
+               }
+
+               // Prevent overriding the named cache with undefined values
+               if ( data !== undefined ) {
+                       elem[ expando ] = id;
+                       thisCache[ name ] = data;
+               }
+
+               return typeof name === "string" ? thisCache[ name ] : thisCache;
+       },
+
+       removeData: function( elem, name ) {
+               if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+                       return;
+               }
+
+               elem = elem == window ?
+                       windowData :
+                       elem;
+
+               var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ];
+
+               // If we want to remove a specific section of the element's data
+               if ( name ) {
+                       if ( thisCache ) {
+                               // Remove the section of cache data
+                               delete thisCache[ name ];
+
+                               // If we've removed all the data, remove the element's cache
+                               if ( jQuery.isEmptyObject(thisCache) ) {
+                                       jQuery.removeData( elem );
+                               }
+                       }
+
+               // Otherwise, we want to remove all of the element's data
+               } else {
+                       // Clean up the element expando
+                       try {
+                               delete elem[ expando ];
+                       } catch( e ) {
+                               // IE has trouble directly removing the expando
+                               // but it's ok with using removeAttribute
+                               if ( elem.removeAttribute ) {
+                                       elem.removeAttribute( expando );
+                               }
+                       }
+
+                       // Completely remove the data cache
+                       delete cache[ id ];
+               }
+       }
+});
+
+jQuery.fn.extend({
+       data: function( key, value ) {
+               if ( typeof key === "undefined" && this.length ) {
+                       return jQuery.data( this[0] );
+
+               } else if ( typeof key === "object" ) {
+                       return this.each(function() {
+                               jQuery.data( this, key );
+                       });
+               }
+
+               var parts = key.split(".");
+               parts[1] = parts[1] ? "." + parts[1] : "";
+
+               if ( value === undefined ) {
+                       var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+
+                       if ( data === undefined && this.length ) {
+                               data = jQuery.data( this[0], key );
+                       }
+                       return data === undefined && parts[1] ?
+                               this.data( parts[0] ) :
+                               data;
+               } else {
+                       return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
+                               jQuery.data( this, key, value );
+                       });
+               }
+       },
+
+       removeData: function( key ) {
+               return this.each(function() {
+                       jQuery.removeData( this, key );
+               });
+       }
+});
+jQuery.extend({
+       queue: function( elem, type, data ) {
+               if ( !elem ) {
+                       return;
+               }
+
+               type = (type || "fx") + "queue";
+               var q = jQuery.data( elem, type );
+
+               // Speed up dequeue by getting out quickly if this is just a lookup
+               if ( !data ) {
+                       return q || [];
+               }
+
+               if ( !q || jQuery.isArray(data) ) {
+                       q = jQuery.data( elem, type, jQuery.makeArray(data) );
+
+               } else {
+                       q.push( data );
+               }
+
+               return q;
+       },
+
+       dequeue: function( elem, type ) {
+               type = type || "fx";
+
+               var queue = jQuery.queue( elem, type ), fn = queue.shift();
+
+               // If the fx queue is dequeued, always remove the progress sentinel
+               if ( fn === "inprogress" ) {
+                       fn = queue.shift();
+               }
+
+               if ( fn ) {
+                       // Add a progress sentinel to prevent the fx queue from being
+                       // automatically dequeued
+                       if ( type === "fx" ) {
+                               queue.unshift("inprogress");
+                       }
+
+                       fn.call(elem, function() {
+                               jQuery.dequeue(elem, type);
+                       });
+               }
+       }
+});
+
+jQuery.fn.extend({
+       queue: function( type, data ) {
+               if ( typeof type !== "string" ) {
+                       data = type;
+                       type = "fx";
+               }
+
+               if ( data === undefined ) {
+                       return jQuery.queue( this[0], type );
+               }
+               return this.each(function( i, elem ) {
+                       var queue = jQuery.queue( this, type, data );
+
+                       if ( type === "fx" && queue[0] !== "inprogress" ) {
+                               jQuery.dequeue( this, type );
+                       }
+               });
+       },
+       dequeue: function( type ) {
+               return this.each(function() {
+                       jQuery.dequeue( this, type );
+               });
+       },
+
+       // Based off of the plugin by Clint Helfers, with permission.
+       // http://blindsignals.com/index.php/2009/07/jquery-delay/
+       delay: function( time, type ) {
+               time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
+               type = type || "fx";
+
+               return this.queue( type, function() {
+                       var elem = this;
+                       setTimeout(function() {
+                               jQuery.dequeue( elem, type );
+                       }, time );
+               });
+       },
+
+       clearQueue: function( type ) {
+               return this.queue( type || "fx", [] );
+       }
+});
+var rclass = /[\n\t]/g,
+       rspace = /\s+/,
+       rreturn = /\r/g,
+       rspecialurl = /href|src|style/,
+       rtype = /(button|input)/i,
+       rfocusable = /(button|input|object|select|textarea)/i,
+       rclickable = /^(a|area)$/i,
+       rradiocheck = /radio|checkbox/;
+
+jQuery.fn.extend({
+       attr: function( name, value ) {
+               return access( this, name, value, true, jQuery.attr );
+       },
+
+       removeAttr: function( name, fn ) {
+               return this.each(function(){
+                       jQuery.attr( this, name, "" );
+                       if ( this.nodeType === 1 ) {
+                               this.removeAttribute( name );
+                       }
+               });
+       },
+
+       addClass: function( value ) {
+               if ( jQuery.isFunction(value) ) {
+                       return this.each(function(i) {
+                               var self = jQuery(this);
+                               self.addClass( value.call(this, i, self.attr("class")) );
+                       });
+               }
+
+               if ( value && typeof value === "string" ) {
+                       var classNames = (value || "").split( rspace );
+
+                       for ( var i = 0, l = this.length; i < l; i++ ) {
+                               var elem = this[i];
+
+                               if ( elem.nodeType === 1 ) {
+                                       if ( !elem.className ) {
+                                               elem.className = value;
+
+                                       } else {
+                                               var className = " " + elem.className + " ";
+                                               for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+                                                       if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
+                                                               elem.className += " " + classNames[c];
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+
+               return this;
+       },
+
+       removeClass: function( value ) {
+               if ( jQuery.isFunction(value) ) {
+                       return this.each(function(i) {
+                               var self = jQuery(this);
+                               self.removeClass( value.call(this, i, self.attr("class")) );
+                       });
+               }
+
+               if ( (value && typeof value === "string") || value === undefined ) {
+                       var classNames = (value || "").split(rspace);
+
+                       for ( var i = 0, l = this.length; i < l; i++ ) {
+                               var elem = this[i];
+
+                               if ( elem.nodeType === 1 && elem.className ) {
+                                       if ( value ) {
+                                               var className = (" " + elem.className + " ").replace(rclass, " ");
+                                               for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+                                                       className = className.replace(" " + classNames[c] + " ", " ");
+                                               }
+                                               elem.className = className.substring(1, className.length - 1);
+
+                                       } else {
+                                               elem.className = "";
+                                       }
+                               }
+                       }
+               }
+
+               return this;
+       },
+
+       toggleClass: function( value, stateVal ) {
+               var type = typeof value, isBool = typeof stateVal === "boolean";
+
+               if ( jQuery.isFunction( value ) ) {
+                       return this.each(function(i) {
+                               var self = jQuery(this);
+                               self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
+                       });
+               }
+
+               return this.each(function() {
+                       if ( type === "string" ) {
+                               // toggle individual class names
+                               var className, i = 0, self = jQuery(this),
+                                       state = stateVal,
+                                       classNames = value.split( rspace );
+
+                               while ( (className = classNames[ i++ ]) ) {
+                                       // check each className given, space seperated list
+                                       state = isBool ? state : !self.hasClass( className );
+                                       self[ state ? "addClass" : "removeClass" ]( className );
+                               }
+
+                       } else if ( type === "undefined" || type === "boolean" ) {
+                               if ( this.className ) {
+                                       // store className if set
+                                       jQuery.data( this, "__className__", this.className );
+                               }
+
+                               // toggle whole className
+                               this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || "";
+                       }
+               });
+       },
+
+       hasClass: function( selector ) {
+               var className = " " + selector + " ";
+               for ( var i = 0, l = this.length; i < l; i++ ) {
+                       if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
+                               return true;
+                       }
+               }
+
+               return false;
+       },
+
+       val: function( value ) {
+               if ( value === undefined ) {
+                       var elem = this[0];
+
+                       if ( elem ) {
+                               if ( jQuery.nodeName( elem, "option" ) ) {
+                                       return (elem.attributes.value || {}).specified ? elem.value : elem.text;
+                               }
+
+                               // We need to handle select boxes special
+                               if ( jQuery.nodeName( elem, "select" ) ) {
+                                       var index = elem.selectedIndex,
+                                               values = [],
+                                               options = elem.options,
+                                               one = elem.type === "select-one";
+
+                                       // Nothing was selected
+                                       if ( index < 0 ) {
+                                               return null;
+                                       }
+
+                                       // Loop through all the selected options
+                                       for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+                                               var option = options[ i ];
+
+                                               if ( option.selected ) {
+                                                       // Get the specifc value for the option
+                                                       value = jQuery(option).val();
+
+                                                       // We don't need an array for one selects
+                                                       if ( one ) {
+                                                               return value;
+                                                       }
+
+                                                       // Multi-Selects return an array
+                                                       values.push( value );
+                                               }
+                                       }
+
+                                       return values;
+                               }
+
+                               // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+                               if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
+                                       return elem.getAttribute("value") === null ? "on" : elem.value;
+                               }
+                               
+
+                               // Everything else, we just grab the value
+                               return (elem.value || "").replace(rreturn, "");
+
+                       }
+
+                       return undefined;
+               }
+
+               var isFunction = jQuery.isFunction(value);
+
+               return this.each(function(i) {
+                       var self = jQuery(this), val = value;
+
+                       if ( this.nodeType !== 1 ) {
+                               return;
+                       }
+
+                       if ( isFunction ) {
+                               val = value.call(this, i, self.val());
+                       }
+
+                       // Typecast each time if the value is a Function and the appended
+                       // value is therefore different each time.
+                       if ( typeof val === "number" ) {
+                               val += "";
+                       }
+
+                       if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
+                               this.checked = jQuery.inArray( self.val(), val ) >= 0;
+
+                       } else if ( jQuery.nodeName( this, "select" ) ) {
+                               var values = jQuery.makeArray(val);
+
+                               jQuery( "option", this ).each(function() {
+                                       this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
+                               });
+
+                               if ( !values.length ) {
+                                       this.selectedIndex = -1;
+                               }
+
+                       } else {
+                               this.value = val;
+                       }
+               });
+       }
+});
+
+jQuery.extend({
+       attrFn: {
+               val: true,
+               css: true,
+               html: true,
+               text: true,
+               data: true,
+               width: true,
+               height: true,
+               offset: true
+       },
+               
+       attr: function( elem, name, value, pass ) {
+               // don't set attributes on text and comment nodes
+               if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+                       return undefined;
+               }
+
+               if ( pass && name in jQuery.attrFn ) {
+                       return jQuery(elem)[name](value);
+               }
+
+               var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
+                       // Whether we are setting (or getting)
+                       set = value !== undefined;
+
+               // Try to normalize/fix the name
+               name = notxml && jQuery.props[ name ] || name;
+
+               // Only do all the following if this is a node (faster for style)
+               if ( elem.nodeType === 1 ) {
+                       // These attributes require special treatment
+                       var special = rspecialurl.test( name );
+
+                       // Safari mis-reports the default selected property of an option
+                       // Accessing the parent's selectedIndex property fixes it
+                       if ( name === "selected" && !jQuery.support.optSelected ) {
+                               var parent = elem.parentNode;
+                               if ( parent ) {
+                                       parent.selectedIndex;
+       
+                                       // Make sure that it also works with optgroups, see #5701
+                                       if ( parent.parentNode ) {
+                                               parent.parentNode.selectedIndex;
+                                       }
+                               }
+                       }
+
+                       // If applicable, access the attribute via the DOM 0 way
+                       if ( name in elem && notxml && !special ) {
+                               if ( set ) {
+                                       // We can't allow the type property to be changed (since it causes problems in IE)
+                                       if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
+                                               throw "type property can't be changed";
+                                       }
+
+                                       elem[ name ] = value;
+                               }
+
+                               // browsers index elements by id/name on forms, give priority to attributes.
+                               if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
+                                       return elem.getAttributeNode( name ).nodeValue;
+                               }
+
+                               // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+                               // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+                               if ( name === "tabIndex" ) {
+                                       var attributeNode = elem.getAttributeNode( "tabIndex" );
+
+                                       return attributeNode && attributeNode.specified ?
+                                               attributeNode.value :
+                                               rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+                                                       0 :
+                                                       undefined;
+                               }
+
+                               return elem[ name ];
+                       }
+
+                       if ( !jQuery.support.style && notxml && name === "style" ) {
+                               if ( set ) {
+                                       elem.style.cssText = "" + value;
+                               }
+
+                               return elem.style.cssText;
+                       }
+
+                       if ( set ) {
+                               // convert the value to a string (all browsers do this but IE) see #1070
+                               elem.setAttribute( name, "" + value );
+                       }
+
+                       var attr = !jQuery.support.hrefNormalized && notxml && special ?
+                                       // Some attributes require a special call on IE
+                                       elem.getAttribute( name, 2 ) :
+                                       elem.getAttribute( name );
+
+                       // Non-existent attributes return null, we normalize to undefined
+                       return attr === null ? undefined : attr;
+               }
+
+               // elem is actually elem.style ... set the style
+               // Using attr for specific style information is now deprecated. Use style insead.
+               return jQuery.style( elem, name, value );
+       }
+});
+var fcleanup = function( nm ) {
+       return nm.replace(/[^\w\s\.\|`]/g, function( ch ) {
+               return "\\" + ch;
+       });
+};
+
+/*
+ * A number of helper functions used for managing events.
+ * Many of the ideas behind this code originated from
+ * Dean Edwards' addEvent library.
+ */
+jQuery.event = {
+
+       // Bind an event to an element
+       // Original by Dean Edwards
+       add: function( elem, types, handler, data ) {
+               if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+                       return;
+               }
+
+               // For whatever reason, IE has trouble passing the window object
+               // around, causing it to be cloned in the process
+               if ( elem.setInterval && ( elem !== window && !elem.frameElement ) ) {
+                       elem = window;
+               }
+
+               // Make sure that the function being executed has a unique ID
+               if ( !handler.guid ) {
+                       handler.guid = jQuery.guid++;
+               }
+
+               // if data is passed, bind to handler
+               if ( data !== undefined ) {
+                       // Create temporary function pointer to original handler
+                       var fn = handler;
+
+                       // Create unique handler function, wrapped around original handler
+                       handler = jQuery.proxy( fn );
+
+                       // Store data in unique handler
+                       handler.data = data;
+               }
+
+               // Init the element's event structure
+               var events = jQuery.data( elem, "events" ) || jQuery.data( elem, "events", {} ),
+                       handle = jQuery.data( elem, "handle" ), eventHandle;
+
+               if ( !handle ) {
+                       eventHandle = function() {
+                               // Handle the second event of a trigger and when
+                               // an event is called after a page has unloaded
+                               return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
+                                       jQuery.event.handle.apply( eventHandle.elem, arguments ) :
+                                       undefined;
+                       };
+
+                       handle = jQuery.data( elem, "handle", eventHandle );
+               }
+
+               // If no handle is found then we must be trying to bind to one of the
+               // banned noData elements
+               if ( !handle ) {
+                       return;
+               }
+
+               // Add elem as a property of the handle function
+               // This is to prevent a memory leak with non-native
+               // event in IE.
+               handle.elem = elem;
+
+               // Handle multiple events separated by a space
+               // jQuery(...).bind("mouseover mouseout", fn);
+               types = types.split( /\s+/ );
+               var type, i=0;
+               while ( (type = types[ i++ ]) ) {
+                       // Namespaced event handlers
+                       var namespaces = type.split(".");
+                       type = namespaces.shift();
+                       handler.type = namespaces.slice(0).sort().join(".");
+
+                       // Get the current list of functions bound to this event
+                       var handlers = events[ type ],
+                               special = this.special[ type ] || {};
+
+                       
+
+                       // Init the event handler queue
+                       if ( !handlers ) {
+                               handlers = events[ type ] = {};
+
+                               // Check for a special event handler
+                               // Only use addEventListener/attachEvent if the special
+                               // events handler returns false
+                               if ( !special.setup || special.setup.call( elem, data, namespaces, handler) === false ) {
+                                       // Bind the global event handler to the element
+                                       if ( elem.addEventListener ) {
+                                               elem.addEventListener( type, handle, false );
+                                       } else if ( elem.attachEvent ) {
+                                               elem.attachEvent( "on" + type, handle );
+                                       }
+                               }
+                       }
+                       
+                       if ( special.add ) { 
+                               var modifiedHandler = special.add.call( elem, handler, data, namespaces, handlers ); 
+                               if ( modifiedHandler && jQuery.isFunction( modifiedHandler ) ) { 
+                                       modifiedHandler.guid = modifiedHandler.guid || handler.guid; 
+                                       handler = modifiedHandler; 
+                               } 
+                       } 
+                       
+                       // Add the function to the element's handler list
+                       handlers[ handler.guid ] = handler;
+
+                       // Keep track of which events have been used, for global triggering
+                       this.global[ type ] = true;
+               }
+
+               // Nullify elem to prevent memory leaks in IE
+               elem = null;
+       },
+
+       global: {},
+
+       // Detach an event or set of events from an element
+       remove: function( elem, types, handler ) {
+               // don't do events on text and comment nodes
+               if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+                       return;
+               }
+
+               var events = jQuery.data( elem, "events" ), ret, type, fn;
+
+               if ( events ) {
+                       // Unbind all events for the element
+                       if ( types === undefined || (typeof types === "string" && types.charAt(0) === ".") ) {
+                               for ( type in events ) {
+                                       this.remove( elem, type + (types || "") );
+                               }
+                       } else {
+                               // types is actually an event object here
+                               if ( types.type ) {
+                                       handler = types.handler;
+                                       types = types.type;
+                               }
+
+                               // Handle multiple events separated by a space
+                               // jQuery(...).unbind("mouseover mouseout", fn);
+                               types = types.split(/\s+/);
+                               var i = 0;
+                               while ( (type = types[ i++ ]) ) {
+                                       // Namespaced event handlers
+                                       var namespaces = type.split(".");
+                                       type = namespaces.shift();
+                                       var all = !namespaces.length,
+                                               cleaned = jQuery.map( namespaces.slice(0).sort(), fcleanup ),
+                                               namespace = new RegExp("(^|\\.)" + cleaned.join("\\.(?:.*\\.)?") + "(\\.|$)"),
+                                               special = this.special[ type ] || {};
+
+                                       if ( events[ type ] ) {
+                                               // remove the given handler for the given type
+                                               if ( handler ) {
+                                                       fn = events[ type ][ handler.guid ];
+                                                       delete events[ type ][ handler.guid ];
+
+                                               // remove all handlers for the given type
+                                               } else {
+                                                       for ( var handle in events[ type ] ) {
+                                                               // Handle the removal of namespaced events
+                                                               if ( all || namespace.test( events[ type ][ handle ].type ) ) {
+                                                                       delete events[ type ][ handle ];
+                                                               }
+                                                       }
+                                               }
+
+                                               if ( special.remove ) {
+                                                       special.remove.call( elem, namespaces, fn);
+                                               }
+
+                                               // remove generic event handler if no more handlers exist
+                                               for ( ret in events[ type ] ) {
+                                                       break;
+                                               }
+                                               if ( !ret ) {
+                                                       if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
+                                                               if ( elem.removeEventListener ) {
+                                                                       elem.removeEventListener( type, jQuery.data( elem, "handle" ), false );
+                                                               } else if ( elem.detachEvent ) {
+                                                                       elem.detachEvent( "on" + type, jQuery.data( elem, "handle" ) );
+                                                               }
+                                                       }
+                                                       ret = null;
+                                                       delete events[ type ];
+                                               }
+                                       }
+                               }
+                       }
+
+                       // Remove the expando if it's no longer used
+                       for ( ret in events ) {
+                               break;
+                       }
+                       if ( !ret ) {
+                               var handle = jQuery.data( elem, "handle" );
+                               if ( handle ) {
+                                       handle.elem = null;
+                               }
+                               jQuery.removeData( elem, "events" );
+                               jQuery.removeData( elem, "handle" );
+                       }
+               }
+       },
+
+       // bubbling is internal
+       trigger: function( event, data, elem /*, bubbling */ ) {
+               // Event object or event type
+               var type = event.type || event,
+                       bubbling = arguments[3];
+
+               if ( !bubbling ) {
+                       event = typeof event === "object" ?
+                               // jQuery.Event object
+                               event[expando] ? event :
+                               // Object literal
+                               jQuery.extend( jQuery.Event(type), event ) :
+                               // Just the event type (string)
+                               jQuery.Event(type);
+
+                       if ( type.indexOf("!") >= 0 ) {
+                               event.type = type = type.slice(0, -1);
+                               event.exclusive = true;
+                       }
+
+                       // Handle a global trigger
+                       if ( !elem ) {
+                               // Don't bubble custom events when global (to avoid too much overhead)
+                               event.stopPropagation();
+
+                               // Only trigger if we've ever bound an event for it
+                               if ( this.global[ type ] ) {
+                                       jQuery.each( jQuery.cache, function() {
+                                               if ( this.events && this.events[type] ) {
+                                                       jQuery.event.trigger( event, data, this.handle.elem );
+                                               }
+                                       });
+                               }
+                       }
+
+                       // Handle triggering a single element
+
+                       // don't do events on text and comment nodes
+                       if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+                               return undefined;
+                       }
+
+                       // Clean up in case it is reused
+                       event.result = undefined;
+                       event.target = elem;
+
+                       // Clone the incoming data, if any
+                       data = jQuery.makeArray( data );
+                       data.unshift( event );
+               }
+
+               event.currentTarget = elem;
+
+               // Trigger the event, it is assumed that "handle" is a function
+               var handle = jQuery.data( elem, "handle" );
+               if ( handle ) {
+                       handle.apply( elem, data );
+               }
+
+               var nativeFn, nativeHandler;
+               try {
+                       if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
+                               nativeFn = elem[ type ];
+                               nativeHandler = elem[ "on" + type ];
+                       }
+               // prevent IE from throwing an error for some elements with some event types, see #3533
+               } catch (e) {}
+
+               var isClick = jQuery.nodeName(elem, "a") && type === "click";
+
+               // Trigger the native events (except for clicks on links)
+               if ( !bubbling && nativeFn && !event.isDefaultPrevented() && !isClick ) {
+                       this.triggered = true;
+                       try {
+                               elem[ type ]();
+                       // prevent IE from throwing an error for some hidden elements
+                       } catch (e) {}
+
+               // Handle triggering native .onfoo handlers
+               } else if ( nativeHandler && elem[ "on" + type ].apply( elem, data ) === false ) {
+                       event.result = false;
+               }
+
+               this.triggered = false;
+
+               if ( !event.isPropagationStopped() ) {
+                       var parent = elem.parentNode || elem.ownerDocument;
+                       if ( parent ) {
+                               jQuery.event.trigger( event, data, parent, true );
+                       }
+               }
+       },
+
+       handle: function( event ) {
+               // returned undefined or false
+               var all, handlers;
+
+               event = arguments[0] = jQuery.event.fix( event || window.event );
+               event.currentTarget = this;
+
+               // Namespaced event handlers
+               var namespaces = event.type.split(".");
+               event.type = namespaces.shift();
+
+               // Cache this now, all = true means, any handler
+               all = !namespaces.length && !event.exclusive;
+
+               var namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)");
+
+               handlers = ( jQuery.data(this, "events") || {} )[ event.type ];
+
+               for ( var j in handlers ) {
+                       var handler = handlers[ j ];
+
+                       // Filter the functions by class
+                       if ( all || namespace.test(handler.type) ) {
+                               // Pass in a reference to the handler function itself
+                               // So that we can later remove it
+                               event.handler = handler;
+                               event.data = handler.data;
+
+                               var ret = handler.apply( this, arguments );
+
+                               if ( ret !== undefined ) {
+                                       event.result = ret;
+                                       if ( ret === false ) {
+                                               event.preventDefault();
+                                               event.stopPropagation();
+                                       }
+                               }
+
+                               if ( event.isImmediatePropagationStopped() ) {
+                                       break;
+                               }
+
+                       }
+               }
+
+               return event.result;
+       },
+
+       props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+
+       fix: function( event ) {
+               if ( event[ expando ] ) {
+                       return event;
+               }
+
+               // store a copy of the original event object
+               // and "clone" to set read-only properties
+               var originalEvent = event;
+               event = jQuery.Event( originalEvent );
+
+               for ( var i = this.props.length, prop; i; ) {
+                       prop = this.props[ --i ];
+                       event[ prop ] = originalEvent[ prop ];
+               }
+
+               // Fix target property, if necessary
+               if ( !event.target ) {
+                       event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
+               }
+
+               // check if target is a textnode (safari)
+               if ( event.target.nodeType === 3 ) {
+                       event.target = event.target.parentNode;
+               }
+
+               // Add relatedTarget, if necessary
+               if ( !event.relatedTarget && event.fromElement ) {
+                       event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
+               }
+
+               // Calculate pageX/Y if missing and clientX/Y available
+               if ( event.pageX == null && event.clientX != null ) {
+                       var doc = document.documentElement, body = document.body;
+                       event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
+                       event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
+               }
+
+               // Add which for key events
+               if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) {
+                       event.which = event.charCode || event.keyCode;
+               }
+
+               // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
+               if ( !event.metaKey && event.ctrlKey ) {
+                       event.metaKey = event.ctrlKey;
+               }
+
+               // Add which for click: 1 === left; 2 === middle; 3 === right
+               // Note: button is not normalized, so don't use it
+               if ( !event.which && event.button !== undefined ) {
+                       event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
+               }
+
+               return event;
+       },
+
+       // Deprecated, use jQuery.guid instead
+       guid: 1E8,
+
+       // Deprecated, use jQuery.proxy instead
+       proxy: jQuery.proxy,
+
+       special: {
+               ready: {
+                       // Make sure the ready event is setup
+                       setup: jQuery.bindReady,
+                       teardown: jQuery.noop
+               },
+
+               live: {
+                       add: function( proxy, data, namespaces, live ) {
+                               jQuery.extend( proxy, data || {} );
+
+                               proxy.guid += data.selector + data.live; 
+                               jQuery.event.add( this, data.live, liveHandler, data ); 
+                               
+                       },
+
+                       remove: function( namespaces ) {
+                               if ( namespaces.length ) {
+                                       var remove = 0, name = new RegExp("(^|\\.)" + namespaces[0] + "(\\.|$)");
+
+                                       jQuery.each( (jQuery.data(this, "events").live || {}), function() {
+                                               if ( name.test(this.type) ) {
+                                                       remove++;
+                                               }
+                                       });
+
+                                       if ( remove < 1 ) {
+                                               jQuery.event.remove( this, namespaces[0], liveHandler );
+                                       }
+                               }
+                       },
+                       special: {}
+               },
+               beforeunload: {
+                       setup: function( data, namespaces, fn ) {
+                               // We only want to do this special case on windows
+                               if ( this.setInterval ) {
+                                       this.onbeforeunload = fn;
+                               }
+
+                               return false;
+                       },
+                       teardown: function( namespaces, fn ) {
+                               if ( this.onbeforeunload === fn ) {
+                                       this.onbeforeunload = null;
+                               }
+                       }
+               }
+       }
+};
+
+jQuery.Event = function( src ) {
+       // Allow instantiation without the 'new' keyword
+       if ( !this.preventDefault ) {
+               return new jQuery.Event( src );
+       }
+
+       // Event object
+       if ( src && src.type ) {
+               this.originalEvent = src;
+               this.type = src.type;
+       // Event type
+       } else {
+               this.type = src;
+       }
+
+       // timeStamp is buggy for some events on Firefox(#3843)
+       // So we won't rely on the native value
+       this.timeStamp = now();
+
+       // Mark it as fixed
+       this[ expando ] = true;
+};
+
+function returnFalse() {
+       return false;
+}
+function returnTrue() {
+       return true;
+}
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+       preventDefault: function() {
+               this.isDefaultPrevented = returnTrue;
+
+               var e = this.originalEvent;
+               if ( !e ) {
+                       return;
+               }
+               
+               // if preventDefault exists run it on the original event
+               if ( e.preventDefault ) {
+                       e.preventDefault();
+               }
+               // otherwise set the returnValue property of the original event to false (IE)
+               e.returnValue = false;
+       },
+       stopPropagation: function() {
+               this.isPropagationStopped = returnTrue;
+
+               var e = this.originalEvent;
+               if ( !e ) {
+                       return;
+               }
+               // if stopPropagation exists run it on the original event
+               if ( e.stopPropagation ) {
+                       e.stopPropagation();
+               }
+               // otherwise set the cancelBubble property of the original event to true (IE)
+               e.cancelBubble = true;
+       },
+       stopImmediatePropagation: function() {
+               this.isImmediatePropagationStopped = returnTrue;
+               this.stopPropagation();
+       },
+       isDefaultPrevented: returnFalse,
+       isPropagationStopped: returnFalse,
+       isImmediatePropagationStopped: returnFalse
+};
+
+// Checks if an event happened on an element within another element
+// Used in jQuery.event.special.mouseenter and mouseleave handlers
+var withinElement = function( event ) {
+       // Check if mouse(over|out) are still within the same parent element
+       var parent = event.relatedTarget;
+
+       // Traverse up the tree
+       while ( parent && parent !== this ) {
+               // Firefox sometimes assigns relatedTarget a XUL element
+               // which we cannot access the parentNode property of
+               try {
+                       parent = parent.parentNode;
+
+               // assuming we've left the element since we most likely mousedover a xul element
+               } catch(e) {
+                       break;
+               }
+       }
+
+       if ( parent !== this ) {
+               // set the correct event type
+               event.type = event.data;
+
+               // handle event if we actually just moused on to a non sub-element
+               jQuery.event.handle.apply( this, arguments );
+       }
+
+},
+
+// In case of event delegation, we only need to rename the event.type,
+// liveHandler will take care of the rest.
+delegate = function( event ) {
+       event.type = event.data;
+       jQuery.event.handle.apply( this, arguments );
+};
+
+// Create mouseenter and mouseleave events
+jQuery.each({
+       mouseenter: "mouseover",
+       mouseleave: "mouseout"
+}, function( orig, fix ) {
+       jQuery.event.special[ orig ] = {
+               setup: function( data ) {
+                       jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
+               },
+               teardown: function( data ) {
+                       jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
+               }
+       };
+});
+
+// submit delegation
+if ( !jQuery.support.submitBubbles ) {
+
+jQuery.event.special.submit = {
+       setup: function( data, namespaces, fn ) {
+               if ( this.nodeName.toLowerCase() !== "form" ) {
+                       jQuery.event.add(this, "click.specialSubmit." + fn.guid, function( e ) {
+                               var elem = e.target, type = elem.type;
+
+                               if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
+                                       return trigger( "submit", this, arguments );
+                               }
+                       });
+        
+                       jQuery.event.add(this, "keypress.specialSubmit." + fn.guid, function( e ) {
+                               var elem = e.target, type = elem.type;
+
+                               if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
+                                       return trigger( "submit", this, arguments );
+                               }
+                       });
+
+               } else {
+                       return false;
+               }
+       },
+
+       remove: function( namespaces, fn ) {
+               jQuery.event.remove( this, "click.specialSubmit" + (fn ? "."+fn.guid : "") );
+               jQuery.event.remove( this, "keypress.specialSubmit" + (fn ? "."+fn.guid : "") );
+       }
+};
+
+}
+
+// change delegation, happens here so we have bind.
+if ( !jQuery.support.changeBubbles ) {
+
+var formElems = /textarea|input|select/i;
+
+function getVal( elem ) {
+       var type = elem.type, val = elem.value;
+
+       if ( type === "radio" || type === "checkbox" ) {
+               val = elem.checked;
+
+       } else if ( type === "select-multiple" ) {
+               val = elem.selectedIndex > -1 ?
+                       jQuery.map( elem.options, function( elem ) {
+                               return elem.selected;
+                       }).join("-") :
+                       "";
+
+       } else if ( elem.nodeName.toLowerCase() === "select" ) {
+               val = elem.selectedIndex;
+       }
+
+       return val;
+}
+
+function testChange( e ) {
+               var elem = e.target, data, val;
+
+               if ( !formElems.test( elem.nodeName ) || elem.readOnly ) {
+                       return;
+               }
+
+               data = jQuery.data( elem, "_change_data" );
+               val = getVal(elem);
+
+               if ( val === data ) {
+                       return;
+               }
+
+               // the current data will be also retrieved by beforeactivate
+               if ( e.type !== "focusout" || elem.type !== "radio" ) {
+                       jQuery.data( elem, "_change_data", val );
+               }
+
+               if ( elem.type !== "select" && (data != null || val) ) {
+                       e.type = "change";
+                       return jQuery.event.trigger( e, arguments[1], this );
+               }
+}
+
+jQuery.event.special.change = {
+       filters: {
+               focusout: testChange, 
+
+               click: function( e ) {
+                       var elem = e.target, type = elem.type;
+
+                       if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) {
+                               return testChange.call( this, e );
+                       }
+               },
+
+               // Change has to be called before submit
+               // Keydown will be called before keypress, which is used in submit-event delegation
+               keydown: function( e ) {
+                       var elem = e.target, type = elem.type;
+
+                       if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") ||
+                               (e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
+                               type === "select-multiple" ) {
+                               return testChange.call( this, e );
+                       }
+               },
+
+               // Beforeactivate happens also before the previous element is blurred
+               // with this event you can't trigger a change event, but you can store
+               // information/focus[in] is not needed anymore
+               beforeactivate: function( e ) {
+                       var elem = e.target;
+
+                       if ( elem.nodeName.toLowerCase() === "input" && elem.type === "radio" ) {
+                               jQuery.data( elem, "_change_data", getVal(elem) );
+                       }
+               }
+       },
+       setup: function( data, namespaces, fn ) {
+               for ( var type in changeFilters ) {
+                       jQuery.event.add( this, type + ".specialChange." + fn.guid, changeFilters[type] );
+               }
+
+               return formElems.test( this.nodeName );
+       },
+       remove: function( namespaces, fn ) {
+               for ( var type in changeFilters ) {
+                       jQuery.event.remove( this, type + ".specialChange" + (fn ? "."+fn.guid : ""), changeFilters[type] );
+               }
+
+               return formElems.test( this.nodeName );
+       }
+};
+
+var changeFilters = jQuery.event.special.change.filters;
+
+}
+
+function trigger( type, elem, args ) {
+       args[0].type = type;
+       return jQuery.event.handle.apply( elem, args );
+}
+
+// Create "bubbling" focus and blur events
+if ( document.addEventListener ) {
+       jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+               jQuery.event.special[ fix ] = {
+                       setup: function() {
+                               this.addEventListener( orig, handler, true );
+                       }, 
+                       teardown: function() { 
+                               this.removeEventListener( orig, handler, true );
+                       }
+               };
+
+               function handler( e ) { 
+                       e = jQuery.event.fix( e );
+                       e.type = fix;
+                       return jQuery.event.handle.call( this, e );
+               }
+       });
+}
+
+jQuery.each(["bind", "one"], function( i, name ) {
+       jQuery.fn[ name ] = function( type, data, fn ) {
+               // Handle object literals
+               if ( typeof type === "object" ) {
+                       for ( var key in type ) {
+                               this[ name ](key, data, type[key], fn);
+                       }
+                       return this;
+               }
+               
+               if ( jQuery.isFunction( data ) ) {
+                       thisObject = fn;
+                       fn = data;
+                       data = undefined;
+               }
+
+               var handler = name === "one" ? jQuery.proxy( fn, function( event ) {
+                       jQuery( this ).unbind( event, handler );
+                       return fn.apply( this, arguments );
+               }) : fn;
+
+               return type === "unload" && name !== "one" ?
+                       this.one( type, data, fn, thisObject ) :
+                       this.each(function() {
+                               jQuery.event.add( this, type, handler, data );
+                       });
+       };
+});
+
+jQuery.fn.extend({
+       unbind: function( type, fn ) {
+               // Handle object literals
+               if ( typeof type === "object" && !type.preventDefault ) {
+                       for ( var key in type ) {
+                               this.unbind(key, type[key]);
+                       }
+                       return this;
+               }
+
+               return this.each(function() {
+                       jQuery.event.remove( this, type, fn );
+               });
+       },
+       trigger: function( type, data ) {
+               return this.each(function() {
+                       jQuery.event.trigger( type, data, this );
+               });
+       },
+
+       triggerHandler: function( type, data ) {
+               if ( this[0] ) {
+                       var event = jQuery.Event( type );
+                       event.preventDefault();
+                       event.stopPropagation();
+                       jQuery.event.trigger( event, data, this[0] );
+                       return event.result;
+               }
+       },
+
+       toggle: function( fn ) {
+               // Save reference to arguments for access in closure
+               var args = arguments, i = 1;
+
+               // link all the functions, so any of them can unbind this click handler
+               while ( i < args.length ) {
+                       jQuery.proxy( fn, args[ i++ ] );
+               }
+
+               return this.click( jQuery.proxy( fn, function( event ) {
+                       // Figure out which function to execute
+                       var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+                       jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+                       // Make sure that clicks stop
+                       event.preventDefault();
+
+                       // and execute the function
+                       return args[ lastToggle ].apply( this, arguments ) || false;
+               }));
+       },
+
+       hover: function( fnOver, fnOut ) {
+               return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+       },
+
+       live: function( type, data, fn ) {
+               if ( jQuery.isFunction( data ) ) {
+                       fn = data;
+                       data = undefined;
+               }
+
+               jQuery( this.context ).bind( liveConvert( type, this.selector ), {
+                       data: data, selector: this.selector, live: type
+               }, fn );
+
+               return this;
+       },
+
+       die: function( type, fn ) {
+               jQuery( this.context ).unbind( liveConvert( type, this.selector ), fn ? { guid: fn.guid + this.selector + type } : null );
+               return this;
+       }
+});
+
+function liveHandler( event ) {
+       var stop = true, elems = [], selectors = [], args = arguments,
+               related, match, fn, elem, j, i, data,
+               live = jQuery.extend({}, jQuery.data( this, "events" ).live);
+
+       for ( j in live ) {
+               fn = live[j];
+               if ( fn.live === event.type ||
+                               fn.altLive && jQuery.inArray(event.type, fn.altLive) > -1 ) {
+
+                       data = fn.data;
+                       if ( !(data.beforeFilter && data.beforeFilter[event.type] && 
+                                       !data.beforeFilter[event.type](event)) ) {
+                               selectors.push( fn.selector );
+                       }
+               } else {
+                       delete live[j];
+               }
+       }
+
+       match = jQuery( event.target ).closest( selectors, event.currentTarget );
+
+       for ( i = 0, l = match.length; i < l; i++ ) {
+               for ( j in live ) {
+                       fn = live[j];
+                       elem = match[i].elem;
+                       related = null;
+
+                       if ( match[i].selector === fn.selector ) {
+                               // Those two events require additional checking
+                               if ( fn.live === "mouseenter" || fn.live === "mouseleave" ) {
+                                       related = jQuery( event.relatedTarget ).closest( fn.selector )[0];
+                               }
+
+                               if ( !related || related !== elem ) {
+                                       elems.push({ elem: elem, fn: fn });
+                               }
+                       }
+               }
+       }
+
+       for ( i = 0, l = elems.length; i < l; i++ ) {
+               match = elems[i];
+               event.currentTarget = match.elem;
+               event.data = match.fn.data;
+               if ( match.fn.apply( match.elem, args ) === false ) {
+                       stop = false;
+                       break;
+               }
+       }
+
+       return stop;
+}
+
+function liveConvert( type, selector ) {
+       return ["live", type, selector.replace(/\./g, "`").replace(/ /g, "&")].join(".");
+}
+
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+       "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+       "change select submit keydown keypress keyup error").split(" "), function( i, name ) {
+
+       // Handle event binding
+       jQuery.fn[ name ] = function( fn ) {
+               return fn ? this.bind( name, fn ) : this.trigger( name );
+       };
+
+       if ( jQuery.attrFn ) {
+               jQuery.attrFn[ name ] = true;
+       }
+});
+
+// Prevent memory leaks in IE
+// Window isn't included so as not to unbind existing unload events
+// More info:
+//  - http://isaacschlueter.com/2006/10/msie-memory-leaks/
+if ( window.attachEvent && !window.addEventListener ) {
+       window.attachEvent("onunload", function() {
+               for ( var id in jQuery.cache ) {
+                       if ( jQuery.cache[ id ].handle ) {
+                               // Try/Catch is to handle iframes being unloaded, see #4280
+                               try {
+                                       jQuery.event.remove( jQuery.cache[ id ].handle.elem );
+                               } catch(e) {}
+                       }
+               }
+       });
+}
+/*!
+ * Sizzle CSS Selector Engine - v1.0
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){
+
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+       done = 0,
+       toString = Object.prototype.toString,
+       hasDuplicate = false,
+       baseHasDuplicate = true;
+
+// Here we check if the JavaScript engine is using some sort of
+// optimization where it does not always call our comparision
+// function. If that is the case, discard the hasDuplicate value.
+//   Thus far that includes Google Chrome.
+[0, 0].sort(function(){
+       baseHasDuplicate = false;
+       return 0;
+});
+
+var Sizzle = function(selector, context, results, seed) {
+       results = results || [];
+       var origContext = context = context || document;
+
+       if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
+               return [];
+       }
+       
+       if ( !selector || typeof selector !== "string" ) {
+               return results;
+       }
+
+       var parts = [], m, set, checkSet, extra, prune = true, contextXML = isXML(context),
+               soFar = selector;
+       
+       // Reset the position of the chunker regexp (start from head)
+       while ( (chunker.exec(""), m = chunker.exec(soFar)) !== null ) {
+               soFar = m[3];
+               
+               parts.push( m[1] );
+               
+               if ( m[2] ) {
+                       extra = m[3];
+                       break;
+               }
+       }
+
+       if ( parts.length > 1 && origPOS.exec( selector ) ) {
+               if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+                       set = posProcess( parts[0] + parts[1], context );
+               } else {
+                       set = Expr.relative[ parts[0] ] ?
+                               [ context ] :
+                               Sizzle( parts.shift(), context );
+
+                       while ( parts.length ) {
+                               selector = parts.shift();
+
+                               if ( Expr.relative[ selector ] ) {
+                                       selector += parts.shift();
+                               }
+                               
+                               set = posProcess( selector, set );
+                       }
+               }
+       } else {
+               // Take a shortcut and set the context if the root selector is an ID
+               // (but not if it'll be faster if the inner selector is an ID)
+               if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
+                               Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
+                       var ret = Sizzle.find( parts.shift(), context, contextXML );
+                       context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];
+               }
+
+               if ( context ) {
+                       var ret = seed ?
+                               { expr: parts.pop(), set: makeArray(seed) } :
+                               Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
+                       set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;
+
+                       if ( parts.length > 0 ) {
+                               checkSet = makeArray(set);
+                       } else {
+                               prune = false;
+                       }
+
+                       while ( parts.length ) {
+                               var cur = parts.pop(), pop = cur;
+
+                               if ( !Expr.relative[ cur ] ) {
+                                       cur = "";
+                               } else {
+                                       pop = parts.pop();
+                               }
+
+                               if ( pop == null ) {
+                                       pop = context;
+                               }
+
+                               Expr.relative[ cur ]( checkSet, pop, contextXML );
+                       }
+               } else {
+                       checkSet = parts = [];
+               }
+       }
+
+       if ( !checkSet ) {
+               checkSet = set;
+       }
+
+       if ( !checkSet ) {
+               throw "Syntax error, unrecognized expression: " + (cur || selector);
+       }
+
+       if ( toString.call(checkSet) === "[object Array]" ) {
+               if ( !prune ) {
+                       results.push.apply( results, checkSet );
+               } else if ( context && context.nodeType === 1 ) {
+                       for ( var i = 0; checkSet[i] != null; i++ ) {
+                               if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) {
+                                       results.push( set[i] );
+                               }
+                       }
+               } else {
+                       for ( var i = 0; checkSet[i] != null; i++ ) {
+                               if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+                                       results.push( set[i] );
+                               }
+                       }
+               }
+       } else {
+               makeArray( checkSet, results );
+       }
+
+       if ( extra ) {
+               Sizzle( extra, origContext, results, seed );
+               Sizzle.uniqueSort( results );
+       }
+
+       return results;
+};
+
+Sizzle.uniqueSort = function(results){
+       if ( sortOrder ) {
+               hasDuplicate = baseHasDuplicate;
+               results.sort(sortOrder);
+
+               if ( hasDuplicate ) {
+                       for ( var i = 1; i < results.length; i++ ) {
+                               if ( results[i] === results[i-1] ) {
+                                       results.splice(i--, 1);
+                               }
+                       }
+               }
+       }
+
+       return results;
+};
+
+Sizzle.matches = function(expr, set){
+       return Sizzle(expr, null, null, set);
+};
+
+Sizzle.find = function(expr, context, isXML){
+       var set, match;
+
+       if ( !expr ) {
+               return [];
+       }
+
+       for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
+               var type = Expr.order[i], match;
+               
+               if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
+                       var left = match[1];
+                       match.splice(1,1);
+
+                       if ( left.substr( left.length - 1 ) !== "\\" ) {
+                               match[1] = (match[1] || "").replace(/\\/g, "");
+                               set = Expr.find[ type ]( match, context, isXML );
+                               if ( set != null ) {
+                                       expr = expr.replace( Expr.match[ type ], "" );
+                                       break;
+                               }
+                       }
+               }
+       }
+
+       if ( !set ) {
+               set = context.getElementsByTagName("*");
+       }
+
+       return {set: set, expr: expr};
+};
+
+Sizzle.filter = function(expr, set, inplace, not){
+       var old = expr, result = [], curLoop = set, match, anyFound,
+               isXMLFilter = set && set[0] && isXML(set[0]);
+
+       while ( expr && set.length ) {
+               for ( var type in Expr.filter ) {
+                       if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
+                               var filter = Expr.filter[ type ], found, item, left = match[1];
+                               anyFound = false;
+
+                               match.splice(1,1);
+
+                               if ( left.substr( left.length - 1 ) === "\\" ) {
+                                       continue;
+                               }
+
+                               if ( curLoop === result ) {
+                                       result = [];
+                               }
+
+                               if ( Expr.preFilter[ type ] ) {
+                                       match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+
+                                       if ( !match ) {
+                                               anyFound = found = true;
+                                       } else if ( match === true ) {
+                                               continue;
+                                       }
+                               }
+
+                               if ( match ) {
+                                       for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
+                                               if ( item ) {
+                                                       found = filter( item, match, i, curLoop );
+                                                       var pass = not ^ !!found;
+
+                                                       if ( inplace && found != null ) {
+                                                               if ( pass ) {
+                                                                       anyFound = true;
+                                                               } else {
+                                                                       curLoop[i] = false;
+                                                               }
+                                                       } else if ( pass ) {
+                                                               result.push( item );
+                                                               anyFound = true;
+                                                       }
+                                               }
+                                       }
+                               }
+
+                               if ( found !== undefined ) {
+                                       if ( !inplace ) {
+                                               curLoop = result;
+                                       }
+
+                                       expr = expr.replace( Expr.match[ type ], "" );
+
+                                       if ( !anyFound ) {
+                                               return [];
+                                       }
+
+                                       break;
+                               }
+                       }
+               }
+
+               // Improper expression
+               if ( expr === old ) {
+                       if ( anyFound == null ) {
+                               throw "Syntax error, unrecognized expression: " + expr;
+                       } else {
+                               break;
+                       }
+               }
+
+               old = expr;
+       }
+
+       return curLoop;
+};
+
+var Expr = Sizzle.selectors = {
+       order: [ "ID", "NAME", "TAG" ],
+       match: {
+               ID: /#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
+               CLASS: /\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
+               NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,
+               ATTR: /\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
+               TAG: /^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,
+               CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,
+               POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,
+               PSEUDO: /:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
+       },
+       leftMatch: {},
+       attrMap: {
+               "class": "className",
+               "for": "htmlFor"
+       },
+       attrHandle: {
+               href: function(elem){
+                       return elem.getAttribute("href");
+               }
+       },
+       relative: {
+               "+": function(checkSet, part){
+                       var isPartStr = typeof part === "string",
+                               isTag = isPartStr && !/\W/.test(part),
+                               isPartStrNotTag = isPartStr && !isTag;
+
+                       if ( isTag ) {
+                               part = part.toLowerCase();
+                       }
+
+                       for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
+                               if ( (elem = checkSet[i]) ) {
+                                       while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
+
+                                       checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
+                                               elem || false :
+                                               elem === part;
+                               }
+                       }
+
+                       if ( isPartStrNotTag ) {
+                               Sizzle.filter( part, checkSet, true );
+                       }
+               },
+               ">": function(checkSet, part){
+                       var isPartStr = typeof part === "string";
+
+                       if ( isPartStr && !/\W/.test(part) ) {
+                               part = part.toLowerCase();
+
+                               for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+                                       var elem = checkSet[i];
+                                       if ( elem ) {
+                                               var parent = elem.parentNode;
+                                               checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
+                                       }
+                               }
+                       } else {
+                               for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+                                       var elem = checkSet[i];
+                                       if ( elem ) {
+                                               checkSet[i] = isPartStr ?
+                                                       elem.parentNode :
+                                                       elem.parentNode === part;
+                                       }
+                               }
+
+                               if ( isPartStr ) {
+                                       Sizzle.filter( part, checkSet, true );
+                               }
+                       }
+               },
+               "": function(checkSet, part, isXML){
+                       var doneName = done++, checkFn = dirCheck;
+
+                       if ( typeof part === "string" && !/\W/.test(part) ) {
+                               var nodeCheck = part = part.toLowerCase();
+                               checkFn = dirNodeCheck;
+                       }
+
+                       checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);
+               },
+               "~": function(checkSet, part, isXML){
+                       var doneName = done++, checkFn = dirCheck;
+
+                       if ( typeof part === "string" && !/\W/.test(part) ) {
+                               var nodeCheck = part = part.toLowerCase();
+                               checkFn = dirNodeCheck;
+                       }
+
+                       checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);
+               }
+       },
+       find: {
+               ID: function(match, context, isXML){
+                       if ( typeof context.getElementById !== "undefined" && !isXML ) {
+                               var m = context.getElementById(match[1]);
+                               return m ? [m] : [];
+                       }
+               },
+               NAME: function(match, context){
+                       if ( typeof context.getElementsByName !== "undefined" ) {
+                               var ret = [], results = context.getElementsByName(match[1]);
+
+                               for ( var i = 0, l = results.length; i < l; i++ ) {
+                                       if ( results[i].getAttribute("name") === match[1] ) {
+                                               ret.push( results[i] );
+                                       }
+                               }
+
+                               return ret.length === 0 ? null : ret;
+                       }
+               },
+               TAG: function(match, context){
+                       return context.getElementsByTagName(match[1]);
+               }
+       },
+       preFilter: {
+               CLASS: function(match, curLoop, inplace, result, not, isXML){
+                       match = " " + match[1].replace(/\\/g, "") + " ";
+
+                       if ( isXML ) {
+                               return match;
+                       }
+
+                       for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
+                               if ( elem ) {
+                                       if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {
+                                               if ( !inplace ) {
+                                                       result.push( elem );
+                                               }
+                                       } else if ( inplace ) {
+                                               curLoop[i] = false;
+                                       }
+                               }
+                       }
+
+                       return false;
+               },
+               ID: function(match){
+                       return match[1].replace(/\\/g, "");
+               },
+               TAG: function(match, curLoop){
+                       return match[1].toLowerCase();
+               },
+               CHILD: function(match){
+                       if ( match[1] === "nth" ) {
+                               // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+                               var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
+                                       match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
+                                       !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+                               // calculate the numbers (first)n+(last) including if they are negative
+                               match[2] = (test[1] + (test[2] || 1)) - 0;
+                               match[3] = test[3] - 0;
+                       }
+
+                       // TODO: Move to normal caching system
+                       match[0] = done++;
+
+                       return match;
+               },
+               ATTR: function(match, curLoop, inplace, result, not, isXML){
+                       var name = match[1].replace(/\\/g, "");
+                       
+                       if ( !isXML && Expr.attrMap[name] ) {
+                               match[1] = Expr.attrMap[name];
+                       }
+
+                       if ( match[2] === "~=" ) {
+                               match[4] = " " + match[4] + " ";
+                       }
+
+                       return match;
+               },
+               PSEUDO: function(match, curLoop, inplace, result, not){
+                       if ( match[1] === "not" ) {
+                               // If we're dealing with a complex expression, or a simple one
+                               if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
+                                       match[3] = Sizzle(match[3], null, null, curLoop);
+                               } else {
+                                       var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+                                       if ( !inplace ) {
+                                               result.push.apply( result, ret );
+                                       }
+                                       return false;
+                               }
+                       } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
+                               return true;
+                       }
+                       
+                       return match;
+               },
+               POS: function(match){
+                       match.unshift( true );
+                       return match;
+               }
+       },
+       filters: {
+               enabled: function(elem){
+                       return elem.disabled === false && elem.type !== "hidden";
+               },
+               disabled: function(elem){
+                       return elem.disabled === true;
+               },
+               checked: function(elem){
+                       return elem.checked === true;
+               },
+               selected: function(elem){
+                       // Accessing this property makes selected-by-default
+                       // options in Safari work properly
+                       elem.parentNode.selectedIndex;
+                       return elem.selected === true;
+               },
+               parent: function(elem){
+                       return !!elem.firstChild;
+               },
+               empty: function(elem){
+                       return !elem.firstChild;
+               },
+               has: function(elem, i, match){
+                       return !!Sizzle( match[3], elem ).length;
+               },
+               header: function(elem){
+                       return /h\d/i.test( elem.nodeName );
+               },
+               text: function(elem){
+                       return "text" === elem.type;
+               },
+               radio: function(elem){
+                       return "radio" === elem.type;
+               },
+               checkbox: function(elem){
+                       return "checkbox" === elem.type;
+               },
+               file: function(elem){
+                       return "file" === elem.type;
+               },
+               password: function(elem){
+                       return "password" === elem.type;
+               },
+               submit: function(elem){
+                       return "submit" === elem.type;
+               },
+               image: function(elem){
+                       return "image" === elem.type;
+               },
+               reset: function(elem){
+                       return "reset" === elem.type;
+               },
+               button: function(elem){
+                       return "button" === elem.type || elem.nodeName.toLowerCase() === "button";
+               },
+               input: function(elem){
+                       return /input|select|textarea|button/i.test(elem.nodeName);
+               }
+       },
+       setFilters: {
+               first: function(elem, i){
+                       return i === 0;
+               },
+               last: function(elem, i, match, array){
+                       return i === array.length - 1;
+               },
+               even: function(elem, i){
+                       return i % 2 === 0;
+               },
+               odd: function(elem, i){
+                       return i % 2 === 1;
+               },
+               lt: function(elem, i, match){
+                       return i < match[3] - 0;
+               },
+               gt: function(elem, i, match){
+                       return i > match[3] - 0;
+               },
+               nth: function(elem, i, match){
+                       return match[3] - 0 === i;
+               },
+               eq: function(elem, i, match){
+                       return match[3] - 0 === i;
+               }
+       },
+       filter: {
+               PSEUDO: function(elem, match, i, array){
+                       var name = match[1], filter = Expr.filters[ name ];
+
+                       if ( filter ) {
+                               return filter( elem, i, match, array );
+                       } else if ( name === "contains" ) {
+                               return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0;
+                       } else if ( name === "not" ) {
+                               var not = match[3];
+
+                               for ( var i = 0, l = not.length; i < l; i++ ) {
+                                       if ( not[i] === elem ) {
+                                               return false;
+                                       }
+                               }
+
+                               return true;
+                       } else {
+                               throw "Syntax error, unrecognized expression: " + name;
+                       }
+               },
+               CHILD: function(elem, match){
+                       var type = match[1], node = elem;
+                       switch (type) {
+                               case 'only':
+                               case 'first':
+                                       while ( (node = node.previousSibling) )  {
+                                               if ( node.nodeType === 1 ) { 
+                                                       return false; 
+                                               }
+                                       }
+                                       if ( type === "first" ) { 
+                                               return true; 
+                                       }
+                                       node = elem;
+                               case 'last':
+                                       while ( (node = node.nextSibling) )      {
+                                               if ( node.nodeType === 1 ) { 
+                                                       return false; 
+                                               }
+                                       }
+                                       return true;
+                               case 'nth':
+                                       var first = match[2], last = match[3];
+
+                                       if ( first === 1 && last === 0 ) {
+                                               return true;
+                                       }
+                                       
+                                       var doneName = match[0],
+                                               parent = elem.parentNode;
+       
+                                       if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
+                                               var count = 0;
+                                               for ( node = parent.firstChild; node; node = node.nextSibling ) {
+                                                       if ( node.nodeType === 1 ) {
+                                                               node.nodeIndex = ++count;
+                                                       }
+                                               } 
+                                               parent.sizcache = doneName;
+                                       }
+                                       
+                                       var diff = elem.nodeIndex - last;
+                                       if ( first === 0 ) {
+                                               return diff === 0;
+                                       } else {
+                                               return ( diff % first === 0 && diff / first >= 0 );
+                                       }
+                       }
+               },
+               ID: function(elem, match){
+                       return elem.nodeType === 1 && elem.getAttribute("id") === match;
+               },
+               TAG: function(elem, match){
+                       return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
+               },
+               CLASS: function(elem, match){
+                       return (" " + (elem.className || elem.getAttribute("class")) + " ")
+                               .indexOf( match ) > -1;
+               },
+               ATTR: function(elem, match){
+                       var name = match[1],
+                               result = Expr.attrHandle[ name ] ?
+                                       Expr.attrHandle[ name ]( elem ) :
+                                       elem[ name ] != null ?
+                                               elem[ name ] :
+                                               elem.getAttribute( name ),
+                               value = result + "",
+                               type = match[2],
+                               check = match[4];
+
+                       return result == null ?
+                               type === "!=" :
+                               type === "=" ?
+                               value === check :
+                               type === "*=" ?
+                               value.indexOf(check) >= 0 :
+                               type === "~=" ?
+                               (" " + value + " ").indexOf(check) >= 0 :
+                               !check ?
+                               value && result !== false :
+                               type === "!=" ?
+                               value !== check :
+                               type === "^=" ?
+                               value.indexOf(check) === 0 :
+                               type === "$=" ?
+                               value.substr(value.length - check.length) === check :
+                               type === "|=" ?
+                               value === check || value.substr(0, check.length + 1) === check + "-" :
+                               false;
+               },
+               POS: function(elem, match, i, array){
+                       var name = match[2], filter = Expr.setFilters[ name ];
+
+                       if ( filter ) {
+                               return filter( elem, i, match, array );
+                       }
+               }
+       }
+};
+
+var origPOS = Expr.match.POS;
+
+for ( var type in Expr.match ) {
+       Expr.match[ type ] = new RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source );
+       Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, function(all, num){
+               return "\\" + (num - 0 + 1);
+       }));
+}
+
+var makeArray = function(array, results) {
+       array = Array.prototype.slice.call( array, 0 );
+
+       if ( results ) {
+               results.push.apply( results, array );
+               return results;
+       }
+       
+       return array;
+};
+
+// Perform a simple check to determine if the browser is capable of
+// converting a NodeList to an array using builtin methods.
+try {
+       Array.prototype.slice.call( document.documentElement.childNodes, 0 );
+
+// Provide a fallback method if it does not work
+} catch(e){
+       makeArray = function(array, results) {
+               var ret = results || [];
+
+               if ( toString.call(array) === "[object Array]" ) {
+                       Array.prototype.push.apply( ret, array );
+               } else {
+                       if ( typeof array.length === "number" ) {
+                               for ( var i = 0, l = array.length; i < l; i++ ) {
+                                       ret.push( array[i] );
+                               }
+                       } else {
+                               for ( var i = 0; array[i]; i++ ) {
+                                       ret.push( array[i] );
+                               }
+                       }
+               }
+
+               return ret;
+       };
+}
+
+var sortOrder;
+
+if ( document.documentElement.compareDocumentPosition ) {
+       sortOrder = function( a, b ) {
+               if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
+                       if ( a == b ) {
+                               hasDuplicate = true;
+                       }
+                       return a.compareDocumentPosition ? -1 : 1;
+               }
+
+               var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;
+               if ( ret === 0 ) {
+                       hasDuplicate = true;
+               }
+               return ret;
+       };
+} else if ( "sourceIndex" in document.documentElement ) {
+       sortOrder = function( a, b ) {
+               if ( !a.sourceIndex || !b.sourceIndex ) {
+                       if ( a == b ) {
+                               hasDuplicate = true;
+                       }
+                       return a.sourceIndex ? -1 : 1;
+               }
+
+               var ret = a.sourceIndex - b.sourceIndex;
+               if ( ret === 0 ) {
+                       hasDuplicate = true;
+               }
+               return ret;
+       };
+} else if ( document.createRange ) {
+       sortOrder = function( a, b ) {
+               if ( !a.ownerDocument || !b.ownerDocument ) {
+                       if ( a == b ) {
+                               hasDuplicate = true;
+                       }
+                       return a.ownerDocument ? -1 : 1;
+               }
+
+               var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
+               aRange.setStart(a, 0);
+               aRange.setEnd(a, 0);
+               bRange.setStart(b, 0);
+               bRange.setEnd(b, 0);
+               var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
+               if ( ret === 0 ) {
+                       hasDuplicate = true;
+               }
+               return ret;
+       };
+}
+
+// Utility function for retreiving the text value of an array of DOM nodes
+function getText( elems ) {
+       var ret = "", elem;
+
+       for ( var i = 0; elems[i]; i++ ) {
+               elem = elems[i];
+
+               // Get the text from text nodes and CDATA nodes
+               if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
+                       ret += elem.nodeValue;
+
+               // Traverse everything else, except comment nodes
+               } else if ( elem.nodeType !== 8 ) {
+                       ret += getText( elem.childNodes );
+               }
+       }
+
+       return ret;
+}
+
+// Check to see if the browser returns elements by name when
+// querying by getElementById (and provide a workaround)
+(function(){
+       // We're going to inject a fake input element with a specified name
+       var form = document.createElement("div"),
+               id = "script" + (new Date).getTime();
+       form.innerHTML = "<a name='" + id + "'/>";
+
+       // Inject it into the root element, check its status, and remove it quickly
+       var root = document.documentElement;
+       root.insertBefore( form, root.firstChild );
+
+       // The workaround has to do additional checks after a getElementById
+       // Which slows things down for other browsers (hence the branching)
+       if ( document.getElementById( id ) ) {
+               Expr.find.ID = function(match, context, isXML){
+                       if ( typeof context.getElementById !== "undefined" && !isXML ) {
+                               var m = context.getElementById(match[1]);
+                               return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];
+                       }
+               };
+
+               Expr.filter.ID = function(elem, match){
+                       var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+                       return elem.nodeType === 1 && node && node.nodeValue === match;
+               };
+       }
+
+       root.removeChild( form );
+       root = form = null; // release memory in IE
+})();
+
+(function(){
+       // Check to see if the browser returns only elements
+       // when doing getElementsByTagName("*")
+
+       // Create a fake element
+       var div = document.createElement("div");
+       div.appendChild( document.createComment("") );
+
+       // Make sure no comments are found
+       if ( div.getElementsByTagName("*").length > 0 ) {
+               Expr.find.TAG = function(match, context){
+                       var results = context.getElementsByTagName(match[1]);
+
+                       // Filter out possible comments
+                       if ( match[1] === "*" ) {
+                               var tmp = [];
+
+                               for ( var i = 0; results[i]; i++ ) {
+                                       if ( results[i].nodeType === 1 ) {
+                                               tmp.push( results[i] );
+                                       }
+                               }
+
+                               results = tmp;
+                       }
+
+                       return results;
+               };
+       }
+
+       // Check to see if an attribute returns normalized href attributes
+       div.innerHTML = "<a href='#'></a>";
+       if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+                       div.firstChild.getAttribute("href") !== "#" ) {
+               Expr.attrHandle.href = function(elem){
+                       return elem.getAttribute("href", 2);
+               };
+       }
+
+       div = null; // release memory in IE
+})();
+
+if ( document.querySelectorAll ) {
+       (function(){
+               var oldSizzle = Sizzle, div = document.createElement("div");
+               div.innerHTML = "<p class='TEST'></p>";
+
+               // Safari can't handle uppercase or unicode characters when
+               // in quirks mode.
+               if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
+                       return;
+               }
+       
+               Sizzle = function(query, context, extra, seed){
+                       context = context || document;
+
+                       // Only use querySelectorAll on non-XML documents
+                       // (ID selectors don't work in non-HTML documents)
+                       if ( !seed && context.nodeType === 9 && !isXML(context) ) {
+                               try {
+                                       return makeArray( context.querySelectorAll(query), extra );
+                               } catch(e){}
+                       }
+               
+                       return oldSizzle(query, context, extra, seed);
+               };
+
+               for ( var prop in oldSizzle ) {
+                       Sizzle[ prop ] = oldSizzle[ prop ];
+               }
+
+               div = null; // release memory in IE
+       })();
+}
+
+(function(){
+       var div = document.createElement("div");
+
+       div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+
+       // Opera can't find a second classname (in 9.6)
+       // Also, make sure that getElementsByClassName actually exists
+       if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
+               return;
+       }
+
+       // Safari caches class attributes, doesn't catch changes (in 3.2)
+       div.lastChild.className = "e";
+
+       if ( div.getElementsByClassName("e").length === 1 ) {
+               return;
+       }
+       
+       Expr.order.splice(1, 0, "CLASS");
+       Expr.find.CLASS = function(match, context, isXML) {
+               if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
+                       return context.getElementsByClassName(match[1]);
+               }
+       };
+
+       div = null; // release memory in IE
+})();
+
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+       for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+               var elem = checkSet[i];
+               if ( elem ) {
+                       elem = elem[dir];
+                       var match = false;
+
+                       while ( elem ) {
+                               if ( elem.sizcache === doneName ) {
+                                       match = checkSet[elem.sizset];
+                                       break;
+                               }
+
+                               if ( elem.nodeType === 1 && !isXML ){
+                                       elem.sizcache = doneName;
+                                       elem.sizset = i;
+                               }
+
+                               if ( elem.nodeName.toLowerCase() === cur ) {
+                                       match = elem;
+                                       break;
+                               }
+
+                               elem = elem[dir];
+                       }
+
+                       checkSet[i] = match;
+               }
+       }
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+       for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+               var elem = checkSet[i];
+               if ( elem ) {
+                       elem = elem[dir];
+                       var match = false;
+
+                       while ( elem ) {
+                               if ( elem.sizcache === doneName ) {
+                                       match = checkSet[elem.sizset];
+                                       break;
+                               }
+
+                               if ( elem.nodeType === 1 ) {
+                                       if ( !isXML ) {
+                                               elem.sizcache = doneName;
+                                               elem.sizset = i;
+                                       }
+                                       if ( typeof cur !== "string" ) {
+                                               if ( elem === cur ) {
+                                                       match = true;
+                                                       break;
+                                               }
+
+                                       } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+                                               match = elem;
+                                               break;
+                                       }
+                               }
+
+                               elem = elem[dir];
+                       }
+
+                       checkSet[i] = match;
+               }
+       }
+}
+
+var contains = document.compareDocumentPosition ? function(a, b){
+       return a.compareDocumentPosition(b) & 16;
+} : function(a, b){
+       return a !== b && (a.contains ? a.contains(b) : true);
+};
+
+var isXML = function(elem){
+       // documentElement is verified for cases where it doesn't yet exist
+       // (such as loading iframes in IE - #4833) 
+       var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
+       return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+var posProcess = function(selector, context){
+       var tmpSet = [], later = "", match,
+               root = context.nodeType ? [context] : context;
+
+       // Position selectors must be done after the filter
+       // And so must :not(positional) so we move all PSEUDOs to the end
+       while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
+               later += match[0];
+               selector = selector.replace( Expr.match.PSEUDO, "" );
+       }
+
+       selector = Expr.relative[selector] ? selector + "*" : selector;
+
+       for ( var i = 0, l = root.length; i < l; i++ ) {
+               Sizzle( selector, root[i], tmpSet );
+       }
+
+       return Sizzle.filter( later, tmpSet );
+};
+
+// EXPOSE
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.filters;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.getText = getText;
+jQuery.isXMLDoc = isXML;
+jQuery.contains = contains;
+
+return;
+
+window.Sizzle = Sizzle;
+
+})();
+var runtil = /Until$/,
+       rparentsprev = /^(?:parents|prevUntil|prevAll)/,
+       // Note: This RegExp should be improved, or likely pulled from Sizzle
+       rmultiselector = /,/,
+       slice = Array.prototype.slice;
+
+// Implement the identical functionality for filter and not
+var winnow = function( elements, qualifier, keep ) {
+       if ( jQuery.isFunction( qualifier ) ) {
+               return jQuery.grep(elements, function( elem, i ) {
+                       return !!qualifier.call( elem, i, elem ) === keep;
+               });
+
+       } else if ( qualifier.nodeType ) {
+               return jQuery.grep(elements, function( elem, i ) {
+                       return (elem === qualifier) === keep;
+               });
+
+       } else if ( typeof qualifier === "string" ) {
+               var filtered = jQuery.grep(elements, function( elem ) {
+                       return elem.nodeType === 1;
+               });
+
+               if ( isSimple.test( qualifier ) ) {
+                       return jQuery.filter(qualifier, filtered, !keep);
+               } else {
+                       qualifier = jQuery.filter( qualifier, elements );
+               }
+       }
+
+       return jQuery.grep(elements, function( elem, i ) {
+               return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
+       });
+};
+
+jQuery.fn.extend({
+       find: function( selector ) {
+               var ret = this.pushStack( "", "find", selector ), length = 0;
+
+               for ( var i = 0, l = this.length; i < l; i++ ) {
+                       length = ret.length;
+                       jQuery.find( selector, this[i], ret );
+
+                       if ( i > 0 ) {
+                               // Make sure that the results are unique
+                               for ( var n = length; n < ret.length; n++ ) {
+                                       for ( var r = 0; r < length; r++ ) {
+                                               if ( ret[r] === ret[n] ) {
+                                                       ret.splice(n--, 1);
+                                                       break;
+                                               }
+                                       }
+                               }
+                       }
+               }
+
+               return ret;
+       },
+
+       has: function( target ) {
+               var targets = jQuery( target );
+               return this.filter(function() {
+                       for ( var i = 0, l = targets.length; i < l; i++ ) {
+                               if ( jQuery.contains( this, targets[i] ) ) {
+                                       return true;
+                               }
+                       }
+               });
+       },
+
+       not: function( selector ) {
+               return this.pushStack( winnow(this, selector, false), "not", selector);
+       },
+
+       filter: function( selector ) {
+               return this.pushStack( winnow(this, selector, true), "filter", selector );
+       },
+       
+       is: function( selector ) {
+               return !!selector && jQuery.filter( selector, this ).length > 0;
+       },
+
+       closest: function( selectors, context ) {
+               if ( jQuery.isArray( selectors ) ) {
+                       var ret = [], cur = this[0], match, matches = {}, selector;
+
+                       if ( cur && selectors.length ) {
+                               for ( var i = 0, l = selectors.length; i < l; i++ ) {
+                                       selector = selectors[i];
+
+                                       if ( !matches[selector] ) {
+                                               matches[selector] = jQuery.expr.match.POS.test( selector ) ? 
+                                                       jQuery( selector, context || this.context ) :
+                                                       selector;
+                                       }
+                               }
+
+                               while ( cur && cur.ownerDocument && cur !== context ) {
+                                       for ( selector in matches ) {
+                                               match = matches[selector];
+
+                                               if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
+                                                       ret.push({ selector: selector, elem: cur });
+                                                       delete matches[selector];
+                                               }
+                                       }
+                                       cur = cur.parentNode;
+                               }
+                       }
+
+                       return ret;
+               }
+
+               var pos = jQuery.expr.match.POS.test( selectors ) ? 
+                       jQuery( selectors, context || this.context ) : null;
+
+               return this.map(function( i, cur ) {
+                       while ( cur && cur.ownerDocument && cur !== context ) {
+                               if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
+                                       return cur;
+                               }
+                               cur = cur.parentNode;
+                       }
+                       return null;
+               });
+       },
+       
+       // Determine the position of an element within
+       // the matched set of elements
+       index: function( elem ) {
+               if ( !elem || typeof elem === "string" ) {
+                       return jQuery.inArray( this[0],
+                               // If it receives a string, the selector is used
+                               // If it receives nothing, the siblings are used
+                               elem ? jQuery( elem ) : this.parent().children() );
+               }
+               // Locate the position of the desired element
+               return jQuery.inArray(
+                       // If it receives a jQuery object, the first element is used
+                       elem.jquery ? elem[0] : elem, this );
+       },
+
+       add: function( selector, context ) {
+               var set = typeof selector === "string" ?
+                               jQuery( selector, context || this.context ) :
+                               jQuery.makeArray( selector ),
+                       all = jQuery.merge( this.get(), set );
+
+               return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
+                       all :
+                       jQuery.unique( all ) );
+       },
+
+       andSelf: function() {
+               return this.add( this.prevObject );
+       }
+});
+
+// A painfully simple check to see if an element is disconnected
+// from a document (should be improved, where feasible).
+function isDisconnected( node ) {
+       return !node || !node.parentNode || node.parentNode.nodeType === 11;
+}
+
+jQuery.each({
+       parent: function( elem ) {
+               var parent = elem.parentNode;
+               return parent && parent.nodeType !== 11 ? parent : null;
+       },
+       parents: function( elem ) {
+               return jQuery.dir( elem, "parentNode" );
+       },
+       parentsUntil: function( elem, i, until ) {
+               return jQuery.dir( elem, "parentNode", until );
+       },
+       next: function( elem ) {
+               return jQuery.nth( elem, 2, "nextSibling" );
+       },
+       prev: function( elem ) {
+               return jQuery.nth( elem, 2, "previousSibling" );
+       },
+       nextAll: function( elem ) {
+               return jQuery.dir( elem, "nextSibling" );
+       },
+       prevAll: function( elem ) {
+               return jQuery.dir( elem, "previousSibling" );
+       },
+       nextUntil: function( elem, i, until ) {
+               return jQuery.dir( elem, "nextSibling", until );
+       },
+       prevUntil: function( elem, i, until ) {
+               return jQuery.dir( elem, "previousSibling", until );
+       },
+       siblings: function( elem ) {
+               return jQuery.sibling( elem.parentNode.firstChild, elem );
+       },
+       children: function( elem ) {
+               return jQuery.sibling( elem.firstChild );
+       },
+       contents: function( elem ) {
+               return jQuery.nodeName( elem, "iframe" ) ?
+                       elem.contentDocument || elem.contentWindow.document :
+                       jQuery.makeArray( elem.childNodes );
+       }
+}, function( name, fn ) {
+       jQuery.fn[ name ] = function( until, selector ) {
+               var ret = jQuery.map( this, fn, until );
+               
+               if ( !runtil.test( name ) ) {
+                       selector = until;
+               }
+
+               if ( selector && typeof selector === "string" ) {
+                       ret = jQuery.filter( selector, ret );
+               }
+
+               ret = this.length > 1 ? jQuery.unique( ret ) : ret;
+
+               if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
+                       ret = ret.reverse();
+               }
+
+               return this.pushStack( ret, name, slice.call(arguments).join(",") );
+       };
+});
+
+jQuery.extend({
+       filter: function( expr, elems, not ) {
+               if ( not ) {
+                       expr = ":not(" + expr + ")";
+               }
+
+               return jQuery.find.matches(expr, elems);
+       },
+       
+       dir: function( elem, dir, until ) {
+               var matched = [], cur = elem[dir];
+               while ( cur && cur.nodeType !== 9 && (until === undefined || !jQuery( cur ).is( until )) ) {
+                       if ( cur.nodeType === 1 ) {
+                               matched.push( cur );
+                       }
+                       cur = cur[dir];
+               }
+               return matched;
+       },
+
+       nth: function( cur, result, dir, elem ) {
+               result = result || 1;
+               var num = 0;
+
+               for ( ; cur; cur = cur[dir] ) {
+                       if ( cur.nodeType === 1 && ++num === result ) {
+                               break;
+                       }
+               }
+
+               return cur;
+       },
+
+       sibling: function( n, elem ) {
+               var r = [];
+
+               for ( ; n; n = n.nextSibling ) {
+                       if ( n.nodeType === 1 && n !== elem ) {
+                               r.push( n );
+                       }
+               }
+
+               return r;
+       }
+});
+var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
+       rleadingWhitespace = /^\s+/,
+       rxhtmlTag = /(<([\w:]+)[^>]*?)\/>/g,
+       rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,
+       rtagName = /<([\w:]+)/,
+       rtbody = /<tbody/i,
+       rhtml = /<|&\w+;/,
+       fcloseTag = function( all, front, tag ) {
+               return rselfClosing.test( tag ) ?
+                       all :
+                       front + "></" + tag + ">";
+       },
+       wrapMap = {
+               option: [ 1, "<select multiple='multiple'>", "</select>" ],
+               legend: [ 1, "<fieldset>", "</fieldset>" ],
+               thead: [ 1, "<table>", "</table>" ],
+               tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+               td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+               col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+               area: [ 1, "<map>", "</map>" ],
+               _default: [ 0, "", "" ]
+       };
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+// IE can't serialize <link> and <script> tags normally
+if ( !jQuery.support.htmlSerialize ) {
+       wrapMap._default = [ 1, "div<div>", "</div>" ];
+}
+
+jQuery.fn.extend({
+       text: function( text ) {
+               if ( jQuery.isFunction(text) ) {
+                       return this.each(function(i) {
+                               var self = jQuery(this);
+                               return self.text( text.call(this, i, self.text()) );
+                       });
+               }
+
+               if ( typeof text !== "object" && text !== undefined ) {
+                       return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
+               }
+
+               return jQuery.getText( this );
+       },
+
+       wrapAll: function( html ) {
+               if ( jQuery.isFunction( html ) ) {
+                       return this.each(function(i) {
+                               jQuery(this).wrapAll( html.call(this, i) );
+                       });
+               }
+
+               if ( this[0] ) {
+                       // The elements to wrap the target around
+                       var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+
+                       if ( this[0].parentNode ) {
+                               wrap.insertBefore( this[0] );
+                       }
+
+                       wrap.map(function() {
+                               var elem = this;
+
+                               while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+                                       elem = elem.firstChild;
+                               }
+
+                               return elem;
+                       }).append(this);
+               }
+
+               return this;
+       },
+
+       wrapInner: function( html ) {
+               return this.each(function() {
+                       var self = jQuery( this ), contents = self.contents();
+
+                       if ( contents.length ) {
+                               contents.wrapAll( html );
+
+                       } else {
+                               self.append( html );
+                       }
+               });
+       },
+
+       wrap: function( html ) {
+               return this.each(function() {
+                       jQuery( this ).wrapAll( html );
+               });
+       },
+
+       unwrap: function() {
+               return this.parent().each(function() {
+                       if ( !jQuery.nodeName( this, "body" ) ) {
+                               jQuery( this ).replaceWith( this.childNodes );
+                       }
+               }).end();
+       },
+
+       append: function() {
+               return this.domManip(arguments, true, function( elem ) {
+                       if ( this.nodeType === 1 ) {
+                               this.appendChild( elem );
+                       }
+               });
+       },
+
+       prepend: function() {
+               return this.domManip(arguments, true, function( elem ) {
+                       if ( this.nodeType === 1 ) {
+                               this.insertBefore( elem, this.firstChild );
+                       }
+               });
+       },
+
+       before: function() {
+               if ( this[0] && this[0].parentNode ) {
+                       return this.domManip(arguments, false, function( elem ) {
+                               this.parentNode.insertBefore( elem, this );
+                       });
+               } else if ( arguments.length ) {
+                       var set = jQuery(arguments[0]);
+                       set.push.apply( set, this.toArray() );
+                       return this.pushStack( set, "before", arguments );
+               }
+       },
+
+       after: function() {
+               if ( this[0] && this[0].parentNode ) {
+                       return this.domManip(arguments, false, function( elem ) {
+                               this.parentNode.insertBefore( elem, this.nextSibling );
+                       });
+               } else if ( arguments.length ) {
+                       var set = this.pushStack( this, "after", arguments );
+                       set.push.apply( set, jQuery(arguments[0]).toArray() );
+                       return set;
+               }
+       },
+
+       clone: function( events ) {
+               // Do the clone
+               var ret = this.map(function() {
+                       if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
+                               // IE copies events bound via attachEvent when
+                               // using cloneNode. Calling detachEvent on the
+                               // clone will also remove the events from the orignal
+                               // In order to get around this, we use innerHTML.
+                               // Unfortunately, this means some modifications to
+                               // attributes in IE that are actually only stored
+                               // as properties will not be copied (such as the
+                               // the name attribute on an input).
+                               var html = this.outerHTML, ownerDocument = this.ownerDocument;
+                               if ( !html ) {
+                                       var div = ownerDocument.createElement("div");
+                                       div.appendChild( this.cloneNode(true) );
+                                       html = div.innerHTML;
+                               }
+
+                               return jQuery.clean([html.replace(rinlinejQuery, "")
+                                       .replace(rleadingWhitespace, "")], ownerDocument)[0];
+                       } else {
+                               return this.cloneNode(true);
+                       }
+               });
+
+               // Copy the events from the original to the clone
+               if ( events === true ) {
+                       cloneCopyEvent( this, ret );
+                       cloneCopyEvent( this.find("*"), ret.find("*") );
+               }
+
+               // Return the cloned set
+               return ret;
+       },
+
+       html: function( value ) {
+               if ( value === undefined ) {
+                       return this[0] && this[0].nodeType === 1 ?
+                               this[0].innerHTML.replace(rinlinejQuery, "") :
+                               null;
+
+               // See if we can take a shortcut and just use innerHTML
+               } else if ( typeof value === "string" && !/<script/i.test( value ) &&
+                       (jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
+                       !wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
+
+                       try {
+                               for ( var i = 0, l = this.length; i < l; i++ ) {
+                                       // Remove element nodes and prevent memory leaks
+                                       if ( this[i].nodeType === 1 ) {
+                                               cleanData( this[i].getElementsByTagName("*") );
+                                               this[i].innerHTML = value;
+                                       }
+                               }
+
+                       // If using innerHTML throws an exception, use the fallback method
+                       } catch(e) {
+                               this.empty().append( value );
+                       }
+
+               } else if ( jQuery.isFunction( value ) ) {
+                       this.each(function(i){
+                               var self = jQuery(this), old = self.html();
+                               self.empty().append(function(){
+                                       return value.call( this, i, old );
+                               });
+                       });
+
+               } else {
+                       this.empty().append( value );
+               }
+
+               return this;
+       },
+
+       replaceWith: function( value ) {
+               if ( this[0] && this[0].parentNode ) {
+                       // Make sure that the elements are removed from the DOM before they are inserted
+                       // this can help fix replacing a parent with child elements
+                       if ( !jQuery.isFunction( value ) ) {
+                               value = jQuery( value ).detach();
+                       }
+
+                       return this.each(function() {
+                               var next = this.nextSibling, parent = this.parentNode;
+
+                               jQuery(this).remove();
+
+                               if ( next ) {
+                                       jQuery(next).before( value );
+                               } else {
+                                       jQuery(parent).append( value );
+                               }
+                       });
+               } else {
+                       return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
+               }
+       },
+
+       detach: function( selector ) {
+               return this.remove( selector, true );
+       },
+
+       domManip: function( args, table, callback ) {
+               var results, first, value = args[0], scripts = [];
+
+               if ( jQuery.isFunction(value) ) {
+                       return this.each(function(i) {
+                               var self = jQuery(this);
+                               args[0] = value.call(this, i, table ? self.html() : undefined);
+                               return self.domManip( args, table, callback );
+                       });
+               }
+
+               if ( this[0] ) {
+                       // If we're in a fragment, just use that instead of building a new one
+                       if ( args[0] && args[0].parentNode && args[0].parentNode.nodeType === 11 ) {
+                               results = { fragment: args[0].parentNode };
+                       } else {
+                               results = buildFragment( args, this, scripts );
+                       }
+
+                       first = results.fragment.firstChild;
+
+                       if ( first ) {
+                               table = table && jQuery.nodeName( first, "tr" );
+
+                               for ( var i = 0, l = this.length; i < l; i++ ) {
+                                       callback.call(
+                                               table ?
+                                                       root(this[i], first) :
+                                                       this[i],
+                                               results.cacheable || this.length > 1 || i > 0 ?
+                                                       results.fragment.cloneNode(true) :
+                                                       results.fragment
+                                       );
+                               }
+                       }
+
+                       if ( scripts ) {
+                               jQuery.each( scripts, evalScript );
+                       }
+               }
+
+               return this;
+
+               function root( elem, cur ) {
+                       return jQuery.nodeName(elem, "table") ?
+                               (elem.getElementsByTagName("tbody")[0] ||
+                               elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+                               elem;
+               }
+       }
+});
+
+function cloneCopyEvent(orig, ret) {
+       var i = 0;
+
+       ret.each(function() {
+               if ( this.nodeName !== (orig[i] && orig[i].nodeName) ) {
+                       return;
+               }
+
+               var oldData = jQuery.data( orig[i++] ), curData = jQuery.data( this, oldData ), events = oldData && oldData.events;
+
+               if ( events ) {
+                       delete curData.handle;
+                       curData.events = {};
+
+                       for ( var type in events ) {
+                               for ( var handler in events[ type ] ) {
+                                       jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
+                               }
+                       }
+               }
+       });
+}
+
+function buildFragment( args, nodes, scripts ) {
+       var fragment, cacheable, cached, cacheresults, doc;
+
+       if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && args[0].indexOf("<option") < 0 ) {
+               cacheable = true;
+               cacheresults = jQuery.fragments[ args[0] ];
+               if ( cacheresults ) {
+                       if ( cacheresults !== 1 ) {
+                               fragment = cacheresults;
+                       }
+                       cached = true;
+               }
+       }
+
+       if ( !fragment ) {
+               doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
+               fragment = doc.createDocumentFragment();
+               jQuery.clean( args, doc, fragment, scripts );
+       }
+
+       if ( cacheable ) {
+               jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
+       }
+
+       return { fragment: fragment, cacheable: cacheable };
+}
+
+jQuery.fragments = {};
+
+jQuery.each({
+       appendTo: "append",
+       prependTo: "prepend",
+       insertBefore: "before",
+       insertAfter: "after",
+       replaceAll: "replaceWith"
+}, function( name, original ) {
+       jQuery.fn[ name ] = function( selector ) {
+               var ret = [], insert = jQuery( selector );
+
+               for ( var i = 0, l = insert.length; i < l; i++ ) {
+                       var elems = (i > 0 ? this.clone(true) : this).get();
+                       jQuery.fn[ original ].apply( jQuery(insert[i]), elems );
+                       ret = ret.concat( elems );
+               }
+               return this.pushStack( ret, name, insert.selector );
+       };
+});
+
+jQuery.each({
+       // keepData is for internal use only--do not document
+       remove: function( selector, keepData ) {
+               if ( !selector || jQuery.filter( selector, [ this ] ).length ) {
+                       if ( !keepData && this.nodeType === 1 ) {
+                               cleanData( this.getElementsByTagName("*") );
+                               cleanData( [ this ] );
+                       }
+
+                       if ( this.parentNode ) {
+                                this.parentNode.removeChild( this );
+                       }
+               }
+       },
+
+       empty: function() {
+               // Remove element nodes and prevent memory leaks
+               if ( this.nodeType === 1 ) {
+                       cleanData( this.getElementsByTagName("*") );
+               }
+
+               // Remove any remaining nodes
+               while ( this.firstChild ) {
+                       this.removeChild( this.firstChild );
+               }
+       }
+}, function( name, fn ) {
+       jQuery.fn[ name ] = function() {
+               return this.each( fn, arguments );
+       };
+});
+
+jQuery.extend({
+       clean: function( elems, context, fragment, scripts ) {
+               context = context || document;
+
+               // !context.createElement fails in IE with an error but returns typeof 'object'
+               if ( typeof context.createElement === "undefined" ) {
+                       context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+               }
+
+               var ret = [];
+
+               jQuery.each(elems, function( i, elem ) {
+                       if ( typeof elem === "number" ) {
+                               elem += "";
+                       }
+
+                       if ( !elem ) {
+                               return;
+                       }
+
+                       // Convert html string into DOM nodes
+                       if ( typeof elem === "string" && !rhtml.test( elem ) ) {
+                               elem = context.createTextNode( elem );
+
+                       } else if ( typeof elem === "string" ) {
+                               // Fix "XHTML"-style tags in all browsers
+                               elem = elem.replace(rxhtmlTag, fcloseTag);
+
+                               // Trim whitespace, otherwise indexOf won't work as expected
+                               var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
+                                       wrap = wrapMap[ tag ] || wrapMap._default,
+                                       depth = wrap[0],
+                                       div = context.createElement("div");
+
+                               // Go to html and back, then peel off extra wrappers
+                               div.innerHTML = wrap[1] + elem + wrap[2];
+
+                               // Move to the right depth
+                               while ( depth-- ) {
+                                       div = div.lastChild;
+                               }
+
+                               // Remove IE's autoinserted <tbody> from table fragments
+                               if ( !jQuery.support.tbody ) {
+
+                                       // String was a <table>, *may* have spurious <tbody>
+                                       var hasBody = rtbody.test(elem),
+                                               tbody = tag === "table" && !hasBody ?
+                                                       div.firstChild && div.firstChild.childNodes :
+
+                                                       // String was a bare <thead> or <tfoot>
+                                                       wrap[1] === "<table>" && !hasBody ?
+                                                               div.childNodes :
+                                                               [];
+
+                                       for ( var j = tbody.length - 1; j >= 0 ; --j ) {
+                                               if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
+                                                       tbody[ j ].parentNode.removeChild( tbody[ j ] );
+                                               }
+                                       }
+
+                               }
+
+                               // IE completely kills leading whitespace when innerHTML is used
+                               if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+                                       div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
+                               }
+
+                               elem = jQuery.makeArray( div.childNodes );
+                       }
+
+                       if ( elem.nodeType ) {
+                               ret.push( elem );
+                       } else {
+                               ret = jQuery.merge( ret, elem );
+                       }
+
+               });
+
+               if ( fragment ) {
+                       for ( var i = 0; ret[i]; i++ ) {
+                               if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
+                                       scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
+                               } else {
+                                       if ( ret[i].nodeType === 1 ) {
+                                               ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
+                                       }
+                                       fragment.appendChild( ret[i] );
+                               }
+                       }
+               }
+
+               return ret;
+       }
+});
+
+function cleanData( elems ) {
+       for ( var i = 0, elem, id; (elem = elems[i]) != null; i++ ) {
+               if ( !jQuery.noData[elem.nodeName.toLowerCase()] && (id = elem[expando]) ) {
+                       delete jQuery.cache[ id ];
+               }
+       }
+}
+// exclude the following css properties to add px
+var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
+       ralpha = /alpha\([^)]*\)/,
+       ropacity = /opacity=([^)]*)/,
+       rfloat = /float/i,
+       rdashAlpha = /-([a-z])/ig,
+       rupper = /([A-Z])/g,
+       rnumpx = /^-?\d+(?:px)?$/i,
+       rnum = /^-?\d/,
+
+       cssShow = { position: "absolute", visibility: "hidden", display:"block" },
+       cssWidth = [ "Left", "Right" ],
+       cssHeight = [ "Top", "Bottom" ],
+
+       // cache check for defaultView.getComputedStyle
+       getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
+       // normalize float css property
+       styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat",
+       fcamelCase = function( all, letter ) {
+               return letter.toUpperCase();
+       };
+
+jQuery.fn.css = function( name, value ) {
+       return access( this, name, value, true, function( elem, name, value ) {
+               if ( value === undefined ) {
+                       return jQuery.curCSS( elem, name );
+               }
+               
+               if ( typeof value === "number" && !rexclude.test(name) ) {
+                       value += "px";
+               }
+
+               jQuery.style( elem, name, value );
+       });
+};
+
+jQuery.extend({
+       style: function( elem, name, value ) {
+               // don't set styles on text and comment nodes
+               if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+                       return undefined;
+               }
+
+               // ignore negative width and height values #1599
+               if ( (name === "width" || name === "height") && parseFloat(value) < 0 ) {
+                       value = undefined;
+               }
+
+               var style = elem.style || elem, set = value !== undefined;
+
+               // IE uses filters for opacity
+               if ( !jQuery.support.opacity && name === "opacity" ) {
+                       if ( set ) {
+                               // IE has trouble with opacity if it does not have layout
+                               // Force it by setting the zoom level
+                               style.zoom = 1;
+
+                               // Set the alpha filter to set the opacity
+                               var opacity = parseInt( value, 10 ) + "" === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")";
+                               var filter = style.filter || jQuery.curCSS( elem, "filter" ) || "";
+                               style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : opacity;
+                       }
+
+                       return style.filter && style.filter.indexOf("opacity=") >= 0 ?
+                               (parseFloat( ropacity.exec(style.filter)[1] ) / 100) + "":
+                               "";
+               }
+
+               // Make sure we're using the right name for getting the float value
+               if ( rfloat.test( name ) ) {
+                       name = styleFloat;
+               }
+
+               name = name.replace(rdashAlpha, fcamelCase);
+
+               if ( set ) {
+                       style[ name ] = value;
+               }
+
+               return style[ name ];
+       },
+
+       css: function( elem, name, force, extra ) {
+               if ( name === "width" || name === "height" ) {
+                       var val, props = cssShow, which = name === "width" ? cssWidth : cssHeight;
+
+                       function getWH() {
+                               val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
+
+                               if ( extra === "border" ) {
+                                       return;
+                               }
+
+                               jQuery.each( which, function() {
+                                       if ( !extra ) {
+                                               val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
+                                       }
+
+                                       if ( extra === "margin" ) {
+                                               val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
+                                       } else {
+                                               val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
+                                       }
+                               });
+                       }
+
+                       if ( elem.offsetWidth !== 0 ) {
+                               getWH();
+                       } else {
+                               jQuery.swap( elem, props, getWH );
+                       }
+
+                       return Math.max(0, Math.round(val));
+               }
+
+               return jQuery.curCSS( elem, name, force );
+       },
+
+       curCSS: function( elem, name, force ) {
+               var ret, style = elem.style, filter;
+
+               // IE uses filters for opacity
+               if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) {
+                       ret = ropacity.test(elem.currentStyle.filter || "") ?
+                               (parseFloat(RegExp.$1) / 100) + "" :
+                               "";
+
+                       return ret === "" ?
+                               "1" :
+                               ret;
+               }
+
+               // Make sure we're using the right name for getting the float value
+               if ( rfloat.test( name ) ) {
+                       name = styleFloat;
+               }
+
+               if ( !force && style && style[ name ] ) {
+                       ret = style[ name ];
+
+               } else if ( getComputedStyle ) {
+
+                       // Only "float" is needed here
+                       if ( rfloat.test( name ) ) {
+                               name = "float";
+                       }
+
+                       name = name.replace( rupper, "-$1" ).toLowerCase();
+
+                       var defaultView = elem.ownerDocument.defaultView;
+
+                       if ( !defaultView ) {
+                               return null;
+                       }
+
+                       var computedStyle = defaultView.getComputedStyle( elem, null );
+
+                       if ( computedStyle ) {
+                               ret = computedStyle.getPropertyValue( name );
+                       }
+
+                       // We should always get a number back from opacity
+                       if ( name === "opacity" && ret === "" ) {
+                               ret = "1";
+                       }
+
+               } else if ( elem.currentStyle ) {
+                       var camelCase = name.replace(rdashAlpha, fcamelCase);
+
+                       ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
+
+                       // From the awesome hack by Dean Edwards
+                       // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+                       // If we're not dealing with a regular pixel number
+                       // but a number that has a weird ending, we need to convert it to pixels
+                       if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
+                               // Remember the original values
+                               var left = style.left, rsLeft = elem.runtimeStyle.left;
+
+                               // Put in the new values to get a computed value out
+                               elem.runtimeStyle.left = elem.currentStyle.left;
+                               style.left = camelCase === "fontSize" ? "1em" : (ret || 0);
+                               ret = style.pixelLeft + "px";
+
+                               // Revert the changed values
+                               style.left = left;
+                               elem.runtimeStyle.left = rsLeft;
+                       }
+               }
+
+               return ret;
+       },
+
+       // A method for quickly swapping in/out CSS properties to get correct calculations
+       swap: function( elem, options, callback ) {
+               var old = {};
+
+               // Remember the old values, and insert the new ones
+               for ( var name in options ) {
+                       old[ name ] = elem.style[ name ];
+                       elem.style[ name ] = options[ name ];
+               }
+
+               callback.call( elem );
+
+               // Revert the old values
+               for ( var name in options ) {
+                       elem.style[ name ] = old[ name ];
+               }
+       }
+});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+       jQuery.expr.filters.hidden = function( elem ) {
+               var width = elem.offsetWidth, height = elem.offsetHeight,
+                       skip = elem.nodeName.toLowerCase() === "tr";
+
+               return width === 0 && height === 0 && !skip ?
+                       true :
+                       width > 0 && height > 0 && !skip ?
+                               false :
+                               jQuery.curCSS(elem, "display") === "none";
+       };
+
+       jQuery.expr.filters.visible = function( elem ) {
+               return !jQuery.expr.filters.hidden( elem );
+       };
+}
+var jsc = now(),
+       rscript = /<script(.|\s)*?\/script>/gi,
+       rselectTextarea = /select|textarea/i,
+       rinput = /color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,
+       jsre = /=\?(&|$)/,
+       rquery = /\?/,
+       rts = /(\?|&)_=.*?(&|$)/,
+       rurl = /^(\w+:)?\/\/([^\/?#]+)/,
+       r20 = /%20/g;
+
+jQuery.fn.extend({
+       // Keep a copy of the old load
+       _load: jQuery.fn.load,
+
+       load: function( url, params, callback ) {
+               if ( typeof url !== "string" ) {
+                       return this._load( url );
+
+               // Don't do a request if no elements are being requested
+               } else if ( !this.length ) {
+                       return this;
+               }
+
+               var off = url.indexOf(" ");
+               if ( off >= 0 ) {
+                       var selector = url.slice(off, url.length);
+                       url = url.slice(0, off);
+               }
+
+               // Default to a GET request
+               var type = "GET";
+
+               // If the second parameter was provided
+               if ( params ) {
+                       // If it's a function
+                       if ( jQuery.isFunction( params ) ) {
+                               // We assume that it's the callback
+                               callback = params;
+                               params = null;
+
+                       // Otherwise, build a param string
+                       } else if ( typeof params === "object" ) {
+                               params = jQuery.param( params, jQuery.ajaxSettings.traditional );
+                               type = "POST";
+                       }
+               }
+
+               // Request the remote document
+               jQuery.ajax({
+                       url: url,
+                       type: type,
+                       dataType: "html",
+                       data: params,
+                       context:this,
+                       complete: function( res, status ) {
+                               // If successful, inject the HTML into all the matched elements
+                               if ( status === "success" || status === "notmodified" ) {
+                                       // See if a selector was specified
+                                       this.html( selector ?
+                                               // Create a dummy div to hold the results
+                                               jQuery("<div />")
+                                                       // inject the contents of the document in, removing the scripts
+                                                       // to avoid any 'Permission Denied' errors in IE
+                                                       .append(res.responseText.replace(rscript, ""))
+
+                                                       // Locate the specified elements
+                                                       .find(selector) :
+
+                                               // If not, just inject the full result
+                                               res.responseText );
+                               }
+
+                               if ( callback ) {
+                                       this.each( callback, [res.responseText, status, res] );
+                               }
+                       }
+               });
+
+               return this;
+       },
+
+       serialize: function() {
+               return jQuery.param(this.serializeArray());
+       },
+       serializeArray: function() {
+               return this.map(function() {
+                       return this.elements ? jQuery.makeArray(this.elements) : this;
+               })
+               .filter(function() {
+                       return this.name && !this.disabled &&
+                               (this.checked || rselectTextarea.test(this.nodeName) ||
+                                       rinput.test(this.type));
+               })
+               .map(function( i, elem ) {
+                       var val = jQuery(this).val();
+
+                       return val == null ?
+                               null :
+                               jQuery.isArray(val) ?
+                                       jQuery.map( val, function( val, i ) {
+                                               return { name: elem.name, value: val };
+                                       }) :
+                                       { name: elem.name, value: val };
+               }).get();
+       }
+});
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function( i, o ) {
+       jQuery.fn[o] = function( f ) {
+               return this.bind(o, f);
+       };
+});
+
+jQuery.extend({
+
+       get: function( url, data, callback, type ) {
+               // shift arguments if data argument was omited
+               if ( jQuery.isFunction( data ) ) {
+                       type = type || callback;
+                       callback = data;
+                       data = null;
+               }
+
+               return jQuery.ajax({
+                       type: "GET",
+                       url: url,
+                       data: data,
+                       success: callback,
+                       dataType: type
+               });
+       },
+
+       getScript: function( url, callback ) {
+               return jQuery.get(url, null, callback, "script");
+       },
+
+       getJSON: function( url, data, callback ) {
+               return jQuery.get(url, data, callback, "json");
+       },
+
+       post: function( url, data, callback, type ) {
+               // shift arguments if data argument was omited
+               if ( jQuery.isFunction( data ) ) {
+                       type = type || callback;
+                       callback = data;
+                       data = {};
+               }
+
+               return jQuery.ajax({
+                       type: "POST",
+                       url: url,
+                       data: data,
+                       success: callback,
+                       dataType: type
+               });
+       },
+
+       ajaxSetup: function( settings ) {
+               jQuery.extend( jQuery.ajaxSettings, settings );
+       },
+
+       ajaxSettings: {
+               url: location.href,
+               global: true,
+               type: "GET",
+               contentType: "application/x-www-form-urlencoded",
+               processData: true,
+               async: true,
+               /*
+               timeout: 0,
+               data: null,
+               username: null,
+               password: null,
+               traditional: false,
+               */
+               // Create the request object; Microsoft failed to properly
+               // implement the XMLHttpRequest in IE7 (can't request local files),
+               // so we use the ActiveXObject when it is available
+               // This function can be overriden by calling jQuery.ajaxSetup
+               xhr: window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ?
+                       function() {
+                               return new window.XMLHttpRequest();
+                       } :
+                       function() {
+                               try {
+                                       return new window.ActiveXObject("Microsoft.XMLHTTP");
+                               } catch(e) {}
+                       },
+               accepts: {
+                       xml: "application/xml, text/xml",
+                       html: "text/html",
+                       script: "text/javascript, application/javascript",
+                       json: "application/json, text/javascript",
+                       text: "text/plain",
+                       _default: "*/*"
+               }
+       },
+
+       // Last-Modified header cache for next request
+       lastModified: {},
+       etag: {},
+
+       ajax: function( origSettings ) {
+               var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings);
+               
+               var jsonp, status, data,
+                       callbackContext = s.context || s,
+                       type = s.type.toUpperCase();
+
+               // convert data if not already a string
+               if ( s.data && s.processData && typeof s.data !== "string" ) {
+                       s.data = jQuery.param( s.data, s.traditional );
+               }
+
+               // Handle JSONP Parameter Callbacks
+               if ( s.dataType === "jsonp" ) {
+                       if ( type === "GET" ) {
+                               if ( !jsre.test( s.url ) ) {
+                                       s.url += (rquery.test( s.url ) ? "&" : "?") + (s.jsonp || "callback") + "=?";
+                               }
+                       } else if ( !s.data || !jsre.test(s.data) ) {
+                               s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
+                       }
+                       s.dataType = "json";
+               }
+
+               // Build temporary JSONP function
+               if ( s.dataType === "json" && (s.data && jsre.test(s.data) || jsre.test(s.url)) ) {
+                       jsonp = s.jsonpCallback || ("jsonp" + jsc++);
+
+                       // Replace the =? sequence both in the query string and the data
+                       if ( s.data ) {
+                               s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
+                       }
+
+                       s.url = s.url.replace(jsre, "=" + jsonp + "$1");
+
+                       // We need to make sure
+                       // that a JSONP style response is executed properly
+                       s.dataType = "script";
+
+                       // Handle JSONP-style loading
+                       window[ jsonp ] = window[ jsonp ] || function( tmp ) {
+                               data = tmp;
+                               success();
+                               complete();
+                               // Garbage collect
+                               window[ jsonp ] = undefined;
+
+                               try {
+                                       delete window[ jsonp ];
+                               } catch(e) {}
+
+                               if ( head ) {
+                                       head.removeChild( script );
+                               }
+                       };
+               }
+
+               if ( s.dataType === "script" && s.cache === null ) {
+                       s.cache = false;
+               }
+
+               if ( s.cache === false && type === "GET" ) {
+                       var ts = now();
+
+                       // try replacing _= if it is there
+                       var ret = s.url.replace(rts, "$1_=" + ts + "$2");
+
+                       // if nothing was replaced, add timestamp to the end
+                       s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");
+               }
+
+               // If data is available, append data to url for get requests
+               if ( s.data && type === "GET" ) {
+                       s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
+               }
+
+               // Watch for a new set of requests
+               if ( s.global && ! jQuery.active++ ) {
+                       jQuery.event.trigger( "ajaxStart" );
+               }
+
+               // Matches an absolute URL, and saves the domain
+               var parts = rurl.exec( s.url ),
+                       remote = parts && (parts[1] && parts[1] !== location.protocol || parts[2] !== location.host);
+
+               // If we're requesting a remote document
+               // and trying to load JSON or Script with a GET
+               if ( s.dataType === "script" && type === "GET" && remote ) {
+                       var head = document.getElementsByTagName("head")[0] || document.documentElement;
+                       var script = document.createElement("script");
+                       script.src = s.url;
+                       if ( s.scriptCharset ) {
+                               script.charset = s.scriptCharset;
+                       }
+
+                       // Handle Script loading
+                       if ( !jsonp ) {
+                               var done = false;
+
+                               // Attach handlers for all browsers
+                               script.onload = script.onreadystatechange = function() {
+                                       if ( !done && (!this.readyState ||
+                                                       this.readyState === "loaded" || this.readyState === "complete") ) {
+                                               done = true;
+                                               success();
+                                               complete();
+
+                                               // Handle memory leak in IE
+                                               script.onload = script.onreadystatechange = null;
+                                               if ( head && script.parentNode ) {
+                                                       head.removeChild( script );
+                                               }
+                                       }
+                               };
+                       }
+
+                       // Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+                       // This arises when a base node is used (#2709 and #4378).
+                       head.insertBefore( script, head.firstChild );
+
+                       // We handle everything using the script element injection
+                       return undefined;
+               }
+
+               var requestDone = false;
+
+               // Create the request object
+               var xhr = s.xhr();
+
+               if ( !xhr ) {
+                       return;
+               }
+
+               // Open the socket
+               // Passing null username, generates a login popup on Opera (#2865)
+               if ( s.username ) {
+                       xhr.open(type, s.url, s.async, s.username, s.password);
+               } else {
+                       xhr.open(type, s.url, s.async);
+               }
+
+               // Need an extra try/catch for cross domain requests in Firefox 3
+               try {
+                       // Set the correct header, if data is being sent
+                       if ( s.data || origSettings && origSettings.contentType ) {
+                               xhr.setRequestHeader("Content-Type", s.contentType);
+                       }
+
+                       // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+                       if ( s.ifModified ) {
+                               if ( jQuery.lastModified[s.url] ) {
+                                       xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
+                               }
+
+                               if ( jQuery.etag[s.url] ) {
+                                       xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
+                               }
+                       }
+
+                       // Set header so the called script knows that it's an XMLHttpRequest
+                       // Only send the header if it's not a remote XHR
+                       if ( !remote ) {
+                               xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+                       }
+
+                       // Set the Accepts header for the server, depending on the dataType
+                       xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
+                               s.accepts[ s.dataType ] + ", */*" :
+                               s.accepts._default );
+               } catch(e) {}
+
+               // Allow custom headers/mimetypes and early abort
+               if ( s.beforeSend && s.beforeSend.call(callbackContext, xhr, s) === false ) {
+                       // Handle the global AJAX counter
+                       if ( s.global && ! --jQuery.active ) {
+                               jQuery.event.trigger( "ajaxStop" );
+                       }
+
+                       // close opended socket
+                       xhr.abort();
+                       return false;
+               }
+
+               if ( s.global ) {
+                       trigger("ajaxSend", [xhr, s]);
+               }
+
+               // Wait for a response to come back
+               var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
+                       // The request was aborted
+                       if ( !xhr || xhr.readyState === 0 ) {
+                               // Opera doesn't call onreadystatechange before this point
+                               // so we simulate the call
+                               if ( !requestDone ) {
+                                       complete();
+                               }
+
+                               requestDone = true;
+                               if ( xhr ) {
+                                       xhr.onreadystatechange = jQuery.noop;
+                               }
+
+                       // The transfer is complete and the data is available, or the request timed out
+                       } else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
+                               requestDone = true;
+                               xhr.onreadystatechange = jQuery.noop;
+
+                               status = isTimeout === "timeout" ?
+                                       "timeout" :
+                                       !jQuery.httpSuccess( xhr ) ?
+                                               "error" :
+                                               s.ifModified && jQuery.httpNotModified( xhr, s.url ) ?
+                                                       "notmodified" :
+                                                       "success";
+
+                               if ( status === "success" ) {
+                                       // Watch for, and catch, XML document parse errors
+                                       try {
+                                               // process the data (runs the xml through httpData regardless of callback)
+                                               data = jQuery.httpData( xhr, s.dataType, s );
+                                       } catch(e) {
+                                               status = "parsererror";
+                                       }
+                               }
+
+                               // Make sure that the request was successful or notmodified
+                               if ( status === "success" || status === "notmodified" ) {
+                                       // JSONP handles its own success callback
+                                       if ( !jsonp ) {
+                                               success();
+                                       }
+                               } else {
+                                       jQuery.handleError(s, xhr, status);
+                               }
+
+                               // Fire the complete handlers
+                               complete();
+
+                               if ( isTimeout === "timeout" ) {
+                                       xhr.abort();
+                               }
+
+                               // Stop memory leaks
+                               if ( s.async ) {
+                                       xhr = null;
+                               }
+                       }
+               };
+
+               // Override the abort handler, if we can (IE doesn't allow it, but that's OK)
+               // Opera doesn't fire onreadystatechange at all on abort
+               try {
+                       var oldAbort = xhr.abort;
+                       xhr.abort = function() {
+                               if ( xhr ) {
+                                       oldAbort.call( xhr );
+                                       if ( xhr ) {
+                                               xhr.readyState = 0;
+                                       }
+                               }
+
+                               onreadystatechange();
+                       };
+               } catch(e) { }
+
+               // Timeout checker
+               if ( s.async && s.timeout > 0 ) {
+                       setTimeout(function() {
+                               // Check to see if the request is still happening
+                               if ( xhr && !requestDone ) {
+                                       onreadystatechange( "timeout" );
+                               }
+                       }, s.timeout);
+               }
+
+               // Send the data
+               try {
+                       xhr.send( type === "POST" || type === "PUT" || type === "DELETE" ? s.data : null );
+               } catch(e) {
+                       jQuery.handleError(s, xhr, null, e);
+                       // Fire the complete handlers
+                       complete();
+               }
+
+               // firefox 1.5 doesn't fire statechange for sync requests
+               if ( !s.async ) {
+                       onreadystatechange();
+               }
+
+               function success() {
+                       // If a local callback was specified, fire it and pass it the data
+                       if ( s.success ) {
+                               s.success.call( callbackContext, data, status, xhr );
+                       }
+
+                       // Fire the global callback
+                       if ( s.global ) {
+                               trigger( "ajaxSuccess", [xhr, s] );
+                       }
+               }
+
+               function complete() {
+                       // Process result
+                       if ( s.complete ) {
+                               s.complete.call( callbackContext, xhr, status);
+                       }
+
+                       // The request was completed
+                       if ( s.global ) {
+                               trigger( "ajaxComplete", [xhr, s] );
+                       }
+
+                       // Handle the global AJAX counter
+                       if ( s.global && ! --jQuery.active ) {
+                               jQuery.event.trigger( "ajaxStop" );
+                       }
+               }
+               
+               function trigger(type, args) {
+                       (s.context ? jQuery(s.context) : jQuery.event).trigger(type, args);
+               }
+
+               // return XMLHttpRequest to allow aborting the request etc.
+               return xhr;
+       },
+
+       handleError: function( s, xhr, status, e ) {
+               // If a local callback was specified, fire it
+               if ( s.error ) {
+                       s.error.call( s.context || window, xhr, status, e );
+               }
+
+               // Fire the global callback
+               if ( s.global ) {
+                       (s.context ? jQuery(s.context) : jQuery.event).trigger( "ajaxError", [xhr, s, e] );
+               }
+       },
+
+       // Counter for holding the number of active queries
+       active: 0,
+
+       // Determines if an XMLHttpRequest was successful or not
+       httpSuccess: function( xhr ) {
+               try {
+                       // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
+                       return !xhr.status && location.protocol === "file:" ||
+                               // Opera returns 0 when status is 304
+                               ( xhr.status >= 200 && xhr.status < 300 ) ||
+                               xhr.status === 304 || xhr.status === 1223 || xhr.status === 0;
+               } catch(e) {}
+
+               return false;
+       },
+
+       // Determines if an XMLHttpRequest returns NotModified
+       httpNotModified: function( xhr, url ) {
+               var lastModified = xhr.getResponseHeader("Last-Modified"),
+                       etag = xhr.getResponseHeader("Etag");
+
+               if ( lastModified ) {
+                       jQuery.lastModified[url] = lastModified;
+               }
+
+               if ( etag ) {
+                       jQuery.etag[url] = etag;
+               }
+
+               // Opera returns 0 when status is 304
+               return xhr.status === 304 || xhr.status === 0;
+       },
+
+       httpData: function( xhr, type, s ) {
+               var ct = xhr.getResponseHeader("content-type") || "",
+                       xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
+                       data = xml ? xhr.responseXML : xhr.responseText;
+
+               if ( xml && data.documentElement.nodeName === "parsererror" ) {
+                       throw "parsererror";
+               }
+
+               // Allow a pre-filtering function to sanitize the response
+               // s is checked to keep backwards compatibility
+               if ( s && s.dataFilter ) {
+                       data = s.dataFilter( data, type );
+               }
+
+               // The filter can actually parse the response
+               if ( typeof data === "string" ) {
+                       // Get the JavaScript object, if JSON is used.
+                       if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
+                               // Make sure the incoming data is actual JSON
+                               // Logic borrowed from http://json.org/json2.js
+                               if (/^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
+                                       .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
+                                       .replace(/(?:^|:|,)(?:\s*\[)+/g, ""))) {
+
+                                       // Try to use the native JSON parser first
+                                       if ( window.JSON && window.JSON.parse ) {
+                                               data = window.JSON.parse( data );
+
+                                       } else {
+                                               data = (new Function("return " + data))();
+                                       }
+
+                               } else {
+                                       throw "Invalid JSON: " + data;
+                               }
+
+                       // If the type is "script", eval it in global context
+                       } else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
+                               jQuery.globalEval( data );
+                       }
+               }
+
+               return data;
+       },
+
+       // Serialize an array of form elements or a set of
+       // key/values into a query string
+       param: function( a, traditional ) {
+               
+               var s = [];
+               
+               // Set traditional to true for jQuery <= 1.3.2 behavior.
+               if ( traditional === undefined ) {
+                       traditional = jQuery.ajaxSettings.traditional;
+               }
+               
+               function add( key, value ) {
+                       // If value is a function, invoke it and return its value
+                       value = jQuery.isFunction(value) ? value() : value;
+                       s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
+               }
+               
+               // If an array was passed in, assume that it is an array of form elements.
+               if ( jQuery.isArray(a) || a.jquery ) {
+                       // Serialize the form elements
+                       jQuery.each( a, function() {
+                               add( this.name, this.value );
+                       });
+                       
+               } else {
+                       // If traditional, encode the "old" way (the way 1.3.2 or older
+                       // did it), otherwise encode params recursively.
+                       jQuery.each( a, function buildParams( prefix, obj ) {
+                               
+                               if ( jQuery.isArray(obj) ) {
+                                       // Serialize array item.
+                                       jQuery.each( obj, function( i, v ) {
+                                               if ( traditional ) {
+                                                       // Treat each array item as a scalar.
+                                                       add( prefix, v );
+                                               } else {
+                                                       // If array item is non-scalar (array or object), encode its
+                                                       // numeric index to resolve deserialization ambiguity issues.
+                                                       // Note that rack (as of 1.0.0) can't currently deserialize
+                                                       // nested arrays properly, and attempting to do so may cause
+                                                       // a server error. Possible fixes are to modify rack's
+                                                       // deserialization algorithm or to provide an option or flag
+                                                       // to force array serialization to be shallow.
+                                                       buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v );
+                                               }
+                                       });
+                                       
+                               } else if ( !traditional && obj != null && typeof obj === "object" ) {
+                                       // Serialize object item.
+                                       jQuery.each( obj, function( k, v ) {
+                                               buildParams( prefix + "[" + k + "]", v );
+                                       });
+                                       
+                               } else {
+                                       // Serialize scalar item.
+                                       add( prefix, obj );
+                               }
+                       });
+               }
+               
+               // Return the resulting serialization
+               return s.join("&").replace(r20, "+");
+       }
+
+});
+var elemdisplay = {},
+       rfxtypes = /toggle|show|hide/,
+       rfxnum = /^([+-]=)?([\d+-.]+)(.*)$/,
+       timerId,
+       fxAttrs = [
+               // height animations
+               [ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
+               // width animations
+               [ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
+               // opacity animations
+               [ "opacity" ]
+       ];
+
+jQuery.fn.extend({
+       show: function( speed, callback ) {
+               if ( speed != null ) {
+                       return this.animate( genFx("show", 3), speed, callback);
+
+               } else {
+                       for ( var i = 0, l = this.length; i < l; i++ ) {
+                               var old = jQuery.data(this[i], "olddisplay");
+
+                               this[i].style.display = old || "";
+
+                               if ( jQuery.css(this[i], "display") === "none" ) {
+                                       var nodeName = this[i].nodeName, display;
+
+                                       if ( elemdisplay[ nodeName ] ) {
+                                               display = elemdisplay[ nodeName ];
+
+                                       } else {
+                                               var elem = jQuery("<" + nodeName + " />").appendTo("body");
+
+                                               display = elem.css("display");
+
+                                               if ( display === "none" ) {
+                                                       display = "block";
+                                               }
+
+                                               elem.remove();
+
+                                               elemdisplay[ nodeName ] = display;
+                                       }
+
+                                       jQuery.data(this[i], "olddisplay", display);
+                               }
+                       }
+
+                       // Set the display of the elements in a second loop
+                       // to avoid the constant reflow
+                       for ( var j = 0, k = this.length; j < k; j++ ) {
+                               this[j].style.display = jQuery.data(this[j], "olddisplay") || "";
+                       }
+
+                       return this;
+               }
+       },
+
+       hide: function( speed, callback ) {
+               if ( speed != null ) {
+                       return this.animate( genFx("hide", 3), speed, callback);
+
+               } else {
+                       for ( var i = 0, l = this.length; i < l; i++ ) {
+                               var old = jQuery.data(this[i], "olddisplay");
+                               if ( !old && old !== "none" ) {
+                                       jQuery.data(this[i], "olddisplay", jQuery.css(this[i], "display"));
+                               }
+                       }
+
+                       // Set the display of the elements in a second loop
+                       // to avoid the constant reflow
+                       for ( var j = 0, k = this.length; j < k; j++ ) {
+                               this[j].style.display = "none";
+                       }
+
+                       return this;
+               }
+       },
+
+       // Save the old toggle function
+       _toggle: jQuery.fn.toggle,
+
+       toggle: function( fn, fn2 ) {
+               var bool = typeof fn === "boolean";
+
+               if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
+                       this._toggle.apply( this, arguments );
+
+               } else if ( fn == null || bool ) {
+                       this.each(function() {
+                               var state = bool ? fn : jQuery(this).is(":hidden");
+                               jQuery(this)[ state ? "show" : "hide" ]();
+                       });
+
+               } else {
+                       this.animate(genFx("toggle", 3), fn, fn2);
+               }
+
+               return this;
+       },
+
+       fadeTo: function( speed, to, callback ) {
+               return this.filter(":hidden").css("opacity", 0).show().end()
+                                       .animate({opacity: to}, speed, callback);
+       },
+
+       animate: function( prop, speed, easing, callback ) {
+               var optall = jQuery.speed(speed, easing, callback);
+
+               if ( jQuery.isEmptyObject( prop ) ) {
+                       return this.each( optall.complete );
+               }
+
+               return this[ optall.queue === false ? "each" : "queue" ](function() {
+                       var opt = jQuery.extend({}, optall), p,
+                               hidden = this.nodeType === 1 && jQuery(this).is(":hidden"),
+                               self = this;
+
+                       for ( p in prop ) {
+                               var name = p.replace(rdashAlpha, fcamelCase);
+
+                               if ( p !== name ) {
+                                       prop[ name ] = prop[ p ];
+                                       delete prop[ p ];
+                                       p = name;
+                               }
+
+                               if ( prop[p] === "hide" && hidden || prop[p] === "show" && !hidden ) {
+                                       return opt.complete.call(this);
+                               }
+
+                               if ( ( p === "height" || p === "width" ) && this.style ) {
+                                       // Store display property
+                                       opt.display = jQuery.css(this, "display");
+
+                                       // Make sure that nothing sneaks out
+                                       opt.overflow = this.style.overflow;
+                               }
+
+                               if ( jQuery.isArray( prop[p] ) ) {
+                                       // Create (if needed) and add to specialEasing
+                                       (opt.specialEasing = opt.specialEasing || {})[p] = prop[p][1];
+                                       prop[p] = prop[p][0];
+                               }
+                       }
+
+                       if ( opt.overflow != null ) {
+                               this.style.overflow = "hidden";
+                       }
+
+                       opt.curAnim = jQuery.extend({}, prop);
+
+                       jQuery.each( prop, function( name, val ) {
+                               var e = new jQuery.fx( self, opt, name );
+
+                               if ( rfxtypes.test(val) ) {
+                                       e[ val === "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+
+                               } else {
+                                       var parts = rfxnum.exec(val),
+                                               start = e.cur(true) || 0;
+
+                                       if ( parts ) {
+                                               var end = parseFloat( parts[2] ),
+                                                       unit = parts[3] || "px";
+
+                                               // We need to compute starting value
+                                               if ( unit !== "px" ) {
+                                                       self.style[ name ] = (end || 1) + unit;
+                                                       start = ((end || 1) / e.cur(true)) * start;
+                                                       self.style[ name ] = start + unit;
+                                               }
+
+                                               // If a +=/-= token was provided, we're doing a relative animation
+                                               if ( parts[1] ) {
+                                                       end = ((parts[1] === "-=" ? -1 : 1) * end) + start;
+                                               }
+
+                                               e.custom( start, end, unit );
+
+                                       } else {
+                                               e.custom( start, val, "" );
+                                       }
+                               }
+                       });
+
+                       // For JS strict compliance
+                       return true;
+               });
+       },
+
+       stop: function( clearQueue, gotoEnd ) {
+               var timers = jQuery.timers;
+
+               if ( clearQueue ) {
+                       this.queue([]);
+               }
+
+               this.each(function() {
+                       // go in reverse order so anything added to the queue during the loop is ignored
+                       for ( var i = timers.length - 1; i >= 0; i-- ) {
+                               if ( timers[i].elem === this ) {
+                                       if (gotoEnd) {
+                                               // force the next step to be the last
+                                               timers[i](true);
+                                       }
+
+                                       timers.splice(i, 1);
+                               }
+                       }
+               });
+
+               // start the next in the queue if the last step wasn't forced
+               if ( !gotoEnd ) {
+                       this.dequeue();
+               }
+
+               return this;
+       }
+
+});
+
+// Generate shortcuts for custom animations
+jQuery.each({
+       slideDown: genFx("show", 1),
+       slideUp: genFx("hide", 1),
+       slideToggle: genFx("toggle", 1),
+       fadeIn: { opacity: "show" },
+       fadeOut: { opacity: "hide" }
+}, function( name, props ) {
+       jQuery.fn[ name ] = function( speed, callback ) {
+               return this.animate( props, speed, callback );
+       };
+});
+
+jQuery.extend({
+       speed: function( speed, easing, fn ) {
+               var opt = speed && typeof speed === "object" ? speed : {
+                       complete: fn || !fn && easing ||
+                               jQuery.isFunction( speed ) && speed,
+                       duration: speed,
+                       easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
+               };
+
+               opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+                       jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default;
+
+               // Queueing
+               opt.old = opt.complete;
+               opt.complete = function() {
+                       if ( opt.queue !== false ) {
+                               jQuery(this).dequeue();
+                       }
+                       if ( jQuery.isFunction( opt.old ) ) {
+                               opt.old.call( this );
+                       }
+               };
+
+               return opt;
+       },
+
+       easing: {
+               linear: function( p, n, firstNum, diff ) {
+                       return firstNum + diff * p;
+               },
+               swing: function( p, n, firstNum, diff ) {
+                       return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
+               }
+       },
+
+       timers: [],
+
+       fx: function( elem, options, prop ) {
+               this.options = options;
+               this.elem = elem;
+               this.prop = prop;
+
+               if ( !options.orig ) {
+                       options.orig = {};
+               }
+       }
+
+});
+
+jQuery.fx.prototype = {
+       // Simple function for setting a style value
+       update: function() {
+               if ( this.options.step ) {
+                       this.options.step.call( this.elem, this.now, this );
+               }
+
+               (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
+
+               // Set display property to block for height/width animations
+               if ( ( this.prop === "height" || this.prop === "width" ) && this.elem.style ) {
+                       this.elem.style.display = "block";
+               }
+       },
+
+       // Get the current size
+       cur: function( force ) {
+               if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
+                       return this.elem[ this.prop ];
+               }
+
+               var r = parseFloat(jQuery.css(this.elem, this.prop, force));
+               return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
+       },
+
+       // Start an animation from one number to another
+       custom: function( from, to, unit ) {
+               this.startTime = now();
+               this.start = from;
+               this.end = to;
+               this.unit = unit || this.unit || "px";
+               this.now = this.start;
+               this.pos = this.state = 0;
+
+               var self = this;
+               function t( gotoEnd ) {
+                       return self.step(gotoEnd);
+               }
+
+               t.elem = this.elem;
+
+               if ( t() && jQuery.timers.push(t) && !timerId ) {
+                       timerId = setInterval(jQuery.fx.tick, 13);
+               }
+       },
+
+       // Simple 'show' function
+       show: function() {
+               // Remember where we started, so that we can go back to it later
+               this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
+               this.options.show = true;
+
+               // Begin the animation
+               // Make sure that we start at a small width/height to avoid any
+               // flash of content
+               this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
+
+               // Start by showing the element
+               jQuery( this.elem ).show();
+       },
+
+       // Simple 'hide' function
+       hide: function() {
+               // Remember where we started, so that we can go back to it later
+               this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
+               this.options.hide = true;
+
+               // Begin the animation
+               this.custom(this.cur(), 0);
+       },
+
+       // Each step of an animation
+       step: function( gotoEnd ) {
+               var t = now(), done = true;
+
+               if ( gotoEnd || t >= this.options.duration + this.startTime ) {
+                       this.now = this.end;
+                       this.pos = this.state = 1;
+                       this.update();
+
+                       this.options.curAnim[ this.prop ] = true;
+
+                       for ( var i in this.options.curAnim ) {
+                               if ( this.options.curAnim[i] !== true ) {
+                                       done = false;
+                               }
+                       }
+
+                       if ( done ) {
+                               if ( this.options.display != null ) {
+                                       // Reset the overflow
+                                       this.elem.style.overflow = this.options.overflow;
+
+                                       // Reset the display
+                                       var old = jQuery.data(this.elem, "olddisplay");
+                                       this.elem.style.display = old ? old : this.options.display;
+
+                                       if ( jQuery.css(this.elem, "display") === "none" ) {
+                                               this.elem.style.display = "block";
+                                       }
+                               }
+
+                               // Hide the element if the "hide" operation was done
+                               if ( this.options.hide ) {
+                                       jQuery(this.elem).hide();
+                               }
+
+                               // Reset the properties, if the item has been hidden or shown
+                               if ( this.options.hide || this.options.show ) {
+                                       for ( var p in this.options.curAnim ) {
+                                               jQuery.style(this.elem, p, this.options.orig[p]);
+                                       }
+                               }
+
+                               // Execute the complete function
+                               this.options.complete.call( this.elem );
+                       }
+
+                       return false;
+
+               } else {
+                       var n = t - this.startTime;
+                       this.state = n / this.options.duration;
+
+                       // Perform the easing function, defaults to swing
+                       var specialEasing = this.options.specialEasing && this.options.specialEasing[this.prop];
+                       var defaultEasing = this.options.easing || (jQuery.easing.swing ? "swing" : "linear");
+                       this.pos = jQuery.easing[specialEasing || defaultEasing](this.state, n, 0, 1, this.options.duration);
+                       this.now = this.start + ((this.end - this.start) * this.pos);
+
+                       // Perform the next step of the animation
+                       this.update();
+               }
+
+               return true;
+       }
+};
+
+jQuery.extend( jQuery.fx, {
+       tick: function() {
+               var timers = jQuery.timers;
+
+               for ( var i = 0; i < timers.length; i++ ) {
+                       if ( !timers[i]() ) {
+                               timers.splice(i--, 1);
+                       }
+               }
+
+               if ( !timers.length ) {
+                       jQuery.fx.stop();
+               }
+       },
+               
+       stop: function() {
+               clearInterval( timerId );
+               timerId = null;
+       },
+       
+       speeds: {
+               slow: 600,
+               fast: 200,
+               // Default speed
+               _default: 400
+       },
+
+       step: {
+               opacity: function( fx ) {
+                       jQuery.style(fx.elem, "opacity", fx.now);
+               },
+
+               _default: function( fx ) {
+                       if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
+                               fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
+                       } else {
+                               fx.elem[ fx.prop ] = fx.now;
+                       }
+               }
+       }
+});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+       jQuery.expr.filters.animated = function( elem ) {
+               return jQuery.grep(jQuery.timers, function( fn ) {
+                       return elem === fn.elem;
+               }).length;
+       };
+}
+
+function genFx( type, num ) {
+       var obj = {};
+
+       jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
+               obj[ this ] = type;
+       });
+
+       return obj;
+}
+if ( "getBoundingClientRect" in document.documentElement ) {
+       jQuery.fn.offset = function( options ) {
+               var elem = this[0];
+
+               if ( !elem || !elem.ownerDocument ) {
+                       return null;
+               }
+
+               if ( options ) { 
+                       return this.each(function( i ) {
+                               jQuery.offset.setOffset( this, options, i );
+                       });
+               }
+
+               if ( elem === elem.ownerDocument.body ) {
+                       return jQuery.offset.bodyOffset( elem );
+               }
+
+               var box = elem.getBoundingClientRect(), doc = elem.ownerDocument, body = doc.body, docElem = doc.documentElement,
+                       clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
+                       top  = box.top  + (self.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop ) - clientTop,
+                       left = box.left + (self.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
+
+               return { top: top, left: left };
+       };
+
+} else {
+       jQuery.fn.offset = function( options ) {
+               var elem = this[0];
+
+               if ( !elem || !elem.ownerDocument ) {
+                       return null;
+               }
+
+               if ( options ) { 
+                       return this.each(function( i ) {
+                               jQuery.offset.setOffset( this, options, i );
+                       });
+               }
+
+               if ( elem === elem.ownerDocument.body ) {
+                       return jQuery.offset.bodyOffset( elem );
+               }
+
+               jQuery.offset.initialize();
+
+               var offsetParent = elem.offsetParent, prevOffsetParent = elem,
+                       doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement,
+                       body = doc.body, defaultView = doc.defaultView,
+                       prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
+                       top = elem.offsetTop, left = elem.offsetLeft;
+
+               while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
+                       if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+                               break;
+                       }
+
+                       computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
+                       top  -= elem.scrollTop;
+                       left -= elem.scrollLeft;
+
+                       if ( elem === offsetParent ) {
+                               top  += elem.offsetTop;
+                               left += elem.offsetLeft;
+
+                               if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.nodeName)) ) {
+                                       top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+                                       left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+                               }
+
+                               prevOffsetParent = offsetParent, offsetParent = elem.offsetParent;
+                       }
+
+                       if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
+                               top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+                               left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+                       }
+
+                       prevComputedStyle = computedStyle;
+               }
+
+               if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
+                       top  += body.offsetTop;
+                       left += body.offsetLeft;
+               }
+
+               if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+                       top  += Math.max( docElem.scrollTop, body.scrollTop );
+                       left += Math.max( docElem.scrollLeft, body.scrollLeft );
+               }
+
+               return { top: top, left: left };
+       };
+}
+
+jQuery.offset = {
+       initialize: function() {
+               var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.curCSS(body, "marginTop", true) ) || 0,
+                       html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
+
+               jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
+
+               container.innerHTML = html;
+               body.insertBefore( container, body.firstChild );
+               innerDiv = container.firstChild;
+               checkDiv = innerDiv.firstChild;
+               td = innerDiv.nextSibling.firstChild.firstChild;
+
+               this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
+               this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
+
+               checkDiv.style.position = "fixed", checkDiv.style.top = "20px";
+               // safari subtracts parent border width here which is 5px
+               this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
+               checkDiv.style.position = checkDiv.style.top = "";
+
+               innerDiv.style.overflow = "hidden", innerDiv.style.position = "relative";
+               this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
+
+               this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
+
+               body.removeChild( container );
+               body = container = innerDiv = checkDiv = table = td = null;
+               jQuery.offset.initialize = jQuery.noop;
+       },
+
+       bodyOffset: function( body ) {
+               var top = body.offsetTop, left = body.offsetLeft;
+
+               jQuery.offset.initialize();
+
+               if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
+                       top  += parseFloat( jQuery.curCSS(body, "marginTop",  true) ) || 0;
+                       left += parseFloat( jQuery.curCSS(body, "marginLeft", true) ) || 0;
+               }
+
+               return { top: top, left: left };
+       },
+       
+       setOffset: function( elem, options, i ) {
+               // set position first, in-case top/left are set even on static elem
+               if ( /static/.test( jQuery.curCSS( elem, "position" ) ) ) {
+                       elem.style.position = "relative";
+               }
+               var curElem   = jQuery( elem ),
+                       curOffset = curElem.offset(),
+                       curTop    = parseInt( jQuery.curCSS( elem, "top",  true ), 10 ) || 0,
+                       curLeft   = parseInt( jQuery.curCSS( elem, "left", true ), 10 ) || 0;
+
+               if ( jQuery.isFunction( options ) ) {
+                       options = options.call( elem, i, curOffset );
+               }
+
+               var props = {
+                       top:  (options.top  - curOffset.top)  + curTop,
+                       left: (options.left - curOffset.left) + curLeft
+               };
+               
+               if ( "using" in options ) {
+                       options.using.call( elem, props );
+               } else {
+                       curElem.css( props );
+               }
+       }
+};
+
+
+jQuery.fn.extend({
+       position: function() {
+               if ( !this[0] ) {
+                       return null;
+               }
+
+               var elem = this[0],
+
+               // Get *real* offsetParent
+               offsetParent = this.offsetParent(),
+
+               // Get correct offsets
+               offset       = this.offset(),
+               parentOffset = /^body|html$/i.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+
+               // Subtract element margins
+               // note: when an element has margin: auto the offsetLeft and marginLeft
+               // are the same in Safari causing offset.left to incorrectly be 0
+               offset.top  -= parseFloat( jQuery.curCSS(elem, "marginTop",  true) ) || 0;
+               offset.left -= parseFloat( jQuery.curCSS(elem, "marginLeft", true) ) || 0;
+
+               // Add offsetParent borders
+               parentOffset.top  += parseFloat( jQuery.curCSS(offsetParent[0], "borderTopWidth",  true) ) || 0;
+               parentOffset.left += parseFloat( jQuery.curCSS(offsetParent[0], "borderLeftWidth", true) ) || 0;
+
+               // Subtract the two offsets
+               return {
+                       top:  offset.top  - parentOffset.top,
+                       left: offset.left - parentOffset.left
+               };
+       },
+
+       offsetParent: function() {
+               return this.map(function() {
+                       var offsetParent = this.offsetParent || document.body;
+                       while ( offsetParent && (!/^body|html$/i.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
+                               offsetParent = offsetParent.offsetParent;
+                       }
+                       return offsetParent;
+               });
+       }
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( ["Left", "Top"], function( i, name ) {
+       var method = "scroll" + name;
+
+       jQuery.fn[ method ] = function(val) {
+               var elem = this[0], win;
+               
+               if ( !elem ) {
+                       return null;
+               }
+
+               if ( val !== undefined ) {
+                       // Set the scroll offset
+                       return this.each(function() {
+                               win = getWindow( this );
+
+                               if ( win ) {
+                                       win.scrollTo(
+                                               !i ? val : jQuery(win).scrollLeft(),
+                                                i ? val : jQuery(win).scrollTop()
+                                       );
+
+                               } else {
+                                       this[ method ] = val;
+                               }
+                       });
+               } else {
+                       win = getWindow( elem );
+
+                       // Return the scroll offset
+                       return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
+                               jQuery.support.boxModel && win.document.documentElement[ method ] ||
+                                       win.document.body[ method ] :
+                               elem[ method ];
+               }
+       };
+});
+
+function getWindow( elem ) {
+       return ("scrollTo" in elem && elem.document) ?
+               elem :
+               elem.nodeType === 9 ?
+                       elem.defaultView || elem.parentWindow :
+                       false;
+}
+// Create innerHeight, innerWidth, outerHeight and outerWidth methods
+jQuery.each([ "Height", "Width" ], function( i, name ) {
+
+       var type = name.toLowerCase();
+
+       // innerHeight and innerWidth
+       jQuery.fn["inner" + name] = function() {
+               return this[0] ?
+                       jQuery.css( this[0], type, false, "padding" ) :
+                       null;
+       };
+
+       // outerHeight and outerWidth
+       jQuery.fn["outer" + name] = function( margin ) {
+               return this[0] ?
+                       jQuery.css( this[0], type, false, margin ? "margin" : "border" ) :
+                       null;
+       };
+
+       jQuery.fn[ type ] = function( size ) {
+               // Get window width or height
+               var elem = this[0];
+               if ( !elem ) {
+                       return size == null ? null : this;
+               }
+
+               return ("scrollTo" in elem && elem.document) ? // does it walk and quack like a window?
+                       // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+                       elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] ||
+                       elem.document.body[ "client" + name ] :
+
+                       // Get document width or height
+                       (elem.nodeType === 9) ? // is it a document
+                               // Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+                               Math.max(
+                                       elem.documentElement["client" + name],
+                                       elem.body["scroll" + name], elem.documentElement["scroll" + name],
+                                       elem.body["offset" + name], elem.documentElement["offset" + name]
+                               ) :
+
+                               // Get or set width or height on the element
+                               size === undefined ?
+                                       // Get width or height on the element
+                                       jQuery.css( elem, type ) :
+
+                                       // Set the width or height on the element (default to pixels if value is unitless)
+                                       this.css( type, typeof size === "string" ? size : size + "px" );
+       };
+
+});
+// Expose jQuery to the global object
+window.jQuery = window.$ = jQuery;
+
+})(window);
diff --git a/wx/viewers/flexpaper/js/swfobject/expressInstall.swf b/wx/viewers/flexpaper/js/swfobject/expressInstall.swf
new file mode 100644 (file)
index 0000000..0fbf8fc
Binary files /dev/null and b/wx/viewers/flexpaper/js/swfobject/expressInstall.swf differ
diff --git a/wx/viewers/flexpaper/js/swfobject/swfobject.js b/wx/viewers/flexpaper/js/swfobject/swfobject.js
new file mode 100644 (file)
index 0000000..8eafe9d
--- /dev/null
@@ -0,0 +1,4 @@
+/*     SWFObject v2.2 <http://code.google.com/p/swfobject/> 
+       is released under the MIT License <http://www.opensource.org/licenses/mit-license.php> 
+*/
+var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y<X;Y++){U[Y]()}}function K(X){if(J){X()}else{U[U.length]=X}}function s(Y){if(typeof O.addEventListener!=D){O.addEventListener("load",Y,false)}else{if(typeof j.addEventListener!=D){j.addEventListener("load",Y,false)}else{if(typeof O.attachEvent!=D){i(O,"onload",Y)}else{if(typeof O.onload=="function"){var X=O.onload;O.onload=function(){X();Y()}}else{O.onload=Y}}}}}function h(){if(T){V()}else{H()}}function V(){var X=j.getElementsByTagName("body")[0];var aa=C(r);aa.setAttribute("type",q);var Z=X.appendChild(aa);if(Z){var Y=0;(function(){if(typeof Z.GetVariable!=D){var ab=Z.GetVariable("$version");if(ab){ab=ab.split(" ")[1].split(",");M.pv=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}else{if(Y<10){Y++;setTimeout(arguments.callee,10);return}}X.removeChild(aa);Z=null;H()})()}else{H()}}function H(){var ag=o.length;if(ag>0){for(var af=0;af<ag;af++){var Y=o[af].id;var ab=o[af].callbackFn;var aa={success:false,id:Y};if(M.pv[0]>0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad<ac;ad++){if(X[ad].getAttribute("name").toLowerCase()!="movie"){ah[X[ad].getAttribute("name")]=X[ad].getAttribute("value")}}P(ai,ah,Y,ab)}else{p(ae);if(ab){ab(aa)}}}}}else{w(Y,true);if(ab){var Z=z(Y);if(Z&&typeof Z.SetVariable!=D){aa.success=true;aa.ref=Z}ab(aa)}}}}}function z(aa){var X=null;var Y=c(aa);if(Y&&Y.nodeName=="OBJECT"){if(typeof Y.SetVariable!=D){X=Y}else{var Z=Y.getElementsByTagName(r)[0];if(Z){X=Z}}}return X}function A(){return !a&&F("6.0.65")&&(M.win||M.mac)&&!(M.wk&&M.wk<312)}function P(aa,ab,X,Z){a=true;E=Z||null;B={success:false,id:X};var ae=c(X);if(ae){if(ae.nodeName=="OBJECT"){l=g(ae);Q=null}else{l=ae;Q=X}aa.id=R;if(typeof aa.width==D||(!/%$/.test(aa.width)&&parseInt(aa.width,10)<310)){aa.width="310"}if(typeof aa.height==D||(!/%$/.test(aa.height)&&parseInt(aa.height,10)<137)){aa.height="137"}j.title=j.title.slice(0,47)+" - Flash Player Installation";var ad=M.ie&&M.win?"ActiveX":"PlugIn",ac="MMredirectURL="+O.location.toString().replace(/&/g,"%26")+"&MMplayerType="+ad+"&MMdoctitle="+j.title;if(typeof ab.flashvars!=D){ab.flashvars+="&"+ac}else{ab.flashvars=ac}if(M.ie&&M.win&&ae.readyState!=4){var Y=C("div");X+="SWFObjectNew";Y.setAttribute("id",X);ae.parentNode.insertBefore(Y,ae);ae.style.display="none";(function(){if(ae.readyState==4){ae.parentNode.removeChild(ae)}else{setTimeout(arguments.callee,10)}})()}u(aa,ab,X)}}function p(Y){if(M.ie&&M.win&&Y.readyState!=4){var X=C("div");Y.parentNode.insertBefore(X,Y);X.parentNode.replaceChild(g(Y),X);Y.style.display="none";(function(){if(Y.readyState==4){Y.parentNode.removeChild(Y)}else{setTimeout(arguments.callee,10)}})()}else{Y.parentNode.replaceChild(g(Y),Y)}}function g(ab){var aa=C("div");if(M.win&&M.ie){aa.innerHTML=ab.innerHTML}else{var Y=ab.getElementsByTagName(r)[0];if(Y){var ad=Y.childNodes;if(ad){var X=ad.length;for(var Z=0;Z<X;Z++){if(!(ad[Z].nodeType==1&&ad[Z].nodeName=="PARAM")&&!(ad[Z].nodeType==8)){aa.appendChild(ad[Z].cloneNode(true))}}}}}return aa}function u(ai,ag,Y){var X,aa=c(Y);if(M.wk&&M.wk<312){return X}if(aa){if(typeof ai.id==D){ai.id=Y}if(M.ie&&M.win){var ah="";for(var ae in ai){if(ai[ae]!=Object.prototype[ae]){if(ae.toLowerCase()=="data"){ag.movie=ai[ae]}else{if(ae.toLowerCase()=="styleclass"){ah+=' class="'+ai[ae]+'"'}else{if(ae.toLowerCase()!="classid"){ah+=" "+ae+'="'+ai[ae]+'"'}}}}}var af="";for(var ad in ag){if(ag[ad]!=Object.prototype[ad]){af+='<param name="'+ad+'" value="'+ag[ad]+'" />'}}aa.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+ah+">"+af+"</object>";N[N.length]=ai.id;X=c(ai.id)}else{var Z=C(r);Z.setAttribute("type",q);for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac])}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac])}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab])}}aa.parentNode.replaceChild(Z,aa);X=Z}}return X}function e(Z,X,Y){var aa=C("param");aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa)}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";(function(){if(X.readyState==4){b(Y)}else{setTimeout(arguments.callee,10)}})()}else{X.parentNode.removeChild(X)}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null}}Y.parentNode.removeChild(Y)}}function c(Z){var X=null;try{X=j.getElementById(Z)}catch(Y){}return X}function C(X){return j.createElement(X)}function i(Z,X,Y){Z.attachEvent(X,Y);I[I.length]=[Z,X,Y]}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return}var aa=j.getElementsByTagName("head")[0];if(!aa){return}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;G=null}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1]}G=X}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y)}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"))}}}function w(Z,X){if(!m){return}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y}else{v("#"+Z,"visibility:"+Y)}}function L(Y){var Z=/[\\\"<>\.;]/;var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;for(var ab=0;ab<ac;ab++){I[ab][0].detachEvent(I[ab][1],I[ab][2])}var Z=N.length;for(var aa=0;aa<Z;aa++){y(N[aa])}for(var Y in M){M[Y]=null}M=null;for(var X in swfobject){swfobject[X]=null}swfobject=null})}}();return{registerObject:function(ab,X,aa,Z){if(M.w3&&ab&&X){var Y={};Y.id=ab;Y.swfVersion=X;Y.expressInstall=aa;Y.callbackFn=Z;o[o.length]=Y;w(ab,false)}else{if(Z){Z({success:false,id:ab})}}},getObjectById:function(X){if(M.w3){return z(X)}},embedSWF:function(ab,ah,ae,ag,Y,aa,Z,ad,af,ac){var X={success:false,id:ah};if(M.w3&&!(M.wk&&M.wk<312)&&ab&&ah&&ae&&ag&&Y){w(ah,false);K(function(){ae+="";ag+="";var aj={};if(af&&typeof af===r){for(var al in af){aj[al]=af[al]}}aj.data=ab;aj.width=ae;aj.height=ag;var am={};if(ad&&typeof ad===r){for(var ak in ad){am[ak]=ad[ak]}}if(Z&&typeof Z===r){for(var ai in Z){if(typeof am.flashvars!=D){am.flashvars+="&"+ai+"="+Z[ai]}else{am.flashvars=ai+"="+Z[ai]}}}if(F(Y)){var an=u(aj,am,ah);if(aj.id==ah){w(ah,true)}X.success=true;X.ref=an}else{if(aa&&A()){aj.data=aa;P(aj,am,ah,ac);return}else{w(ah,true)}}if(ac){ac(X)}})}else{if(ac){ac(X)}}},switchOffAutoHideShow:function(){m=false},ua:M,getFlashPlayerVersion:function(){return{major:M.pv[0],minor:M.pv[1],release:M.pv[2]}},hasFlashPlayerVersion:F,createSWF:function(Z,Y,X){if(M.w3){return u(Z,Y,X)}else{return undefined}},showExpressInstall:function(Z,aa,X,Y){if(M.w3&&A()){P(Z,aa,X,Y)}},removeSWF:function(X){if(M.w3){y(X)}},createCSS:function(aa,Z,Y,X){if(M.w3){v(aa,Z,Y,X)}},addDomLoadEvent:K,addLoadEvent:s,getQueryParamValue:function(aa){var Z=j.location.search||j.location.hash;if(Z){if(/\?/.test(Z)){Z=Z.split("?")[1]}if(aa==null){return L(Z)}var Y=Z.split("&");for(var X=0;X<Y.length;X++){if(Y[X].substring(0,Y[X].indexOf("="))==aa){return L(Y[X].substring((Y[X].indexOf("=")+1)))}}}return""},expressInstallCallback:function(){if(a){var X=c(R);if(X&&l){X.parentNode.replaceChild(l,X);if(Q){w(Q,true);if(M.ie&&M.win){l.style.display="block"}}if(E){E(B)}}a=false}}}}();
\ No newline at end of file
index a7d71ce..8a92849 100644 (file)
@@ -28,7 +28,8 @@ order = 0
 type = "core"
 name = u"No Viewer"
 desc = (u'The SWF will be in "raw" format, with each page a seperate frame. '
-        u"Use this if you want to add a viewer yourself afterwards.")
+        u"Use this if you want to add a viewer yourself afterwards or "
+        u"if you will use the `One Page Per File`.")
 
 swf_options = [
     Choose("flashversion", u"Flash version:",
@@ -43,6 +44,7 @@ viewer_options = []
 
 from gui.plugin import Plugin
 class Raw(Plugin):
+    one_page_per_file = True
     def __init__(self, swf, filename):
         for opt in swf_options:
             swf.setparameter(opt.name, str(opt.value))
@@ -50,7 +52,7 @@ class Raw(Plugin):
 def init(swf, filename):
     return Raw(swf, filename)
 
-from wx.lib.embeddedimage import PyEmbeddedImage
+from lib.embeddedimage import PyEmbeddedImage
 preview = PyEmbeddedImage(
     "iVBORw0KGgoAAAANSUhEUgAAAGYAAABmCAIAAAC2vXM1AAAAAXNSR0IArs4c6QAADGNJREFU"
     "eNrtXX1MFEcU36/74LwDvByNnIqaFL9ORU2MEUNtE6AVIxWjFuN30ESNTWtiIhpBTVDSNk2j"
index 15343f9..433f153 100644 (file)
@@ -128,7 +128,7 @@ class Rfx(Plugin):
 def init(swf, filename):
     return Rfx(swf, filename)
 
-from wx.lib.embeddedimage import PyEmbeddedImage
+from lib.embeddedimage import PyEmbeddedImage
 
 preview = PyEmbeddedImage(
     "iVBORw0KGgoAAAANSUhEUgAAAGYAAABmCAIAAAC2vXM1AAAAAXNSR0IArs4c6QAAIABJREFU"
index 93918b5..dd59332 100644 (file)
@@ -52,7 +52,7 @@ def init(swf, filename):
     return Simple(swf, filename)
 
 
-from wx.lib.embeddedimage import PyEmbeddedImage
+from lib.embeddedimage import PyEmbeddedImage
 preview = PyEmbeddedImage(
     "iVBORw0KGgoAAAANSUhEUgAAAGYAAABmCAIAAAC2vXM1AAAAAXNSR0IArs4c6QAAF8NJREFU"
     "eNrtXWtQW+eZPhIS6ILu0kEIJCQQNwlZmJu5mVBsAnaMY7tpkmnjZHLpTtvZTNptt+5sZ6ed"
diff --git a/wx/viewers/technoargia.py b/wx/viewers/technoargia.py
new file mode 100644 (file)
index 0000000..7d6afa2
--- /dev/null
@@ -0,0 +1,350 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# gpdf2swf.py
+# graphical user interface for pdf2swf
+#
+# Part of the swftools package.
+# 
+# Copyright (c) 2008,2009 Matthias Kramm <kramm@quiss.org> 
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+from gui.fields import Choose, ChooseAndInt, Hidden
+
+order = 4
+type = "custom"
+name = u"technoargia Viewer"
+desc = (u"Simple viewer with home link from Laurent Lalanne"
+        u" (http://technoargia.free.fr/swftools/examples/viewer_home/viewer_home.html)")
+
+swf_options = [
+    Hidden("flashversion", 6),
+]
+
+viewer_options = [
+    Choose("html", u"Save HTML:",
+           (u"no", False, u"yes", True, ), True),
+    ChooseAndInt('width', 'Width:',
+                  ('same as PDF', -2, 'fullscreen', -1, 'custom', 0), 1, 2, 600),
+    ChooseAndInt('height', 'Height:',
+                  ('same as PDF', -2, 'fullscreen', -1, 'custom', 0), 1, 2, 800),
+    Choose('zoomtype', 'Initial zoom level:',
+            ('Original resolution', 1,
+             'Show all', 2,
+             'Maximum width/height', 3), 2),
+]
+
+
+html_template = """<html>
+<body style="padding: 0px; margin: 0px">
+<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+        width="%(width)s"
+        height="%(height)s"
+        codebase="http://active.macromedia.com/flash5/cabs/swflash.cab#version=%(version)d,0,0,0">
+        <param name="MOVIE" value="%(swffilename)s">
+        <param name="PLAY" value="true">
+        <param name="LOOP" value="true">
+        <param name="QUALITY" value="high">
+        <param name="FLASHVARS" value="%(flashvars)s">
+          <embed src="%(swffilename)s" width="%(width)s" height="%(height)s"
+                 play="true" ALIGN="" loop="true" quality="high"
+                 type="application/x-shockwave-flash"
+                 flashvars="%(flashvars)s"
+                 pluginspage="http://www.macromedia.com/go/getflashplayer">
+          </embed>
+</object>
+</body>
+</html>
+"""
+
+from gui.plugin import Plugin
+import os
+
+class Technoargia(Plugin):
+    def __init__(self, swf, filename):
+        self.__swf = swf
+        self.__filename = filename
+
+        for opt in swf_options:
+            swf.setparameter(opt.name, str(opt.value))
+            setattr(self, "_%s" % opt.name, opt.value)
+
+        for opt in viewer_options:
+            setattr(self, "_%s" % opt.name, opt.value)
+
+    def after_save(self, page):
+        viewerfilename = self._swap_extension(__file__, "swf")
+
+        self.swfcombine(
+               u"%s" % viewerfilename,
+               u"viewport=%s" % self.__filename,
+               u"-o", u"%s" % self.__filename,
+        )
+
+        if not self._html:
+            return
+
+        if self._width == -1:
+            width = "100%"
+        elif self._width == -2:
+            width = page.width+40
+        else:
+            width = self._width
+
+        if self._height == -1:
+            height = "100%"
+        elif self._height == -2:
+            height = page.height+70
+        else:
+            height = self._height
+
+        template_vars = {
+                         'width': width,
+                         'height': height,
+                         'version': self._flashversion,
+                         'flashvars': "zoomtype=%s" % self._zoomtype,
+                         'swffilename': os.path.basename(self.__filename),
+                        }
+
+        htmlfilename = self._swap_extension(self.__filename, "html")
+        f = open(htmlfilename, "wb")
+        f.write(html_template % template_vars)
+        f.close()
+
+
+def init(swf, filename):
+    return Technoargia(swf, filename)
+
+
+from lib.embeddedimage import PyEmbeddedImage
+
+preview = PyEmbeddedImage(
+    "iVBORw0KGgoAAAANSUhEUgAAAGYAAABmCAYAAAA53+RiAAAABHNCSVQICAgIfAhkiAAAIABJ"
+    "REFUeJztfXl4FUXW/nv6XiABFGWN7IGwhG1ARHlQNhlBNgkIPIAjiw6bKMig4oZ+IOgnOCCL"
+    "gowyMOqgDojIjOACyBpERoiKGLYQAyGGQHaSu9X5/XG76lbX7RucVfk9Xz/PTXfXcuq8p06d"
+    "c6q6ukPMzKv5JLKoDBYDIWIEmQFC5GD7TFe4Jq28Xt/tYO36SnTltVs9sz2Gkx+Tl18YFgLg"
+    "AcFDBAZQiytjMiWBXuXjfA5lTCB4mXAraqM1roUI1yKwAZE08mz/Za1pUwjkKhadyTAFWTt8"
+    "ZpUHI5cdYtCBOrvOLPULxSLAyEYZ9iEPBQjAIsL1qET0NH/NALgZqmECmrlrWOQ+0rB5xNI4"
+    "Z2p0nYq1OlLvSiPBfUy5txMRFbvQ+dmwfIhz+AIX4QGR12KgKnnDnWI3+8e3vsfpsyEMvP16"
+    "6npzfd6+4wxZBO7QrhZq1bkGzExEpDdNDAYRcThBqotDYIox5gguApFdPgKJAGZmBw1S7TAY"
+    "ICJFR/LCzND4MtMcNGR9IiKtzM+K5S40wLdUCB9CsAIQSEEDSCYAICdPoG7rtvg6LYcfnX8M"
+    "3+Y34e8Km+J//1iADe9/jzCW8CHxSyAuB+tnF2HqddlOUrTsS5kUqw3VAczsEJazCEcIaU3Y"
+    "7f/DWHQc/y4s/ZCAIDMsQUBVeMON2L1qWYDXA/z9WIhad0lGfBUir4fRqn0jZPqa4Q/rjtua"
+    "BtLadaiqmc7MBABFBWWmtps0HHSUthttxBA+iovKABFyK0M6LSLS+TDbrRCLma838K9iqYs4"
+    "hIhhAZGRIgTb4HzweIAuv+7CoQADDCaE8V5zTWWU12iJFW+chGVF+NAHkAStN0xEWL4yDU8t"
+    "/gGbNp/Qy+jSc0jS0GqVH8tcnc8uxIx5GXho7mn8/e/ZDhOn1Y0auaYGV4TFFKQ8/p1YAMDS"
+    "ohAQC3rmhSO4oV1HggCEAHHYbhLLyAVAFS/IUzcJ85ceJ8siCMFkqyMBIDk67GsQERatOAZR"
+    "pz3d3Ls1jmawKmeXJdvMyJ4mTSBk/KDT18/7v/gRt97Rlm68tSU2fxFPXx46r4aJwZvuI91o"
+    "umIx+8KNrhu9K2Gx88lOpXDH2B1VXuLD5McOc4NfdUQlLzlMo90860rlIUadpJaYv/Q4LIvY"
+    "Hm2s/QBbOxa/dhLXNE1GfJzFAT/g9YTLEBHbTMkziCJaLWnovsEor84AEF+F4PeDgwGgceL1"
+    "/PHX1+DQ33OUo9f5isKntWe3E4XFrZxNqMJyTjfjHJ0On8SRsxcAqqESLViWzt3vuonKS8Ei"
+    "3NvSSNnaJQMLBkDEDFgE3JDcEotWHKNHH0xWWmILgomI/rA2HVUSWkkNIBbgMlSnxxZ8D0Nr"
+    "pe1AoOwyzZzUnBs2uAa2HoGI6IXfH0GBLy5cyCVADQZDaNkpnBYKMiUkVOfNqeVUt/Ylbtyk"
+    "piSj+JRRmeRZ40Wd9WjNEDhJ4Zi+DBFz5cRm+DmZZvcWqWiO7I5hgK+NFzj95XeMuOvQoFl9"
+    "DglFKyIABtkyYY+XKOeHPPhLi+G/HEQoGITl8Sj7TUT4+OOTnEeNqZYXYBEOQUMhRuOk+kxW"
+    "fVMQCNcN87Nl61E8MLEtJPjS4jK+XKUBtWpXRwrKPBMABPxhmARwKMRIbFGbF69Nx++fugYe"
+    "byVHZ0oFgmZyI3ywLlwtyTFNUGdT4HoIbk4tXNqPwuIFgFIO0KMzfwUAeHjO12iYVB8QJFsg"
+    "2Z26IC0LKLpwAQufbkmAxyFkIkJhQSm2HfKi3Y3xCAYZNm9ERAiFAA5F5gf6fCLMGVGlSpai"
+    "ycyoVNlDLEII+O2Ry/asgeX4sfHqToUZAT+j7c2tsHz1N3j4gfbKh+n8akdEzaVUtQ4zOso1"
+    "MnPJ0zud9FFqWBhb3uHa3nBGZAZMlhIIWOtfWwuJIzbNLuuJmpsAwMbNGWjfpR0CPlvoiHjD"
+    "COdSsIQY0W/EDJjxjuwMOaBJkdd6y/ZJDFz01QCLIEAOJWKHUH7aoZumCEsuMohVzxydql5E"
+    "3mQ5quk9zWyOEn2sOiKLMF1yRCZJidcg/1JARmvSBurKTLZ+kxrtFEVXRi3uGk4cWe2KnoYQ"
+    "bKFXqgz4S4uJLK8Di4HNFYuh3crf6eXlT6sHPU2yL7G4+Bk9igMIsKI6xNkYwitjJBUQrIIH"
+    "52FqQY8eTSgj7Si8laQ2RSSotEtrTnk9RU9JSbYbpSTyLjzRlTdOLJZFdPL7izSiXw2bnMOP"
+    "RMi4zLu0MtIfmPVMx+8we2b5GAGGqzn1IvahRSLaGAO5DGT3+o9NaUyrN+eiaYu6CNl+Jjx3"
+    "Iyot9Stz46zFCASBOpaexKhc2QMR9OPy5SAL92VUeD2EqlW94YmyzaMvQGh+3Y98U5c2pAvI"
+    "xdlXZIaUszbTzahM0olFz+gkJWNlypSPCV9ERwb6TDYsUUhJ6gZEYzCq8cZNavKgW85h+7HL"
+    "VK9uVQ6FGF4v4Yej6dyvWzUEhasAIATjli5JElyYNnkxdkBV5F740ZVfi4hOnb6ES6IVV6tW"
+    "ORztWIRAzvc8fmobxzxId8CShh45xeggPeSNmpiYB7mvt0XRDvdr2PVQ2DhFojK9nGJAemWA"
+    "KRKZ6TGzzjCZw9VukLre0gA5uadxLK8+1akTB8FgWJWoW7eGbsB13yIdsxJg69a1qXVrh1I4"
+    "HHGVysCu42GdEiAqOH2cH3+oleRHrrzqbZjRlyuWCDuOtTWpNI4REyEXHVrrWOzMaCy2FCwt"
+    "MUJBORUOG37Sa2vmPcZQ1YcyMyNlcDMkX5eFrDMF4XCDQ47ybtcubchlG8cEURdU7ZpVkJ9f"
+    "SgWFfpScOYrHH2oJ5ojgdZyx+K8Ii17HjOZ+SnRnYrHbcJpI+6GAHDHKJFSiIEovg1ko4UXN"
+    "sAHAKzwoKbrs2rhr59zVAg0PncPO1Gz0uLGaK3Dd4WrXunbJeYC5tMEAKLF5bdT3fs314yth"
+    "6INtWRsFDpuujxxT4G7CduucWD7q34WFZvMRfgBJ3BhhYeXklODEiUvweFRIZ3YMA6BgiNEi"
+    "6XrccMM1UcPfaJD0NInZNBdRY9++dwHDphBl+Km34SJQtfShY5GmyOi4nwULgfADleJVnHT6"
+    "GGZGQkJ1JCRUx089dA3RGGRdMDrTklG4mBW3srG00+0wTdOVTIsbDhdefhYsXt1AuRA0h5mi"
+    "h4jGOSIeE6TbodcxyivNMhg3ozBX0xNLuEZdZ6JzFP2sWHTOLMRo03CWJEeFNAvyLG/shJgT"
+    "rhigiN1n9qSVgUbXEVFVpMlXIxY9xnQ8KDOYd6Rx5CGWDjbqXgemN67RUr8raaPGSxRvhl9x"
+    "i7yuOiz68kc4XNY6x3BaSrO0oe3GoCtIeS01IpYGmhqk03WzwWYHuLQZhcVsU2IxR09FWHQ8"
+    "sej+q1giIyaSrGwfESEYDDrMhLyX+TptyZib4F9//XVH5/r9fle7rdti2U4UCi1fi2gc/Oh1"
+    "2UUShrLx9u3bkZ+fDyFEFBbTTOr+y+TnH8Fi0tWxyC6yzE6RDioxMVEyyUuWLMGGDRsqdIp6"
+    "FHPkyBHevHkzA+BXX33VwfOhQ4c4LS2NdWavEME4nKV9b3aKY65ia7d67Czs595kL+/oglu0"
+    "aBEKCgoghFB8PPDAA7rA2KYp6epOnG1aUYJ3URYV4T333HM63yZPHO4YF70UQuCaa65RhQKB"
+    "AFepUgV5eXkYO3YsLMtiy7Lw8ssv86BBg3Dw4EH5/J6//fZbdOvWDTNmzMD69etRp04dnDp1"
+    "CnPmzAEAeDwedOzYEdnZ2ZgwYQJXqlSJLctSzJ08eRJ9+/bldevWgYiwZMkSLFy4kIkIDz30"
+    "EK9fvx5PPPEEZsyYgU2bNiEtLQ0bNmzA8OHDsXLlSowePVrhGDp0KGbPng3LsjB79myeNWsW"
+    "5s+fz3Ik/+Y3v0Fubi7Xrl1bdVqnTp14zZo1PGzYMCYizJ07FytXrowaMVOnTsU999wDIsL6"
+    "9etx//3384oVK5iIeMKECRg9ejQXFhairKyMBw0ahOeffx4lJSW44YYbePHixXjssceYiDB2"
+    "7FiMGDECPp/P4fwxWxzhTC4RzCyYWQghBDOLNm3aCFtLxP3338/nz58XAHjv3r0iMzOT9+7d"
+    "y/PmzeNt27aJ7t27hwuKcJX3339f/P73vxfMLAYPHsx33XUXP/fcc7x7926RkpIimFkA4D17"
+    "9vC5c+c4GAyy3S536NCBmZlTU1PF1q1bed68eWLZsmV86NAh0bFjR54+fbpISkoSqampokuX"
+    "LiI/P18AEKtXr+Y+ffrw9OnTxXfffSduuukmcerUKTFq1CjV3rfffiv69OnDp06dEpMmTeJL"
+    "ly6JFi1acGlpqYOH5ORkZmZ+6qmn+M033xRTpkwRx48fl/LgBQsW8J49e8QPP/ygaJ86dYoH"
+    "Dx7MTzzxBGdmZoqJEyfyn/70J05KSmJmFt27d+f8/HxRUFDAAwYMEMzMkyZNEpmZmWLcuHFi"
+    "9erVgplFJpeI2XyEvaabkloRCkXWs3bt2oXrrrsORUVFmDNnDrKzs9GpUyd89NFH8Pv92L17"
+    "N4QQsOynn4FAgEKhEANAYWEhdu3ahbVr1yIYDCI+Ph4AqKSkBHPnzsW3336Ljz76CMFgEEeP"
+    "HsWwYcMAAF27dkVKSgrWrFkDIsIf//hH1KhRA0uXLsWOHTvQtWtXVK5cGUSE5557Dm3atMHQ"
+    "oUPRuXNnHDt2DJmZmWjWrBlycnIAAA0bNkTbtm0RCARw6tQp9O7dG9dffz26deumsErzKa3K"
+    "1q1bMX/+fKpXrx6npqaiRYsWAIAPP/wQTz75pBJZ586d0axZM3z44Ydo27YtvvjiC8yaNQsD"
+    "BgzAs88+CwAoKSlBXFwcioqKFP1du3YhKysLjzzyCG6//fbI7NDNlMlKzzzzDAYOHIiRI0ei"
+    "SZMmiIuLw/Dhw9GkSRPs3bsXU6ZMgccTfqycnJysnDoQDhQuX74MAFRaWgoAqFy5MtLT06la"
+    "tfDST9++fVGvXj0cP348zIhloUOHDtiyZYs0DXj88cfRp08f9OzZExMmTMA333wDALj22msB"
+    "AJcvX8bu3buRn5+PxMREHD58GDVr1sT27dvRvn17vPLKK8jMzERGRoZSuNLSUnTs2BGLFy/G"
+    "tGnTsG7dOphHYWEhAGD06NHo2bMnpk2bhmHDhikV7t+/P5555hmaOHEiACA/P1/Vfeihh1Cr"
+    "Vi3s2LEDKSkpqFOnDt544w1kZGTg5MmTYGYUFRUBAMaPH4969eph06ZNGDhwoDOWs00Z26Ys"
+    "bMvCI1r4fD4uLS1lZuZQKMQlJSX86aefilAoJEc1FxUVqSEuD5/Px/n5+SpdmricnBzZBBcW"
+    "FvKOHTs4GAyqYvLi888/V/dpaWmcm5urkxepqanMzCIrK0vnm7/44gvZjmBmvnTpkigrK1P3"
+    "kgfJf3Fxsaqr82DzyczMhw4dcpSTZQ8dOqToZmZmOnD6fD5RXFysaEg+8vPzORAI8MWLF2VZ"
+    "UV5eruhzSIhMLuHZfIRptjjCD5BaxHQsIRCpJQXH9AbOvnUs/Nn17MEXWcvjSPhp0tOjL30O"
+    "5SgnidlnWce5uhjhR85R9MhPLiE52jDmOooHdkaKrlj0dA2fKxazHY0faBD4B4QXMbUHuOEK"
+    "Rqyuh9ESsH6vbmRUhkgYCe3eEeYa5VR5mabVgd6OdnbwpwtMEyjrflLnVVc+kwep9TavqqyJ"
+    "RfpQE4smJwcWPU2TjcJC4Tc41GE+KFPrOPKMyJKGWnawFYCYmUKhEIiIduzYQb/73e+IiOid"
+    "d94hIoIQgoQQDloA8Oc//5k8Hg/t2LGDiMhRRtYhIoRCIdhtONIlnVAopJZYZMcQEc2cORPp"
+    "6enk8XhQr1496tWrlxxRjiUUALBp0qJFi4iIUFBQQD6fj4iImjVrJvlz8C+EoAsXLhAzY9++"
+    "ffT4448rGVmWRfPnz1drZ8FgUB8pZPyUrJm1zSYcYxFTB68NNUe+EAJEhJKSEgBAXFwcgsEg"
+    "AGDIkCHw+XxkWRYsy1I0JMCVK1ciFAqFIxH78Pv9YU2x6wBAQUEBLMtCKBSCx+OBZVmOTvD5"
+    "fGp+oUeF586dQ0JCAnJzczFw4EB8/vnnjmcmknfZHjNj2rRpAMIOedeuXQCA6667TpZxmLdA"
+    "IIA2bdrA7/dT7dq14fF4dLlh5syZ6j4tLQ2FhYWONjWr5r64RpGozDGspGmymXGYC3lYloXJ"
+    "kydj3Lhx+O1vf4saNWogLi4OW7duxe7du7Fz506uVasWEhMTsXHjRhARLMvCfffdxwcPHkSj"
+    "Ro3g9/tRo0YNdOzYEW3atAEA1K1bFw0aNEAoFEKfPn3QvXt31KhRA40aNeLOnTvL2TMTERo3"
+    "boy2bdti8ODBbFkWevXqhebNm/Nf/vIX+Hw+dO7cGVu2bOHx48crE7p48WIcPnwYvXv3BhHh"
+    "5ptvhs/nw/z587F582YcOHAATz75JE6dOoX4+HgMHz4cNWvWZKkEAPDggw+itLQUQ4cO5bi4"
+    "OOzduxdt2rTByJEjVceUlZWhQYMGWLFiBZYuXaqURjPZUrzOJS65P8xtgikP815GEsws8vLy"
+    "xMiRI1W9ffv2iccee0y8++67Ytu2beKDDz4Qb731lmBm0ahRI2ZmEQqFBDOLO+64Q9VLSEgQ"
+    "zCx27dolVq1aJXbv3i1KS0vF6tWrxejRo/nUqVPitttuE8wsOnTo4JgE9+3bV50//PBDXrly"
+    "JTOzuOuuuwQziwMHDoiNGzcK2XYgEBDbtm0Tb7/9toiPj+ePP/5YDBkyRDCzmDx5sjqnp6cL"
+    "Zhbt27cXmZmZ4tVXXxWpqamSDjOzaNq0qWBmceLECdGiRQvBzKJt27aitLRUjBs3TuTm5ooW"
+    "LVqIefPmOeq5yVZhEpEJpu5j9OcJ6mxcS1NCxcXF1KBBAwJAeXl55PF4KBAIkM/no0AgQAjP"
+    "YejSpUtUr1496HT8fr+iXbt2bQJAPXr0oCNHjlAgEKD09HSKj4+n48ePo1mzZlRSUkIAqFq1"
+    "aqafIAB08uRJateuHb788ksAoHPnzhEAunDhAhUVFSnbT0SUlJREjzzyCL322mtYs2YNpaSk"
+    "0KVLl+jy5csEgMrKyqiwsJAAkM/no8aNG1NOTg55ws/aydZ8hcHn89GgQYPUNTOT3++nOnXq"
+    "0PHjx+mGG26g1atXq3qmr3P9sbEZQ/cn0pHCGdqp1ZymTZvStddei8aNG/PTTz9NvXv3xk03"
+    "3cRdu3aFz+dDVlYWnnnmGbz11lu0Z88eaSYZgPJFAFCjRg3pUHnlypVUu3ZtNGrUiA8fPozU"
+    "1FQCwF26dKFAIMBJSUmUm5vLderUAQB89dVX6NSpE1auXInExETq1KkTevbsyXXr1lUYbL8G"
+    "W6jcvHlzqlGjBt977700b948fvPNNxEIBMheceDGjRtTpUqVAIClaerVqxdOnDiBLl26KJvT"
+    "okULtvnGnXfeCQC48cYbKT4+HnfffTd/8sknNGrUKHg8Hj5+/DhCoRBZliWnADKcdl9BJ1DM"
+    "CaayW/akSp+ECSFYm2RGTTCZmd977z2xYcMGZmZ9EsnMrCZfMl0Oc33iGggEHHRd2hP9+vXT"
+    "+Xa0IYRgv98vfD6fg0fZZiAQUOW0NqImxZI3lzRHeZmmmXsnMy6HJmNhI1MTzKjtS9rcQWk5"
+    "2yOGjQ1rHD3RUvWaN28On8/HAEgu3cj8qlWrhpe2I8PbnI+wjHR02kb76N+/v863Y5cMEbHX"
+    "K1//UQdb4RdH2ePxyEhN0bX5cWDRHLOaJErMWnk9klXzPVOW9rU+YpzPYiJ9QXIRUxI0zzJP"
+    "neU8Bs5D+R9pDm+88Ua1ImCEh1I4jvrsTJAdoc/oSafDzDxjxgzSes0UjupMDfw/jEUTmls5"
+    "1/SKsLA9Z9FCZ6X06o0y1t7BlGepdRpDakYvhS7ztRHimPnrobYRu+ta4fjp9DQgDtrvvfce"
+    "Hz9+HCL8Nq6Dnq7Z+rkiLDJfP5tYJB3DivzLWNz4tO9Yn8fo3asvbTg0TFcEI9+heVp9s3zU"
+    "NWyl0elJIGfPng0/QAIoLS0NQ4cOpZYtW8KyLKxatQp79uwBEakV6qKiIhQWFuLChQu4cOEC"
+    "Vq5cidzcXAghcOHCBXrjjTeQmZlJZE8yv/zyS/z1r391TKj/E1iMw1WmqpydG3P7kuY73LQF"
+    "MNaB9Gt9lGh13WiodF2rZcbevXvxxhtvYN++fXzgwAHceuutDAB33nknOnbsiDFjxmD//v14"
+    "4oknMGfOHCxatAiPPPIIrr32WgwYMACtWrVCu3btUFxcjLp163JOTg6efvpp1V7Lli3RtWtX"
+    "cz3u347FLCN9m55olHFOMF0mPlFRGkdHQc5wTaNj5LGWppepMJLp3r27GDx4MDOzuO2225iZ"
+    "Ra1atUT37t3F66+/LphZjBgxQowcOZIffPBBHjVqlPjb3/4m2rdvL3r27CnOnDkjcnJyxG9/"
+    "+1uddyGE4PLycuH3+//jWLR7U4ZRNDK5RMwWR9gxYjQfonpXt6cRhXGuvMJtaSFa+7TiKsGh"
+    "WXYBB62EhARFo6ysjAEgPj4eL774IizLwurVq5GZmYnOnTujpKQEVapUQadOnSCEwJIlS/DM"
+    "M8/gzJkzDj6A8FwqLS0Nq1ev/o9jMcpFjTpD5mFzFmtJxuhVxwM0bRSxVq9CLdM0xdQSBw1D"
+    "k7iwsFAUFhayEEL8+OOPcu4g1qxZI9555x3BzGL79u2irKyM9+7dy9nZ2YKZRU5Ojli1apU4"
+    "fPiwKCsrE7t27TI11eT9P45FF6d27xwxIrwkIx+UQe72lx2qzSkiHRn9cMvUGMfqQQytc23H"
+    "Lc/kw2VER2tbjLRfAha3dh3pDPyAUrxKJ23nz7EBuYHWhRQLbEVA3Bg3abmBknRFZJkl6rGE"
+    "zptJX85L9M42y7vx/u/A4qbo0eAil3InporBmZ22kSOUmCNzGD0qMcs6NsmZvJs/Ge3oNGWe"
+    "3A9WXFwMIuLu3bvjnnvuYcuy+LPPPuNHHnmEs7OzpY8w+VFn2c7ChQu5efPmsM2IAwsR4YUX"
+    "XuC+ffvy8uXL5bzi34ZF8mbK1CH38BwmnDebnT7GsJlmpOawi2b5GHbZYXvd2jB/0o8wM7dq"
+    "1Uows9i/f7+YP3++YGaxadMmcf/99wt7r5vD/geDwZi0ExMTK8Qil+979+4tjhw5Yvrbn4TF"
+    "LK83VpFsZV5kXxk7h5Ddo2rSRdpKqGbjo97C0jXCOPQJlRndQQhBeXl56N27NycmJtKIESMw"
+    "btw4DBkyhL///nvk5eXhzJkzNG3aND59+jRZlsVPPPEEUlJS8N577+Gee+4BANx1111IS0vD"
+    "b37zG2RlZWHNmjV49tlnMX36dKxfvx6nTp2irKws7t+/P23dulUf8Qq91+tlAFSrVi3YK8H/"
+    "EBYtX5eJGcI5ZMqaKbXfWg4fZlRm9qBxOGLvWL+fomXyCIVC4scffxT9+vUTzCzq1q0rtm7d"
+    "Kh9wsb0jVCxevFh89dVXqv4999wj7r//fsHM4uDBg6J+/fp84MABZmZx8803i3Xr1olWrVqJ"
+    "l19+WWRkZIjc3FwxZcoU1XYoFOLy8nLx4osviueff14ws2jZsqVo2bKlACAKCwt/8ohxCCi2"
+    "JYmK9KKsjIgxj3HTAH25QjpOjiw56LXN6a2blrkdJIRAy5YtgfACIJ0/fx7164e/zlS1alVV"
+    "pry8nIDwRvA+ffrg9ddfBwB06dIF586dw9tvv433338fycnJ2LhxI8aOHYvdu3ejadOmCAQC"
+    "FAgEHFgqV66MGTNm4He/+x0BoEqVKiE9PR3p6ek0bNgwN4ddIRZpSbQyZOS70mDTfZHLlzH0"
+    "aMtciJPDTjNp+iRJOdFYYaNbtMMcXuJfvnw5/vSnP/GSJUtowoQJ6N69O7xer9wVyeXl5QgG"
+    "gwwAiYmJ8iEcmjZtil69emHu3Lnw+/0YM2YMunXrhhMnTqB9+/bYv38/gPCDOHvjiGM5pUqV"
+    "KmpyWLt2bfTt2xcXL17k7du3Vxh2x4jcTKdPLnWi3lBwdIysdaUHZXZa1LKFlmbex1pica0f"
+    "CoX4/PnzPGnSJFVAfzglj9zcXC4pKYlaGjLLueUJIYTf72d75+YVsbjw/ZOw6OUrkoVGRxj5"
+    "6kFZ1LK/HCHGYqUaFEJ7wcfQDhVimvTMcszsKOf1erlWrVq69jEA+c4KMzPq1KnD1apVi1py"
+    "Zy1Sl9dmHhGhUqVKaNiwoaO8G4+hUEhuFFThMjPDfhtA8gdbeVS5ijDrbWm0IYSAECJSjyPn"
+    "qA1/8iyJceThFzEzzp07p8ppnee2QVCnB/3ezicgvLmhdu3a9PzzzzuezwPhzdr2xg6VJtux"
+    "O0Ll6bxcCYtJS2fw7NmzlJmZqbDIOhkZGXT+/HlVLicnh+y9C6T9XGWj48/OzlZp586dw5kz"
+    "ZyQvkfpkPChzUyepvZZl8csvv4wTJ07A5/Op1wGFEJg6dSosy0IwGGS5WmvvolTbVKWmBAIB"
+    "+P1+NakKBoNqs585SmfNmoWMjAwuLy9XIycYDCIYDCo7HQqFEAgEOBAIqNFs09Q1GlLrJT45"
+    "wmyTAiLCkSNHkJycLN8qUCNm7dq1sN9vwdq1a3Hy5ElMnjyZ7Q7kQCDAkrZsi5kRCATkhBN2"
+    "4MG33XYbAPCxY8fQokULHD582BxpYXlrvUq6JkvVkiMFAL3++uu4/fbbKT8/n4Dw6wp+v59W"
+    "rlwJWwNo//79RERUUFBAzExyp2ZeXh4A0LFjx+jgwYNERFRcXExFRUU4evRolGYBoMaNGyMu"
+    "Lo7OnDmjtD0rK4sKCgoIAO3YsYMuX75M2dnZdPLkSVy6dAkA6Mcff6S9e/eSEMKh9SdOnKAR"
+    "I0bA7/dTaWmp2sJ7+fJllJWVYd26dfTnP/8ZvXr1UjyEQiF6++236bPPPqOkpCSMHj0aSUlJ"
+    "iIuLU/I6ePAgSc0HgGAwSEePHsX58+fliKfMzEycPn2aZJT55ptvYu1adyc0AAAMAUlEQVTa"
+    "tXTHHXfoI44g38JU8xjhuroshBAiGAyKjz76SCxdupSZI5v0EhMTRVFRkZg5c6a4dOmSGDJk"
+    "iFi2bJkYMWKEGDt2rDh79qycmXOPHj3EJ598ImbNmiWmTp0qXnjhBbFgwQJRtWpV0b59e5Gf"
+    "n++M6ZnFokWLOCEhQYwcOVK8/fbbYvny5WL48OFCrgY0atRI3H777aJy5coiJSWFe/Xqxcws"
+    "unXrJt599121QZCZxfjx48W9994r1q5dKz744APx1FNPcUpKitizZ48YNGiQ2L9/v0hKShJj"
+    "xowRBw8eVPX+9re/iTp16oiHH35Y5Obmih49ejAzi7vvvlvk5uaKYcOGiQ8++EAkJCSIUCgk"
+    "gsGgyMvLEwDEs88+K7p16yYKCgpE//79efLkyaJatWoiLy9PJCcni1GjRol9+/ZF5j3aPMac"
+    "YLLROSq8aNGihQomZsyYwR9//DHffffdXFpaKhYsWMAPP/wwjxkzhps3b87MzH/4wx/EunXr"
+    "uGHDhvyXv/yFn3/+ee7evTuPGzdO9OzZk5mZp0yZwqWlpVxWVsahUEgPBJmZxaOPPso7d+7k"
+    "goICXrhwoejWrRszs9iwYYPYuXOnuOWWW5jtJRRm5r59+/KiRYvEsGHDRMuWLbm0tFSB3rNn"
+    "D3ft2lXcd999XFhYyI8++ii3bdtWrF69mn/9618zM/PEiRNFfn5+hAGbn65duyrGZNnhw4fz"
+    "d999J5o0acK33HILL1myhJnD26IuXLggJk6cyMzMrVu35qlTpwr5js+vfvUrZmbx0EMPyfdr"
+    "IuJ27MQkZTqUfZTDSk7q1q5di8mTJwMIb6hesGAB+vXrhxUrViA/Px/5+flo164dqlWrhvT0"
+    "dNx7773o168fjRs3Dp9//jlGjBiBUaNGoUmTJujZsyd99tlnGD9+PICw75Gv7Jkxvd/vR0JC"
+    "AoqLi5GXl0dVq1bFnj17aN26ddSxY0ekpaUBALKyskiay+TkZKpSpQrS09MlzwSAMjIykJqa"
+    "SkePHoXX68WiRYuwePFizJ8/H0OGDFHYysvLVRAifZ5tEgGEN7oDQHFxMa6//nq6ePEitmzZ"
+    "gk6dOmHZsmXweDwgIhw9ehQ7d+6E3+9HSkoKli1bhvT0dHz99dcAQIFAAHLnpjEnsk0ZO+cx"
+    "cpCEQiGRk5PDs2bN4nfeeUdpkFTrTz/9VGqIyM7OZmbmzZs381NPPcXffPMNM7N46aWXmJl5"
+    "zpw5Sgtfe+018eyzz3JxcTG///77bG/I46ysLJGVlcXyl5ubK7788kv2+/3s9/t5/fr1zMw8"
+    "bNgw8e6778qRw8wsZs6cyczMy5cvZ2bmjz76SDz55JP89ddfi7Nnz/Ljjz8uPvvsM+7fvz+/"
+    "+uqrzMy8atUqZmbxyiuvcEFBATMzT548WehvnMmjR48easRkZGQwM/Mnn3zCoVBIFBYW8tNP"
+    "P82vvPIKMzOnpKRwXl6e6NixI69YsYLLy8uZmcWWLVt44cKFLDdBTp8+nX/44QfnPEawyBTu"
+    "b5SpUeP2HIa09XVdu4X9CgQzq9cm9Ncv9Hqyrny1Qh7/8z//o15StSwLXq8Xc+bMIWFvVTLr"
+    "SB5l20IIsnlgnQ9ZXr+26zg+SyW01zj0Q6bL+qFQiDzah79DoRDsjYWqTG5uLiZNmoQPPvhA"
+    "f/1CLl5GtSVFo38WK+pVP2jhpSZQx0qpviYkV0q1e7Vcw5E5UGScVlAecERmZv2oV/10frUV"
+    "b9nYz4YlGAzyiRMnSL5aYrYTCwvBftWPIq/6OXyMwYTbQlzMQ2qyPur0swHMUU7Pcxm1MT9X"
+    "aID+WbEAgNfrRevWraPouUzIo7CAYuzEtAnoC5JqMsfs/ig5lrAr6gQTuElPu2aDD7WoavL9"
+    "S8Ai8/UXlf4ZLFHL/iYTJgC3owLNU67FMDMVtmne/5Q2pR+qiO7VgkVfkvnJjJvl3YhLLTDS"
+    "9HpRjUgAZpYbsJ/C59WOxbF32UVbXFdMNWb0tSd940KF9luaE/nT6UmnrDPuxofbCIkl3KsR"
+    "y/99evEXhEXfSvZ/n178BWGxn14ScIVPL2rUdKbdGHQFqdtPNzuqRStRdBARYlQ9swNchHzV"
+    "YomMmEiysrFulbWhb264VuGom2mRZd0iJqMNNvJiem5pu9340etejVhkF0V9elGjHeUU3Zhw"
+    "OaLexrLrQ0tjN6HFYJy1ujoNJyBECeGqw6L3hesbZSZIcu6GMQlLuvorfnpZRc/FlrMEX5Gm"
+    "u+Q7aMYyMVcbFr37o1btDEaUs5RppvPSzuqDCKZgYtyT8VP0NIfo6tCvZEquZiymKbsiSJlX"
+    "0ajV6l7JRjj8cgVOUV3HKuPiX2Lem3m/NCx6S1F7lysK+2IJIlYdqZ0GyJgmOZaQY/GjO2k3"
+    "Pq42LHpfuG5fMsJIFWebUUosW68LzI2RWBoW4zqKJ80cmWbo/xss5uqyVp7drmMyZVT+KRFP"
+    "FI0rANdD0IrCUeVU5YZBJ2u/XCzOqMzgwy2SgREuIhIiOvJdQkvXa62uHnLCSINR1gSkh5+O"
+    "w35qyOnp6eqLrUbI/IvEonP1T396EZHIRZUzfnq6qmMzElVei5DUBgXbpCgehBBkP34m+VlG"
+    "I7ICEN7dmZycTOvWrUOHDh3o7Nmzqs3/FhadruGXouhqOMNl+F/49KJbHTNkt0FEFY1uMXJs"
+    "27YNmzdvxty5c9Wz8WnTpqkPS1+4cIGWLl2qvoqxe/dujBs3Djt37lR8hUIhfPXVV3jxxRdR"
+    "vXp1VK9e/WfBYtIyrFHs+vQvfHrRTHOxxaynudlXt+P06dPYtGkTbr75Zrz00ksYMWIEBg4c"
+    "iIKCAk5NTcWoUaN4xowZ/Nhjj+HEiRN47rnn8OCDD/KYMWMUfSJCfHw8GjZsiLlz5/J1113H"
+    "tlb+17DE8jeamZN0XT+9aL4fo0yxzQgb6aSqOwG4frBAq+/YkaILyNBCLi4uxsKFC1G9enW8"
+    "+OKLKCoq4gEDBmDjxo0IBoPcoUMHxV9ubi6fOXMGq1atwvnz59UIsywLtWrV4osXL8YSxn8c"
+    "iyxjjBa9raiACxpX//SnF2W6bkt1fyDTNAFE5bv9atWqRXfeeSd16dKFXnrpJdSoUYPWrVtH"
+    "J0+epOzsbNq5cyfNmjWLDh8+TLfeeisBoE6dOlGXLl1g78anUChEfr+fbrvtNuratSsFg0E3"
+    "XP9RLC7puBJ29WNc8WOlsb4lI9Pkvb4Z0NyDzDJf1tXbMfJ48eLF/PHHH4uzZ8+q9r766is+"
+    "e/asOHPmjKIh3zBmZvHNN98I+al72XZBQYFgZhEMBoX9JvN/FYuzePTXRbT76HcwtS/8ESLz"
+    "Tv0Mvbe1YaqcqX6QM4GBqAdIOn29nrq2t8VSzZo15bCn9u3bK/J33HEHqlSpQoMHD2YAJITg"
+    "1q1bq6btC65evbrcLEi6GfpvYdFMnWpfo0laeW3TWoTeP/3pRYNRszNVXYPxqBgehs2ePn06"
+    "KleuzNpORfZ4PBIcffrpp6q+rCdfA9dtt7Zb8mfBotOT1zYvpNPSsOv0yNxUHtWjZhpFzxvU"
+    "vWF3Y5aDi+2V8ouLi3N8GZwi6FQa24+G9XY0QfxisMh7raMcWFSmMy36876I9K5DG3TCWr6u"
+    "Va6RjBqiESG4aRn0fGmKuIIoyeRPb+eXhAURS1VRxCf5YnudgEEgCwyY/3GcI4t4Dm1hZzio"
+    "55sLc1GTMZe6WpP/2ucKNXvurHQVY7EsIhQjYFZ22EfDTiue4NSWqDKGv3KjodI1LXObBEoy"
+    "phTceL6qsRQhAAsEy8uEPbgga+i1AXebLO8ddlWaBlnXiJJ0WiYzUetUFC1hZUV0PvR2TM2+"
+    "GrGAgEO4BC8TLCIgA6U4gLxwIQ4Xts0b29dMIL2P2baJEQ1ibWXaybctFefqqUaP7e8NAxEr"
+    "a9gOzf5L2uzURCKX/z15lWE5jRJ8h0IQAd7KbAEEbMJZnEEpOqMmqrAHNn2SzsjRgG0OHXeR"
+    "suahI2RHKqscdpSNdqiydISTSEr02SmICAe/UCxBYhzlQuyhC4hnL4gAyhGX+TU6jRAEBIAg"
+    "C6kW0WR1RmNF9WRcxzoqKuMGxS3PbKsintzq6uV+RiwEwEsWLA4n3UeJ+H/DuFHe8Nz9egAA"
+    "AABJRU5ErkJggg==")
+getpreviewData = preview.GetData
+getpreviewImage = preview.GetImage
+getpreviewBitmap = preview.GetBitmap
+getpreviewIcon = preview.GetIcon
+
diff --git a/wx/viewers/technoargia.swf b/wx/viewers/technoargia.swf
new file mode 100644 (file)
index 0000000..6530c7e
Binary files /dev/null and b/wx/viewers/technoargia.swf differ